Merge ~ltrager/maas:lp1848171 into maas:master

[Lee Trager]

LP: #1848171 - Add link_speeds to websocket machine list output.

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp1848171 lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/6946/console
COMMIT: 48610c2ffa7bd1159ff427d7a9e87ece11749837

review: Needs Fixing

[Newell Jensen (newell-jensen)]

+1

review: Approve

b6f85b9... by Lee Trager on 2019-11-04

Fix failing tests

diff --git a/src/maasserver/websockets/handlers/node.py b/src/maasserver/websockets/handlers/node.py
index ec688b4..03ce848 100644
--- a/src/maasserver/websockets/handlers/node.py
+++ b/src/maasserver/websockets/handlers/node.py
@@ -265,6 +265,15 @@ class NodeHandler(TimestampedModelHandler):
             data["extra_macs"] = [
                 "%s" % mac_address for mac_address in obj.get_extra_macs()
             ]
+            data["link_speeds"] = sorted(
+                set(
+                    [
+                        interface.link_speed
+                        for interface in obj.interface_set.all()
+                        if interface.link_speed > 0
+                    ]
+                )
+            )
 
         if not for_list:
             data["on_network"] = obj.on_network()
diff --git a/src/maasserver/websockets/handlers/tests/test_device.py b/src/maasserver/websockets/handlers/tests/test_device.py
index 0668b74..a2dd93a 100644
--- a/src/maasserver/websockets/handlers/tests/test_device.py
+++ b/src/maasserver/websockets/handlers/tests/test_device.py
@@ -141,6 +141,15 @@ class TestDeviceHandler(MAASTransactionServerTestCase):
                 "%s" % mac_address.mac_address
                 for mac_address in node.get_extra_macs()
             ],
+            "link_speeds": sorted(
+                set(
+                    [
+                        interface.link_speed
+                        for interface in node.interface_set.all()
+                        if interface.link_speed > 0
+                    ]
+                )
+            ),
             "fqdn": node.fqdn,
             "hostname": node.hostname,
             "description": node.description,
@@ -193,6 +202,7 @@ class TestDeviceHandler(MAASTransactionServerTestCase):
                 "primary_mac",
                 "spaces",
                 "subnets",
+                "link_speeds",
                 "tags",
                 "interface_speed",
                 "link_connected",
diff --git a/src/maasserver/websockets/handlers/tests/test_machine.py b/src/maasserver/websockets/handlers/tests/test_machine.py
index 120fe3c..7307c56 100644
--- a/src/maasserver/websockets/handlers/tests/test_machine.py
+++ b/src/maasserver/websockets/handlers/tests/test_machine.py
@@ -251,6 +251,15 @@ class TestMachineHandler(MAASServerTestCase):
             "extra_macs": [
                 "%s" % mac_address for mac_address in node.get_extra_macs()
             ],
+            "link_speeds": sorted(
+                set(
+                    [
+                        interface.link_speed
+                        for interface in node.interface_set.all()
+                        if interface.link_speed > 0
+                    ]
+                )
+            ),
             "fqdn": node.fqdn,
             "hwe_kernel": make_hwe_kernel_ui_text(node.hwe_kernel),
             "hostname": node.hostname,
@@ -337,6 +346,7 @@ class TestMachineHandler(MAASServerTestCase):
                 "dhcp_on",
                 "distro_series",
                 "extra_macs",
+                "link_speeds",
                 "fabrics",
                 "fqdn",
                 "has_logs",
@@ -2283,6 +2293,7 @@ class TestMachineHandler(MAASServerTestCase):
         self.expectThat(created_node["hostname"], Equals(hostname))
         self.expectThat(created_node["pxe_mac"], Equals(mac))
         self.expectThat(created_node["extra_macs"], Equals([]))
+        self.expectThat(created_node["link_speeds"], Equals([]))
         self.expectThat(created_node["architecture"], Equals(architecture))
         self.expectThat(created_node["description"], Equals(description))
         self.expectThat(created_node["zone"]["id"], Equals(zone.id))