Merge lp:~jtv/maas/bug-1378803-through-Node-pxe_mac into lp:~maas-committers/maas/trunk

[Jeroen T. Vermeulen]

Tell the OS driver to bring up only a node's PXE-booting network interface on boot.

Uses the new field Node.pxe_mac. We're not actually populating that yet, so I built in a hack to keep development systems working in the meantime (should not be long). The hack doesn't try to simulate anything like desired behaviour, because that might just end up hiding problems. It's just enough for development testing.

Once we populate Node.pxe_mac, we should dig up the two XXX markers and remove the hack.

Jeroen

[Jason Hobbs (jason-hobbs)]

Looks good -- I can't find anything to comment on :)

review: Approve

[Christian Reis (kiko)]

Just discussed with Raphael and as this needs to be done in sync with bug 1379209, I'm rejecting this and duping the bug -- Raphael and Jason will complete this with the new get-pxe API

review: Disapprove

[Raphaël Badin (rvb)]

This has landed (with modifications) as part of https://code.launchpad.net/~jason-hobbs/maas/bug-1378803-through-Node-pxe_mac/+merge/237803.

=== modified file 'src/maasserver/networking_preseed.py'
--- src/maasserver/networking_preseed.py	2014-10-06 10:07:01 +0000
+++ src/maasserver/networking_preseed.py	2014-10-09 09:47:08 +0000
@@ -32,6 +32,7 @@
 import json
 
 from lxml import etree
+from maasserver import logger
 from maasserver.clusterrpc.osystems import compose_curtin_network_preseed
 from maasserver.dns.zonegenerator import get_dns_server_address
 from maasserver.exceptions import UnresolvableHost
@@ -317,9 +318,16 @@
     :param node: A `Node`.
     :return: A list of normalised MAC address strings.
     """
-    macs = node.mac_addresses_on_managed_interfaces()
-    if len(macs) == 0:
+    pxe_mac = node.pxe_mac
+    if pxe_mac is None:
+        # XXX jtv 2014-10-09, bug=1379209: Replace this with an error once we
+        # have the code to populate Node.pxe_mac.  It's just here to facilitate
+        # the transition on development/testing systems.
+        logger.warn(
+            "Node %s has no known PXE-boot MAC address.", node.hostname)
         macs = node.macaddress_set.all()
+    else:
+        macs = [pxe_mac]
     return [normalise_mac(unicode(mac.mac_address)) for mac in macs]
 
 
 
=== modified file 'src/maasserver/tests/test_networking_preseed.py'
--- src/maasserver/tests/test_networking_preseed.py	2014-10-08 08:51:09 +0000
+++ src/maasserver/tests/test_networking_preseed.py	2014-10-09 09:47:08 +0000
@@ -725,37 +725,31 @@
 
 class TestFindMACsForAutomaticInterfaces(MAASServerTestCase):
 
-    def test__returns_netboot_interface_in_simple_case(self):
-        node = factory.make_node_with_mac_attached_to_nodegroupinterface()
-        mac = node.get_primary_mac().mac_address
-        self.assertEqual(
-            [normalise_mac(unicode(mac))],
-            find_macs_for_automatic_interfaces(node))
-
-    def test__returns_only_macs_on_managed_networks_if_connected(self):
-        node = factory.make_node_with_mac_attached_to_nodegroupinterface()
-        boot_mac = node.get_primary_mac().mac_address
-        factory.make_MACAddress(
-            node=node,
-            cluster_interface=factory.make_NodeGroupInterface(
-                node.nodegroup,
-                management=NODEGROUPINTERFACE_MANAGEMENT.UNMANAGED))
-        self.assertEqual(
-            [normalise_mac(unicode(boot_mac))],
-            find_macs_for_automatic_interfaces(node))
-
-    def test__returns_all_macs_if_no_managed_networks_connected(self):
-        node = factory.make_node_with_mac_attached_to_nodegroupinterface(
-            management=NODEGROUPINTERFACE_MANAGEMENT.UNMANAGED)
-        mac1 = node.get_primary_mac().mac_address
-        other_mac = factory.make_MACAddress(
-            node=node,
-            cluster_interface=factory.make_NodeGroupInterface(
-                node.nodegroup,
-                management=NODEGROUPINTERFACE_MANAGEMENT.UNMANAGED))
-        mac2 = other_mac.mac_address
+    def test__returns_pxe_mac_if_known(self):
+        node = factory.make_node_with_mac_attached_to_nodegroupinterface()
+        mac = node.get_primary_mac()
+        node.pxe_mac = mac
+        self.assertEqual(
+            [extract_mac_string(mac)],
+            find_macs_for_automatic_interfaces(node))
+
+    def test__ignores_other_interfaces_if_pxe_mac_known(self):
+        node = factory.make_Node()
+        macs = [factory.make_MACAddress(node=node) for _ in range(3)]
+        pxe_mac = macs[1]
+        node.pxe_mac = pxe_mac
+        self.assertEqual(
+            [extract_mac_string(pxe_mac)],
+            find_macs_for_automatic_interfaces(node))
+
+    def test__returns_all_macs_if_no_pxe_mac_known(self):
+        # XXX jtv 2014-10-09, bug=1379209: Once the code to populate
+        # Node.pxe_mac has landed, this situation should no longer occur.
+        node = factory.make_Node()
+        node.pxe_mac = None
+        macs = [factory.make_MACAddress(node=node) for _ in range(2)]
         self.assertItemsEqual(
-            [normalise_mac(unicode(mac1)), normalise_mac(unicode(mac2))],
+            [extract_mac_string(mac) for mac in macs],
             find_macs_for_automatic_interfaces(node))