Merge ~lloydwaltersj/maas:fix-url-string-parameters into maas:master

Proposed by Jack Lloyd-Walters
Status: Merged
Approved by: Jack Lloyd-Walters
Approved revision: 72558a5be68e1f500719c1c661b1621177a57e20
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~lloydwaltersj/maas:fix-url-string-parameters
Merge into: maas:master
Diff against target: 26 lines (+2/-2)
2 files modified
src/maasserver/api/nodes.py (+1/-1)
src/maasserver/api/tests/test_annotations.py (+1/-1)
Reviewer Review Type Date Requested Status
MAAS Lander Approve
Alexsander de Souza Approve
Review via email: mp+428476@code.launchpad.net

Commit message

fix incorrect url-string parameter in methods

Description of the change

OAS3 requires these be defined as true

To post a comment you must log in.
Revision history for this message
Alexsander de Souza (alexsander-souza) wrote :

+1

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b fix-url-string-parameters lp:~lloydwaltersj/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 72558a5be68e1f500719c1c661b1621177a57e20

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/src/maasserver/api/nodes.py b/src/maasserver/api/nodes.py
index 6896e07..f7152c0 100644
--- a/src/maasserver/api/nodes.py
+++ b/src/maasserver/api/nodes.py
@@ -1197,7 +1197,7 @@ class PowersMixin:
1197 power parameters for a specific machine or more than one machine:1197 power parameters for a specific machine or more than one machine:
1198 ``op=power_parameters&id=abc123&id=def456``.1198 ``op=power_parameters&id=abc123&id=def456``.
11991199
1200 @param (url-string) "id" [required=false] A system ID. To request more1200 @param (url-string) "id" [required=true] A system ID. To request more
1201 than one machine, provide multiple ``id`` arguments in the request.1201 than one machine, provide multiple ``id`` arguments in the request.
1202 Only machines with matching system ids will be returned.1202 Only machines with matching system ids will be returned.
1203 @param-example "id"1203 @param-example "id"
diff --git a/src/maasserver/api/tests/test_annotations.py b/src/maasserver/api/tests/test_annotations.py
index 5f0e27d..19f40d4 100644
--- a/src/maasserver/api/tests/test_annotations.py
+++ b/src/maasserver/api/tests/test_annotations.py
@@ -50,7 +50,7 @@ class TestAPIAnnotations(APITestCase.ForUser):
50 @param (int) "param_name2" [required=false] param2 description50 @param (int) "param_name2" [required=false] param2 description
51 @param-example "param_name2" param2-ex51 @param-example "param_name2" param2-ex
5252
53 @param (url-string) "param_name3" [required=false] param3 description53 @param (url-string) "param_name3" [required=true] param3 description
54 @param-example "param_name3" param3-ex54 @param-example "param_name3" param3-ex
5555
56 @param (json) "param_name4" [required=false] param4 description56 @param (json) "param_name4" [required=false] param4 description

Subscribers

People subscribed via source and target branches