MAAS

Merge lp:~rbanffy/maas/bug-1440090-info-lost-rediscovery into lp:~maas-committers/maas/trunk

  1. bug-1440090-info-lost-rediscovery
  2. Merge into trunk
Proposed by Ricardo Bánffy
Status: Merged
Approved by: Andres Rodriguez
Approved revision: no longer in the source branch.
Merged at revision: 3780
Proposed branch: lp:~rbanffy/maas/bug-1440090-info-lost-rediscovery
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
src/metadataserver/models/commissioningscript.py (+1/-1)
To merge this branch: bzr merge lp:~rbanffy/maas/bug-1440090-info-lost-rediscovery
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+255278@code.launchpad.net

Commit message

Fix MACAddress recreation issue caused by incorrect MAC x MACAddress comparisons.

Description of the change

Fix MAC x MACAddress comparisons, reorder addition and removal to make errors more easily detectable, add tests and make NIC redetection happen before DHCP reconfiguration.

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

I'm gonna approve, but there's just one minor fix you need to address. See inline.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/metadataserver/models/commissioningscript.py'
2--- src/metadataserver/models/commissioningscript.py 2015-04-06 15:44:31 +0000
3+++ src/metadataserver/models/commissioningscript.py 2015-04-06 18:33:47 +0000
4@@ -587,7 +587,7 @@
5 'content': LIST_MODALIASES_SCRIPT.encode('ascii'),
6 'hook': null_hook,
7 },
8- '00-maas-07-network-interfaces.out': {
9+ '00-maas-05-network-interfaces.out': {
10 'content': IPLINK_SCRIPT.encode('ascii'),
11 'hook': update_node_network_information,
12 },