MAAS

Merge ~mpontillo/maas:add-controller-tag-names-to-api--bug-1790147--2.4 into maas:2.4

  1. Git
  2. lp:~mpontillo/maas
  3. add-controller-tag-names-to-api--bug-1790147--2.4
  4. Merge into 2.4
Proposed by Mike Pontillo
Status: Merged
Approved by: Mike Pontillo
Approved revision: 04961d52ebfc893f72191e334f6dc5352ea82dfa
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~mpontillo/maas:add-controller-tag-names-to-api--bug-1790147--2.4
Merge into: maas:2.4
Diff against target: 47 lines (+4/-0)
4 files modified
src/maasserver/api/rackcontrollers.py (+1/-0)
src/maasserver/api/regioncontrollers.py (+1/-0)
src/maasserver/api/tests/test_rackcontroller.py (+1/-0)
src/maasserver/api/tests/test_regioncontroller.py (+1/-0)
Reviewer Review Type Date Requested Status
Mike Pontillo (community) Approve
Review via email: mp+354367@code.launchpad.net

Commit message

Backport 1d5bae995 - LP: #1790147 - Add tag_names field to rack and region controller API output.

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

Self-approve backport.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasserver/api/rackcontrollers.py b/src/maasserver/api/rackcontrollers.py
2index 55e6032..87cb881 100644
3--- a/src/maasserver/api/rackcontrollers.py
4+++ b/src/maasserver/api/rackcontrollers.py
5@@ -72,6 +72,7 @@ DISPLAYED_RACK_CONTROLLER_FIELDS = (
6 'other_test_status',
7 'other_test_status_name',
8 'hardware_info',
9+ 'tag_names',
10 )
11
12
13diff --git a/src/maasserver/api/regioncontrollers.py b/src/maasserver/api/regioncontrollers.py
14index 7835ef4..d366437 100644
15--- a/src/maasserver/api/regioncontrollers.py
16+++ b/src/maasserver/api/regioncontrollers.py
17@@ -55,6 +55,7 @@ DISPLAYED_REGION_CONTROLLER_FIELDS = (
18 'other_test_status',
19 'other_test_status_name',
20 'hardware_info',
21+ 'tag_names',
22 )
23
24
25diff --git a/src/maasserver/api/tests/test_rackcontroller.py b/src/maasserver/api/tests/test_rackcontroller.py
26index 9feda0b..87e2aa3 100644
27--- a/src/maasserver/api/tests/test_rackcontroller.py
28+++ b/src/maasserver/api/tests/test_rackcontroller.py
29@@ -150,6 +150,7 @@ class TestRackControllersAPI(APITestCase.ForUser):
30 'other_test_status',
31 'other_test_status_name',
32 'hardware_info',
33+ 'tag_names',
34 ],
35 list(parsed_result[0]))
36
37diff --git a/src/maasserver/api/tests/test_regioncontroller.py b/src/maasserver/api/tests/test_regioncontroller.py
38index 80cdf91..f37d557 100644
39--- a/src/maasserver/api/tests/test_regioncontroller.py
40+++ b/src/maasserver/api/tests/test_regioncontroller.py
41@@ -97,5 +97,6 @@ class TestRegionControllersAPI(APITestCase.ForUser):
42 'other_test_status',
43 'other_test_status_name',
44 'hardware_info',
45+ 'tag_names',
46 ],
47 list(parsed_result[0]))

Subscribers

People subscribed via source and target branches