From 4ccd35516fb9a0f4329f584902d2163a0c968c8c Mon Sep 17 00:00:00 2001
From: jh629g <jh629g@att.com>
Date: Tue, 19 May 2020 15:00:35 -0500
Subject: [PATCH] TEST PATCHSET - REMOVE RBAC
Attempt to remove rbac tests to
resolve duplicate idempotent id
issues in tempest pipeline due
to import of patrole_tempest_plugin
utilities
Change-Id: Ife08863979e39ecfdabb6b07ac90dad3a5747c9a
---
ranger_tempest_plugin/tests/rbac/__init__.py | 0
.../tests/rbac/test_customers.py | 239 ------------------
.../tests/rbac/test_regions.py | 142 -----------
requirements.txt | 1 -
4 files changed, 382 deletions(-)
delete mode 100644 ranger_tempest_plugin/tests/rbac/__init__.py
delete mode 100644 ranger_tempest_plugin/tests/rbac/test_customers.py
delete mode 100644 ranger_tempest_plugin/tests/rbac/test_regions.py
diff --git a/ranger_tempest_plugin/tests/rbac/__init__.py b/ranger_tempest_plugin/tests/rbac/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/ranger_tempest_plugin/tests/rbac/test_customers.py b/ranger_tempest_plugin/tests/rbac/test_customers.py
deleted file mode 100644
index cc77ab5..0000000
--- a/ranger_tempest_plugin/tests/rbac/test_customers.py
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright (c) 2019 AT&T Intellectual Property. All other rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-# pylint: disable=too-many-ancestors
-
-from patrole_tempest_plugin import rbac_rule_validation
-from patrole_tempest_plugin import rbac_utils
-
-from ranger_tempest_plugin.tests.api import cms_base
-
-from tempest import config
-from tempest.lib import decorators
-
-
-CONF = config.CONF
-
-
-class TestCustomer(rbac_utils.RbacUtilsMixin, cms_base.CmsBaseOrmTest):
-
- @classmethod
- def setup_clients(cls):
- super(TestCustomer, cls).setup_clients()
- cls.client = cls.os_primary.cms_rbac_client
-
- @classmethod
- def skip_checks(cls):
- super(TestCustomer, cls).skip_checks()
- if not CONF.ranger.test_rbac:
- skip_msg = ("%s skipped as this is not an rbac test run"
- % cls.__name__)
- raise cls.skipException(skip_msg)
-
- @rbac_rule_validation.action(service="ranger",
- rules=['customers:get_one'],
- expected_error_codes=[403])
- @decorators.idempotent_id('c28cca7b-99ab-4d8d-bef9-f1fe1a1e86cc')
- def test_get_customer(self):
- with self.override_role():
- self.client.get_customer(self.setup_customer_id)
-
- @rbac_rule_validation.action(service="ranger",
- rules=['customers:get_all'],
- expected_error_codes=[403])
- @decorators.idempotent_id('5f1e6d5b-f7b8-4e19-a30e-95afa3902827')
- def test_list_customer(self):
- with self.override_role():
- # List customers without any filters
- self.client.list_customers(None)
-
- @rbac_rule_validation.action(service='ranger',
- rules=['customers:create'],
- expected_error_codes=[403])
- @decorators.idempotent_id('021ada0a-3638-4075-8220-76ff4cbfc9ce')
- def test_create_customer(self):
- post_body = self._get_customer_params(
- quota=False,
- region_users=False,
- default_users=False
- )
- with self.override_role():
- _, body = self.client.create_customer(**post_body)
- test_customer_id = body['customer']['id']
- self.addCleanup(self._del_cust_validate_deletion_on_dcp_and_lcp,
- test_customer_id)
- self._wait_for_status(test_customer_id, 'Success')
-
- @rbac_rule_validation.action(service='ranger',
- rules=['customers:update'],
- expected_error_codes=[403])
- @decorators.idempotent_id('b2b1d36a-9448-4646-839b-9698405ada6d')
- def test_update_customer(self):
- customer = self._get_bare_customer_params()
- customer['name'] = self.setup_customer['name']
- customer['regions'] = [{'name': CONF.identity.region}]
- with self.override_role():
- self.client.update_customer(self.setup_customer_id, customer)
- self._wait_for_status(self.setup_customer_id, 'Success')
-
- @rbac_rule_validation.action(service='ranger',
- rules=['customers:delete'],
- expected_error_codes=[403])
- @decorators.idempotent_id('58c7f2a6-3bfe-4ac4-ab10-1064efc10dbe')
- def test_delete_customer(self):
- customer = self._get_bare_customer_params()
- customer_id = (
- self._create_cust_validate_creation_on_dcp_and_lcp(
- **customer))
- with self.override_role():
- self.client.delete_customer(customer_id)
-
- @rbac_rule_validation.action(service='ranger',
- rules=['customers:add_region_user'],
- expected_error_codes=[403])
- @decorators.idempotent_id('4745cf25-aec5-4aaa-9664-eb3d20e45f31')
- def test_add_region_user(self):
- post_body = self._get_customer_params(region_users=False,
- default_users=False)
- test_customer_id = self._create_cust_validate_creation_on_dcp_and_lcp(
- **post_body)
- self.addCleanup(self._del_cust_validate_deletion_on_dcp_and_lcp,
- test_customer_id)
- _, body = self.client.get_customer(test_customer_id)
- self.assertFalse(body["regions"][0]["users"])
-
- post_region_user = self._get_user_params()
- with self.override_role():
- self.client.add_region_user(test_customer_id,
- CONF.identity.region,
- *post_region_user)
- self._wait_for_status(test_customer_id, 'Success')
-
- @rbac_rule_validation.action(service='ranger',
- rules=['customers:update_region_user'],
- expected_error_codes=[403])
- @decorators.idempotent_id('6776a21a-2572-4b78-aa03-59a6cf4e163b')
- def test_update_region_user(self):
- put_region_user = self._get_user_params(alt=True)
- with self.override_role():
- self.client.replace_region_user(self.setup_customer_id,
- CONF.identity.region,
- *put_region_user)
- self._wait_for_status(self.setup_customer_id, 'Success')
-
- @rbac_rule_validation.action(service='ranger',
- rules=['customers:delete_region_user'],
- expected_error_codes=[403])
- @decorators.idempotent_id('ceaf7bb2-fd6d-442d-90ba-1a41aacaed4f')
- def test_delete_region_user(self):
- post_body = self._get_customer_params(default_users=False)
- region_user_id = post_body["regions"][0]["users"][0]["id"]
- test_customer_id = self._create_cust_validate_creation_on_dcp_and_lcp(
- **post_body)
- self.addCleanup(self._del_cust_validate_deletion_on_dcp_and_lcp,
- test_customer_id)
- with self.override_role():
- self.client.delete_region_user(test_customer_id,
- CONF.identity.region,
- region_user_id)
- self._wait_for_status(test_customer_id, 'Success')
-
- @rbac_rule_validation.action(service='ranger',
- rules=['customers:add_default_user'],
- expected_error_codes=[403])
- @decorators.idempotent_id('975d87a6-4e14-42a6-98ce-71e7277b4768')
- def test_add_default_user(self):
- post_default_user = self._get_user_params()
- with self.override_role():
- self.client.add_default_user(
- self.bare_customer_id, *post_default_user)
- self._wait_for_status(self.bare_customer_id, 'Success')
-
- @rbac_rule_validation.action(service='ranger',
- rules=['customers:update_default_user'],
- expected_error_codes=[403])
- @decorators.idempotent_id('8220fd8a-7677-4071-ad6c-bd0b14860b39')
- def test_update_default_user(self):
- put_default_user = self._get_user_params(alt=True)
- with self.override_role():
- self.client.replace_default_user(
- self.bare_customer_id, *put_default_user)
- self._wait_for_status(self.bare_customer_id, 'Success')
-
- @rbac_rule_validation.action(service='ranger',
- rules=['customers:delete_default_user'],
- expected_error_codes=[403])
- @decorators.idempotent_id('3cb53862-701b-40cd-a436-8bbe88dc91fb')
- def test_delete_default_user(self):
- post_body = self._get_customer_params()
- default_user_id = post_body['users'][0]['id']
- test_customer_id = self._create_cust_validate_creation_on_dcp_and_lcp(
- **post_body)
- self.addCleanup(self._del_cust_validate_deletion_on_dcp_and_lcp,
- test_customer_id)
- with self.override_role():
- self.client.delete_default_user(
- test_customer_id, default_user_id)
- self._wait_for_status(test_customer_id, 'Success')
-
- @rbac_rule_validation.action(service='ranger',
- rules=['customers:add_metadata'],
- expected_error_codes=[403])
- @decorators.idempotent_id('bbb961fe-0770-492a-b4a2-1c5d6d05df2e')
- def test_add_metadata(self):
- metadata = {'metadata': {'add_key': 'add_value'}}
- with self.override_role():
- self.client.add_metadata(self.setup_customer_id,
- metadata)
- self._wait_for_status(self.setup_customer_id, 'Success')
-
- @rbac_rule_validation.action(service='ranger',
- rules=['customers:update_metadata'],
- expected_error_codes=[403])
- @decorators.idempotent_id('470193ab-37d0-44d8-ba4e-1ed975d631f2')
- def test_update_metadata(self):
- metadata = {'metadata': {'replace_key': 'replace_value'}}
- with self.override_role():
- self.client.replace_metadata(self.setup_customer_id, metadata)
- self._wait_for_status(self.setup_customer_id, 'Success')
-
- @rbac_rule_validation.action(service='ranger',
- rules=['customers:enable'],
- expected_error_codes=[403])
- @decorators.idempotent_id('83ba3e54-e6e6-48ce-b67b-c2f389a63b9a')
- def test_disable_customer(self):
- with self.override_role():
- self.client.enable_customer(self.setup_customer_id, False)
- self._wait_for_status(self.setup_customer_id, 'Success')
-
- @rbac_rule_validation.action(service='ranger',
- rules=['customers:add_region'],
- expected_error_codes=[403])
- @decorators.idempotent_id('80d3d706-01ce-4de1-987a-8e61a70e494b')
- def test_add_region(self):
- region = self._get_region_params()
- with self.override_role():
- self.client.add_regions(self.bare_customer_id, region)
- self._wait_for_status(self.bare_customer_id, 'Success')
-
- @rbac_rule_validation.action(service='ranger',
- rules=['customers:delete_region'],
- expected_error_codes=[403])
- @decorators.idempotent_id('1cd601db-39d8-424b-a82f-87c7645a0c1c')
- def test_delete_region(self):
- region_name = self.setup_customer['regions'][0]['name']
- with self.override_role():
- self.client.delete_region_from_customer(
- self.setup_customer_id, region_name)
- self._wait_for_status(self.setup_customer_id, 'no regions')
diff --git a/ranger_tempest_plugin/tests/rbac/test_regions.py b/ranger_tempest_plugin/tests/rbac/test_regions.py
deleted file mode 100644
index 70f5992..0000000
--- a/ranger_tempest_plugin/tests/rbac/test_regions.py
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright (c) 2019 AT&T Intellectual Property. All other rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-from patrole_tempest_plugin import rbac_rule_validation
-from patrole_tempest_plugin import rbac_utils
-
-from ranger_tempest_plugin import data_utils as orm_data_utils
-from ranger_tempest_plugin.tests.api import rms_base
-
-from tempest import config
-from tempest.lib import decorators
-
-from tempest.lib.common.utils import data_utils
-
-
-CONF = config.CONF
-
-
-class TestRegion(rbac_utils.RbacUtilsMixin, rms_base.RmsBaseOrmTest):
-
- @classmethod
- def setup_clients(cls):
- super(TestRegion, cls).setup_clients()
- cls.client = cls.os_primary.rms_rbac_client
-
- @classmethod
- def skip_checks(cls):
- super(TestRegion, cls).skip_checks()
- if not CONF.ranger.test_rbac:
- skip_msg = ("%s skipped as this is not an rbac test run"
- % cls.__name__)
- raise cls.skipException(skip_msg)
-
- @rbac_rule_validation.action(service='ranger',
- rules=['region:get_all'],
- expected_error_codes=[403])
- @decorators.idempotent_id('f8be1f6b-7e3f-40ea-b099-1fd57e4124a1')
- def test_list_regions(self):
- with self.override_role():
- self.client.list_regions()
-
- @rbac_rule_validation.action(service='ranger',
- rules=['region:get_one'],
- expected_error_codes=[403])
- @decorators.idempotent_id('0a97dd58-d4b0-448b-b7f4-9fdbc99efce3')
- def test_get_region(self):
- filter = {'regionname': self.region_1['name']}
- with self.override_role():
- self.client.list_regions(filter)
-
- @rbac_rule_validation.action(service='ranger',
- rules=['region:create'],
- expected_error_codes=[403])
- @decorators.idempotent_id('3d5895cf-ec8b-44f4-8d52-183baf2ff062')
- def test_create_region(self):
- region_id = None
- with self.override_role():
- _, region = self.client.create_region(data_utils.rand_name())
- region_id = region['id']
- self.client.delete_region(region_id)
-
- @rbac_rule_validation.action(service='ranger',
- rules=['region:update'],
- expected_error_codes=[403])
- @decorators.idempotent_id('cbb32c8f-f183-42c4-a9d9-61e93d066c5f')
- def test_update_region(self):
- region_id = self.setup_ids[-1]
- region = orm_data_utils.rand_region(region_id)
- with self.override_role():
- self.client.update_region(region_id, **region)
-
- @rbac_rule_validation.action(service='ranger',
- rules=['region:delete'],
- expected_error_codes=[403])
- @decorators.idempotent_id('62596380-c8a8-4832-8b3a-c665d2ecf18f')
- def test_delete_region(self):
- _, region = self.client.create_region(data_utils.rand_name())
- region_id = region['id']
- with self.override_role():
- self.client.delete_region(region_id)
-
- @rbac_rule_validation.action(service='ranger',
- rules=['metadata:get'],
- expected_error_codes=[403])
- @decorators.idempotent_id('96dbb841-52b6-4366-b62b-cdbb820c9c24')
- def test_get_region_metadata(self):
- with self.override_role():
- self.client.get_region_metadata(self.region_1['id'])
-
- @rbac_rule_validation.action(service='ranger',
- rules=['metadata:create'],
- expected_error_codes=[403])
- @decorators.idempotent_id('4fa6d3ff-8a77-462c-a856-7f65d0579400')
- def test_add_region_metadata(self):
- metadata = {}
- metadata['metadata'] = orm_data_utils.rand_region_metadata()
- with self.override_role():
- self.client.add_region_metadata(self.region_1['id'], **metadata)
-
- @rbac_rule_validation.action(service='ranger',
- rules=['metadata:update'],
- expected_error_codes=[403])
- @decorators.idempotent_id('01c592b1-6357-4daa-8150-9476c5644d8b')
- def test_update_region_metadata(self):
- metadata = {}
- metadata['metadata'] = orm_data_utils.rand_region_metadata()
- with self.override_role():
- self.client.update_region_metadata(self.region_1['id'], metadata)
-
- @rbac_rule_validation.action(service='ranger',
- rules=['metadata:delete'],
- expected_error_codes=[403])
- @decorators.idempotent_id('25b5d305-586f-4ef5-9774-e46362a69b4c')
- def test_delete_region_metadata(self):
- metadata = {}
- metadata['metadata'] = orm_data_utils.rand_region_metadata()
- key = list(metadata['metadata'].keys())[0]
- self.client.add_region_metadata(self.region_1['id'], **metadata)
- with self.override_role():
- self.client.delete_region_metadata(self.region_1['id'], key)
-
- @rbac_rule_validation.action(service='ranger',
- rules=['status:put'],
- expected_error_codes=[403])
- @decorators.idempotent_id('57a73d35-0e40-4fd1-b2ea-2fd6ac8364d5')
- def test_update_region_status(self):
- status = {}
- status['status'] = orm_data_utils.rand_region_status(
- [self.region_1['status']])
- with self.override_role():
- self.client.update_region_status(self.region_1['id'], status)
diff --git a/requirements.txt b/requirements.txt
index 303b601..784e536 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,6 @@ oslo.log>=3.36.0 # Apache-2.0
oslosphinx>=4.7.0 # Apache-2.0
oslotest>=1.10.0 # Apache-2.0
oslo.utils>=3.33.0 # Apache-2.0
-patrole>=0.7.0 # Apache-2.0
python-subunit>=0.0.18 # Apache-2.0/BSD
reno>=1.8.0 # Apache-2.0
requests>=2.10.0