X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Futils%2Fopenstack_utils.py;h=3093cb558062872b379946ebd4611d6b4358a019;hb=03208634b25e61faebaa34e932e282a8f26c0ea4;hp=e0add0cd2e561195e657a1e320f6b7acbed2dae7;hpb=b45170e25650a1671a461a2d5d3cf5883e4e5081;p=functest.git

diff --git a/functest/utils/openstack_utils.py b/functest/utils/openstack_utils.py
index e0add0cd2..3093cb558 100755
--- a/functest/utils/openstack_utils.py
+++ b/functest/utils/openstack_utils.py
@@ -10,7 +10,7 @@
 
 import os
 import os.path
-import subprocess
+import re
 import sys
 import time
 
@@ -52,14 +52,13 @@ def is_keystone_v3():
 
 
 def get_rc_env_vars():
-    keystone_v3 = is_keystone_v3()
     env_vars = ['OS_AUTH_URL', 'OS_USERNAME', 'OS_PASSWORD']
-    if keystone_v3 is False:
-        env_vars.extend(['OS_TENANT_NAME'])
-    else:
+    if is_keystone_v3():
         env_vars.extend(['OS_PROJECT_NAME',
                          'OS_USER_DOMAIN_NAME',
                          'OS_PROJECT_DOMAIN_NAME'])
+    else:
+        env_vars.extend(['OS_TENANT_NAME'])
     return env_vars
 
 
@@ -113,12 +112,15 @@ def get_credentials(other_creds={}):
 
 
 def source_credentials(rc_file):
-    pipe = subprocess.Popen(". %s; env" % rc_file, stdout=subprocess.PIPE,
-                            shell=True)
-    output = pipe.communicate()[0]
-    env = dict((line.split("=", 1) for line in output.splitlines()))
-    os.environ.update(env)
-    return env
+    with open(rc_file, "r") as f:
+        for line in f:
+            var = line.rstrip('"\n').replace('export ', '').split("=")
+            # The two next lines should be modified as soon as rc_file
+            # conforms with common rules. Be aware that it could induce
+            # issues if value starts with '
+            key = re.sub(r'^["\' ]*|[ \'"]*$', '', var[0])
+            value = re.sub(r'^["\' ]*|[ \'"]*$', '', "".join(var[1:]))
+            os.environ[key] = value
 
 
 def get_credentials_for_rally():
@@ -173,8 +175,8 @@ def get_session(other_creds={}):
 def get_keystone_client_version():
     api_version = os.getenv('OS_IDENTITY_API_VERSION')
     if api_version is not None:
-        logger.debug("OS_IDENTITY_API_VERSION is set in env as '%s'",
-                     api_version)
+        logger.info("OS_IDENTITY_API_VERSION is set in env as '%s'",
+                    api_version)
         return api_version
     return DEFAULT_API_VERSION
 
@@ -1254,7 +1256,10 @@ def delete_volume_type(cinder_client, volume_type):
 # *********************************************
 def get_tenants(keystone_client):
     try:
-        tenants = keystone_client.tenants.list()
+        if is_keystone_v3():
+            tenants = keystone_client.projects.list()
+        else:
+            tenants = keystone_client.tenants.list()
         return tenants
     except Exception, e:
         logger.error("Error [get_tenants(keystone_client)]: %s" % e)
@@ -1271,7 +1276,7 @@ def get_users(keystone_client):
 
 
 def get_tenant_id(keystone_client, tenant_name):
-    tenants = keystone_client.tenants.list()
+    tenants = get_tenants(keystone_client)
     id = ''
     for t in tenants:
         if t.name == tenant_name:
@@ -1281,7 +1286,7 @@ def get_tenant_id(keystone_client, tenant_name):
 
 
 def get_user_id(keystone_client, user_name):
-    users = keystone_client.users.list()
+    users = get_users(keystone_client)
     id = ''
     for u in users:
         if u.name == user_name:
@@ -1302,16 +1307,16 @@ def get_role_id(keystone_client, role_name):
 
 def create_tenant(keystone_client, tenant_name, tenant_description):
     try:
-        if get_keystone_client_version() == '2':
-            tenant = keystone_client.tenants.create(tenant_name,
-                                                    tenant_description,
-                                                    enabled=True)
-        else:
+        if is_keystone_v3():
             tenant = keystone_client.projects.create(
                 name=tenant_name,
                 description=tenant_description,
                 domain="default",
                 enabled=True)
+        else:
+            tenant = keystone_client.tenants.create(tenant_name,
+                                                    tenant_description,
+                                                    enabled=True)
         return tenant.id
     except Exception, e:
         logger.error("Error [create_tenant(keystone_client, '%s', '%s')]: %s"
@@ -1322,18 +1327,18 @@ def create_tenant(keystone_client, tenant_name, tenant_description):
 def create_user(keystone_client, user_name, user_password,
                 user_email, tenant_id):
     try:
-        if get_keystone_client_version() == '2':
-            user = keystone_client.users.create(user_name,
-                                                user_password,
-                                                user_email,
-                                                tenant_id,
-                                                enabled=True)
-        else:
+        if is_keystone_v3():
             user = keystone_client.users.create(name=user_name,
                                                 password=user_password,
                                                 email=user_email,
                                                 project_id=tenant_id,
                                                 enabled=True)
+        else:
+            user = keystone_client.users.create(user_name,
+                                                user_password,
+                                                user_email,
+                                                tenant_id,
+                                                enabled=True)
         return user.id
     except Exception, e:
         logger.error("Error [create_user(keystone_client, '%s', '%s', '%s'"
@@ -1344,7 +1349,12 @@ def create_user(keystone_client, user_name, user_password,
 
 def add_role_user(keystone_client, user_id, role_id, tenant_id):
     try:
-        keystone_client.roles.add_user_role(user_id, role_id, tenant_id)
+        if is_keystone_v3():
+            keystone_client.roles.grant(role=role_id,
+                                        user=user_id,
+                                        project=tenant_id)
+        else:
+            keystone_client.roles.add_user_role(user_id, role_id, tenant_id)
         return True
     except Exception, e:
         logger.error("Error [add_role_user(keystone_client, '%s', '%s'"
@@ -1354,10 +1364,10 @@ def add_role_user(keystone_client, user_id, role_id, tenant_id):
 
 def delete_tenant(keystone_client, tenant_id):
     try:
-        if get_keystone_client_version() == '2':
-            keystone_client.tenants.delete(tenant_id)
-        else:
+        if is_keystone_v3():
             keystone_client.projects.delete(tenant_id)
+        else:
+            keystone_client.tenants.delete(tenant_id)
         return True
     except Exception, e:
         logger.error("Error [delete_tenant(keystone_client, '%s')]: %s"