Merge ~smoser/cloud-init:feature/net-convert-work-with-old into cloud-init:master

[Scott Moser]

tools/net-convert.py: support old cloudinit versions by using kwargs.

Older cloud-init versions have a bug in the signature of the
render_network_state method for netplan (bug 1685944).
The old had:
  render_network_state(target, network_state)
The correct is
  render_network_state(network_state, target)

This just changes our caller to use kwargs style when invoking that
method so that it works with either format.

[Scott Moser (smoser)]

I found this when wanting to use the trunk's tools/net-convert.py against a dpkg installed version of cloud-init on xenial.

[Chad Smith (chad.smith)]

+1 on explicit kwargs for extensibility of the call for future revs as well as handling the existing param re-ordering difference.

review: Approve

[Ryan Harper (raharper)]

OK, I had to test it myself, but I'm convinced that specifying the name of parameters in kwarg style does indeed do the right thing here.

review: Approve

diff --git a/tools/net-convert.py b/tools/net-convert.py
index b2db8ad..68559cb 100755
--- a/tools/net-convert.py
+++ b/tools/net-convert.py
@@ -75,7 +75,7 @@ def main():
         r_cls = sysconfig.Renderer
 
     r = r_cls()
-    r.render_network_state(ns, target=args.directory)
+    r.render_network_state(network_state=ns, target=args.directory)
 
 
 if __name__ == '__main__':