One Convergence: Skip all tests with 'v6' in name

Adds a check to the test setup for the One Convergence tests
to look for v6 in the name of the test and skip it if present.
This prevents IPv6 developers from having to explicitly skip
each new IPv6 test in the One Convergence unit tests until the
plugin gains IPv6 support.

Closes-bug: #1361366
Change-Id: I5c17d7290302597d5c85ef2c1df95f4f71e1a69b

diff --git a/neutron/tests/unit/oneconvergence/test_nvsd_plugin.py b/neutron/tests/unit/oneconvergence/test_nvsd_plugin.py
index 06d9cdaca13b428699acebe15930b71bd83754da..67f5bd9507d2cad64ebc60df2617eb3613e9ffd1 100644 (file)
--- a/neutron/tests/unit/oneconvergence/test_nvsd_plugin.py
+++ b/neutron/tests/unit/oneconvergence/test_nvsd_plugin.py
@@ -36,6 +36,9 @@ class OneConvergencePluginV2TestCase(test_plugin.NeutronDbPluginV2TestCase):
     _plugin_name = PLUGIN_NAME
 
     def setUp(self):
+        if 'v6' in self._testMethodName:
+            self.skipTest("NVSD Plugin does not support IPV6.")
+
         def mocked_oneconvergence_init(self):
             def side_effect(*args, **kwargs):
                 return {'id': str(uuid.uuid4())}
@@ -57,41 +60,7 @@ class TestOneConvergencePluginNetworksV2(test_plugin.TestNetworksV2,
 
 class TestOneConvergencePluginSubnetsV2(test_plugin.TestSubnetsV2,
                                         OneConvergencePluginV2TestCase):
-    def test_update_subnet_inconsistent_ipv6_gatewayv4(self):
-        self.skipTest("NVSD Plugin does not support IPV6.")
-
-    def test_create_subnet_with_v6_allocation_pool(self):
-        self.skipTest("NVSD Plugin does not support IPV6.")
-
-    def test_update_subnet_inconsistent_ipv6_hostroute_dst_v4(self):
-        self.skipTest("NVSD Plugin does not support IPV6.")
-
-    def test_update_subnet_inconsistent_ipv6_hostroute_np_v4(self):
-        self.skipTest("NVSD Plugin does not support IPV6.")
-
-    def test_create_subnet_ipv6_attributes(self):
-        self.skipTest("NVSD Plugin does not support IPV6.")
-
-    def test_create_subnet_ipv6_single_attribute_set(self):
-        self.skipTest("NVSD Plugin does not support IPV6.")
-
-    def test_update_subnet_ipv6_attributes(self):
-        self.skipTest("NVSD Plugin does not support IPV6.")
-
-    def test_update_subnet_ipv6_inconsistent_enable_dhcp(self):
-        self.skipTest("NVSD Plugin does not support IPV6.")
-
-    def test_update_subnet_ipv6_inconsistent_ra_attribute(self):
-        self.skipTest("NVSD Plugin does not support IPV6.")
-
-    def test_update_subnet_ipv6_inconsistent_address_attribute(self):
-        self.skipTest("NVSD Plugin does not support IPV6.")
-
-    def test_create_subnet_ipv6_out_of_cidr_global(self):
-        self.skipTest("NVSD Plugin does not support IPV6.")
-
-    def test_create_subnet_ipv6_out_of_cidr_lla(self):
-        self.skipTest("NVSD Plugin does not support IPV6.")
+    pass
 
 
 class TestOneConvergencePluginPortsV2(test_plugin.TestPortsV2,
@@ -99,9 +68,6 @@ class TestOneConvergencePluginPortsV2(test_plugin.TestPortsV2,
                                       OneConvergencePluginV2TestCase):
     VIF_TYPE = portbindings.VIF_TYPE_OVS
 
-    def test_requested_subnet_id_v4_and_v6(self):
-        self.skipTest("NVSD Plugin does not support IPV6.")
-
     def test_port_vif_details(self):
         plugin = manager.NeutronManager.get_plugin()
         with self.port(name='name') as port1:
@@ -121,12 +87,6 @@ class TestOneConvergencePluginPortsV2(test_plugin.TestPortsV2,
                 self.assertEqual(port['binding:vif_type'],
                                  portbindings.VIF_TYPE_OVS)
 
-    def test_ip_allocation_for_ipv6_subnet_slaac_adddress_mode(self):
-        self.skipTest("NVSD Plugin does not support IPV6.")
-
-    def test_generated_duplicate_ip_ipv6(self):
-        self.skipTest("NVSD Plugin does not support IPV6.")
-
 
 class TestOneConvergenceBasicGet(test_plugin.TestBasicGet,
                                  OneConvergencePluginV2TestCase):

diff --git a/neutron/tests/unit/oneconvergence/test_security_group.py b/neutron/tests/unit/oneconvergence/test_security_group.py
index db9ca6b97d2e81f66d9b77927fb147c68f3755c7..93dc0ab4dcf5b0b6bd03a03400cf280d1347102d 100644 (file)
--- a/neutron/tests/unit/oneconvergence/test_security_group.py
+++ b/neutron/tests/unit/oneconvergence/test_security_group.py
@@ -36,6 +36,9 @@ class OneConvergenceSecurityGroupsTestCase(test_sg.SecurityGroupDBTestCase):
     _plugin_name = PLUGIN_NAME
 
     def setUp(self):
+        if 'v6' in self._testMethodName:
+            self.skipTest("NVSD Plugin does not support IPV6.")
+
         def mocked_oneconvergence_init(self):
             def side_effect(*args, **kwargs):
                 return {'id': str(uuid.uuid4())}
@@ -66,63 +69,15 @@ class OneConvergenceSecurityGroupsTestCase(test_sg.SecurityGroupDBTestCase):
 class TestOneConvergenceSGServerRpcCallBack(
     OneConvergenceSecurityGroupsTestCase,
     test_sg_rpc.SGServerRpcCallBackMixinTestCase):
-    def test_security_group_rules_for_devices_ipv6_egress(self):
-        self.skipTest("NVSD Plugin does not support IPV6.")
-
-    def test_security_group_rules_for_devices_ipv6_ingress(self):
-        self.skipTest("NVSD Plugin does not support IPV6.")
-
-    def test_security_group_rules_for_devices_ipv6_source_group(self):
-        self.skipTest("NVSD Plugin does not support IPV6.")
-
-    def test_security_group_ra_rules_for_devices_ipv6_gateway_global(self):
-        self.skipTest("NVSD Plugin does not support IPV6.")
-
-    def test_security_group_ra_rules_for_devices_ipv6_gateway_lla(self):
-        self.skipTest("NVSD Plugin does not support IPV6.")
-
-    def test_security_group_ra_rules_for_devices_ipv6_no_gateway_port(self):
-        self.skipTest("NVSD Plugin does not support IPV6.")
-
-    def test_security_group_rule_for_device_ipv6_multi_router_interfaces(self):
-        self.skipTest("NVSD Plugin does not support IPV6.")
-
-    def test_notify_security_group_ipv6_gateway_port_added(self):
-        self.skipTest("NVSD Plugin does not support IPV6.")
 
-    def test_notify_security_group_ipv6_normal_port_added(self):
-        self.skipTest("NVSD Plugin does not support IPV6.")
+    pass
 
 
 class TestOneConvergenceSGServerRpcCallBackXML(
     OneConvergenceSecurityGroupsTestCase,
     test_sg_rpc.SGServerRpcCallBackMixinTestCaseXML):
-    def test_security_group_rules_for_devices_ipv6_egress(self):
-        self.skipTest("NVSD Plugin does not support IPV6.")
-
-    def test_security_group_rules_for_devices_ipv6_ingress(self):
-        self.skipTest("NVSD Plugin does not support IPV6.")
-
-    def test_security_group_rules_for_devices_ipv6_source_group(self):
-        self.skipTest("NVSD Plugin does not support IPV6.")
-
-    def test_security_group_ra_rules_for_devices_ipv6_gateway_global(self):
-        self.skipTest("NVSD Plugin does not support IPV6.")
-
-    def test_security_group_ra_rules_for_devices_ipv6_gateway_lla(self):
-        self.skipTest("NVSD Plugin does not support IPV6.")
-
-    def test_security_group_ra_rules_for_devices_ipv6_no_gateway_port(self):
-        self.skipTest("NVSD Plugin does not support IPV6.")
-
-    def test_security_group_rule_for_device_ipv6_multi_router_interfaces(self):
-        self.skipTest("NVSD Plugin does not support IPV6.")
-
-    def test_notify_security_group_ipv6_gateway_port_added(self):
-        self.skipTest("NVSD Plugin does not support IPV6.")
 
-    def test_notify_security_group_ipv6_normal_port_added(self):
-        self.skipTest("NVSD Plugin does not support IPV6.")
+    pass
 
 
 class TestOneConvergenceSecurityGroups(OneConvergenceSecurityGroupsTestCase,