Merge lp:~newell-jensen/maas/fix-1616773 into lp:~maas-committers/maas/trunk

[Newell Jensen]

Have IP address show up in the interfaces section of the node detail page so the user will be able to know which IP address to SSH into for Rescue Mode.

[Newell Jensen (newell-jensen)]

I tested this in NEC lab. IP address shows up once the node enters Rescue Mode state.

[Mike Pontillo (mpontillo)]

Looks good to me; thanks for the fix.

review: Approve

=== modified file 'src/maasserver/websockets/handlers/node.py'
--- src/maasserver/websockets/handlers/node.py	2016-08-18 17:31:05 +0000
+++ src/maasserver/websockets/handlers/node.py	2016-08-25 23:16:05 +0000
@@ -361,10 +361,10 @@
             "links": links,
         }
 
-        # When the node is commissioning display the discovered IP address for
-        # this interface. This will only be shown on interfaces that are
-        # connected to a MAAS managed subnet.
-        if obj.status == NODE_STATUS.COMMISSIONING:
+        # When the node is commissioning or in rescue mode display the
+        # discovered IP address for this interface. This will only be shown on
+        # interfaces that are connected to a MAAS managed subnet.
+        if obj.status in (NODE_STATUS.COMMISSIONING, NODE_STATUS.RESCUE_MODE):
             discovereds = interface.get_discovered()
             if discovereds is not None:
                 for discovered in discovereds:

=== modified file 'src/maasserver/websockets/handlers/tests/test_machine.py'
--- src/maasserver/websockets/handlers/tests/test_machine.py	2016-08-18 17:31:05 +0000
+++ src/maasserver/websockets/handlers/tests/test_machine.py	2016-08-25 23:16:05 +0000
@@ -666,6 +666,46 @@
             "discovered": expected_discovered,
         }, handler.dehydrate_interface(interface, node))
 
+    def test_dehydrate_interface_for_rescue_mode_node(self):
+        owner = factory.make_User()
+        node = factory.make_Node(owner=owner, status=NODE_STATUS.RESCUE_MODE)
+        handler = MachineHandler(owner, {})
+        interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, node=node)
+        factory.make_StaticIPAddress(
+            alloc_type=IPADDRESS_TYPE.AUTO, ip="",
+            subnet=factory.make_Subnet(), interface=interface)
+        expected_links = interface.get_links()
+        for link in expected_links:
+            link["subnet_id"] = link.pop("subnet").id
+        discovered_subnet = factory.make_Subnet()
+        factory.make_StaticIPAddress(
+            alloc_type=IPADDRESS_TYPE.DISCOVERED,
+            ip=factory.pick_ip_in_network(discovered_subnet.get_ipnetwork()),
+            subnet=discovered_subnet, interface=interface)
+        expected_discovered = interface.get_discovered()
+        for discovered in expected_discovered:
+            discovered["subnet_id"] = discovered.pop("subnet").id
+        self.assertEqual({
+            "id": interface.id,
+            "type": interface.type,
+            "name": interface.get_name(),
+            "tags": interface.tags,
+            "enabled": interface.is_enabled(),
+            "is_boot": interface == node.get_boot_interface(),
+            "mac_address": "%s" % interface.mac_address,
+            "vlan_id": interface.vlan_id,
+            "parents": [
+                nic.id
+                for nic in interface.parents.all()
+            ],
+            "children": [
+                nic.child.id
+                for nic in interface.children_relationships.all()
+            ],
+            "links": expected_links,
+            "discovered": expected_discovered,
+        }, handler.dehydrate_interface(interface, node))
+
     def test_dehydrate_summary_output_returns_None(self):
         owner = factory.make_User()
         node = factory.make_Node(owner=owner)