Merge ~newell-jensen/maas:display-pod-host-in-api into maas:master

Proposed by Newell Jensen
Status: Merged
Approved by: Mike Pontillo
Approved revision: 5b359daf5a7089166256cc75964d6c043403c48c
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~newell-jensen/maas:display-pod-host-in-api
Merge into: maas:master
Diff against target: 24 lines (+2/-0)
2 files modified
src/maasserver/api/pods.py (+1/-0)
src/maasserver/api/tests/test_pods.py (+1/-0)
Reviewer Review Type Date Requested Status
MAAS Lander Needs Fixing
Mike Pontillo (community) Approve
Review via email: mp+353608@code.launchpad.net

Commit message

Re-add 'host' to DISPLAYED_POD_FIELDS so that the pod's host can be seen in the API output.

To post a comment you must log in.
Revision history for this message
Mike Pontillo (mpontillo) wrote :

Looks good!

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

UNIT TESTS
-b display-pod-host-in-api lp:~newell-jensen/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/3773/console
COMMIT: 5b359daf5a7089166256cc75964d6c043403c48c

review: Needs Fixing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/src/maasserver/api/pods.py b/src/maasserver/api/pods.py
index 599d3cc..4a2106e 100644
--- a/src/maasserver/api/pods.py
+++ b/src/maasserver/api/pods.py
@@ -44,6 +44,7 @@ DISPLAYED_POD_FIELDS = (
44 'memory_over_commit_ratio',44 'memory_over_commit_ratio',
45 'storage_pools',45 'storage_pools',
46 'pool',46 'pool',
47 'host',
47 'default_macvlan_mode',48 'default_macvlan_mode',
48 )49 )
4950
diff --git a/src/maasserver/api/tests/test_pods.py b/src/maasserver/api/tests/test_pods.py
index 216b451..5cc1da7 100644
--- a/src/maasserver/api/tests/test_pods.py
+++ b/src/maasserver/api/tests/test_pods.py
@@ -126,6 +126,7 @@ class TestPodsAPI(APITestCase.ForUser, PodMixin):
126 'memory_over_commit_ratio',126 'memory_over_commit_ratio',
127 'storage_pools',127 'storage_pools',
128 'pool',128 'pool',
129 'host',
129 'default_macvlan_mode',130 'default_macvlan_mode',
130 ],131 ],
131 list(parsed_result[0]))132 list(parsed_result[0]))

Subscribers

People subscribed via source and target branches