Merge pull request #19 from ps3910att/master
Remove enable_rbac option and ensure Keystone project synchronization
diff --git a/README.md b/README.md
index 4bae9e6..d9cf2e1 100644
--- a/README.md
+++ b/README.md
@@ -71,8 +71,6 @@
After comfiguring tempmest.conf as per tempest and Patrole requirements, please make below changes too in the patrole section of tempest.conf:
- enable_rbac must be true.
-
test_custom_requirements must be true if you want to run tests against a `custom_requirements_file` which defines RBAC requirements.
custom_requirements_file must be absolute path of file path of the YAML file that defines your RBAC requirements.
diff --git a/README.rst b/README.rst
index c0e0c8f..f8f00b0 100644
--- a/README.rst
+++ b/README.rst
@@ -79,8 +79,6 @@
After comfiguring tempmest.conf as per tempest and Patrole requirements, please make below changes too in the patrole section of tempest.conf:
- enable_rbac must be true.
-
test_custom_requirements must be true if you want to run tests against a `custom_requirements_file` which defines RBAC requirements.
custom_requirements_file must be absolute path of file path of the YAML file that defines your RBAC requirements.
diff --git a/tungsten_tempest_plugin/tests/api/contrail/rbac_base.py b/tungsten_tempest_plugin/tests/api/contrail/rbac_base.py
index 1072418..39b74ef 100644
--- a/tungsten_tempest_plugin/tests/api/contrail/rbac_base.py
+++ b/tungsten_tempest_plugin/tests/api/contrail/rbac_base.py
@@ -121,9 +121,6 @@
super(BaseContrailTest, cls).skip_checks()
if not CONF.service_available.contrail:
raise cls.skipException("Contrail support is required")
- if not CONF.patrole.enable_rbac:
- raise cls.skipException(
- "%s skipped as RBAC Flag not enabled" % cls.__name__)
if CONF.auth.tempest_roles != ['admin']:
raise cls.skipException(
"%s skipped because tempest roles is not admin" % cls.__name__)
@@ -394,6 +391,9 @@
@classmethod
def resource_setup(cls):
cls.tenant_name = cls.os_primary.credentials.tenant_name
+ cls.tenant_id = cls.fq_client.fqname_to_id(fq_name=['default-domain',
+ cls.tenant_name],
+ type='project')['uuid']
@classmethod
def _try_delete_resource(cls, delete_callable, *args, **kwargs):