openstack
/
neutron-fwaas
Code Issues Proposed changes

Merge "Switch to decorators.idempotent_id"

This commit is contained in:
Jenkins 2017-02-01 15:00:52 +00:00 committed by Gerrit Code Review
parent 547e2e12fe d370a2ebe1
commit 8cfa2de66b
4 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
neutron_fwaas/tests/tempest_plugin/tests/api/test_fwaas_extensions.py
View File

@ -16,6 +16,7 @@ import six
from tempest import config
from tempest.lib.common.utils import data_utils
from tempest.lib import decorators
from tempest.lib import exceptions as lib_exc
from tempest import test
@ -104,7 +105,7 @@ class FWaaSExtensionTestJSON(base.BaseFWaaSTest):
(fw_id, target_states))
raise lib_exc.TimeoutException(m)
@test.idempotent_id('1b84cf01-9c09-4ce7-bc72-b15e39076468')
@decorators.idempotent_id('1b84cf01-9c09-4ce7-bc72-b15e39076468')
@test.attr(type='smoke')
def test_list_firewall_rules(self):
# List firewall rules
@ -123,7 +124,7 @@ class FWaaSExtensionTestJSON(base.BaseFWaaSTest):
m['ip_version'],
m['enabled']) for m in fw_rules])
@test.idempotent_id('563564f7-7077-4f5e-8cdc-51f37ae5a2b9')
@decorators.idempotent_id('563564f7-7077-4f5e-8cdc-51f37ae5a2b9')
@test.attr(type='smoke')
def test_create_update_delete_firewall_rule(self):
# Create firewall rule
@ -145,7 +146,7 @@ class FWaaSExtensionTestJSON(base.BaseFWaaSTest):
self.assertNotIn(fw_rule_id,
[m['id'] for m in fw_rules['firewall_rules']])
@test.idempotent_id('3ff8c08e-26ff-4034-ae48-810ed213a998')
@decorators.idempotent_id('3ff8c08e-26ff-4034-ae48-810ed213a998')
@test.attr(type='smoke')
def test_show_firewall_rule(self):
# show a created firewall rule
@ -154,7 +155,7 @@ class FWaaSExtensionTestJSON(base.BaseFWaaSTest):
for key, value in six.iteritems(fw_rule['firewall_rule']):
self.assertEqual(self.fw_rule[key], value)
@test.idempotent_id('1086dd93-a4c0-4bbb-a1bd-6d4bc62c199f')
@decorators.idempotent_id('1086dd93-a4c0-4bbb-a1bd-6d4bc62c199f')
@test.attr(type='smoke')
def test_list_firewall_policies(self):
fw_policies = self.firewall_policies_client.list_firewall_policies()
@ -166,7 +167,7 @@ class FWaaSExtensionTestJSON(base.BaseFWaaSTest):
m['name'],
m['firewall_rules']) for m in fw_policies])
@test.idempotent_id('bbf37b6c-498c-421e-9c95-45897d3ed775')
@decorators.idempotent_id('bbf37b6c-498c-421e-9c95-45897d3ed775')
@test.attr(type='smoke')
def test_create_update_delete_firewall_policy(self):
# Create firewall policy
@ -189,7 +190,7 @@ class FWaaSExtensionTestJSON(base.BaseFWaaSTest):
fw_policies = fw_policies['firewall_policies']
self.assertNotIn(fw_policy_id, [m['id'] for m in fw_policies])
@test.idempotent_id('1df59b3a-517e-41d4-96f6-fc31cf4ecff2')
@decorators.idempotent_id('1df59b3a-517e-41d4-96f6-fc31cf4ecff2')
@test.attr(type='smoke')
def test_show_firewall_policy(self):
# show a created firewall policy
@ -199,7 +200,7 @@ class FWaaSExtensionTestJSON(base.BaseFWaaSTest):
for key, value in six.iteritems(fw_policy):
self.assertEqual(self.fw_policy[key], value)
@test.idempotent_id('02082a03-3cdd-4789-986a-1327dd80bfb7')
@decorators.idempotent_id('02082a03-3cdd-4789-986a-1327dd80bfb7')
@test.attr(type='smoke')
def test_create_show_delete_firewall(self):
# Create tenant network resources required for an ACTIVE firewall
@ -244,7 +245,7 @@ class FWaaSExtensionTestJSON(base.BaseFWaaSTest):
# Delete firewall
self.firewalls_client.delete_firewall(firewall_id)
@test.idempotent_id('1355cf5c-77d4-4bb9-87d7-e50c194d08b5')
@decorators.idempotent_id('1355cf5c-77d4-4bb9-87d7-e50c194d08b5')
def test_firewall_insertion_mode_add_remove_router(self):
# Create routers
router1 = self.create_router(
@ -285,7 +286,7 @@ class FWaaSExtensionTestJSON(base.BaseFWaaSTest):
self.assertNotIn(router1['id'], updated_firewall['router_ids'])
self.assertEqual(1, len(updated_firewall['router_ids']))
@test.idempotent_id('c60ceff5-d51f-451d-b6e6-cb983d16ab6b')
@decorators.idempotent_id('c60ceff5-d51f-451d-b6e6-cb983d16ab6b')
def test_firewall_insertion_mode_one_firewall_per_router(self):
# Create router required for an ACTIVE firewall
router = self.create_router(
@ -310,7 +311,7 @@ class FWaaSExtensionTestJSON(base.BaseFWaaSTest):
router_ids=[router['id']])
@test.attr(type='smoke')
@test.idempotent_id('53305b4b-9897-4e01-87c0-2ae386083180')
@decorators.idempotent_id('53305b4b-9897-4e01-87c0-2ae386083180')
def test_firewall_rule_insertion_position_removal_rule_from_policy(self):
# Create firewall rule
body = self.firewall_rules_client.create_firewall_rule(
@ -377,7 +378,7 @@ class FWaaSExtensionTestJSON(base.BaseFWaaSTest):
return [ruleid for ruleid in fw_policy['firewall_policy']
['firewall_rules']]
@test.idempotent_id('8515ca8a-0d2f-4298-b5ff-6f924e4587ca')
@decorators.idempotent_id('8515ca8a-0d2f-4298-b5ff-6f924e4587ca')
def test_update_firewall_policy_audited_attribute(self):
# Create firewall rule
body = self.firewall_rules_client.create_firewall_rule(

17
neutron_fwaas/tests/tempest_plugin/tests/api/test_fwaasv2_extensions.py
View File

@ -18,6 +18,7 @@ import six
from tempest import config
from tempest import exceptions
from tempest.lib.common.utils import data_utils
from tempest.lib import decorators
from tempest.lib import exceptions as lib_exc
from tempest import test
@ -147,7 +148,7 @@ class FWaaSv2ExtensionTestJSON(v2_base.BaseFWaaSTest):
(fwg_id, target_states))
raise exceptions.TimeoutException(m)
@test.idempotent_id('ddccfa87-4af7-48a6-9e50-0bd0ad1348cb')
@decorators.idempotent_id('ddccfa87-4af7-48a6-9e50-0bd0ad1348cb')
def test_list_firewall_rules(self):
# List firewall rules
fw_rules = self.firewall_rules_client.list_firewall_rules()
@ -165,7 +166,7 @@ class FWaaSv2ExtensionTestJSON(v2_base.BaseFWaaSTest):
m['ip_version'],
m['enabled']) for m in fw_rules])
@test.idempotent_id('ffc009fa-cd17-4029-8025-c4b81a7dd923')
@decorators.idempotent_id('ffc009fa-cd17-4029-8025-c4b81a7dd923')
def test_create_update_delete_firewall_rule(self):
# Create firewall rule
body = self.firewall_rules_client.create_firewall_rule(
@ -186,7 +187,7 @@ class FWaaSv2ExtensionTestJSON(v2_base.BaseFWaaSTest):
self.assertNotIn(fw_rule_id,
[m['id'] for m in fw_rules['firewall_rules']])
@test.idempotent_id('76b07afc-444e-4bb9-abec-9b8c5f994dcd')
@decorators.idempotent_id('76b07afc-444e-4bb9-abec-9b8c5f994dcd')
def test_show_firewall_rule(self):
# show a created firewall rule
fw_rule = self.firewall_rules_client.show_firewall_rule(
@ -194,7 +195,7 @@ class FWaaSv2ExtensionTestJSON(v2_base.BaseFWaaSTest):
for key, value in six.iteritems(fw_rule['firewall_rule']):
self.assertEqual(self.fw_rule_1[key], value)
@test.idempotent_id('f6b83902-746f-4e74-9403-2ec9899583a3')
@decorators.idempotent_id('f6b83902-746f-4e74-9403-2ec9899583a3')
def test_list_firewall_policies(self):
fw_policies = self.firewall_policies_client.list_firewall_policies()
fw_policies = fw_policies['firewall_policies']
@ -205,7 +206,7 @@ class FWaaSv2ExtensionTestJSON(v2_base.BaseFWaaSTest):
m['name'],
m['firewall_rules']) for m in fw_policies])
@test.idempotent_id('6ef9bd02-7349-4d61-8d1f-80479f64d904')
@decorators.idempotent_id('6ef9bd02-7349-4d61-8d1f-80479f64d904')
def test_create_update_delete_firewall_policy(self):
# Create firewall policy
body = self.firewall_policies_client.create_firewall_policy(
@ -227,7 +228,7 @@ class FWaaSv2ExtensionTestJSON(v2_base.BaseFWaaSTest):
fw_policies = fw_policies['firewall_policies']
self.assertNotIn(fw_policy_id, [m['id'] for m in fw_policies])
@test.idempotent_id('164381de-61f4-483f-9a5a-48105b8e70e2')
@decorators.idempotent_id('164381de-61f4-483f-9a5a-48105b8e70e2')
def test_show_firewall_policy(self):
# show a created firewall policy
fw_policy = self.firewall_policies_client.show_firewall_policy(
@ -236,7 +237,7 @@ class FWaaSv2ExtensionTestJSON(v2_base.BaseFWaaSTest):
for key, value in six.iteritems(fw_policy):
self.assertEqual(self.fw_policy_1[key], value)
@test.idempotent_id('48dfcd75-3924-479d-bb65-b3ed33397663')
@decorators.idempotent_id('48dfcd75-3924-479d-bb65-b3ed33397663')
def test_create_show_delete_firewall_group(self):
# create router and add interfaces
intf_1, intf_2 = self._create_router_interfaces()
@ -279,7 +280,7 @@ class FWaaSv2ExtensionTestJSON(v2_base.BaseFWaaSTest):
# Delete firewall_group
self.firewall_groups_client.delete_firewall_group(fwg_id)
@test.idempotent_id('e021baab-d4f7-4bad-b382-bde4946e0e0b')
@decorators.idempotent_id('e021baab-d4f7-4bad-b382-bde4946e0e0b')
def test_update_firewall_group(self):
# create router and add interfaces
intf_1, intf_2 = self._create_router_interfaces()

17
neutron_fwaas/tests/tempest_plugin/tests/scenario/test_fwaas.py
View File

@ -16,6 +16,7 @@
import testscenarios
from tempest import config
from tempest.lib import decorators
from tempest import test
from neutron_fwaas.tests.tempest_plugin.tests.scenario import base
@ -336,43 +337,43 @@ class TestFWaaS(base.FWaaSScenarioTest):
confirm_allowed2(ip_address=server2_floating_ip, username=ssh_login,
private_key=private_key2)
@test.idempotent_id('f970f6b3-6541-47ac-a9ea-f769be1e21a8')
@decorators.idempotent_id('f970f6b3-6541-47ac-a9ea-f769be1e21a8')
def test_firewall_block_ip(self):
self._test_firewall_basic(block=self._block_ip, allow=self._allow_ip,
confirm_allowed=self._confirm_allowed_oneway)
@test.idempotent_id('b985d010-994a-4055-bd5c-9e961464ccde')
@decorators.idempotent_id('b985d010-994a-4055-bd5c-9e961464ccde')
def test_firewall_block_icmp(self):
self._test_firewall_basic(
block=self._block_icmp,
confirm_blocked=self._confirm_icmp_blocked_but_tcp)
@test.idempotent_id('ca473af0-26f9-4fad-9550-1c34371c900e')
@decorators.idempotent_id('ca473af0-26f9-4fad-9550-1c34371c900e')
def test_firewall_insert_rule(self):
self._test_firewall_basic(
block=self._block_icmp,
allow=self._allow_ssh_and_icmp,
confirm_blocked=self._confirm_icmp_blocked_but_tcp)
@test.idempotent_id('54a937a6-cecf-444c-b3f9-b67a1c1b7411')
@decorators.idempotent_id('54a937a6-cecf-444c-b3f9-b67a1c1b7411')
def test_firewall_remove_rule(self):
self._test_firewall_basic(block=self._block_all_with_default_allow,
allow=self._remove_rule)
@test.idempotent_id('12a18776-9b60-4479-9988-f45971c96a92')
@decorators.idempotent_id('12a18776-9b60-4479-9988-f45971c96a92')
def test_firewall_disable_rule(self):
self._test_firewall_basic(block=self._block_all_with_default_allow,
allow=self._disable_rule)
@test.idempotent_id('a2a58c1f-49ad-4b5f-9463-e746b9efe08a')
@decorators.idempotent_id('a2a58c1f-49ad-4b5f-9463-e746b9efe08a')
def test_firewall_empty_policy(self):
self._test_firewall_basic(block=self._empty_policy)
@test.idempotent_id('477a47e0-5156-4784-9417-f77970d85c36')
@decorators.idempotent_id('477a47e0-5156-4784-9417-f77970d85c36')
def test_firewall_all_disabled_rules(self):
self._test_firewall_basic(block=self._all_disabled_rules)
@test.idempotent_id('a83f51c5-1a18-4d2a-a778-c368e4d95c29')
@decorators.idempotent_id('a83f51c5-1a18-4d2a-a778-c368e4d95c29')
def test_firewall_admin_disable(self):
self._test_firewall_basic(block=self._admin_disable,
allow=self._admin_enable)

3
neutron_fwaas/tests/tempest_plugin/tests/scenario/test_fwaas_v2.py
View File

@ -20,6 +20,7 @@ from neutron_fwaas.tests.tempest_plugin.tests.scenario import base
from oslo_log import log as logging
from tempest import config
from tempest.lib.common.utils import test_utils
from tempest.lib import decorators
from tempest.lib import exceptions as lib_exc
from tempest import test
@ -206,7 +207,7 @@ class TestFWaaS_v2(base.FWaaSScenarioTest_V2):
return resp
@test.idempotent_id('77fdf3ea-82c1-453d-bfec-f7efe335625d')
@decorators.idempotent_id('77fdf3ea-82c1-453d-bfec-f7efe335625d')
def test_icmp_reachability_scenarios(self):
topology = self._create_topology()
ssh_login = CONF.validation.image_ssh_user