X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=doctor_tests%2Fuser.py;h=fee3e1fb7eb4b7f24b611c9d8009b7f941c94b4c;hb=7b73fe24ce63e36dea924164c98e0a15fd1d7684;hp=5598a2d572d2bfa21ebe24b2038cb5044df7f7a4;hpb=bdbd22904733af311225a3315555bb39ea12ed55;p=doctor.git

diff --git a/doctor_tests/user.py b/doctor_tests/user.py
index 5598a2d5..fee3e1fb 100644
--- a/doctor_tests/user.py
+++ b/doctor_tests/user.py
@@ -13,6 +13,7 @@ from oslo_config import cfg
 from doctor_tests.identity_auth import get_session
 from doctor_tests.os_clients import keystone_client
 from doctor_tests.os_clients import nova_client
+from keystoneclient import exceptions as ks_exceptions
 
 
 OPTS = [
@@ -88,12 +89,13 @@ class User(object):
                     self.conf.doctor_domain_id)
             self.projects[test_project.name] = test_project
         else:
-            self.log.info('project %s already created......' % self.conf.doctor_project)
-        self.log.info('test project %s' % str(self.projects[self.conf.doctor_project]))
+            self.log.info('project %s already created......'
+                          % self.conf.doctor_project)
+        self.log.info('test project %s'
+                      % str(self.projects[self.conf.doctor_project]))
 
     def _create_user(self):
         """create test user"""
-        project = self.projects.get(self.conf.doctor_project)
         self.users = {user.name: user for user in
                       self.keystone.users.list(
                           domain=self.conf.doctor_domain_id)}
@@ -105,8 +107,10 @@ class User(object):
                 domain=self.conf.doctor_domain_id)
             self.users[test_user.name] = test_user
         else:
-            self.log.info('user %s already created......' % self.conf.doctor_user)
-        self.log.info('test user %s' % str(self.users[self.conf.doctor_user]))
+            self.log.info('user %s already created......'
+                          % self.conf.doctor_user)
+        self.log.info('test user %s'
+                      % str(self.users[self.conf.doctor_user]))
 
     def _create_role(self):
         """create test role"""
@@ -119,7 +123,8 @@ class User(object):
             self.roles[test_role.name] = test_role
         else:
             self.use_exist_role = True
-            self.log.info('role %s already created......' % self.conf.doctor_role)
+            self.log.info('role %s already created......'
+                          % self.conf.doctor_role)
         self.log.info('test role %s' % str(self.roles[self.conf.doctor_role]))
 
     def _add_user_role_in_project(self, is_admin=False):
@@ -136,12 +141,15 @@ class User(object):
         roles_for_user = self.roles_for_admin \
             if is_admin else self.roles_for_user
 
-        if not self.keystone.roles.check(role, user=user, project=project):
+        try:
+            self.keystone.roles.check(role, user=user, project=project)
+            self.log.info('Already grant a role:%s to user: %s on'
+                          ' project: %s'
+                          % (role_name, user_name,
+                             self.conf.doctor_project))
+        except ks_exceptions.NotFound:
             self.keystone.roles.grant(role, user=user, project=project)
             roles_for_user[role_name] = role
-        else:
-            self.log.info('Already grant a role:%s to user: %s on project: %s'
-                          % (role_name, user_name, self.conf.doctor_project))
 
     def delete(self):
         """delete the test user, project and role"""
@@ -178,9 +186,10 @@ class User(object):
             self.quota = self.nova.quotas.get(project.id,
                                               user_id=user.id)
             if self.conf.quota_instances > self.quota.instances:
-                self.nova.quotas.update(project.id,
-                                        instances=self.conf.quota_instances,
-                                        user_id=user.id)
+                self.nova.quotas.update(
+                    project.id,
+                    instances=self.conf.quota_instances,
+                    user_id=user.id)
             if self.conf.quota_cores > self.quota.cores:
                 self.nova.quotas.update(project.id,
                                         cores=self.conf.quota_cores,
@@ -188,4 +197,3 @@ class User(object):
             self.log.info('user quota update end......')
         else:
             raise Exception('No project or role for update quota')
-