Merge ~cgrabowski/maas:fix_vlan_discovery into maas:master
Proposed by
Christian Grabowski
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | Alberto Donato | ||||||||
Approved revision: | 50f817870f78b6fadfe6f7c0e371d92ef7a93d0c | ||||||||
Merge reported by: | MAAS Lander | ||||||||
Merged at revision: | not available | ||||||||
Proposed branch: | ~cgrabowski/maas:fix_vlan_discovery | ||||||||
Merge into: | maas:master | ||||||||
Diff against target: |
71 lines (+7/-15) 3 files modified
src/maasserver/models/interface.py (+2/-10) src/maasserver/models/tests/test_interface.py (+2/-2) src/maasserver/models/tests/test_node.py (+3/-3) |
||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alberto Donato (community) | Approve | ||
MAAS Lander | Needs Fixing | ||
Review via email: mp+424987@code.launchpad.net |
Commit message
update report_neighbours test
ignore observed vlan if already exists
Description of the change
This addresses LP:1978981 by instead of updating the existing VLAN's fabric, it ignores the report. This does change the fix for LP:1975477 in that its original fix would identify the existing VLAN by finding a matching subnet if possible, and updating its fabric to the observed one, avoiding the collision prior. So this now both avoids the collision issue and prevents the vlan from being moved unexpectedly.
To post a comment you must log in.
UNIT TESTS
-b fix_vlan_discovery lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas
STATUS: FAILED maas-ci. internal: 8080/job/ maas/job/ branch- tester/ 12987/console adfe6f7c0e371d9 2ef7a93d0c
LOG: http://
COMMIT: 50f817870f78b6f