Merge "Mark Vpnaas4in4 as smoke remove unstable tag" into mcp/caracal
diff --git a/neutron_tempest_plugin/vpnaas/scenario/test_vpnaas.py b/neutron_tempest_plugin/vpnaas/scenario/test_vpnaas.py
index 32181fe..78b9323 100644
--- a/neutron_tempest_plugin/vpnaas/scenario/test_vpnaas.py
+++ b/neutron_tempest_plugin/vpnaas/scenario/test_vpnaas.py
@@ -265,7 +265,6 @@
subnet_id, port)
raise self.fail(msg)
- @test.unstable_test("bug 1882220")
def _test_vpnaas(self):
# RIGHT
right_server = self._create_server(network=self._right_network,
@@ -303,6 +302,7 @@
class Vpnaas4in4(Vpnaas):
@decorators.idempotent_id('aa932ab2-63aa-49cf-a2a0-8ae71ac2bc24')
+ @decorators.attr(type='smoke')
def test_vpnaas(self):
self._test_vpnaas()
@@ -316,6 +316,7 @@
@testtools.skipIf(
CONF.neutron_vpnaas_plugin_options.skip_4in6_6in4_tests,
'VPNaaS 4in6 test is skipped.')
+ @test.unstable_test("bug 1882220")
def test_vpnaas_4in6(self):
self._test_vpnaas()
@@ -327,11 +328,9 @@
@testtools.skipUnless(CONF.network_feature_enabled.ipv6,
'IPv6 tests are disabled.')
@testtools.skipIf(
- CONF.neutron_vpnaas_plugin_options.skip_4in6_6in4_tests,
- 'VPNaaS 6in4 test is skipped.')
- @testtools.skipIf(
CONF.neutron_vpnaas_plugin_options.skip_6in4_tests,
'VPNaaS 6in4 test is skipped.')
+ @test.unstable_test("bug 1882220")
def test_vpnaas_6in4(self):
self._test_vpnaas()
@@ -346,5 +345,6 @@
@testtools.skipIf(
CONF.neutron_vpnaas_plugin_options.skip_6in6_tests,
'VPNaaS 6in6 test is skipped.')
+ @test.unstable_test("bug 1882220")
def test_vpnaas_6in6(self):
self._test_vpnaas()