Merge ~newell-jensen/maas:lp1755815 into maas:master

Proposed by Newell Jensen
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 47e8c99aabf3c32adc5fc8d6f772bc2211adaa9a
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~newell-jensen/maas:lp1755815
Merge into: maas:master
Diff against target: 25 lines (+3/-0)
2 files modified
src/maasserver/models/bmc.py (+1/-0)
src/maasserver/models/tests/test_bmc.py (+2/-0)
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
MAAS Lander unittests Pending
Review via email: mp+341422@code.launchpad.net

Commit message

LP: #1755815 -- Sync discovered pod's tags properly.

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) wrote :

Lgtm!

Revision history for this message
Andres Rodriguez (andreserl) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasserver/models/bmc.py b/src/maasserver/models/bmc.py
2index 1808c1a..2ce11ea 100644
3--- a/src/maasserver/models/bmc.py
4+++ b/src/maasserver/models/bmc.py
5@@ -915,6 +915,7 @@ class Pod(BMC):
6 self.local_storage = discovered_pod.local_storage
7 self.local_disks = discovered_pod.local_disks
8 self.iscsi_storage = discovered_pod.iscsi_storage
9+ self.tags = discovered_pod.tags
10 self.save()
11 self.sync_hints(discovered_pod.hints)
12 self.sync_machines(discovered_pod.machines, commissioning_user)
13diff --git a/src/maasserver/models/tests/test_bmc.py b/src/maasserver/models/tests/test_bmc.py
14index e4c143f..fba7c6e 100644
15--- a/src/maasserver/models/tests/test_bmc.py
16+++ b/src/maasserver/models/tests/test_bmc.py
17@@ -700,6 +700,8 @@ class TestPod(MAASServerTestCase):
18 memory=Equals(discovered.memory),
19 local_storage=Equals(discovered.local_storage),
20 local_disks=Equals(discovered.local_disks),
21+ iscsi_storage=Equals(discovered.iscsi_storage),
22+ tags=Equals(discovered.tags),
23 capabilities=Equals(discovered.capabilities),
24 hints=MatchesStructure(
25 cores=Equals(discovered.hints.cores),

Subscribers

People subscribed via source and target branches