Switch to use idempotent_id decorator from tempest.lib
Decorator idempotent_id() in tempest.test is deprecated and
tempest.lib.decorators.idempotent_id() should be used instead.
This patch switch all tempest tests to use new decorator.
Change-Id: I2df9c13fbb44b8807da6805761ad30bfd010dc55
diff --git a/neutron/tests/tempest/api/test_revisions.py b/neutron/tests/tempest/api/test_revisions.py
index 1da4493..2e06c7c 100644
--- a/neutron/tests/tempest/api/test_revisions.py
+++ b/neutron/tests/tempest/api/test_revisions.py
@@ -12,6 +12,7 @@
import netaddr
+from tempest.lib import decorators
from tempest import test
from neutron.tests.tempest.api import base
@@ -26,7 +27,7 @@
def skip_checks(cls):
super(TestRevisions, cls).skip_checks()
- @test.idempotent_id('4a26a4be-9c53-483c-bc50-b53f1db10ac6')
+ @decorators.idempotent_id('4a26a4be-9c53-483c-bc50-b53f1db10ac6')
def test_update_network_bumps_revision(self):
net = self.create_network()
self.assertIn('revision_number', net)
@@ -34,7 +35,7 @@
self.assertGreater(updated['network']['revision_number'],
net['revision_number'])
- @test.idempotent_id('cac7ecde-12d5-4331-9a03-420899dea077')
+ @decorators.idempotent_id('cac7ecde-12d5-4331-9a03-420899dea077')
def test_update_port_bumps_revision(self):
net = self.create_network()
port = self.create_port(net)
@@ -43,7 +44,7 @@
self.assertGreater(updated['port']['revision_number'],
port['revision_number'])
- @test.idempotent_id('c1c4fa41-8e89-44d0-9bfc-409f3b66dc57')
+ @decorators.idempotent_id('c1c4fa41-8e89-44d0-9bfc-409f3b66dc57')
def test_update_subnet_bumps_revision(self):
net = self.create_network()
subnet = self.create_subnet(net)
@@ -52,7 +53,7 @@
self.assertGreater(updated['subnet']['revision_number'],
subnet['revision_number'])
- @test.idempotent_id('e8c5d7db-2b8d-4615-a476-6e537437c4f2')
+ @decorators.idempotent_id('e8c5d7db-2b8d-4615-a476-6e537437c4f2')
def test_update_subnetpool_bumps_revision(self):
sp = self.create_subnetpool('subnetpool', default_prefixlen=24,
prefixes=['10.0.0.0/8'])
@@ -61,7 +62,7 @@
self.assertGreater(updated['subnetpool']['revision_number'],
sp['revision_number'])
- @test.idempotent_id('e8c5d7db-2b8d-4567-a326-6e123437c4d1')
+ @decorators.idempotent_id('e8c5d7db-2b8d-4567-a326-6e123437c4d1')
def test_update_subnet_bumps_network_revision(self):
net = self.create_network()
subnet = self.create_subnet(net)
@@ -73,7 +74,7 @@
self.assertGreater(updated2['network']['revision_number'],
updated['network']['revision_number'])
- @test.idempotent_id('6c256f71-c929-4200-b3dc-4e1843506be5')
+ @decorators.idempotent_id('6c256f71-c929-4200-b3dc-4e1843506be5')
@test.requires_ext(extension="security-group", service="network")
def test_update_sg_group_bumps_revision(self):
sg, name = self._create_security_group()
@@ -83,7 +84,7 @@
self.assertGreater(update_body['security_group']['revision_number'],
sg['security_group']['revision_number'])
- @test.idempotent_id('6489632f-8550-4453-a674-c98849742967')
+ @decorators.idempotent_id('6489632f-8550-4453-a674-c98849742967')
@test.requires_ext(extension="security-group", service="network")
def test_update_port_sg_binding_bumps_revision(self):
net = self.create_network()
@@ -98,7 +99,7 @@
self.assertGreater(updated2['port']['revision_number'],
updated['port']['revision_number'])
- @test.idempotent_id('29c7ab2b-d1d8-425d-8cec-fcf632960f22')
+ @decorators.idempotent_id('29c7ab2b-d1d8-425d-8cec-fcf632960f22')
@test.requires_ext(extension="security-group", service="network")
def test_update_sg_rule_bumps_sg_revision(self):
sg, name = self._create_security_group()
@@ -115,7 +116,7 @@
self.assertGreater(updated2['security_group']['revision_number'],
updated['security_group']['revision_number'])
- @test.idempotent_id('db70c285-0365-4fac-9f55-2a0ad8cf55a8')
+ @decorators.idempotent_id('db70c285-0365-4fac-9f55-2a0ad8cf55a8')
@test.requires_ext(extension="allowed-address-pairs", service="network")
def test_update_allowed_address_pairs_bumps_revision(self):
net = self.create_network()
@@ -129,7 +130,7 @@
self.assertGreater(updated2['port']['revision_number'],
updated['port']['revision_number'])
- @test.idempotent_id('a21ec3b4-3569-4b77-bf29-4177edaa2df5')
+ @decorators.idempotent_id('a21ec3b4-3569-4b77-bf29-4177edaa2df5')
@test.requires_ext(extension="extra_dhcp_opt", service="network")
def test_update_extra_dhcp_opt_bumps_revision(self):
net = self.create_network()
@@ -144,7 +145,7 @@
self.assertGreater(updated2['port']['revision_number'],
updated['port']['revision_number'])
- @test.idempotent_id('40ba648f-f374-4c29-a5b7-489dd5a38a4e')
+ @decorators.idempotent_id('40ba648f-f374-4c29-a5b7-489dd5a38a4e')
@test.requires_ext(extension="dns-integration", service="network")
def test_update_dns_domain_bumps_revision(self):
net = self.create_network(dns_domain='example.test.')
@@ -161,7 +162,7 @@
self.assertGreater(updated2['port']['revision_number'],
updated['port']['revision_number'])
- @test.idempotent_id('8482324f-cf59-4d73-b98e-d37119255300')
+ @decorators.idempotent_id('8482324f-cf59-4d73-b98e-d37119255300')
@test.requires_ext(extension="router", service="network")
@test.requires_ext(extension="extraroute", service="network")
def test_update_router_extra_routes_bumps_revision(self):
@@ -178,7 +179,7 @@
self.assertGreater(updated2['router']['revision_number'],
updated['router']['revision_number'])
- @test.idempotent_id('6bd18702-e25a-4b4b-8c0c-680113533511')
+ @decorators.idempotent_id('6bd18702-e25a-4b4b-8c0c-680113533511')
@test.requires_ext(extension="subnet-service-types", service="network")
def test_update_subnet_service_types_bumps_revisions(self):
subnet = self.create_subnet(self.create_network())
@@ -191,7 +192,7 @@
self.assertGreater(updated2['subnet']['revision_number'],
updated['subnet']['revision_number'])
- @test.idempotent_id('9c83105c-9973-45ff-9ca2-e66d64700abe')
+ @decorators.idempotent_id('9c83105c-9973-45ff-9ca2-e66d64700abe')
@test.requires_ext(extension="port-security", service="network")
def test_update_port_security_bumps_revisions(self):
net = self.create_network(port_security_enabled=False)
@@ -213,7 +214,7 @@
self.assertGreater(updated2['port']['revision_number'],
updated['port']['revision_number'])
- @test.idempotent_id('68d5ac3a-11a1-4847-8e2e-5843c043d89b')
+ @decorators.idempotent_id('68d5ac3a-11a1-4847-8e2e-5843c043d89b')
@test.requires_ext(extension="binding", service="network")
def test_portbinding_bumps_revision(self):
port = self.create_port(self.create_network())
@@ -224,7 +225,7 @@
self.assertGreater(updated['revision_number'],
port['revision_number'])
- @test.idempotent_id('4a37bde9-1975-47e0-9b8c-2c9ca36415b0')
+ @decorators.idempotent_id('4a37bde9-1975-47e0-9b8c-2c9ca36415b0')
@test.requires_ext(extension="router", service="network")
def test_update_router_bumps_revision(self):
subnet = self.create_subnet(self.create_network())
@@ -239,7 +240,7 @@
self.assertGreater(updated['revision_number'],
router['revision_number'])
- @test.idempotent_id('9de71ebc-f5df-4cd0-80bc-60299fce3ce9')
+ @decorators.idempotent_id('9de71ebc-f5df-4cd0-80bc-60299fce3ce9')
@test.requires_ext(extension="router", service="network")
@test.requires_ext(extension="standard-attr-description",
service="network")
@@ -263,7 +264,7 @@
# disassociate
self.client.update_floatingip(b2['floatingip']['id'], port_id=None)
- @test.idempotent_id('afb6486c-41b5-483e-a500-3c506f4deb49')
+ @decorators.idempotent_id('afb6486c-41b5-483e-a500-3c506f4deb49')
@test.requires_ext(extension="router", service="network")
@test.requires_ext(extension="dvr", service="network")
def test_update_router_extra_attributes_bumps_revision(self):
@@ -279,7 +280,7 @@
self.assertGreater(updated['revision_number'],
router['revision_number'])
- @test.idempotent_id('90743b00-b0e2-40e4-9524-1c884fe3ef23')
+ @decorators.idempotent_id('90743b00-b0e2-40e4-9524-1c884fe3ef23')
@test.requires_ext(extension="external-net", service="network")
@test.requires_ext(extension="auto-allocated-topology", service="network")
@test.requires_ext(extension="subnet_allocation", service="network")
@@ -292,7 +293,7 @@
self.assertGreater(updated['network']['revision_number'],
net['revision_number'])
- @test.idempotent_id('5af6450a-0f61-49c3-b628-38db77c7b856')
+ @decorators.idempotent_id('5af6450a-0f61-49c3-b628-38db77c7b856')
@test.requires_ext(extension="qos", service="network")
def test_update_qos_port_policy_binding_bumps_revision(self):
policy = self.create_qos_policy(name='port-policy', shared=False)
@@ -303,7 +304,7 @@
self.assertGreater(updated['port']['revision_number'],
port['revision_number'])
- @test.idempotent_id('817da343-c6e4-445c-9519-a621f124dfbe')
+ @decorators.idempotent_id('817da343-c6e4-445c-9519-a621f124dfbe')
@test.requires_ext(extension="qos", service="network")
def test_update_qos_network_policy_binding_bumps_revision(self):
policy = self.create_qos_policy(name='network-policy', shared=False)