Skip IPv6 Tests in the OpenContrail plugin

Similar to the way we are skipping tests in the OneConvergence plugin,
introduced by Kevin Benton in 9294de441e684a81f6e802ba0564083f1ad319d6.

Partial-Bug: #1378952

Change-Id: I1650b0708af73ce63e92c55bc842607bb69efe60
(cherry picked from commit 67962943969bc737a3f680a0defc2fc9df03c429)

diff --git a/neutron/tests/unit/opencontrail/test_contrail_plugin.py b/neutron/tests/unit/opencontrail/test_contrail_plugin.py
index de280f346f817714be9e5cbb21a139e70b1bf546..a9a37be50e6e8b3fb130cdf963238e752fd0e6e2 100644 (file)
--- a/neutron/tests/unit/opencontrail/test_contrail_plugin.py
+++ b/neutron/tests/unit/opencontrail/test_contrail_plugin.py
@@ -214,7 +214,8 @@ class ContrailPluginTestCase(test_plugin.NeutronDbPluginV2TestCase):
     _plugin_name = ('%s.NeutronPluginContrailCoreV2' % CONTRAIL_PKG_PATH)
 
     def setUp(self, plugin=None, ext_mgr=None):
-
+        if 'v6' in self._testMethodName:
+            self.skipTest("OpenContrail Plugin does not support IPV6.")
         cfg.CONF.keystone_authtoken = KeyStoneInfo()
         mock.patch('requests.post').start().side_effect = FAKE_SERVER.request
         super(ContrailPluginTestCase, self).setUp(self._plugin_name)
@@ -231,19 +232,6 @@ class TestContrailSubnetsV2(test_plugin.TestSubnetsV2,
     def setUp(self):
         super(TestContrailSubnetsV2, self).setUp()
 
-    # Support ipv6 in contrail is planned in Juno
-    def test_update_subnet_ipv6_attributes(self):
-        self.skipTest("Contrail isn't supporting ipv6 yet")
-
-    def test_update_subnet_ipv6_inconsistent_address_attribute(self):
-        self.skipTest("Contrail isn't supporting ipv6 yet")
-
-    def test_update_subnet_ipv6_inconsistent_enable_dhcp(self):
-        self.skipTest("Contrail isn't supporting ipv6 yet")
-
-    def test_update_subnet_ipv6_inconsistent_ra_attribute(self):
-        self.skipTest("Contrail isn't supporting ipv6 yet")
-
     def test_delete_subnet_dhcp_port_associated_with_other_subnets(self):
         self.skipTest("There is no dhcp port in contrail")