Revert "Extend the IPoIBInterfaceDriver to support link_up parameter"

This reverts commit ce293ab.

Reason for revert: Due to upstream revert https://opendev.org/openstack/neutron/commit/36bf1df46df4de8f9ed0c19e1118480ce2e55d8a

Change-Id: Id227297c146bc77957e621c2d756df08e4d8ad44

Author: wmousa

networking_mlnx/linux/interface_drivers/interface.py

@@ -48,17 +48,15 @@ def __init__(self, conf, get_networks_callback=None, **kwargs):
             LOG.error("IPoIB root device %s does not exist.", self.root_dev)
 
     def plug_new(self, network_id, port_id, device_name, mac_address,
-                 bridge=None, namespace=None, prefix=None, mtu=None,
-                 link_up=True):
+                 bridge=None, namespace=None, prefix=None, mtu=None):
         """Plugin the interface."""
         ip = ip_lib.IPoIBWrapper(namespace=namespace)
         try:
             net = self.get_networks(filters={"id": [network_id]},
                                     fields=[constants.SEGMENTATION_ID])[0]
             segmentation_id = net.get(constants.SEGMENTATION_ID)
             dev = ip.add_ipoib(device_name, self.root_dev, segmentation_id)
-            if link_up:
-                dev.link.set_up()
+            dev.link.set_up()
         except RuntimeError as e:
             LOG.error("Failed plugging interface '%s' - %s",
                       device_name, str(e))
@@ -259,8 +257,7 @@ def _get_driver_for_existing_interface(self, device_name, namespace=None):
         return None
 
     def plug_new(self, network_id, port_id, device_name, mac_address,
-                 bridge=None, namespace=None, prefix=None, mtu=None,
-                 link_up=True):
+                 bridge=None, namespace=None, prefix=None, mtu=None):
         """Plugin the interface."""
         network = MultiInterfaceDriver.network_cache.get(network_id)
         physnet = network.get(constants.PHYSICAL_NETWORK)
@@ -270,7 +267,7 @@ def plug_new(self, network_id, port_id, device_name, mac_address,
         try:
             driver = self.drivers[physnet]
             driver.plug_new(network_id, port_id, device_name, mac_address,
-                            bridge, namespace, prefix, mtu, link_up)
+                            bridge, namespace, prefix, mtu)
         except KeyError:
             LOG.error("Interface driver not found for physnet: %s", physnet)
 

networking_mlnx/tests/unit/linux/interface_drivers/test_interface.py

@@ -72,33 +72,24 @@ def _mock_ipoib_wrapper(self):
         self.addCleanup(patcher.stop)
         return ip_mock_inst
 
-    def _test_plug_new(self, net_id, dev_name, link_up=True):
+    def _test_plug_new(self, net_id, dev_name):
         ip_mock = self._mock_ipoib_wrapper()
         ip_dev_mock = mock.Mock()
         ip_mock.add_ipoib.return_value = ip_dev_mock
+        return
         self.driver.plug_new(net_id, uuids.port_id, dev_name,
-                            None, link_up)
-        if net_id == uuids.flat_net:
-            ip_mock.add_ipoib.assert_called_with(
-                dev_name, self.root_dev, None)
-        else:
-            ip_mock.add_ipoib.assert_called_with(
-                dev_name, self.root_dev,
-                network_db[uuids.vlan_net][constants.SEGMENTATION_ID])
-        if link_up:
-            ip_dev_mock.link.set_up.asset_called_once()
-        else:
-            ip_dev_mock.link.asset_not_called()
+                            None)
+        ip_mock.add_ipoib.assert_called_with(
+            dev_name, self.root_dev,
+            int(network_db[uuids.uuids.vlan_net][constants.SEGMENTATION_ID]))
+        ip_dev_mock.link.set_up.asset_called_once()
 
     def test_plug_new_vlan_network(self):
         self._test_plug_new(uuids.vlan_net, "my-ipoib-netdev")
 
     def test_plug_new_flat_network(self):
         self._test_plug_new(uuids.flat_net, "my-ipoib-netdev")
 
-    def test_plug_new_link_unchanged(self):
-        self._test_plug_new(uuids.vlan_net, "my-ipoib-netdev", False)
-
     @mock.patch("networking_mlnx.linux.interface_drivers.interface.LOG")
     def test_plug_new_ip_lib_raises(self, log_mock):
         ip_mock = self._mock_ipoib_wrapper()
@@ -412,15 +403,13 @@ def test_plug_new(self, load_mapping_mock, init_net_cache_mock):
         ns = 'test-ns'
         # network with physnet
         driver.plug_new(uuids.vlan_net, uuids.vlan_port, device_name, mac,
-                        bridge=None, namespace=ns, prefix=None, mtu=None,
-                        link_up=True)
+                        bridge=None, namespace=ns, prefix=None, mtu=None)
         driver.drivers['datacenter'].plug_new.assert_called_once_with(
             uuids.vlan_net, uuids.vlan_port, device_name, mac, None, ns, None,
-            None, True)
+            None)
         # network without physnet
         driver.plug_new(uuids.vxlan_net, uuids.vxlan_port, device_name, mac,
-                        bridge=None, namespace=ns, prefix=None, mtu=None,
-                        link_up=True)
+                        bridge=None, namespace=ns, prefix=None, mtu=None)
         driver.drivers['nil'].plug_new.assert_called_once_with(
             uuids.vxlan_net, uuids.vxlan_port, device_name, mac, None, ns,
-            None, None, True)
+            None, None)