Merge "Remove override of 'expected_error_codes' with defaults"
diff --git a/patrole_tempest_plugin/rbac_rule_validation.py b/patrole_tempest_plugin/rbac_rule_validation.py
index e6d1e80..32deb9f 100644
--- a/patrole_tempest_plugin/rbac_rule_validation.py
+++ b/patrole_tempest_plugin/rbac_rule_validation.py
@@ -110,7 +110,7 @@
c) if both api_action1 and api_action2 fail, then the expected error
code is the first error seen (404).
- If an error code is missing from the list, it is defaulted to 403.
+ If it is not passed, then it is defaulted to 403.
:param dict extra_target_data: Dictionary, keyed with ``oslo.policy``
generic check names, whose values are string literals that reference
diff --git a/patrole_tempest_plugin/tests/api/network/test_floating_ips_rbac.py b/patrole_tempest_plugin/tests/api/network/test_floating_ips_rbac.py
index 57ea839..8a02149 100644
--- a/patrole_tempest_plugin/tests/api/network/test_floating_ips_rbac.py
+++ b/patrole_tempest_plugin/tests/api/network/test_floating_ips_rbac.py
@@ -76,8 +76,7 @@
@rbac_rule_validation.action(
service="neutron",
rules=["create_floatingip",
- "create_floatingip:floating_ip_address"],
- expected_error_codes=[403, 403])
+ "create_floatingip:floating_ip_address"])
@decorators.idempotent_id('a8bb826a-403d-4130-a55d-120a0a660806')
def test_create_floating_ip_floatingip_address(self):
"""Create floating IP with address.
diff --git a/patrole_tempest_plugin/tests/api/network/test_network_segments_rbac.py b/patrole_tempest_plugin/tests/api/network/test_network_segments_rbac.py
index 0097c7b..c985111 100644
--- a/patrole_tempest_plugin/tests/api/network/test_network_segments_rbac.py
+++ b/patrole_tempest_plugin/tests/api/network/test_network_segments_rbac.py
@@ -67,8 +67,7 @@
@rbac_rule_validation.action(service="neutron",
rules=["create_network",
- "create_network:segments"],
- expected_error_codes=[403, 403])
+ "create_network:segments"])
@decorators.idempotent_id('9e1d0c3d-92e3-40e3-855e-bfbb72ea6e0b')
def test_create_network_segments(self):
"""Create network with segments.
diff --git a/patrole_tempest_plugin/tests/api/network/test_networks_rbac.py b/patrole_tempest_plugin/tests/api/network/test_networks_rbac.py
index dccc3df..2e69f89 100644
--- a/patrole_tempest_plugin/tests/api/network/test_networks_rbac.py
+++ b/patrole_tempest_plugin/tests/api/network/test_networks_rbac.py
@@ -110,8 +110,7 @@
@rbac_rule_validation.action(service="neutron",
rules=["create_network",
- "create_network:is_default"],
- expected_error_codes=[403, 403])
+ "create_network:is_default"])
@decorators.idempotent_id('28602661-5ac7-407e-b739-e393f619f5e3')
def test_create_network_is_default(self):
@@ -129,8 +128,7 @@
@rbac_rule_validation.action(service="neutron",
rules=["create_network",
- "create_network:shared"],
- expected_error_codes=[403, 403])
+ "create_network:shared"])
@decorators.idempotent_id('ccabf2a9-28c8-44b2-80e6-ffd65d43eef2')
def test_create_network_shared(self):
@@ -144,8 +142,7 @@
@utils.requires_ext(extension='external-net', service='network')
@rbac_rule_validation.action(service="neutron",
rules=["create_network",
- "create_network:router:external"],
- expected_error_codes=[403, 403])
+ "create_network:router:external"])
@decorators.idempotent_id('51adf2a7-739c-41e0-8857-3b4c460cbd24')
def test_create_network_router_external(self):
@@ -160,8 +157,7 @@
@rbac_rule_validation.action(
service="neutron",
rules=["create_network",
- "create_network:provider:physical_network"],
- expected_error_codes=[403, 403])
+ "create_network:provider:physical_network"])
@decorators.idempotent_id('76783fed-9ff3-4499-a0d1-82d99eec364e')
def test_create_network_provider_physical_network(self):
@@ -184,8 +180,7 @@
@rbac_rule_validation.action(
service="neutron",
rules=["create_network",
- "create_network:provider:network_type"],
- expected_error_codes=[403, 403])
+ "create_network:provider:network_type"])
@decorators.idempotent_id('3c42f7b8-b80c-44ef-8fa4-69ec4b1836bc')
def test_create_network_provider_network_type(self):
@@ -200,8 +195,7 @@
@rbac_rule_validation.action(
service="neutron",
rules=["create_network",
- "create_network:provider:segmentation_id"],
- expected_error_codes=[403, 403])
+ "create_network:provider:segmentation_id"])
@decorators.idempotent_id('b9decb7b-68ef-4504-b99b-41edbf7d2af5')
def test_create_network_provider_segmentation_id(self):
diff --git a/patrole_tempest_plugin/tests/api/network/test_ports_rbac.py b/patrole_tempest_plugin/tests/api/network/test_ports_rbac.py
index 786b388..175d051 100644
--- a/patrole_tempest_plugin/tests/api/network/test_ports_rbac.py
+++ b/patrole_tempest_plugin/tests/api/network/test_ports_rbac.py
@@ -69,8 +69,7 @@
@decorators.idempotent_id('045ee797-4962-4913-b96a-5d7ea04099e7')
@rbac_rule_validation.action(service="neutron",
rules=["create_port",
- "create_port:device_owner"],
- expected_error_codes=[403, 403])
+ "create_port:device_owner"])
def test_create_port_device_owner(self):
with self.rbac_utils.override_role(self):
self.create_port(self.network,
@@ -79,8 +78,7 @@
@decorators.idempotent_id('c4fa8844-f5ef-4daa-bfa2-b89897dfaedf')
@rbac_rule_validation.action(service="neutron",
rules=["create_port",
- "create_port:port_security_enabled"],
- expected_error_codes=[403, 403])
+ "create_port:port_security_enabled"])
def test_create_port_security_enabled(self):
with self.rbac_utils.override_role(self):
self.create_port(self.network, port_security_enabled=True)
@@ -88,8 +86,7 @@
@utils.requires_ext(extension='binding', service='network')
@rbac_rule_validation.action(service="neutron",
rules=["create_port",
- "create_port:binding:host_id"],
- expected_error_codes=[403, 403])
+ "create_port:binding:host_id"])
@decorators.idempotent_id('a54bd6b8-a7eb-4101-bfe8-093930b0d660')
def test_create_port_binding_host_id(self):
@@ -102,8 +99,7 @@
@utils.requires_ext(extension='binding', service='network')
@rbac_rule_validation.action(service="neutron",
rules=["create_port",
- "create_port:binding:profile"],
- expected_error_codes=[403, 403])
+ "create_port:binding:profile"])
@decorators.idempotent_id('98fa38ab-c2ed-46a0-99f0-59f18cbd257a')
def test_create_port_binding_profile(self):
@@ -120,8 +116,7 @@
'"create_port:fixed_ips:ip_address" must be available in the cloud.')
@rbac_rule_validation.action(service="neutron",
rules=["create_port",
- "create_port:fixed_ips:ip_address"],
- expected_error_codes=[403, 403])
+ "create_port:fixed_ips:ip_address"])
@decorators.idempotent_id('2551e10d-006a-413c-925a-8c6f834c09ac')
def test_create_port_fixed_ips_ip_address(self):
@@ -137,8 +132,7 @@
@rbac_rule_validation.action(service="neutron",
rules=["create_port",
- "create_port:mac_address"],
- expected_error_codes=[403, 403])
+ "create_port:mac_address"])
@decorators.idempotent_id('aee6d0be-a7f3-452f-aefc-796b4eb9c9a8')
def test_create_port_mac_address(self):
@@ -150,8 +144,7 @@
@rbac_rule_validation.action(service="neutron",
rules=["create_port",
- "create_port:allowed_address_pairs"],
- expected_error_codes=[403, 403])
+ "create_port:allowed_address_pairs"])
@decorators.idempotent_id('b638d1f4-d903-4ca8-aa2a-6fd603c5ec3a')
def test_create_port_allowed_address_pairs(self):
diff --git a/patrole_tempest_plugin/tests/api/network/test_routers_rbac.py b/patrole_tempest_plugin/tests/api/network/test_routers_rbac.py
index b4b81da..3d7631a 100644
--- a/patrole_tempest_plugin/tests/api/network/test_routers_rbac.py
+++ b/patrole_tempest_plugin/tests/api/network/test_routers_rbac.py
@@ -72,8 +72,7 @@
@utils.requires_ext(extension='l3-ha', service='network')
@rbac_rule_validation.action(service="neutron",
rules=["create_router",
- "create_router:ha"],
- expected_error_codes=[403, 403])
+ "create_router:ha"])
def test_create_high_availability_router(self):
"""Create high-availability router
@@ -88,8 +87,7 @@
@utils.requires_ext(extension='dvr', service='network')
@rbac_rule_validation.action(service="neutron",
rules=["create_router",
- "create_router:distributed"],
- expected_error_codes=[403, 403])
+ "create_router:distributed"])
def test_create_distributed_router(self):
"""Create distributed router
@@ -104,8 +102,7 @@
@rbac_rule_validation.action(
service="neutron",
rules=["create_router",
- "create_router:external_gateway_info:enable_snat"],
- expected_error_codes=[403, 403])
+ "create_router:external_gateway_info:enable_snat"])
@decorators.idempotent_id('3c5acd49-0ec7-4109-ab51-640557b48ebc')
def test_create_router_enable_snat(self):
"""Create Router Snat
@@ -126,8 +123,7 @@
@rbac_rule_validation.action(
service="neutron",
rules=["create_router",
- "create_router:external_gateway_info:external_fixed_ips"],
- expected_error_codes=[403, 403])
+ "create_router:external_gateway_info:external_fixed_ips"])
@decorators.idempotent_id('d0354369-a040-4349-b869-645c8aed13cd')
def test_create_router_external_fixed_ips(self):
"""Create Router Fixed IPs
diff --git a/patrole_tempest_plugin/tests/api/network/test_subnetpools_rbac.py b/patrole_tempest_plugin/tests/api/network/test_subnetpools_rbac.py
index a20e39e..7d02271 100644
--- a/patrole_tempest_plugin/tests/api/network/test_subnetpools_rbac.py
+++ b/patrole_tempest_plugin/tests/api/network/test_subnetpools_rbac.py
@@ -65,8 +65,7 @@
@rbac_rule_validation.action(service="neutron",
rules=["create_subnetpool",
- "create_subnetpool:shared"],
- expected_error_codes=[403, 403])
+ "create_subnetpool:shared"])
@decorators.idempotent_id('cf730989-0d47-40bc-b39a-99e7de484723')
def test_create_subnetpool_shared(self):
"""Create subnetpool shared.
@@ -107,8 +106,7 @@
@decorators.idempotent_id('a16f4e5c-0675-415f-b636-00af00638693')
@rbac_rule_validation.action(service="neutron",
rules=["update_subnetpool",
- "update_subnetpool:is_default"],
- expected_error_codes=[403, 403])
+ "update_subnetpool:is_default"])
def test_update_subnetpool_is_default(self):
"""Update default subnetpool.