Merge "Tempest: Removed bug decorators, renamed obsolete def"
This commit is contained in:
commit
8a9415780f
@ -18,7 +18,7 @@ import netaddr
|
|||||||
|
|
||||||
from tempest import config
|
from tempest import config
|
||||||
from tempest.lib.common.utils import data_utils
|
from tempest.lib.common.utils import data_utils
|
||||||
from tempest.lib import decorators
|
from tempest.lib.common.utils import test_utils
|
||||||
from tempest import test
|
from tempest import test
|
||||||
|
|
||||||
from vmware_nsx_tempest._i18n import _LI
|
from vmware_nsx_tempest._i18n import _LI
|
||||||
@ -60,8 +60,8 @@ class L2GatewayConnectionTest(base_l2gw.BaseL2GatewayTest):
|
|||||||
Clean all the resources used during the test.
|
Clean all the resources used during the test.
|
||||||
"""
|
"""
|
||||||
super(L2GatewayConnectionTest, cls).resource_cleanup()
|
super(L2GatewayConnectionTest, cls).resource_cleanup()
|
||||||
cls._try_delete_resource(cls.networks_client.delete_network,
|
test_utils.call_and_ignore_notfound_exc(
|
||||||
cls.network["id"])
|
cls.networks_client.delete_network, cls.network["id"])
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def l2gw_cleanup(cls):
|
def l2gw_cleanup(cls):
|
||||||
@ -76,7 +76,6 @@ class L2GatewayConnectionTest(base_l2gw.BaseL2GatewayTest):
|
|||||||
cls.l2gw_created.pop(l2gw_id)
|
cls.l2gw_created.pop(l2gw_id)
|
||||||
|
|
||||||
@test.attr(type="nsxv3")
|
@test.attr(type="nsxv3")
|
||||||
@decorators.skip_because(bug="634513")
|
|
||||||
@test.idempotent_id("81edfb9e-4722-4565-939c-6593b8405ff4")
|
@test.idempotent_id("81edfb9e-4722-4565-939c-6593b8405ff4")
|
||||||
def test_l2_gateway_connection_create(self):
|
def test_l2_gateway_connection_create(self):
|
||||||
"""
|
"""
|
||||||
@ -110,7 +109,6 @@ class L2GatewayConnectionTest(base_l2gw.BaseL2GatewayTest):
|
|||||||
self.addCleanup(self.l2gw_cleanup)
|
self.addCleanup(self.l2gw_cleanup)
|
||||||
|
|
||||||
@test.attr(type="nsxv3")
|
@test.attr(type="nsxv3")
|
||||||
@decorators.skip_because(bug="634513")
|
|
||||||
@test.idempotent_id("7db4f6c9-18c5-4a99-93c1-68bc2ecb48a7")
|
@test.idempotent_id("7db4f6c9-18c5-4a99-93c1-68bc2ecb48a7")
|
||||||
def test_l2_gateway_connection_create_with_multiple_vlans(self):
|
def test_l2_gateway_connection_create_with_multiple_vlans(self):
|
||||||
"""
|
"""
|
||||||
|
@ -20,6 +20,7 @@ from tempest import config
|
|||||||
from tempest import test
|
from tempest import test
|
||||||
|
|
||||||
from tempest.lib.common.utils import data_utils
|
from tempest.lib.common.utils import data_utils
|
||||||
|
from tempest.lib.common.utils import test_utils
|
||||||
from tempest.lib import decorators
|
from tempest.lib import decorators
|
||||||
from tempest.lib import exceptions as lib_exc
|
from tempest.lib import exceptions as lib_exc
|
||||||
|
|
||||||
@ -63,8 +64,8 @@ class L2GatewayConnectionNegative(base_l2gw.BaseL2GatewayTest):
|
|||||||
Clean all the resources used during the test.
|
Clean all the resources used during the test.
|
||||||
"""
|
"""
|
||||||
super(L2GatewayConnectionNegative, cls).resource_cleanup()
|
super(L2GatewayConnectionNegative, cls).resource_cleanup()
|
||||||
cls._try_delete_resource(cls.networks_client.delete_network,
|
test_utils.call_and_ignore_notfound_exc(
|
||||||
cls.network["id"])
|
cls.networks_client.delete_network, cls.network["id"])
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def l2gw_cleanup(cls):
|
def l2gw_cleanup(cls):
|
||||||
@ -105,7 +106,6 @@ class L2GatewayConnectionNegative(base_l2gw.BaseL2GatewayTest):
|
|||||||
self.assertRaises(lib_exc.Conflict, self.delete_l2gw, l2gw_id)
|
self.assertRaises(lib_exc.Conflict, self.delete_l2gw, l2gw_id)
|
||||||
self.addCleanup(self.l2gw_cleanup)
|
self.addCleanup(self.l2gw_cleanup)
|
||||||
|
|
||||||
@decorators.skip_because(bug="634513")
|
|
||||||
@test.attr(type="nsxv3")
|
@test.attr(type="nsxv3")
|
||||||
@test.idempotent_id("488faaae-180a-4c48-8b7a-44c3a243369f")
|
@test.idempotent_id("488faaae-180a-4c48-8b7a-44c3a243369f")
|
||||||
def test_recreate_l2_gateway_connection(self):
|
def test_recreate_l2_gateway_connection(self):
|
||||||
@ -132,7 +132,6 @@ class L2GatewayConnectionNegative(base_l2gw.BaseL2GatewayTest):
|
|||||||
l2gwc_param)
|
l2gwc_param)
|
||||||
self.addCleanup(self.l2gw_cleanup)
|
self.addCleanup(self.l2gw_cleanup)
|
||||||
|
|
||||||
@decorators.skip_because(bug="1640042")
|
|
||||||
@test.attr(type="nsxv3")
|
@test.attr(type="nsxv3")
|
||||||
@test.idempotent_id("14606e74-4f65-402e-ae50-a0adcd877a83")
|
@test.idempotent_id("14606e74-4f65-402e-ae50-a0adcd877a83")
|
||||||
def test_create_l2gwc_with_nonexist_l2gw(self):
|
def test_create_l2gwc_with_nonexist_l2gw(self):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user