render_network_state: switch arguments around, do not require target

render_network_state should default to rendering on /.
The changes here just make it so render_network_state does not
require a target, but defaults to None, and uses target_path
to handle that.

2 files changed, 10 insertions, 9 deletions

diff --git a/tests/unittests/test_datasource/test_configdrive.py b/tests/unittests/test_datasource/test_configdrive.py
index 55153357..337be667 100644
--- a/tests/unittests/test_datasource/test_configdrive.py
+++ b/tests/unittests/test_datasource/test_configdrive.py
@@ -645,7 +645,7 @@ class TestConvertNetworkData(TestCase):
             routes)
         eni_renderer = eni.Renderer()
         eni_renderer.render_network_state(
-            self.tmp, network_state.parse_net_config_data(ncfg))
+            network_state.parse_net_config_data(ncfg), self.tmp)
         with open(os.path.join(self.tmp, "etc",
                                "network", "interfaces"), 'r') as f:
             eni_rendering = f.read()
@@ -665,8 +665,9 @@ class TestConvertNetworkData(TestCase):
         ncfg = openstack.convert_net_json(NETWORK_DATA_BOND,
                                           known_macs=KNOWN_MACS)
         eni_renderer = eni.Renderer()
+
         eni_renderer.render_network_state(
-            self.tmp, network_state.parse_net_config_data(ncfg))
+            network_state.parse_net_config_data(ncfg), self.tmp)
         with open(os.path.join(self.tmp, "etc",
                                "network", "interfaces"), 'r') as f:
             eni_rendering = f.read()
@@ -697,7 +698,7 @@ class TestConvertNetworkData(TestCase):
                                           known_macs=KNOWN_MACS)
         eni_renderer = eni.Renderer()
         eni_renderer.render_network_state(
-            self.tmp, network_state.parse_net_config_data(ncfg))
+            network_state.parse_net_config_data(ncfg), self.tmp)
         with open(os.path.join(self.tmp, "etc",
                                "network", "interfaces"), 'r') as f:
             eni_rendering = f.read()
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
index c6535e1c..dca44b37 100644
--- a/tests/unittests/test_net.py
+++ b/tests/unittests/test_net.py
@@ -697,7 +697,7 @@ class TestSysConfigRendering(CiTestCase):
         os.makedirs(render_dir)
 
         renderer = sysconfig.Renderer()
-        renderer.render_network_state(render_dir, ns)
+        renderer.render_network_state(ns, render_dir)
 
         render_file = 'etc/sysconfig/network-scripts/ifcfg-eth1000'
         with open(os.path.join(render_dir, render_file)) as fh:
@@ -725,7 +725,7 @@ USERCTL=no
             ns = network_state.parse_net_config_data(network_cfg,
                                                      skip_broken=False)
             renderer = sysconfig.Renderer()
-            renderer.render_network_state(render_dir, ns)
+            renderer.render_network_state(ns, render_dir)
             for fn, expected_content in os_sample.get('out_sysconfig', []):
                 with open(os.path.join(render_dir, fn)) as fh:
                     self.assertEqual(expected_content, fh.read())
@@ -735,7 +735,7 @@ USERCTL=no
         render_dir = self.tmp_path("render")
         os.makedirs(render_dir)
         renderer = sysconfig.Renderer()
-        renderer.render_network_state(render_dir, ns)
+        renderer.render_network_state(ns, render_dir)
         found = dir2dict(render_dir)
         nspath = '/etc/sysconfig/network-scripts/'
         self.assertNotIn(nspath + 'ifcfg-lo', found.keys())
@@ -775,7 +775,7 @@ class TestEniNetRendering(CiTestCase):
             {'links_path_prefix': None,
              'eni_path': 'interfaces', 'netrules_path': None,
              })
-        renderer.render_network_state(render_dir, ns)
+        renderer.render_network_state(ns, render_dir)
 
         self.assertTrue(os.path.exists(os.path.join(render_dir,
                                                     'interfaces')))
@@ -795,7 +795,7 @@ iface eth1000 inet dhcp
         tmp_dir = self.tmp_dir()
         ns = network_state.parse_net_config_data(CONFIG_V1_EXPLICIT_LOOPBACK)
         renderer = eni.Renderer()
-        renderer.render_network_state(tmp_dir, ns)
+        renderer.render_network_state(ns, tmp_dir)
         expected = """\
 auto lo
 iface lo inet loopback
@@ -972,7 +972,7 @@ class TestEniRoundTrip(CiTestCase):
             config={'eni_path': eni_path, 'links_path_prefix': links_prefix,
                     'netrules_path': netrules_path})
 
-        renderer.render_network_state(dir, ns)
+        renderer.render_network_state(ns, dir)
         return dir2dict(dir)
 
     def testsimple_convert_and_render(self):