Merge "Improve compass ci verification--clear all flake8 warnings & errors of compass4nfv JIRA: COMPASS-494"

3 files changed, 17 insertions, 17 deletions

diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/files/controllers.py b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/files/controllers.py
index b4466ef6..f6ec8be5 100644
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/files/controllers.py
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/files/controllers.py
@@ -7,7 +7,7 @@ from keystone.common import controller
 from keystone import config
 from keystone import exception
 from keystone.models import token_model
-from keystone.contrib.moon.exception import *   # noqa
+from keystone.contrib.moon.exception import *   # noqa: F403
 from oslo_log import log
 from uuid import uuid4
 import requests
@@ -17,7 +17,7 @@ CONF = config.CONF
 LOG = log.getLogger(__name__)
 
 
-@dependency.requires('configuration_api')
+@dependency.requires('configuration_api')  # noqa: F405
 class Configuration(controller.V3Controller):
     collection_name = 'configurations'
     member_name = 'configuration'
@@ -48,7 +48,7 @@ class Configuration(controller.V3Controller):
             user_id)
 
 
-@dependency.requires('tenant_api', 'resource_api')
+@dependency.requires('tenant_api', 'resource_api')  # noqa: F405
 class Tenants(controller.V3Controller):
 
     def __init__(self):
@@ -152,7 +152,7 @@ def callback(self, context, prep_info, *args, **kwargs):
         raise exception.Unauthorized
 
 
-@dependency.requires('authz_api')
+@dependency.requires('authz_api')  # noqa: F405
 class Authz_v3(controller.V3Controller):
 
     def __init__(self):
@@ -168,7 +168,7 @@ class Authz_v3(controller.V3Controller):
             return {'authz': False, 'comment': unicode(e)}
 
 
-@dependency.requires('admin_api', 'root_api')
+@dependency.requires('admin_api', 'root_api')  # noqa: F405
 class IntraExtensions(controller.V3Controller):
     collection_name = 'intra_extensions'
     member_name = 'intra_extension'
@@ -926,7 +926,7 @@ class IntraExtensions(controller.V3Controller):
             user_id, intra_extension_id, sub_meta_rule_id, rule_id, rule_list)
 
 
-@dependency.requires('authz_api')
+@dependency.requires('authz_api')  # noqa: F405
 class InterExtensions(controller.V3Controller):
 
     def __init__(self):
@@ -968,7 +968,7 @@ class InterExtensions(controller.V3Controller):
     # self.interextension_api.delete_inter_extension(kw['inter_extension_id'])
 
 
-@dependency.requires('moonlog_api', 'authz_api')
+@dependency.requires('moonlog_api', 'authz_api')  # noqa: F405
 class Logs(controller.V3Controller):
 
     def __init__(self):
@@ -987,7 +987,7 @@ class Logs(controller.V3Controller):
         return self.moonlog_api.get_logs(user_id, options)
 
 
-@dependency.requires('identity_api', "token_provider_api", "resource_api")
+@dependency.requires('identity_api', "token_provider_api", "resource_api")  # noqa: F405
 class MoonAuth(controller.V3Controller):
 
     def __init__(self):
diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/moon/files/controllers.py b/deploy/adapters/ansible/openstack_newton_xenial/roles/moon/files/controllers.py
index f55191d4..fd107a5e 100644
--- a/deploy/adapters/ansible/openstack_newton_xenial/roles/moon/files/controllers.py
+++ b/deploy/adapters/ansible/openstack_newton_xenial/roles/moon/files/controllers.py
@@ -7,7 +7,7 @@ from keystone.common import controller
 from keystone import config
 from keystone import exception
 from keystone.models import token_model
-from keystone.contrib.moon.exception import *   # noqa
+from keystone.contrib.moon.exception import *   # noqa: F403
 from oslo_log import log
 from uuid import uuid4
 import requests
@@ -17,7 +17,7 @@ CONF = config.CONF
 LOG = log.getLogger(__name__)
 
 
-@dependency.requires('configuration_api')
+@dependency.requires('configuration_api')  # noqa: 405
 class Configuration(controller.V3Controller):
     collection_name = 'configurations'
     member_name = 'configuration'
@@ -48,7 +48,7 @@ class Configuration(controller.V3Controller):
             user_id)
 
 
-@dependency.requires('tenant_api', 'resource_api')
+@dependency.requires('tenant_api', 'resource_api')  # noqa: 405
 class Tenants(controller.V3Controller):
 
     def __init__(self):
@@ -152,7 +152,7 @@ def callback(self, context, prep_info, *args, **kwargs):
         raise exception.Unauthorized
 
 
-@dependency.requires('authz_api')
+@dependency.requires('authz_api')  # noqa: 405
 class Authz_v3(controller.V3Controller):
 
     def __init__(self):
@@ -168,7 +168,7 @@ class Authz_v3(controller.V3Controller):
             return {'authz': False, 'comment': unicode(e)}
 
 
-@dependency.requires('admin_api', 'root_api')
+@dependency.requires('admin_api', 'root_api')  # noqa: 405
 class IntraExtensions(controller.V3Controller):
     collection_name = 'intra_extensions'
     member_name = 'intra_extension'
@@ -926,7 +926,7 @@ class IntraExtensions(controller.V3Controller):
             user_id, intra_extension_id, sub_meta_rule_id, rule_id, rule_list)
 
 
-@dependency.requires('authz_api')
+@dependency.requires('authz_api')  # noqa: 405
 class InterExtensions(controller.V3Controller):
 
     def __init__(self):
@@ -968,7 +968,7 @@ class InterExtensions(controller.V3Controller):
     # self.interextension_api.delete_inter_extension(kw['inter_extension_id'])
 
 
-@dependency.requires('moonlog_api', 'authz_api')
+@dependency.requires('moonlog_api', 'authz_api')  # noqa: 405
 class Logs(controller.V3Controller):
 
     def __init__(self):
@@ -987,7 +987,7 @@ class Logs(controller.V3Controller):
         return self.moonlog_api.get_logs(user_id, options)
 
 
-@dependency.requires('identity_api', "token_provider_api", "resource_api")
+@dependency.requires('identity_api', "token_provider_api", "resource_api")  # noqa: 405
 class MoonAuth(controller.V3Controller):
 
     def __init__(self):
diff --git a/util/check_valid.py b/util/check_valid.py
index 36d74ba4..5b3a8ab3 100644
--- a/util/check_valid.py
+++ b/util/check_valid.py
@@ -101,7 +101,7 @@ def check_dha_file(dha):
                     hosts:
                         - name: %s
                           interfaces:
-                            - %s: %s''' % (i['name'], j.keys()[0], j.values()[0]))
+                            - %s: %s''' % (i['name'], j.keys()[0], j.values()[0]))  # noqa: E501
                     invalid = True
             if not is_valid_ip(i['ipmiIp']):
                 err_print('''invalid address: