From: Ryota Mibu <r-mibu@cq.jp.nec.com>
Date: Tue, 9 Jan 2018 13:02:33 +0000 (+0000)
Subject: Merge "support pep8 check"
X-Git-Tag: opnfv-6.0.0~22
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=9fd701278bf7d8c5b9451491bcb1a92580adc780;hp=-c;p=doctor.git

Merge "support pep8 check"
---

9fd701278bf7d8c5b9451491bcb1a92580adc780
diff --combined doctor_tests/common/utils.py
index 01889d9a,0e2c8752..1a84c824
--- a/doctor_tests/common/utils.py
+++ b/doctor_tests/common/utils.py
@@@ -57,7 -57,8 +57,7 @@@ class SSHClient(object)
                   key_filename=None, log=None, look_for_keys=False,
                   allow_agent=False):
          self.client = paramiko.SSHClient()
 -        self.client.load_system_host_keys()
 -        self.client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
 +        self.client.set_missing_host_key_policy(paramiko.WarningPolicy())
          self.client.connect(ip, username=username, password=password,
                              pkey=pkey, key_filename=key_filename,
                              look_for_keys=look_for_keys,
@@@ -77,7 -78,8 +77,8 @@@
              output.append(line.decode('utf-8'))
          if ret:
              if self.log:
-                 self.log.info("*** FAILED to run command %s (%s)" % (command, ret))
+                 self.log.info("*** FAILED to run command %s (%s)"
+                               % (command, ret))
              raise Exception(
                  "Unable to run \ncommand: %s\nret: %s"
                  % (command, ret))
diff --combined doctor_tests/user.py
index a6f58d9a,b5637d93..fee3e1fb
--- a/doctor_tests/user.py
+++ b/doctor_tests/user.py
@@@ -13,7 -13,6 +13,7 @@@ from oslo_config import cf
  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 = [
@@@ -89,12 -88,13 +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)}
@@@ -106,8 -106,10 +107,10 @@@
                  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"""
@@@ -120,7 -122,8 +123,8 @@@
              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):
@@@ -137,15 -140,12 +141,15 @@@
          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"""
@@@ -182,9 -182,10 +186,10 @@@
              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,
@@@ -192,4 -193,3 +197,3 @@@
              self.log.info('user quota update end......')
          else:
              raise Exception('No project or role for update quota')
-