Merge ~mpontillo/maas:interface-params-websocket--bug-1801776 into maas:master

[Mike Pontillo]

LP: #1801776 - Add bond and bridge parameters to interface websocket JSON.

This is needed to unblock some work the web team is doing with regard to bond and bridge parameters.

[Anthony Dillon (ya-bo-ng)]

Awesome, thank you +1

review: Approve

[Newell Jensen (newell-jensen)]

+1

review: Approve

[Mike Pontillo (mpontillo)]

Ah, forgot to go back and fix a couple of tests that failed as a side effect of this. Will take care of those before landing.

[MAAS Lander (maas-lander)]

LANDING
-b interface-params-websocket--bug-1801776 lp:~mpontillo/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/4390/consoleText

66929cd... by Mike Pontillo on 2018-11-05

Fix TestDeviceHandler.test_get().

diff --git a/src/maasserver/websockets/handlers/node.py b/src/maasserver/websockets/handlers/node.py
index 3a5e72d..d025038 100644
--- a/src/maasserver/websockets/handlers/node.py
+++ b/src/maasserver/websockets/handlers/node.py
@@ -577,6 +577,7 @@ class NodeHandler(TimestampedModelHandler):
             "is_boot": interface == obj.get_boot_interface(),
             "mac_address": "%s" % interface.mac_address,
             "vlan_id": interface.vlan_id,
+            "params": interface.params,
             "parents": [
                 nic.id
                 for nic in interface.parents.all()
diff --git a/src/maasserver/websockets/handlers/tests/test_device.py b/src/maasserver/websockets/handlers/tests/test_device.py
index 82eca61..f60f9bb 100644
--- a/src/maasserver/websockets/handlers/tests/test_device.py
+++ b/src/maasserver/websockets/handlers/tests/test_device.py
@@ -105,6 +105,7 @@ class TestDeviceHandler(MAASTransactionServerTestCase):
             "is_boot": interface == obj.get_boot_interface(),
             "mac_address": "%s" % interface.mac_address,
             "vlan_id": interface.vlan_id,
+            "params": interface.params,
             "parents": [
                 nic.id
                 for nic in interface.parents.all()
diff --git a/src/maasserver/websockets/handlers/tests/test_machine.py b/src/maasserver/websockets/handlers/tests/test_machine.py
index 68b1f11..2cf3f57 100644
--- a/src/maasserver/websockets/handlers/tests/test_machine.py
+++ b/src/maasserver/websockets/handlers/tests/test_machine.py
@@ -1155,6 +1155,7 @@ class TestMachineHandler(MAASServerTestCase):
             "is_boot": True,
             "mac_address": "%s" % interface.mac_address,
             "vlan_id": interface.vlan_id,
+            "params": interface.params,
             "parents": [
                 nic.id
                 for nic in interface.parents.all()
@@ -1175,6 +1176,7 @@ class TestMachineHandler(MAASServerTestCase):
             "is_boot": False,
             "mac_address": "%s" % interface2.mac_address,
             "vlan_id": interface2.vlan_id,
+            "params": interface2.params,
             "parents": [
                 nic.id
                 for nic in interface2.parents.all()
@@ -1206,6 +1208,7 @@ class TestMachineHandler(MAASServerTestCase):
             "is_boot": interface == node.get_boot_interface(),
             "mac_address": "%s" % interface.mac_address,
             "vlan_id": interface.vlan_id,
+            "params": interface.params,
             "parents": [
                 nic.id
                 for nic in interface.parents.all()
@@ -1245,6 +1248,7 @@ class TestMachineHandler(MAASServerTestCase):
             "is_boot": interface == node.get_boot_interface(),
             "mac_address": "%s" % interface.mac_address,
             "vlan_id": interface.vlan_id,
+            "params": interface.params,
             "parents": [
                 nic.id
                 for nic in interface.parents.all()
@@ -1257,6 +1261,36 @@ class TestMachineHandler(MAASServerTestCase):
             "discovered": expected_discovered,
         }, handler.dehydrate_interface(interface, node))
 
+    def test_dehydrate_interface_includes_params(self):
+        owner = factory.make_User()
+        node = factory.make_Node(owner=owner, status=NODE_STATUS.COMMISSIONING)
+        handler = MachineHandler(owner, {}, None)
+        eth0 = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, node=node)
+        eth1 = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, node=node)
+        bond_params = {
+            "bond_downdelay": 0,
+            "bond_lacp_rate": "slow",
+            "bond_miimon": 100,
+            "bond_mode": "balance-xor",
+            "bond_num_grat_arp": 1,
+            "bond_updelay": 0,
+            "bond_xmit_hash_policy": "layer3+4"
+        }
+        bond0 = factory.make_Interface(
+            INTERFACE_TYPE.BOND, node=node, parents=[eth0, eth1],
+            params=bond_params)
+        bridge_params = {
+            "bridge_fd": 5,
+            "bridge_stp": True
+        }
+        br_bond0 = factory.make_Interface(
+            INTERFACE_TYPE.BRIDGE, node=node, parents=[bond0],
+            params=bridge_params)
+        bond_json = handler.dehydrate_interface(bond0, node)
+        bridge_json = handler.dehydrate_interface(br_bond0, node)
+        self.assertThat(bond_json['params'], Equals(bond_params))
+        self.assertThat(bridge_json['params'], Equals(bridge_params))
+
     def test_dehydrate_interface_for_rescue_mode_node(self):
         owner = factory.make_User()
         node = factory.make_Node(
@@ -1289,6 +1323,7 @@ class TestMachineHandler(MAASServerTestCase):
             "is_boot": interface == node.get_boot_interface(),
             "mac_address": "%s" % interface.mac_address,
             "vlan_id": interface.vlan_id,
+            "params": interface.params,
             "parents": [
                 nic.id
                 for nic in interface.parents.all()
@@ -1329,6 +1364,7 @@ class TestMachineHandler(MAASServerTestCase):
             "is_boot": interface == node.get_boot_interface(),
             "mac_address": "%s" % interface.mac_address,
             "vlan_id": interface.vlan_id,
+            "params": interface.params,
             "parents": [
                 nic.id
                 for nic in interface.parents.all()
@@ -1371,6 +1407,7 @@ class TestMachineHandler(MAASServerTestCase):
             "is_boot": interface == node.get_boot_interface(),
             "mac_address": "%s" % interface.mac_address,
             "vlan_id": interface.vlan_id,
+            "params": interface.params,
             "parents": [
                 nic.id
                 for nic in interface.parents.all()