Merge ~bjornt/maas:bug-1811377-machine-ip-addresses into maas:master

[Björn Tillenius]

LP: #1811377 - JS error in machine listing: TypeError: Cannot read property 'filter' of undefined

Always include ip_addresses when dehydrating a machine. Every information that
is available in the list needs to be there when viewing the object by itself.

[Björn Tillenius (bjornt)]

See this MP for more discussion about the problem:

  https://code.launchpad.net/~steverydz/maas/+git/maas/+merge/361889

[MAAS Lander (maas-lander)]

UNIT TESTS
-b bug-1811377-machine-ip-addresses lp:~bjornt/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/4915/console
COMMIT: 7039c60e957f2e98bc2bfe1f258c25e61625c77a

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b bug-1811377-machine-ip-addresses lp:~bjornt/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/4916/console
COMMIT: f06266db6fab2747974f5f1cb5e95ecf104e3cdf

review: Needs Fixing

[Alberto Donato (ack)]

+1, lgtm

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b bug-1811377-machine-ip-addresses lp:~bjornt/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/4919/consoleText

diff --git a/src/maasserver/websockets/handlers/machine.py b/src/maasserver/websockets/handlers/machine.py
index 0d7845b..f5b3f10 100644
--- a/src/maasserver/websockets/handlers/machine.py
+++ b/src/maasserver/websockets/handlers/machine.py
@@ -221,8 +221,7 @@ class MachineHandler(NodeHandler):
                 data["pxe_mac_vendor"] = obj.get_pxe_mac_vendor()
                 data["power_type"] = obj.power_type
                 data["vlan"] = self.dehydrate_vlan(obj, boot_interface)
-                if for_list:
-                    data["ip_addresses"] = self.dehydrate_all_ip_addresses(obj)
+                data["ip_addresses"] = self.dehydrate_all_ip_addresses(obj)
             else:
                 data["pxe_mac"] = data["pxe_mac_vendor"] = ""
 
diff --git a/src/maasserver/websockets/handlers/tests/test_controller.py b/src/maasserver/websockets/handlers/tests/test_controller.py
index 9fc748c..fc3368a 100644
--- a/src/maasserver/websockets/handlers/tests/test_controller.py
+++ b/src/maasserver/websockets/handlers/tests/test_controller.py
@@ -133,7 +133,7 @@ class TestControllerHandler(MAASServerTestCase):
         # number means regiond has to do more work slowing down its process
         # and slowing down the client waiting for the response.
         self.assertEqual(
-            queries, 31,
+            queries, 35,
             "Number of queries has changed; make sure this is expected.")
 
     def test_get_form_class_for_create(self):
diff --git a/src/maasserver/websockets/handlers/tests/test_machine.py b/src/maasserver/websockets/handlers/tests/test_machine.py
index f109958..1ecd7bb 100644
--- a/src/maasserver/websockets/handlers/tests/test_machine.py
+++ b/src/maasserver/websockets/handlers/tests/test_machine.py
@@ -317,8 +317,7 @@ class TestMachineHandler(MAASServerTestCase):
         }
         if boot_interface:
             data["vlan"] = handler.dehydrate_vlan(node, boot_interface)
-            if for_list:
-                data["ip_addresses"] = handler.dehydrate_all_ip_addresses(node)
+            data["ip_addresses"] = handler.dehydrate_all_ip_addresses(node)
         bmc = node.bmc
         if bmc is not None and bmc.bmc_type == BMC_TYPE.POD:
             data['pod'] = {'id': bmc.id, 'name': bmc.name}
@@ -1779,6 +1778,22 @@ class TestMachineHandler(MAASServerTestCase):
                     [handler.dehydrate_filesystem(filesystem)])
             }))
 
+    def test_get_includes_static_ip_addresses(self):
+        user = factory.make_User()
+        machine = factory.make_Machine(owner=user)
+        [interface1, interface2] = [
+            factory.make_Interface(INTERFACE_TYPE.PHYSICAL, node=machine)
+            for _ in range(2)
+        ]
+        ip_address1 = factory.make_StaticIPAddress(interface=interface1)
+        ip_address2 = factory.make_StaticIPAddress(interface=interface2)
+        handler = MachineHandler(user, {}, None)
+        dehydrated_machine = handler.get({"system_id": machine.system_id})
+        dehydrated_ips = [
+            info['ip'] for info in dehydrated_machine['ip_addresses']]
+        self.assertEqual(
+            sorted(dehydrated_ips), sorted([ip_address1.ip, ip_address2.ip]))
+
     def test_list(self):
         user = factory.make_User()
         node = factory.make_Node(status=NODE_STATUS.ALLOCATED, owner=user)