Merge lp:~mpontillo/maas/fix-1486505 into lp:~maas-committers/maas/trunk

[Mike Pontillo]

Use old model temporarily to fix LP#1486505.

This is a temporary fix for #1486505, to use the old networking model until the new model is fully in-place. This will be obsoleted in the very near future, since the mac.ip_addresses attribute (and backing table) is going away.

Currently being tested by the CI.

Validated locally; this fixes allocation of IP addresses and deployment of nodes for me.

[Blake Rouse (blake-rouse)]

I assume this is only to get 1.9 alpha 1 out the door. I really don't like this, because we should be dropping the old model as quick as possible.

No test needs to be modified? Then this was not test very well.

review: Approve

[Andres Rodriguez (andreserl)]

Yup, this is only to get alpha1 out the door. I'd like to get something out nowish so people can start testing 1.9.

review: Approve

[Mike Pontillo (mpontillo)]

Yes, this is just to get 1.9 out the door. I'm curious why the tests pass too. My current theory is that the tests are looking at the old model data to determine that they passed. (That's why I am removing the old model in the next branch I'll be doing, which forces all those tests to fail.) I've already fixed hundreds of tests in that branch.

[Mike Pontillo (mpontillo)]

*1.9alpha1 that is

=== modified file 'src/maasserver/models/interface.py'
--- src/maasserver/models/interface.py	2015-08-18 13:30:00 +0000
+++ src/maasserver/models/interface.py	2015-08-19 18:59:57 +0000
@@ -318,7 +318,7 @@
             interface: None
             for interface in cluster_interfaces
             }
-        for sip in self.ip_addresses.all():
+        for sip in self.mac.ip_addresses.all():
             interface = find_cluster_interface_responsible_for_ip(
                 cluster_interfaces, IPAddress(sip.ip))
             if interface is not None: