X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=doctor_tests%2Fuser.py;h=29aa004b4a8b23c9d974638a8fd4a0cdef885ed4;hb=b54cbc5dd2d32fcb27238680b4657ed384d021c5;hp=5598a2d572d2bfa21ebe24b2038cb5044df7f7a4;hpb=bdbd22904733af311225a3315555bb39ea12ed55;p=doctor.git diff --git a/doctor_tests/user.py b/doctor_tests/user.py index 5598a2d5..29aa004b 100644 --- a/doctor_tests/user.py +++ b/doctor_tests/user.py @@ -8,6 +8,7 @@ ############################################################################## import os +from keystoneclient import exceptions as ks_exceptions from oslo_config import cfg from doctor_tests.identity_auth import get_session @@ -52,10 +53,11 @@ class User(object): def __init__(self, conf, log): self.conf = conf self.log = log + self.def_quota = None + self.restore_def_quota = False self.keystone = keystone_client( self.conf.keystone_version, get_session()) - self.nova = \ - nova_client(conf.nova_version, get_session()) + self.nova = nova_client(conf.nova_version, get_session()) self.users = {} self.projects = {} self.roles = {} @@ -82,18 +84,18 @@ class User(object): domain=self.conf.doctor_domain_id)} if self.conf.doctor_project not in self.projects: self.log.info('create project......') - test_project = \ - self.keystone.projects.create( - self.conf.doctor_project, - self.conf.doctor_domain_id) + test_project = self.keystone.projects.create( + self.conf.doctor_project, + 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,22 @@ 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 _restore_default_quota(self): + if self.def_quota is not None and self.restore_def_quota: + self.log.info('restore default quota......') + self.nova.quota_classes.update('default', + instances=self.def_quota.instances, + cores=self.def_quota.cores) def delete(self): """delete the test user, project and role""" @@ -151,6 +166,8 @@ class User(object): user = self.users.get(self.conf.doctor_user) role = self.roles.get(self.conf.doctor_role) + self._restore_default_quota() + if project: if 'admin' in self.roles_for_admin: self.keystone.roles.revoke( @@ -169,23 +186,45 @@ class User(object): self.keystone.projects.delete(project) self.log.info('user delete end......') - def update_quota(self): - self.log.info('user quota update start......') + def update_quota(self, instances=None, cores=None): + self.log.info('quota update start......') project = self.projects.get(self.conf.doctor_project) + user = self.users.get(self.conf.doctor_user) + if instances is not None: + quota_instances = instances + else: + quota_instances = self.conf.quota_instances + if cores is not None: + quota_cores = cores + else: + quota_cores = self.conf.quota_cores + if project and user: + # default needs to be at least the same as with doctor_user + self.log.info('default quota update start......') + + self.def_quota = self.nova.quota_classes.get('default') + if quota_instances > self.def_quota.instances: + self.restore_def_quota = True + self.nova.quota_classes.update('default', + instances=quota_instances) + if quota_cores > self.def_quota.cores: + self.restore_def_quota = True + self.nova.quota_classes.update('default', + cores=quota_cores) + self.log.info('user quota update start......') self.quota = self.nova.quotas.get(project.id, user_id=user.id) - if self.conf.quota_instances > self.quota.instances: + if quota_instances > self.quota.instances: self.nova.quotas.update(project.id, - instances=self.conf.quota_instances, + instances=quota_instances, user_id=user.id) - if self.conf.quota_cores > self.quota.cores: + if quota_cores > self.quota.cores: self.nova.quotas.update(project.id, - cores=self.conf.quota_cores, + cores=quota_cores, user_id=user.id) - self.log.info('user quota update end......') else: raise Exception('No project or role for update quota') - + self.log.info('quota update end......')