Merge "Compute API Floating Ips Tests."
diff --git a/patrole_tempest_plugin/tests/api/compute/test_agents_rbac.py b/patrole_tempest_plugin/tests/api/compute/test_agents_rbac.py
new file mode 100644
index 0000000..356782c
--- /dev/null
+++ b/patrole_tempest_plugin/tests/api/compute/test_agents_rbac.py
@@ -0,0 +1,44 @@
+# Copyright 2017 AT&T Corporation.
+# All 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 tempest import config
+from tempest.lib import decorators
+
+from patrole_tempest_plugin import rbac_rule_validation
+from patrole_tempest_plugin.rbac_utils import rbac_utils
+from patrole_tempest_plugin.tests.api.compute import rbac_base
+
+CONF = config.CONF
+
+
+class AgentsRbacTest(rbac_base.BaseV2ComputeRbacTest):
+
+ def tearDown(self):
+ rbac_utils.switch_role(self, switchToRbacRole=False)
+ super(AgentsRbacTest, self).tearDown()
+
+ @classmethod
+ def skip_checks(cls):
+ super(AgentsRbacTest, cls).skip_checks()
+ if not CONF.compute_feature_enabled.api_extensions:
+ raise cls.skipException(
+ '%s skipped as no compute extensions enabled' % cls.__name__)
+
+ @rbac_rule_validation.action(
+ service="nova", rule="os_compute_api:os-agents")
+ @decorators.idempotent_id('d1bc6d97-07f5-4f45-ac29-1c619a6a7e27')
+ def test_list_agents_rbac(self):
+ rbac_utils.switch_role(self, switchToRbacRole=True)
+ self.agents_client.list_agents()
diff --git a/patrole_tempest_plugin/tests/api/compute/test_hypervisor_rbac.py b/patrole_tempest_plugin/tests/api/compute/test_hypervisor_rbac.py
index 5f571a5..e495b7d 100644
--- a/patrole_tempest_plugin/tests/api/compute/test_hypervisor_rbac.py
+++ b/patrole_tempest_plugin/tests/api/compute/test_hypervisor_rbac.py
@@ -23,33 +23,6 @@
CONF = config.CONF
-class HypervisorRbacTest(rbac_base.BaseV2ComputeRbacTest):
-
- @classmethod
- def setup_clients(cls):
- super(HypervisorRbacTest, cls).setup_clients()
- cls.client = cls.hypervisor_client
-
- @classmethod
- def skip_checks(cls):
- super(HypervisorRbacTest, cls).skip_checks()
- if not CONF.compute_feature_enabled.api_extensions:
- raise cls.skipException(
- '%s skipped as no compute extensions enabled' % cls.__name__)
-
- def tearDown(self):
- rbac_utils.switch_role(self, switchToRbacRole=False)
- super(HypervisorRbacTest, self).tearDown()
-
- @decorators.idempotent_id('afe5d5ed-c9b9-4e9b-bdc6-20ef9fe86ad8')
- @rbac_rule_validation.action(
- service="nova",
- rule="os_compute_api:limits:discoverable")
- def test_hypervisor_discoverable(self):
- rbac_utils.switch_role(self, switchToRbacRole=True)
- self.extensions_client.list_extensions()
-
-
class HypervisorAdminRbacTest(rbac_base.BaseV2ComputeAdminRbacTest):
@classmethod
diff --git a/patrole_tempest_plugin/tests/api/identity/v2/test_services_rbac.py b/patrole_tempest_plugin/tests/api/identity/v2/test_services_rbac.py
index c8447bb..93f20ef 100644
--- a/patrole_tempest_plugin/tests/api/identity/v2/test_services_rbac.py
+++ b/patrole_tempest_plugin/tests/api/identity/v2/test_services_rbac.py
@@ -53,7 +53,7 @@
RBAC test for Identity Admin 2.0 delete_service
"""
- service_id = self._create_service()
+ service_id = self._create_service()['OS-KSADM:service']['id']
rbac_utils.switch_role(self, switchToRbacRole=True)
self.services_client.delete_service(service_id)
@@ -66,7 +66,7 @@
RBAC test for Identity Admin 2.0 show_service
"""
- service_id = self._create_service()
+ service_id = self._create_service()['OS-KSADM:service']['id']
rbac_utils.switch_role(self, switchToRbacRole=True)
self.services_client.show_service(service_id)
diff --git a/patrole_tempest_plugin/tests/api/image/v2/test_test_image_namespace_resource_type.py b/patrole_tempest_plugin/tests/api/image/v2/test_image_namespace_resource_type.py
similarity index 100%
rename from patrole_tempest_plugin/tests/api/image/v2/test_test_image_namespace_resource_type.py
rename to patrole_tempest_plugin/tests/api/image/v2/test_image_namespace_resource_type.py
diff --git a/patrole_tempest_plugin/tests/api/volume/test_volumes_rbac.py b/patrole_tempest_plugin/tests/api/volume/test_volumes_rbac.py
index 5d889e8..093e2bc 100644
--- a/patrole_tempest_plugin/tests/api/volume/test_volumes_rbac.py
+++ b/patrole_tempest_plugin/tests/api/volume/test_volumes_rbac.py
@@ -46,7 +46,7 @@
# Test volume reset status : available->error->available
rbac_utils.switch_role(self, switchToRbacRole=True)
self.client.reset_volume_status(volume['id'], status='error')
- self.client.reset_volume_status(volume['id'], status='availble')
+ self.client.reset_volume_status(volume['id'], status='available')
@rbac_rule_validation.action(
service="cinder",