Merge "Execute "IpMonitorTestCase" tests always inside a namespace" into stable/yoga

Author: Zuul

neutron/tests/functional/agent/linux/test_ip_lib.py

@@ -27,7 +27,6 @@
 from oslo_utils import importutils
 from oslo_utils import uuidutils
 from pyroute2.iproute import linux as iproute_linux
-import testscenarios
 import testtools
 
 from neutron.agent.common import async_process
@@ -697,19 +696,13 @@ def test_network_namespace_exists_ns_doesnt_exists_try_is_ready(self):
                                                          try_is_ready=True))
 
 
-class IpMonitorTestCase(testscenarios.WithScenarios,
-                        functional_base.BaseLoggingTestCase):
-
-    scenarios = [
-        ('namespace', {'namespace': 'ns_' + uuidutils.generate_uuid()}),
-        ('no_namespace', {'namespace': None})
-    ]
+class IpMonitorTestCase(functional_base.BaseLoggingTestCase):
 
     def setUp(self):
         super(IpMonitorTestCase, self).setUp()
         self.addCleanup(self._cleanup)
-        if self.namespace:
-            priv_ip_lib.create_netns(self.namespace)
+        self.namespace = 'ns_' + uuidutils.generate_uuid()
+        priv_ip_lib.create_netns(self.namespace)
         self.devices = [('int_' + uuidutils.generate_uuid())[
                         :constants.DEVICE_NAME_MAX_LEN] for _ in range(5)]
         self.ip_wrapper = ip_lib.IPWrapper(self.namespace)
@@ -719,14 +712,7 @@ def setUp(self):
 
     def _cleanup(self):
         self.proc.stop(kill_timeout=10, kill_signal=signal.SIGTERM)
-        if self.namespace:
-            priv_ip_lib.remove_netns(self.namespace)
-        else:
-            for device in self.devices:
-                try:
-                    priv_ip_lib.delete_interface(device, self.namespace)
-                except priv_ip_lib.NetworkInterfaceNotFound:
-                    pass
+        priv_ip_lib.remove_netns(self.namespace)
 
     @staticmethod
     def _normalize_module_name(name):