Merge "autopep8 make py files more standard"

2 files changed, 268 insertions, 121 deletions

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 6da5b423..8171e238 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
@@ -27,7 +27,8 @@ class Configuration(controller.V3Controller):
 
     def _get_user_id_from_token(self, token_id):
         response = self.token_provider_api.validate_token(token_id)
-        token_ref = token_model.KeystoneToken(token_id=token_id, token_data=response)
+        token_ref = token_model.KeystoneToken(
+            token_id=token_id, token_data=response)
         return token_ref.get('user')
 
     @controller.protected()
@@ -43,7 +44,8 @@ class Configuration(controller.V3Controller):
     @controller.protected()
     def get_sub_meta_rule_algorithms(self, context, **kw):
         user_id = self._get_user_id_from_token(context.get('token_id'))
-        return self.configuration_api.get_sub_meta_rule_algorithms_dict(user_id)
+        return self.configuration_api.get_sub_meta_rule_algorithms_dict(
+            user_id)
 
 
 @dependency.requires('tenant_api', 'resource_api')
@@ -54,7 +56,8 @@ class Tenants(controller.V3Controller):
 
     def _get_user_id_from_token(self, token_id):
         response = self.token_provider_api.validate_token(token_id)
-        token_ref = token_model.KeystoneToken(token_id=token_id, token_data=response)
+        token_ref = token_model.KeystoneToken(
+            token_id=token_id, token_data=response)
         return token_ref.get('user')
 
     @controller.protected()
@@ -62,7 +65,8 @@ class Tenants(controller.V3Controller):
         user_id = self._get_user_id_from_token(context.get('token_id'))
         return self.tenant_api.get_tenants_dict(user_id)
 
-    def __get_keystone_tenant_dict(self, tenant_id="", tenant_name="", tenant_description="", domain="default"):
+    def __get_keystone_tenant_dict(
+            self, tenant_id="", tenant_name="", tenant_description="", domain="default"):
         tenants = self.resource_api.list_projects()
         for tenant in tenants:
             if tenant_id and tenant_id == tenant['id']:
@@ -80,7 +84,8 @@ class Tenants(controller.V3Controller):
             "enabled": True,
             "domain_id": domain
         }
-        keystone_tenant = self.resource_api.create_project(tenant["id"], tenant)
+        keystone_tenant = self.resource_api.create_project(
+            tenant["id"], tenant)
         return keystone_tenant
 
     @controller.protected()
@@ -88,7 +93,8 @@ class Tenants(controller.V3Controller):
         user_id = self._get_user_id_from_token(context.get('token_id'))
         k_tenant_dict = self.__get_keystone_tenant_dict(
             tenant_name=kw.get('tenant_name'),
-            tenant_description=kw.get('tenant_description', kw.get('tenant_name')),
+            tenant_description=kw.get(
+                'tenant_description', kw.get('tenant_name')),
             domain=kw.get('tenant_domain', "default"),
 
         )
@@ -96,9 +102,12 @@ class Tenants(controller.V3Controller):
         tenant_dict['id'] = k_tenant_dict['id']
         tenant_dict['name'] = kw.get('tenant_name', None)
         tenant_dict['description'] = kw.get('tenant_description', None)
-        tenant_dict['intra_authz_extension_id'] = kw.get('tenant_intra_authz_extension_id', None)
-        tenant_dict['intra_admin_extension_id'] = kw.get('tenant_intra_admin_extension_id', None)
-        return self.tenant_api.add_tenant_dict(user_id, tenant_dict['id'], tenant_dict)
+        tenant_dict['intra_authz_extension_id'] = kw.get(
+            'tenant_intra_authz_extension_id', None)
+        tenant_dict['intra_admin_extension_id'] = kw.get(
+            'tenant_intra_admin_extension_id', None)
+        return self.tenant_api.add_tenant_dict(
+            user_id, tenant_dict['id'], tenant_dict)
 
     @controller.protected()
     def get_tenant(self, context, **kw):
@@ -116,16 +125,19 @@ class Tenants(controller.V3Controller):
     def set_tenant(self, context, **kw):
         user_id = self._get_user_id_from_token(context.get('token_id'))
         # Next line will raise an error if tenant doesn't exist
-        k_tenant_dict = self.resource_api.get_project(kw.get('tenant_id', None))
+        k_tenant_dict = self.resource_api.get_project(
+            kw.get('tenant_id', None))
         tenant_id = kw.get('tenant_id', None)
         tenant_dict = dict()
         tenant_dict['name'] = k_tenant_dict.get('name', None)
         if 'tenant_description' in kw:
             tenant_dict['description'] = kw.get('tenant_description', None)
         if 'tenant_intra_authz_extension_id' in kw:
-            tenant_dict['intra_authz_extension_id'] = kw.get('tenant_intra_authz_extension_id', None)
+            tenant_dict['intra_authz_extension_id'] = kw.get(
+                'tenant_intra_authz_extension_id', None)
         if 'tenant_intra_admin_extension_id' in kw:
-            tenant_dict['intra_admin_extension_id'] = kw.get('tenant_intra_admin_extension_id', None)
+            tenant_dict['intra_admin_extension_id'] = kw.get(
+                'tenant_intra_admin_extension_id', None)
         self.tenant_api.set_tenant_dict(user_id, tenant_id, tenant_dict)
 
 
@@ -147,9 +159,11 @@ class Authz_v3(controller.V3Controller):
         super(Authz_v3, self).__init__()
 
     @controller.protected(callback)
-    def get_authz(self, context, tenant_id, subject_k_id, object_name, action_name):
+    def get_authz(self, context, tenant_id, subject_k_id,
+                  object_name, action_name):
         try:
-            return self.authz_api.authz(tenant_id, subject_k_id, object_name, action_name)
+            return self.authz_api.authz(
+                tenant_id, subject_k_id, object_name, action_name)
         except Exception as e:
             return {'authz': False, 'comment': unicode(e)}
 
@@ -164,7 +178,8 @@ class IntraExtensions(controller.V3Controller):
 
     def _get_user_id_from_token(self, token_id):
         response = self.token_provider_api.validate_token(token_id)
-        token_ref = token_model.KeystoneToken(token_id=token_id, token_data=response)
+        token_ref = token_model.KeystoneToken(
+            token_id=token_id, token_data=response)
         return token_ref.get('user')['id']
 
     # IntraExtension functions
@@ -180,30 +195,47 @@ class IntraExtensions(controller.V3Controller):
         intra_extension_dict['name'] = kw.get('intra_extension_name', None)
         intra_extension_dict['model'] = kw.get('intra_extension_model', None)
         intra_extension_dict['genre'] = kw.get('intra_extension_genre', None)
-        intra_extension_dict['description'] = kw.get('intra_extension_description', None)
-        intra_extension_dict['subject_categories'] = kw.get('intra_extension_subject_categories', dict())
-        intra_extension_dict['object_categories'] = kw.get('intra_extension_object_categories', dict())
-        intra_extension_dict['action_categories'] = kw.get('intra_extension_action_categories', dict())
-        intra_extension_dict['subjects'] = kw.get('intra_extension_subjects', dict())
-        intra_extension_dict['objects'] = kw.get('intra_extension_objects', dict())
-        intra_extension_dict['actions'] = kw.get('intra_extension_actions', dict())
-        intra_extension_dict['subject_scopes'] = kw.get('intra_extension_subject_scopes', dict())
-        intra_extension_dict['object_scopes'] = kw.get('intra_extension_object_scopes', dict())
-        intra_extension_dict['action_scopes'] = kw.get('intra_extension_action_scopes', dict())
-        intra_extension_dict['subject_assignments'] = kw.get('intra_extension_subject_assignments', dict())
-        intra_extension_dict['object_assignments'] = kw.get('intra_extension_object_assignments', dict())
-        intra_extension_dict['action_assignments'] = kw.get('intra_extension_action_assignments', dict())
-        intra_extension_dict['aggregation_algorithm'] = kw.get('intra_extension_aggregation_algorithm', dict())
-        intra_extension_dict['sub_meta_rules'] = kw.get('intra_extension_sub_meta_rules', dict())
+        intra_extension_dict['description'] = kw.get(
+            'intra_extension_description', None)
+        intra_extension_dict['subject_categories'] = kw.get(
+            'intra_extension_subject_categories', dict())
+        intra_extension_dict['object_categories'] = kw.get(
+            'intra_extension_object_categories', dict())
+        intra_extension_dict['action_categories'] = kw.get(
+            'intra_extension_action_categories', dict())
+        intra_extension_dict['subjects'] = kw.get(
+            'intra_extension_subjects', dict())
+        intra_extension_dict['objects'] = kw.get(
+            'intra_extension_objects', dict())
+        intra_extension_dict['actions'] = kw.get(
+            'intra_extension_actions', dict())
+        intra_extension_dict['subject_scopes'] = kw.get(
+            'intra_extension_subject_scopes', dict())
+        intra_extension_dict['object_scopes'] = kw.get(
+            'intra_extension_object_scopes', dict())
+        intra_extension_dict['action_scopes'] = kw.get(
+            'intra_extension_action_scopes', dict())
+        intra_extension_dict['subject_assignments'] = kw.get(
+            'intra_extension_subject_assignments', dict())
+        intra_extension_dict['object_assignments'] = kw.get(
+            'intra_extension_object_assignments', dict())
+        intra_extension_dict['action_assignments'] = kw.get(
+            'intra_extension_action_assignments', dict())
+        intra_extension_dict['aggregation_algorithm'] = kw.get(
+            'intra_extension_aggregation_algorithm', dict())
+        intra_extension_dict['sub_meta_rules'] = kw.get(
+            'intra_extension_sub_meta_rules', dict())
         intra_extension_dict['rules'] = kw.get('intra_extension_rules', dict())
-        ref = self.admin_api.load_intra_extension_dict(user_id, intra_extension_dict=intra_extension_dict)
+        ref = self.admin_api.load_intra_extension_dict(
+            user_id, intra_extension_dict=intra_extension_dict)
         return self.admin_api.populate_default_data(ref)
 
     @controller.protected()
     def get_intra_extension(self, context, **kw):
         user_id = self._get_user_id_from_token(context.get('token_id'))
         intra_extension_id = kw.get('intra_extension_id', None)
-        return self.admin_api.get_intra_extension_dict(user_id, intra_extension_id)
+        return self.admin_api.get_intra_extension_dict(
+            user_id, intra_extension_id)
 
     @controller.protected()
     def del_intra_extension(self, context, **kw):
@@ -219,8 +251,10 @@ class IntraExtensions(controller.V3Controller):
         intra_extension_dict['name'] = kw.get('intra_extension_name', None)
         intra_extension_dict['model'] = kw.get('intra_extension_model', None)
         intra_extension_dict['genre'] = kw.get('intra_extension_genre', None)
-        intra_extension_dict['description'] = kw.get('intra_extension_description', None)
-        return self.admin_api.set_intra_extension_dict(user_id, intra_extension_id, intra_extension_dict)
+        intra_extension_dict['description'] = kw.get(
+            'intra_extension_description', None)
+        return self.admin_api.set_intra_extension_dict(
+            user_id, intra_extension_id, intra_extension_dict)
 
     @controller.protected()
     def load_root_intra_extension(self, context, **kw):
@@ -231,7 +265,8 @@ class IntraExtensions(controller.V3Controller):
     def get_subject_categories(self, context, **kw):
         user_id = self._get_user_id_from_token(context.get('token_id'))
         intra_extension_id = kw.get('intra_extension_id', None)
-        return self.admin_api.get_subject_categories_dict(user_id, intra_extension_id)
+        return self.admin_api.get_subject_categories_dict(
+            user_id, intra_extension_id)
 
     @controller.protected()
     def add_subject_category(self, context, **kw):
@@ -239,22 +274,26 @@ class IntraExtensions(controller.V3Controller):
         intra_extension_id = kw.get('intra_extension_id', None)
         subject_category_dict = dict()
         subject_category_dict['name'] = kw.get('subject_category_name', None)
-        subject_category_dict['description'] = kw.get('subject_category_description', None)
-        return self.admin_api.add_subject_category_dict(user_id, intra_extension_id, subject_category_dict)
+        subject_category_dict['description'] = kw.get(
+            'subject_category_description', None)
+        return self.admin_api.add_subject_category_dict(
+            user_id, intra_extension_id, subject_category_dict)
 
     @controller.protected()
     def get_subject_category(self, context, **kw):
         user_id = self._get_user_id_from_token(context.get('token_id'))
         intra_extension_id = kw.get('intra_extension_id', None)
         subject_category_id = kw.get('subject_category_id', None)
-        return self.admin_api.get_subject_category_dict(user_id, intra_extension_id, subject_category_id)
+        return self.admin_api.get_subject_category_dict(
+            user_id, intra_extension_id, subject_category_id)
 
     @controller.protected()
     def del_subject_category(self, context, **kw):
         user_id = self._get_user_id_from_token(context.get('token_id'))
         intra_extension_id = kw.get('intra_extension_id', None)
         subject_category_id = kw.get('subject_category_id', None)
-        self.admin_api.del_subject_category(user_id, intra_extension_id, subject_category_id)
+        self.admin_api.del_subject_category(
+            user_id, intra_extension_id, subject_category_id)
 
     @controller.protected()
     def set_subject_category(self, context, **kw):
@@ -263,14 +302,17 @@ class IntraExtensions(controller.V3Controller):
         subject_category_id = kw.get('subject_category_id', None)
         subject_category_dict = dict()
         subject_category_dict['name'] = kw.get('subject_category_name', None)
-        subject_category_dict['description'] = kw.get('subject_category_description', None)
-        return self.admin_api.set_subject_category_dict(user_id, intra_extension_id, subject_category_id, subject_category_dict)
+        subject_category_dict['description'] = kw.get(
+            'subject_category_description', None)
+        return self.admin_api.set_subject_category_dict(
+            user_id, intra_extension_id, subject_category_id, subject_category_dict)
 
     @controller.protected()
     def get_object_categories(self, context, **kw):
         user_id = self._get_user_id_from_token(context.get('token_id'))
         intra_extension_id = kw.get('intra_extension_id', None)
-        return self.admin_api.get_object_categories_dict(user_id, intra_extension_id)
+        return self.admin_api.get_object_categories_dict(
+            user_id, intra_extension_id)
 
     @controller.protected()
     def add_object_category(self, context, **kw):
@@ -278,22 +320,26 @@ class IntraExtensions(controller.V3Controller):
         intra_extension_id = kw.get('intra_extension_id', None)
         object_category_dict = dict()
         object_category_dict['name'] = kw.get('object_category_name', None)
-        object_category_dict['description'] = kw.get('object_category_description', None)
-        return self.admin_api.add_object_category_dict(user_id, intra_extension_id, object_category_dict)
+        object_category_dict['description'] = kw.get(
+            'object_category_description', None)
+        return self.admin_api.add_object_category_dict(
+            user_id, intra_extension_id, object_category_dict)
 
     @controller.protected()
     def get_object_category(self, context, **kw):
         user_id = self._get_user_id_from_token(context.get('token_id'))
         intra_extension_id = kw.get('intra_extension_id', None)
         object_category_id = kw.get('object_category_id', None)
-        return self.admin_api.get_object_categories_dict(user_id, intra_extension_id, object_category_id)
+        return self.admin_api.get_object_categories_dict(
+            user_id, intra_extension_id, object_category_id)
 
     @controller.protected()
     def del_object_category(self, context, **kw):
         user_id = self._get_user_id_from_token(context.get('token_id'))
         intra_extension_id = kw.get('intra_extension_id', None)
         object_category_id = kw.get('object_category_id', None)
-        self.admin_api.del_object_category(user_id, intra_extension_id, object_category_id)
+        self.admin_api.del_object_category(
+            user_id, intra_extension_id, object_category_id)
 
     @controller.protected()
     def set_object_category(self, context, **kw):
@@ -302,14 +348,17 @@ class IntraExtensions(controller.V3Controller):
         object_category_id = kw.get('object_category_id', None)
         object_category_dict = dict()
         object_category_dict['name'] = kw.get('object_category_name', None)
-        object_category_dict['description'] = kw.get('object_category_description', None)
-        return self.admin_api.set_object_category_dict(user_id, intra_extension_id, object_category_id, object_category_dict)
+        object_category_dict['description'] = kw.get(
+            'object_category_description', None)
+        return self.admin_api.set_object_category_dict(
+            user_id, intra_extension_id, object_category_id, object_category_dict)
 
     @controller.protected()
     def get_action_categories(self, context, **kw):
         user_id = self._get_user_id_from_token(context.get('token_id'))
         intra_extension_id = kw.get('intra_extension_id', None)
-        return self.admin_api.get_action_categories_dict(user_id, intra_extension_id)
+        return self.admin_api.get_action_categories_dict(
+            user_id, intra_extension_id)
 
     @controller.protected()
     def add_action_category(self, context, **kw):
@@ -317,22 +366,26 @@ class IntraExtensions(controller.V3Controller):
         intra_extension_id = kw.get('intra_extension_id', None)
         action_category_dict = dict()
         action_category_dict['name'] = kw.get('action_category_name', None)
-        action_category_dict['description'] = kw.get('action_category_description', None)
-        return self.admin_api.add_action_category_dict(user_id, intra_extension_id, action_category_dict)
+        action_category_dict['description'] = kw.get(
+            'action_category_description', None)
+        return self.admin_api.add_action_category_dict(
+            user_id, intra_extension_id, action_category_dict)
 
     @controller.protected()
     def get_action_category(self, context, **kw):
         user_id = self._get_user_id_from_token(context.get('token_id'))
         intra_extension_id = kw.get('intra_extension_id', None)
         action_category_id = kw.get('action_category_id', None)
-        return self.admin_api.get_action_categories_dict(user_id, intra_extension_id, action_category_id)
+        return self.admin_api.get_action_categories_dict(
+            user_id, intra_extension_id, action_category_id)
 
     @controller.protected()
     def del_action_category(self, context, **kw):
         user_id = self._get_user_id_from_token(context.get('token_id'))
         intra_extension_id = kw.get('intra_extension_id', None)
         action_category_id = kw.get('action_category_id', None)
-        self.admin_api.del_action_category(user_id, intra_extension_id, action_category_id)
+        self.admin_api.del_action_category(
+            user_id, intra_extension_id, action_category_id)
 
     @controller.protected()
     def set_action_category(self, context, **kw):
@@ -341,8 +394,10 @@ class IntraExtensions(controller.V3Controller):
         action_category_id = kw.get('action_category_id', None)
         action_category_dict = dict()
         action_category_dict['name'] = kw.get('action_category_name', None)
-        action_category_dict['description'] = kw.get('action_category_description', None)
-        return self.admin_api.set_action_category_dict(user_id, intra_extension_id, action_category_id, action_category_dict)
+        action_category_dict['description'] = kw.get(
+            'action_category_description', None)
+        return self.admin_api.set_action_category_dict(
+            user_id, intra_extension_id, action_category_id, action_category_dict)
 
     # Perimeter functions
     @controller.protected()
@@ -360,14 +415,16 @@ class IntraExtensions(controller.V3Controller):
         subject_dict['description'] = kw.get('subject_description', None)
         subject_dict['password'] = kw.get('subject_password', None)
         subject_dict['email'] = kw.get('subject_email', None)
-        return self.admin_api.add_subject_dict(user_id, intra_extension_id, subject_dict)
+        return self.admin_api.add_subject_dict(
+            user_id, intra_extension_id, subject_dict)
 
     @controller.protected()
     def get_subject(self, context, **kw):
         user_id = self._get_user_id_from_token(context.get('token_id'))
         intra_extension_id = kw.get('intra_extension_id', None)
         subject_id = kw.get('subject_id', None)
-        return self.admin_api.get_subject_dict(user_id, intra_extension_id, subject_id)
+        return self.admin_api.get_subject_dict(
+            user_id, intra_extension_id, subject_id)
 
     @controller.protected()
     def del_subject(self, context, **kw):
@@ -384,7 +441,8 @@ class IntraExtensions(controller.V3Controller):
         subject_dict = dict()
         subject_dict['name'] = kw.get('subject_name', None)
         subject_dict['description'] = kw.get('subject_description', None)
-        return self.admin_api.set_subject_dict(user_id, intra_extension_id, subject_id, subject_dict)
+        return self.admin_api.set_subject_dict(
+            user_id, intra_extension_id, subject_id, subject_dict)
 
     @controller.protected()
     def get_objects(self, context, **kw):
@@ -399,14 +457,16 @@ class IntraExtensions(controller.V3Controller):
         object_dict = dict()
         object_dict['name'] = kw.get('object_name', None)
         object_dict['description'] = kw.get('object_description', None)
-        return self.admin_api.add_object_dict(user_id, intra_extension_id, object_dict)
+        return self.admin_api.add_object_dict(
+            user_id, intra_extension_id, object_dict)
 
     @controller.protected()
     def get_object(self, context, **kw):
         user_id = self._get_user_id_from_token(context.get('token_id'))
         intra_extension_id = kw.get('intra_extension_id', None)
         object_id = kw.get('object_id', None)
-        return self.admin_api.get_object_dict(user_id, intra_extension_id, object_id)
+        return self.admin_api.get_object_dict(
+            user_id, intra_extension_id, object_id)
 
     @controller.protected()
     def del_object(self, context, **kw):
@@ -423,7 +483,8 @@ class IntraExtensions(controller.V3Controller):
         object_dict = dict()
         object_dict['name'] = kw.get('object_name', None)
         object_dict['description'] = kw.get('object_description', None)
-        return self.admin_api.set_object_dict(user_id, intra_extension_id, object_id, object_dict)
+        return self.admin_api.set_object_dict(
+            user_id, intra_extension_id, object_id, object_dict)
 
     @controller.protected()
     def get_actions(self, context, **kw):
@@ -438,14 +499,16 @@ class IntraExtensions(controller.V3Controller):
         action_dict = dict()
         action_dict['name'] = kw.get('action_name', None)
         action_dict['description'] = kw.get('action_description', None)
-        return self.admin_api.add_action_dict(user_id, intra_extension_id, action_dict)
+        return self.admin_api.add_action_dict(
+            user_id, intra_extension_id, action_dict)
 
     @controller.protected()
     def get_action(self, context, **kw):
         user_id = self._get_user_id_from_token(context.get('token_id'))
         intra_extension_id = kw.get('intra_extension_id', None)
         action_id = kw.get('action_id', None)
-        return self.admin_api.get_action_dict(user_id, intra_extension_id, action_id)
+        return self.admin_api.get_action_dict(
+            user_id, intra_extension_id, action_id)
 
     @controller.protected()
     def del_action(self, context, **kw):
@@ -462,7 +525,8 @@ class IntraExtensions(controller.V3Controller):
         action_dict = dict()
         action_dict['name'] = kw.get('action_name', None)
         action_dict['description'] = kw.get('action_description', None)
-        return self.admin_api.set_action_dict(user_id, intra_extension_id, action_id, action_dict)
+        return self.admin_api.set_action_dict(
+            user_id, intra_extension_id, action_id, action_dict)
 
     # Scope functions
     @controller.protected()
@@ -470,7 +534,8 @@ class IntraExtensions(controller.V3Controller):
         user_id = self._get_user_id_from_token(context.get('token_id'))
         intra_extension_id = kw.get('intra_extension_id', None)
         subject_category_id = kw.get('subject_category_id', None)
-        return self.admin_api.get_subject_scopes_dict(user_id, intra_extension_id, subject_category_id)
+        return self.admin_api.get_subject_scopes_dict(
+            user_id, intra_extension_id, subject_category_id)
 
     @controller.protected()
     def add_subject_scope(self, context, **kw):
@@ -479,8 +544,10 @@ class IntraExtensions(controller.V3Controller):
         subject_category_id = kw.get('subject_category_id', None)
         subject_scope_dict = dict()
         subject_scope_dict['name'] = kw.get('subject_scope_name', None)
-        subject_scope_dict['description'] = kw.get('subject_scope_description', None)
-        return self.admin_api.add_subject_scope_dict(user_id, intra_extension_id, subject_category_id, subject_scope_dict)
+        subject_scope_dict['description'] = kw.get(
+            'subject_scope_description', None)
+        return self.admin_api.add_subject_scope_dict(
+            user_id, intra_extension_id, subject_category_id, subject_scope_dict)
 
     @controller.protected()
     def get_subject_scope(self, context, **kw):
@@ -488,7 +555,8 @@ class IntraExtensions(controller.V3Controller):
         intra_extension_id = kw.get('intra_extension_id', None)
         subject_category_id = kw.get('subject_category_id', None)
         subject_scope_id = kw.get('subject_scope_id', None)
-        return self.admin_api.get_subject_scope_dict(user_id, intra_extension_id, subject_category_id, subject_scope_id)
+        return self.admin_api.get_subject_scope_dict(
+            user_id, intra_extension_id, subject_category_id, subject_scope_id)
 
     @controller.protected()
     def del_subject_scope(self, context, **kw):
@@ -496,7 +564,11 @@ class IntraExtensions(controller.V3Controller):
         intra_extension_id = kw.get('intra_extension_id', None)
         subject_category_id = kw.get('subject_category_id', None)
         subject_scope_id = kw.get('subject_scope_id', None)
-        self.admin_api.del_subject_scope(user_id, intra_extension_id, subject_category_id, subject_scope_id)
+        self.admin_api.del_subject_scope(
+            user_id,
+            intra_extension_id,
+            subject_category_id,
+            subject_scope_id)
 
     @controller.protected()
     def set_subject_scope(self, context, **kw):
@@ -506,15 +578,18 @@ class IntraExtensions(controller.V3Controller):
         subject_scope_id = kw.get('subject_scope_id', None)
         subject_scope_dict = dict()
         subject_scope_dict['name'] = kw.get('subject_scope_name', None)
-        subject_scope_dict['description'] = kw.get('subject_scope_description', None)
-        return self.admin_api.set_subject_scope_dict(user_id, intra_extension_id, subject_category_id, subject_scope_id, subject_scope_dict)
+        subject_scope_dict['description'] = kw.get(
+            'subject_scope_description', None)
+        return self.admin_api.set_subject_scope_dict(
+            user_id, intra_extension_id, subject_category_id, subject_scope_id, subject_scope_dict)
 
     @controller.protected()
     def get_object_scopes(self, context, **kw):
         user_id = self._get_user_id_from_token(context.get('token_id'))
         intra_extension_id = kw.get('intra_extension_id', None)
         object_category_id = kw.get('object_category_id', None)
-        return self.admin_api.get_object_scopes_dict(user_id, intra_extension_id, object_category_id)
+        return self.admin_api.get_object_scopes_dict(
+            user_id, intra_extension_id, object_category_id)
 
     @controller.protected()
     def add_object_scope(self, context, **kw):
@@ -523,8 +598,10 @@ class IntraExtensions(controller.V3Controller):
         object_category_id = kw.get('object_category_id', None)
         object_scope_dict = dict()
         object_scope_dict['name'] = kw.get('object_scope_name', None)
-        object_scope_dict['description'] = kw.get('object_scope_description', None)
-        return self.admin_api.add_object_scope_dict(user_id, intra_extension_id, object_category_id, object_scope_dict)
+        object_scope_dict['description'] = kw.get(
+            'object_scope_description', None)
+        return self.admin_api.add_object_scope_dict(
+            user_id, intra_extension_id, object_category_id, object_scope_dict)
 
     @controller.protected()
     def get_object_scope(self, context, **kw):
@@ -532,7 +609,8 @@ class IntraExtensions(controller.V3Controller):
         intra_extension_id = kw.get('intra_extension_id', None)
         object_category_id = kw.get('object_category_id', None)
         object_scope_id = kw.get('object_scope_id', None)
-        return self.admin_api.get_object_scope_dict(user_id, intra_extension_id, object_category_id, object_scope_id)
+        return self.admin_api.get_object_scope_dict(
+            user_id, intra_extension_id, object_category_id, object_scope_id)
 
     @controller.protected()
     def del_object_scope(self, context, **kw):
@@ -540,7 +618,11 @@ class IntraExtensions(controller.V3Controller):
         intra_extension_id = kw.get('intra_extension_id', None)
         object_category_id = kw.get('object_category_id', None)
         object_scope_id = kw.get('object_scope_id', None)
-        self.admin_api.del_object_scope(user_id, intra_extension_id, object_category_id, object_scope_id)
+        self.admin_api.del_object_scope(
+            user_id,
+            intra_extension_id,
+            object_category_id,
+            object_scope_id)
 
     @controller.protected()
     def set_object_scope(self, context, **kw):
@@ -550,15 +632,18 @@ class IntraExtensions(controller.V3Controller):
         object_scope_id = kw.get('object_scope_id', None)
         object_scope_dict = dict()
         object_scope_dict['name'] = kw.get('object_scope_name', None)
-        object_scope_dict['description'] = kw.get('object_scope_description', None)
-        return self.admin_api.set_object_scope_dict(user_id, intra_extension_id, object_category_id, object_scope_id, object_scope_dict)
+        object_scope_dict['description'] = kw.get(
+            'object_scope_description', None)
+        return self.admin_api.set_object_scope_dict(
+            user_id, intra_extension_id, object_category_id, object_scope_id, object_scope_dict)
 
     @controller.protected()
     def get_action_scopes(self, context, **kw):
         user_id = self._get_user_id_from_token(context.get('token_id'))
         intra_extension_id = kw.get('intra_extension_id', None)
         action_category_id = kw.get('action_category_id', None)
-        return self.admin_api.get_action_scopes_dict(user_id, intra_extension_id, action_category_id)
+        return self.admin_api.get_action_scopes_dict(
+            user_id, intra_extension_id, action_category_id)
 
     @controller.protected()
     def add_action_scope(self, context, **kw):
@@ -567,8 +652,10 @@ class IntraExtensions(controller.V3Controller):
         action_category_id = kw.get('action_category_id', None)
         action_scope_dict = dict()
         action_scope_dict['name'] = kw.get('action_scope_name', None)
-        action_scope_dict['description'] = kw.get('action_scope_description', None)
-        return self.admin_api.add_action_scope_dict(user_id, intra_extension_id, action_category_id, action_scope_dict)
+        action_scope_dict['description'] = kw.get(
+            'action_scope_description', None)
+        return self.admin_api.add_action_scope_dict(
+            user_id, intra_extension_id, action_category_id, action_scope_dict)
 
     @controller.protected()
     def get_action_scope(self, context, **kw):
@@ -576,7 +663,8 @@ class IntraExtensions(controller.V3Controller):
         intra_extension_id = kw.get('intra_extension_id', None)
         action_category_id = kw.get('action_category_id', None)
         action_scope_id = kw.get('action_scope_id', None)
-        return self.admin_api.get_action_scope_dict(user_id, intra_extension_id, action_category_id, action_scope_id)
+        return self.admin_api.get_action_scope_dict(
+            user_id, intra_extension_id, action_category_id, action_scope_id)
 
     @controller.protected()
     def del_action_scope(self, context, **kw):
@@ -584,7 +672,11 @@ class IntraExtensions(controller.V3Controller):
         intra_extension_id = kw.get('intra_extension_id', None)
         action_category_id = kw.get('action_category_id', None)
         action_scope_id = kw.get('action_scope_id', None)
-        self.admin_api.del_action_scope(user_id, intra_extension_id, action_category_id, action_scope_id)
+        self.admin_api.del_action_scope(
+            user_id,
+            intra_extension_id,
+            action_category_id,
+            action_scope_id)
 
     @controller.protected()
     def set_action_scope(self, context, **kw):
@@ -594,8 +686,10 @@ class IntraExtensions(controller.V3Controller):
         action_scope_id = kw.get('action_scope_id', None)
         action_scope_dict = dict()
         action_scope_dict['name'] = kw.get('action_scope_name', None)
-        action_scope_dict['description'] = kw.get('action_scope_description', None)
-        return self.admin_api.set_action_scope_dict(user_id, intra_extension_id, action_category_id, action_scope_id, action_scope_dict)
+        action_scope_dict['description'] = kw.get(
+            'action_scope_description', None)
+        return self.admin_api.set_action_scope_dict(
+            user_id, intra_extension_id, action_category_id, action_scope_id, action_scope_dict)
 
     # Assignment functions
 
@@ -606,7 +700,8 @@ class IntraExtensions(controller.V3Controller):
         subject_id = kw.get('subject_id', None)
         subject_category_id = kw.get('subject_category_id', None)
         subject_scope_id = kw.get('subject_scope_id', None)
-        return self.admin_api.add_subject_assignment_list(user_id, intra_extension_id, subject_id, subject_category_id, subject_scope_id)
+        return self.admin_api.add_subject_assignment_list(
+            user_id, intra_extension_id, subject_id, subject_category_id, subject_scope_id)
 
     @controller.protected()
     def get_subject_assignment(self, context, **kw):
@@ -614,7 +709,8 @@ class IntraExtensions(controller.V3Controller):
         intra_extension_id = kw.get('intra_extension_id', None)
         subject_id = kw.get('subject_id', None)
         subject_category_id = kw.get('subject_category_id', None)
-        return self.admin_api.get_subject_assignment_list(user_id, intra_extension_id, subject_id, subject_category_id)
+        return self.admin_api.get_subject_assignment_list(
+            user_id, intra_extension_id, subject_id, subject_category_id)
 
     @controller.protected()
     def del_subject_assignment(self, context, **kw):
@@ -623,7 +719,12 @@ class IntraExtensions(controller.V3Controller):
         subject_id = kw.get('subject_id', None)
         subject_category_id = kw.get('subject_category_id', None)
         subject_scope_id = kw.get('subject_scope_id', None)
-        self.admin_api.del_subject_assignment(user_id, intra_extension_id, subject_id, subject_category_id, subject_scope_id)
+        self.admin_api.del_subject_assignment(
+            user_id,
+            intra_extension_id,
+            subject_id,
+            subject_category_id,
+            subject_scope_id)
 
     @controller.protected()
     def add_object_assignment(self, context, **kw):
@@ -632,7 +733,8 @@ class IntraExtensions(controller.V3Controller):
         object_id = kw.get('object_id', None)
         object_category_id = kw.get('object_category_id', None)
         object_scope_id = kw.get('object_scope_id', None)
-        return self.admin_api.add_object_assignment_list(user_id, intra_extension_id, object_id, object_category_id, object_scope_id)
+        return self.admin_api.add_object_assignment_list(
+            user_id, intra_extension_id, object_id, object_category_id, object_scope_id)
 
     @controller.protected()
     def get_object_assignment(self, context, **kw):
@@ -640,7 +742,8 @@ class IntraExtensions(controller.V3Controller):
         intra_extension_id = kw.get('intra_extension_id', None)
         object_id = kw.get('object_id', None)
         object_category_id = kw.get('object_category_id', None)
-        return self.admin_api.get_object_assignment_list(user_id, intra_extension_id, object_id, object_category_id)
+        return self.admin_api.get_object_assignment_list(
+            user_id, intra_extension_id, object_id, object_category_id)
 
     @controller.protected()
     def del_object_assignment(self, context, **kw):
@@ -649,7 +752,12 @@ class IntraExtensions(controller.V3Controller):
         object_id = kw.get('object_id', None)
         object_category_id = kw.get('object_category_id', None)
         object_scope_id = kw.get('object_scope_id', None)
-        self.admin_api.del_object_assignment(user_id, intra_extension_id, object_id, object_category_id, object_scope_id)
+        self.admin_api.del_object_assignment(
+            user_id,
+            intra_extension_id,
+            object_id,
+            object_category_id,
+            object_scope_id)
 
     @controller.protected()
     def add_action_assignment(self, context, **kw):
@@ -658,7 +766,8 @@ class IntraExtensions(controller.V3Controller):
         action_id = kw.get('action_id', None)
         action_category_id = kw.get('action_category_id', None)
         action_scope_id = kw.get('action_scope_id', None)
-        return self.admin_api.add_action_assignment_list(user_id, intra_extension_id, action_id, action_category_id, action_scope_id)
+        return self.admin_api.add_action_assignment_list(
+            user_id, intra_extension_id, action_id, action_category_id, action_scope_id)
 
     @controller.protected()
     def get_action_assignment(self, context, **kw):
@@ -666,7 +775,8 @@ class IntraExtensions(controller.V3Controller):
         intra_extension_id = kw.get('intra_extension_id', None)
         action_id = kw.get('action_id', None)
         action_category_id = kw.get('action_category_id', None)
-        return self.admin_api.get_action_assignment_list(user_id, intra_extension_id, action_id, action_category_id)
+        return self.admin_api.get_action_assignment_list(
+            user_id, intra_extension_id, action_id, action_category_id)
 
     @controller.protected()
     def del_action_assignment(self, context, **kw):
@@ -675,7 +785,12 @@ class IntraExtensions(controller.V3Controller):
         action_id = kw.get('action_id', None)
         action_category_id = kw.get('action_category_id', None)
         action_scope_id = kw.get('action_scope_id', None)
-        self.admin_api.del_action_assignment(user_id, intra_extension_id, action_id, action_category_id, action_scope_id)
+        self.admin_api.del_action_assignment(
+            user_id,
+            intra_extension_id,
+            action_id,
+            action_category_id,
+            action_scope_id)
 
     # Metarule functions
 
@@ -683,20 +798,23 @@ class IntraExtensions(controller.V3Controller):
     def get_aggregation_algorithm(self, context, **kw):
         user_id = self._get_user_id_from_token(context.get('token_id'))
         intra_extension_id = kw.get('intra_extension_id', None)
-        return self.admin_api.get_aggregation_algorithm_id(user_id, intra_extension_id)
+        return self.admin_api.get_aggregation_algorithm_id(
+            user_id, intra_extension_id)
 
     @controller.protected()
     def set_aggregation_algorithm(self, context, **kw):
         user_id = self._get_user_id_from_token(context.get('token_id'))
         intra_extension_id = kw.get('intra_extension_id', None)
         aggregation_algorithm_id = kw.get('aggregation_algorithm_id', None)
-        return self.admin_api.set_aggregation_algorithm_id(user_id, intra_extension_id, aggregation_algorithm_id)
+        return self.admin_api.set_aggregation_algorithm_id(
+            user_id, intra_extension_id, aggregation_algorithm_id)
 
     @controller.protected()
     def get_sub_meta_rules(self, context, **kw):
         user_id = self._get_user_id_from_token(context.get('token_id'))
         intra_extension_id = kw.get('intra_extension_id', None)
-        return self.admin_api.get_sub_meta_rules_dict(user_id, intra_extension_id)
+        return self.admin_api.get_sub_meta_rules_dict(
+            user_id, intra_extension_id)
 
     @controller.protected()
     def add_sub_meta_rule(self, context, **kw):
@@ -704,25 +822,32 @@ class IntraExtensions(controller.V3Controller):
         intra_extension_id = kw.get('intra_extension_id', None)
         sub_meta_rule_dict = dict()
         sub_meta_rule_dict['name'] = kw.get('sub_meta_rule_name', None)
-        sub_meta_rule_dict['algorithm'] = kw.get('sub_meta_rule_algorithm', None)
-        sub_meta_rule_dict['subject_categories'] = kw.get('sub_meta_rule_subject_categories', None)
-        sub_meta_rule_dict['object_categories'] = kw.get('sub_meta_rule_object_categories', None)
-        sub_meta_rule_dict['action_categories'] = kw.get('sub_meta_rule_action_categories', None)
-        return self.admin_api.add_sub_meta_rule_dict(user_id, intra_extension_id, sub_meta_rule_dict)
+        sub_meta_rule_dict['algorithm'] = kw.get(
+            'sub_meta_rule_algorithm', None)
+        sub_meta_rule_dict['subject_categories'] = kw.get(
+            'sub_meta_rule_subject_categories', None)
+        sub_meta_rule_dict['object_categories'] = kw.get(
+            'sub_meta_rule_object_categories', None)
+        sub_meta_rule_dict['action_categories'] = kw.get(
+            'sub_meta_rule_action_categories', None)
+        return self.admin_api.add_sub_meta_rule_dict(
+            user_id, intra_extension_id, sub_meta_rule_dict)
 
     @controller.protected()
     def get_sub_meta_rule(self, context, **kw):
         user_id = self._get_user_id_from_token(context.get('token_id'))
         intra_extension_id = kw.get('intra_extension_id', None)
         sub_meta_rule_id = kw.get('sub_meta_rule_id', None)
-        return self.admin_api.get_sub_meta_rule_dict(user_id, intra_extension_id, sub_meta_rule_id)
+        return self.admin_api.get_sub_meta_rule_dict(
+            user_id, intra_extension_id, sub_meta_rule_id)
 
     @controller.protected()
     def del_sub_meta_rule(self, context, **kw):
         user_id = self._get_user_id_from_token(context.get('token_id'))
         intra_extension_id = kw.get('intra_extension_id', None)
         sub_meta_rule_id = kw.get('sub_meta_rule_id', None)
-        self.admin_api.del_sub_meta_rule(user_id, intra_extension_id, sub_meta_rule_id)
+        self.admin_api.del_sub_meta_rule(
+            user_id, intra_extension_id, sub_meta_rule_id)
 
     @controller.protected()
     def set_sub_meta_rule(self, context, **kw):
@@ -731,11 +856,16 @@ class IntraExtensions(controller.V3Controller):
         sub_meta_rule_id = kw.get('sub_meta_rule_id', None)
         sub_meta_rule_dict = dict()
         sub_meta_rule_dict['name'] = kw.get('sub_meta_rule_name', None)
-        sub_meta_rule_dict['algorithm'] = kw.get('sub_meta_rule_algorithm', None)
-        sub_meta_rule_dict['subject_categories'] = kw.get('sub_meta_rule_subject_categories', None)
-        sub_meta_rule_dict['object_categories'] = kw.get('sub_meta_rule_object_categories', None)
-        sub_meta_rule_dict['action_categories'] = kw.get('sub_meta_rule_action_categories', None)
-        return self.admin_api.set_sub_meta_rule_dict(user_id, intra_extension_id, sub_meta_rule_id, sub_meta_rule_dict)
+        sub_meta_rule_dict['algorithm'] = kw.get(
+            'sub_meta_rule_algorithm', None)
+        sub_meta_rule_dict['subject_categories'] = kw.get(
+            'sub_meta_rule_subject_categories', None)
+        sub_meta_rule_dict['object_categories'] = kw.get(
+            'sub_meta_rule_object_categories', None)
+        sub_meta_rule_dict['action_categories'] = kw.get(
+            'sub_meta_rule_action_categories', None)
+        return self.admin_api.set_sub_meta_rule_dict(
+            user_id, intra_extension_id, sub_meta_rule_id, sub_meta_rule_dict)
 
     # Rules functions
     @controller.protected()
@@ -743,7 +873,8 @@ class IntraExtensions(controller.V3Controller):
         user_id = self._get_user_id_from_token(context.get('token_id'))
         intra_extension_id = kw.get('intra_extension_id', None)
         sub_meta_rule_id = kw.get('sub_meta_rule_id', None)
-        return self.admin_api.get_rules_dict(user_id, intra_extension_id, sub_meta_rule_id)
+        return self.admin_api.get_rules_dict(
+            user_id, intra_extension_id, sub_meta_rule_id)
 
     @controller.protected()
     def add_rule(self, context, **kw):
@@ -754,8 +885,10 @@ class IntraExtensions(controller.V3Controller):
         object_category_list = kw.get('object_categories', [])
         action_category_list = kw.get('action_categories', [])
         enabled_bool = kw.get('enabled', True)
-        rule_list = subject_category_list + action_category_list + object_category_list + [enabled_bool, ]
-        return self.admin_api.add_rule_dict(user_id, intra_extension_id, sub_meta_rule_id, rule_list)
+        rule_list = subject_category_list + action_category_list + \
+            object_category_list + [enabled_bool, ]
+        return self.admin_api.add_rule_dict(
+            user_id, intra_extension_id, sub_meta_rule_id, rule_list)
 
     @controller.protected()
     def get_rule(self, context, **kw):
@@ -763,7 +896,8 @@ class IntraExtensions(controller.V3Controller):
         intra_extension_id = kw.get('intra_extension_id', None)
         sub_meta_rule_id = kw.get('sub_meta_rule_id', None)
         rule_id = kw.get('rule_id', None)
-        return self.admin_api.get_rule_dict(user_id, intra_extension_id, sub_meta_rule_id, rule_id)
+        return self.admin_api.get_rule_dict(
+            user_id, intra_extension_id, sub_meta_rule_id, rule_id)
 
     @controller.protected()
     def del_rule(self, context, **kw):
@@ -771,7 +905,11 @@ class IntraExtensions(controller.V3Controller):
         intra_extension_id = kw.get('intra_extension_id', None)
         sub_meta_rule_id = kw.get('sub_meta_rule_id', None)
         rule_id = kw.get('rule_id', None)
-        self.admin_api.del_rule(user_id, intra_extension_id, sub_meta_rule_id, rule_id)
+        self.admin_api.del_rule(
+            user_id,
+            intra_extension_id,
+            sub_meta_rule_id,
+            rule_id)
 
     @controller.protected()
     def set_rule(self, context, **kw):
@@ -784,7 +922,8 @@ class IntraExtensions(controller.V3Controller):
         object_category_list = kw.get('object_categories', [])
         action_category_list = kw.get('action_categories', [])
         rule_list = subject_category_list + action_category_list + object_category_list
-        return self.admin_api.set_rule_dict(user_id, intra_extension_id, sub_meta_rule_id, rule_id, rule_list)
+        return self.admin_api.set_rule_dict(
+            user_id, intra_extension_id, sub_meta_rule_id, rule_id, rule_list)
 
 
 @dependency.requires('authz_api')
@@ -795,7 +934,8 @@ class InterExtensions(controller.V3Controller):
 
     def _get_user_from_token(self, token_id):
         response = self.token_provider_api.validate_token(token_id)
-        token_ref = token_model.KeystoneToken(token_id=token_id, token_data=response)
+        token_ref = token_model.KeystoneToken(
+            token_id=token_id, token_data=response)
         return token_ref['user']
 
     # @controller.protected()
@@ -824,7 +964,8 @@ class InterExtensions(controller.V3Controller):
     #     user = self._get_user_from_token(context.get('token_id'))
     #     if 'inter_extension_id' not in kw:
     #         raise exception.Error
-    #     return self.interextension_api.delete_inter_extension(kw['inter_extension_id'])
+    # return
+    # self.interextension_api.delete_inter_extension(kw['inter_extension_id'])
 
 
 @dependency.requires('moonlog_api', 'authz_api')
@@ -835,7 +976,8 @@ class Logs(controller.V3Controller):
 
     def _get_user_id_from_token(self, token_id):
         response = self.token_provider_api.validate_token(token_id)
-        token_ref = token_model.KeystoneToken(token_id=token_id, token_data=response)
+        token_ref = token_model.KeystoneToken(
+            token_id=token_id, token_data=response)
         return token_ref['user']
 
     @controller.protected()
@@ -912,9 +1054,9 @@ class MoonAuth(controller.V3Controller):
                 'message': message
             }
             try:
-                _result["roles"] = map(lambda x: x['name'], _data["token"]["roles"])
+                _result["roles"] = map(
+                    lambda x: x['name'], _data["token"]["roles"])
             except KeyError:
                 pass
             return _result
         return {"token": None, 'message': req.json()}
-
diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/moon/files/get_deb_depends.py b/deploy/adapters/ansible/openstack_newton_xenial/roles/moon/files/get_deb_depends.py
index 05fc5d46..d510bcf4 100644
--- a/deploy/adapters/ansible/openstack_newton_xenial/roles/moon/files/get_deb_depends.py
+++ b/deploy/adapters/ansible/openstack_newton_xenial/roles/moon/files/get_deb_depends.py
@@ -6,7 +6,12 @@ import subprocess
 pkts = []
 
 for arg in sys.argv[1:]:
-    proc = subprocess.Popen(["dpkg-deb", "--info", arg], stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    proc = subprocess.Popen(["dpkg-deb",
+                             "--info",
+                             arg],
+                            stdin=None,
+                            stdout=subprocess.PIPE,
+                            stderr=subprocess.PIPE)
     out = proc.stdout.read()
     err = proc.stderr.read()
     if err: