Merge ~raharper/cloud-init:fix-net-convert into cloud-init:master

Proposed by Ryan Harper
Status: Merged
Approved by: Scott Moser
Approved revision: ac7951d53b318f2b34f671b7d32495b768b89331
Merged at revision: 9a178611b89ca198145c200718ab8f205ece398c
Proposed branch: ~raharper/cloud-init:fix-net-convert
Merge into: cloud-init:master
Diff against target: 13 lines (+1/-1)
1 file modified
tools/net-convert.py (+1/-1)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
cloud-init Commiters Pending
Review via email: mp+323083@code.launchpad.net

Description of the change

tools/net-convert: fix argument order for render_network_state

We're calling Renderer.render_network_state() with incorrect args.

% PYTHONPATH=`pwd` ./tools/net-convert.py --network-data simple-v2.yaml \
                                          --kind yaml \
                                          --output-kind netplan \
                                          --directory ./target

Traceback (most recent call last):
  File "./tools/net-convert.py", line 82, in <module>
    main()
  File "./tools/net-convert.py", line 78, in main
    r.render_network_state(ns, target=args.directory)
TypeError: render_network_state() got multiple values for argument 'target'

The method signature requires passing <target dir>, <network_state>.
This patch fixes the call order.

Fixes: LP:1685944

To post a comment you must log in.
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/tools/net-convert.py b/tools/net-convert.py
2index 870da63..ec4ee64 100755
3--- a/tools/net-convert.py
4+++ b/tools/net-convert.py
5@@ -75,7 +75,7 @@ def main():
6 r_cls = sysconfig.Renderer
7
8 r = r_cls()
9- r.render_network_state(ns, target=args.directory)
10+ r.render_network_state(args.directory, ns)
11
12
13 if __name__ == '__main__':

Subscribers

People subscribed via source and target branches