Merge pull request #19 from ps3910att/master

Remove enable_rbac option and ensure Keystone project synchronization

README.md

@@ -71,8 +71,6 @@ Next you must properly configure tungsten-fabric, which is relatively straightfo
 
 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.

README.rst

@@ -79,8 +79,6 @@ Next you must properly configure tungsten-fabric, which is relatively straightfo
 
 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.

tungsten_tempest_plugin/tests/api/contrail/rbac_base.py

@@ -121,9 +121,6 @@ def skip_checks(cls):
         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 @@ def setup_clients(cls):
     @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):