Merge ~xnox/cloud-init:typeerror into cloud-init:master

[Dimitri John Ledkov]

netplan: fix render_network_state arguments positions

tools/net-convert fails to output netplan config, because the
positional arguments of render_network_state are the wrong way around
for that function w.r.t. other renders.

cloudinit/net/netplan.py: def render_network_state(self, target, network_state):

vs

cloudinit/net/eni.py: def render_network_state(self, network_state, target=None):
cloudinit/net/renderer.py: def render_network_state(self, network_state, target=None):
cloudinit/net/sysconfig.py: def render_network_state(self, network_state, target=None):

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:e2503df6cdf774d9fe98aa5ac5867ba2cc758a37
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~xnox/cloud-init/+git/cloud-init/+merge/324012/+edit-commit-message

https://jenkins.ubuntu.com/server/job/cloud-init-ci/331/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-amd64/331
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-arm64/331
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-ppc64el/331
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=vm-i386/331

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/331/rebuild

review: Needs Fixing (continuous-integration)

[Ryan Harper (raharper)]

I also fixed up all callers in unittests to pass target= but, that's not strictly needed.

review: Approve

diff --git a/cloudinit/net/netplan.py b/cloudinit/net/netplan.py
index 825fe83..56b41be 100644
--- a/cloudinit/net/netplan.py
+++ b/cloudinit/net/netplan.py
@@ -205,7 +205,7 @@ class Renderer(renderer.Renderer):
         self._postcmds = config.get('postcmds', False)
         self.clean_default = config.get('clean_default', True)
 
-    def render_network_state(self, target, network_state):
+    def render_network_state(self, network_state, target):
         # check network state for version
         # if v2, then extract network_state.config
         # else render_v2_from_state
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
index 7c5dc4e..dd9c610 100644
--- a/tests/unittests/test_net.py
+++ b/tests/unittests/test_net.py
@@ -1072,7 +1072,7 @@ class TestNetplanNetRendering(CiTestCase):
         render_target = 'netplan.yaml'
         renderer = netplan.Renderer(
             {'netplan_path': render_target, 'postcmds': False})
-        renderer.render_network_state(render_dir, ns)
+        renderer.render_network_state(ns, render_dir)
 
         self.assertTrue(os.path.exists(os.path.join(render_dir,
                                                     render_target)))
@@ -1177,7 +1177,7 @@ class TestNetplanPostcommands(CiTestCase):
         render_target = 'netplan.yaml'
         renderer = netplan.Renderer(
             {'netplan_path': render_target, 'postcmds': True})
-        renderer.render_network_state(render_dir, ns)
+        renderer.render_network_state(ns, render_dir)
 
         mock_netplan_generate.assert_called_with(run=True)
         mock_net_setup_link.assert_called_with(run=True)
@@ -1202,7 +1202,7 @@ class TestNetplanPostcommands(CiTestCase):
                        '/sys/class/net/lo'], capture=True),
         ]
         with mock.patch.object(os.path, 'islink', return_value=True):
-            renderer.render_network_state(render_dir, ns)
+            renderer.render_network_state(ns, render_dir)
             mock_subp.assert_has_calls(expected)
 
 
@@ -1370,7 +1370,7 @@ class TestNetplanRoundTrip(CiTestCase):
         renderer = netplan.Renderer(
             config={'netplan_path': netplan_path})
 
-        renderer.render_network_state(dir, ns)
+        renderer.render_network_state(ns, dir)
         return dir2dict(dir)
 
     def testsimple_render_small_netplan(self):