diff --git a/manila/network/linux/interface.py b/manila/network/linux/interface.py index a4acc2ee04..f254849ccf 100644 --- a/manila/network/linux/interface.py +++ b/manila/network/linux/interface.py @@ -144,6 +144,20 @@ class LinuxInterfaceDriver(object): """Unplug the interface.""" +class NoopInterfaceDriver(LinuxInterfaceDriver): + """Noop driver when manila-share is already connected to admin network""" + + def init_l3(self, device_name, ip_cidrs, namespace=None, clear_cidrs=[]): + pass + + def plug(self, device_name, port_id, mac_address, + bridge=None, namespace=None, prefix=None): + pass + + def unplug(self, device_name, bridge=None, namespace=None, prefix=None): + pass + + class OVSInterfaceDriver(LinuxInterfaceDriver): """Driver for creating an internal interface on an OVS bridge.""" diff --git a/manila/tests/network/linux/test_interface.py b/manila/tests/network/linux/test_interface.py index 867d589a60..9897cd80a1 100644 --- a/manila/tests/network/linux/test_interface.py +++ b/manila/tests/network/linux/test_interface.py @@ -141,6 +141,21 @@ class TestABCDriver(TestBase): self.assertEqual(set(), result) +class TestNoopInterfaceDriver(TestBase): + + def test_init_l3(self): + self.ip.assert_not_called() + self.ip_dev.assert_not_called() + + def test_plug(self): + self.ip.assert_not_called() + self.ip_dev.assert_not_called() + + def test_unplug(self): + self.ip.assert_not_called() + self.ip_dev.assert_not_called() + + class TestOVSInterfaceDriver(TestBase): def test_get_device_name(self):