Merge ~lloydwaltersj/maas:Oapi-servers-list into maas:master

Proposed by Jack Lloyd-Walters
Status: Merged
Approved by: Jack Lloyd-Walters
Approved revision: 69fdcb1cfbaa8b28697536ba9ae8c55bc5f2b838
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~lloydwaltersj/maas:Oapi-servers-list
Merge into: maas:master
Diff against target: 35 lines (+12/-6)
2 files modified
src/maasserver/api/doc_oapi.py (+6/-4)
src/maasserver/api/tests/test_oapi.py (+6/-2)
Reviewer Review Type Date Requested Status
Alexsander de Souza Approve
MAAS Lander Approve
Review via email: mp+427477@code.launchpad.net

Commit message

Change OpenApi servers element to list item

To post a comment you must log in.
69fdcb1... by Jack Lloyd-Walters

formatting

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

UNIT TESTS
-b Oapi-servers-list lp:~lloydwaltersj/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 69fdcb1cfbaa8b28697536ba9ae8c55bc5f2b838

review: Approve
Revision history for this message
Alexsander de Souza (alexsander-souza) wrote :

+1

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/doc_oapi.py b/src/maasserver/api/doc_oapi.py
index e7ad8bd..993c624 100644
--- a/src/maasserver/api/doc_oapi.py
+++ b/src/maasserver/api/doc_oapi.py
@@ -94,7 +94,9 @@ def _get_maas_servers():
94 Config.objects.get_config("maas_url").rstrip("/").removesuffix("/MAAS")94 Config.objects.get_config("maas_url").rstrip("/").removesuffix("/MAAS")
95 )95 )
96 maas_name = Config.objects.get_config("maas_name")96 maas_name = Config.objects.get_config("maas_name")
97 return {97 return [
98 "url": f"{maas_url}{settings.API_URL_PREFIX}",98 {
99 "description": f"{maas_name} API",99 "url": f"{maas_url}{settings.API_URL_PREFIX}",
100 }100 "description": f"{maas_name} API",
101 },
102 ]
diff --git a/src/maasserver/api/tests/test_oapi.py b/src/maasserver/api/tests/test_oapi.py
index a35fbfb..4b3cf01 100644
--- a/src/maasserver/api/tests/test_oapi.py
+++ b/src/maasserver/api/tests/test_oapi.py
@@ -44,6 +44,10 @@ class TestApiEndpoint(MAASServerTestCase):
44 content = yaml.safe_load(page.content)44 content = yaml.safe_load(page.content)
45 self.assertIn("servers", content)45 self.assertIn("servers", content)
46 servers = content["servers"]46 servers = content["servers"]
47 self.assertIsInstance(servers, list)
48 maasserver = servers[0]
47 maas_name = Config.objects.get_config("maas_name")49 maas_name = Config.objects.get_config("maas_name")
48 self.assertEqual(servers["url"], "http://localhost:5240/MAAS/api/2.0/")50 self.assertEqual(
49 self.assertEqual(servers["description"], f"{maas_name} API")51 maasserver["url"], "http://localhost:5240/MAAS/api/2.0/"
52 )
53 self.assertEqual(maasserver["description"], f"{maas_name} API")

Subscribers

People subscribed via source and target branches