Merge lp:~jtv/maas/retire-get_managed_interface into lp:~maas-committers/maas/trunk

[Jeroen T. Vermeulen]

Retire NodeGroup.get_managed_interface().

A nodegroup can now have multiple managed interfaces, so the method's been replaced by NodeGroup.get_managed_interfaces(). In practice we're not quite at the stage where we allow multiple managed interfaces yet (there's a bit more code to be completed before we can), but this is an important if small milestone along that path. Use of get_managed_interface() was the main tell-tale for implicit reliance on the old model.

Jeroen

[Julian Edwards (julian-edwards)]

 review: approve

\o/

review: Approve

=== modified file 'src/maasserver/models/nodegroup.py'
--- src/maasserver/models/nodegroup.py	2014-01-23 08:50:05 +0000
+++ src/maasserver/models/nodegroup.py	2014-01-28 05:02:42 +0000
@@ -212,23 +212,6 @@
             return interface
         return None
 
-    # XXX JeroenVermeulen 2014-01-17, bug=1052339: This method is going away.
-    # Use get_managed_interfaces() instead.  There may be more than one managed
-    # interface.
-    def get_managed_interface(self):
-        """Return the interface for which MAAS managed the DHCP service.
-
-        This is a temporary method that should be refactored once we add
-        proper support for multiple interfaces on a nodegroup.
-        """
-        # Iterate over all the interfaces in python instead of doing the
-        # filtering in SQL so that this will use the cached version of
-        # self.nodegroupinterface_set if it is there.
-        for interface in self.nodegroupinterface_set.all():
-            if interface.management != NODEGROUPINTERFACE_MANAGEMENT.UNMANAGED:
-                return interface
-        return None
-
     def get_managed_interfaces(self):
         """Return the list of interfaces for which MAAS manages DHCP."""
         # Filter in python instead of in SQL.  This will use the cached

=== modified file 'src/maasserver/models/tests/test_nodegroup.py'
--- src/maasserver/models/tests/test_nodegroup.py	2014-01-17 08:14:11 +0000
+++ src/maasserver/models/tests/test_nodegroup.py	2014-01-28 05:02:42 +0000
@@ -333,30 +333,6 @@
         args, kwargs = task.apply_async.call_args
         self.assertEqual(nodegroup.work_queue, kwargs['queue'])
 
-    # XXX JeroenVermeulen 2014-01-17, bug=1052339: Deprecated.
-    def test_get_managed_interface_returns_managed_interface(self):
-        nodegroup = factory.make_node_group()
-        interface = nodegroup.nodegroupinterface_set.all()[0]
-        self.assertEqual(interface, nodegroup.get_managed_interface())
-
-    # XXX JeroenVermeulen 2014-01-17, bug=1052339: Deprecated.
-    def test_get_managed_interface_does_not_return_unmanaged_interface(self):
-        nodegroup = factory.make_node_group()
-        interface = nodegroup.nodegroupinterface_set.all()[0]
-        interface.management = NODEGROUPINTERFACE_MANAGEMENT.UNMANAGED
-        interface.save()
-        self.assertIsNone(nodegroup.get_managed_interface())
-
-    # XXX JeroenVermeulen 2014-01-17, bug=1052339: Deprecated.
-    def test_get_managed_interface_does_not_return_unrelated_interface(self):
-        nodegroup = factory.make_node_group()
-        # Create another nodegroup with a managed interface.
-        factory.make_node_group()
-        interface = nodegroup.nodegroupinterface_set.all()[0]
-        interface.management = NODEGROUPINTERFACE_MANAGEMENT.UNMANAGED
-        interface.save()
-        self.assertIsNone(nodegroup.get_managed_interface())
-
     def test_get_dns_managed_interface_returns_dns_managed_interface(self):
         nodegroup = factory.make_node_group(
             management=NODEGROUPINTERFACE_MANAGEMENT.DHCP_AND_DNS)