MAAS

Merge lp:~jtv/maas/ngi-name-ci-breakage into lp:~maas-committers/maas/trunk

  1. ngi-name-ci-breakage
  2. Merge into trunk
Proposed by Jeroen T. Vermeulen
Status: Merged
Approved by: Jeroen T. Vermeulen
Approved revision: no longer in the source branch.
Merged at revision: 2561
Proposed branch: lp:~jtv/maas/ngi-name-ci-breakage
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
src/maasserver/api.py (+1/-1)
To merge this branch: bzr merge lp:~jtv/maas/ngi-name-ci-breakage
Reviewer Review Type Date Requested Status
Raphaël Badin (community) Approve
Review via email: mp+226859@code.launchpad.net

Commit message

Fix ‘name’ error when accessing a cluster interface from the CLI. The problem was a missing parameter name change in the API handler's resource_uri method, which is used to generate both the API documentation and the CLI's API metadata.

Description of the change

Gavin found the solution. Thanks.

Jeroen

To post a comment you must log in.
Revision history for this message
Raphaël Badin (rvb) wrote :

This code path is probably only used for by documentation and by the CLI… we should probably think about testing it but that can wait.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/maasserver/api.py'
2--- src/maasserver/api.py 2014-07-15 07:48:50 +0000
3+++ src/maasserver/api.py 2014-07-15 15:08:49 +0000
4@@ -2164,7 +2164,7 @@
5 else:
6 uuid = nodegroup.uuid
7 if interface is None:
8- interface_name = 'interface'
9+ interface_name = 'name'
10 else:
11 interface_name = interface.name
12 return ('nodegroupinterface_handler', [uuid, interface_name])