Merge "Update code to 4.6 official version"

9 files changed, 137 insertions, 109 deletions

diff --git a/python_moonclient/python_moonclient/cli/authz.py b/python_moonclient/python_moonclient/cli/authz.py
index 2f45e847..4edc307f 100644
--- a/python_moonclient/python_moonclient/cli/authz.py
+++ b/python_moonclient/python_moonclient/cli/authz.py
@@ -1,12 +1,13 @@
 import logging
-from cliff.command import Command
+
 from importlib.machinery import SourceFileLoader
+from cliff.command import Command
 
 from python_moonclient.core import models, policies, pdp, authz
 from python_moonclient.cli.parser import Parser
 from python_moonclient.cli.projects import ProjectsUtils
 
-logger = logging.getLogger("moonclient.cli.authz")
+LOGGER = logging.getLogger("moonclient.cli.authz")
 
 
 class SendAuthz(Command):
@@ -29,13 +30,14 @@ class SendAuthz(Command):
         pdp.init(consul_host, consul_port)
 
         if parsed_args.filename:
-            logger.info("Loading: {}".format(parsed_args.filename))
+            LOGGER.info("Loading: {}".format(parsed_args.filename))
         m = SourceFileLoader("scenario", parsed_args.filename)
         scenario = m.load_module()
 
-        keystone_project_id = ProjectsUtils.get_project_id(pdp, parsed_args.id_project, parsed_args.name_project)
+        keystone_project_id = ProjectsUtils.get_project_id(pdp, parsed_args.id_project,
+                                                           parsed_args.name_project)
         if keystone_project_id is None:
-            logger.error("Project not found !")
+            LOGGER.error("Project not found !")
 
         keystone_project_id = pdp.get_keystone_id(keystone_project_id)
         time_data = authz.send_requests(
@@ -50,4 +52,4 @@ class SendAuthz(Command):
             destination=parsed_args.destination
         )
         if not parsed_args.dry_run:
-            authz.save_data(parsed_args.write, time_data)
\ No newline at end of file
+            authz.save_data(parsed_args.write, time_data)
diff --git a/python_moonclient/python_moonclient/cli/export.py b/python_moonclient/python_moonclient/cli/export.py
index a16928de..4ea5cf4f 100644
--- a/python_moonclient/python_moonclient/cli/export.py
+++ b/python_moonclient/python_moonclient/cli/export.py
@@ -8,6 +8,7 @@ from cliff.command import Command
 
 class Export(Command):
     """dump the complete moon database into a json file"""
+
     def get_parser(self, prog_name):
         parser = super().get_parser(prog_name)
         Parser.add_filename_argument(parser)
@@ -27,6 +28,5 @@ class Export(Command):
             json_file = open(parsed_args.filename, "w")
             json.dump(res["content"], json_file)
             return "Export ok!"
-        else:
-            return "Unexpected results : the returned json does not have the correct syntax"
 
+        return "Unexpected results : the returned json does not have the correct syntax"
diff --git a/python_moonclient/python_moonclient/cli/import.py b/python_moonclient/python_moonclient/cli/import.py
index c6c43439..efefc304 100644
--- a/python_moonclient/python_moonclient/cli/import.py
+++ b/python_moonclient/python_moonclient/cli/import.py
@@ -1,4 +1,3 @@
-
 from python_moonclient.core import models, policies, pdp, json_import
 from python_moonclient.cli.parser import Parser
 from python_moonclient.cli.projects import ProjectsUtils
@@ -8,6 +7,7 @@ from cliff.command import Command
 
 class Import(Command):
     """import a json file describing pdps """
+
     def get_parser(self, prog_name):
         parser = super().get_parser(prog_name)
         Parser.add_common_options(parser)
@@ -26,4 +26,3 @@ class Import(Command):
         if "message" in res:
             return res["message"]
         return res
-
diff --git a/python_moonclient/python_moonclient/cli/models.py b/python_moonclient/python_moonclient/cli/models.py
index 922a1830..369d9027 100644
--- a/python_moonclient/python_moonclient/cli/models.py
+++ b/python_moonclient/python_moonclient/cli/models.py
@@ -1,13 +1,12 @@
 import logging
+from importlib.machinery import SourceFileLoader
 from cliff.lister import Lister
 from cliff.command import Command
-from importlib.machinery import SourceFileLoader
-
 from python_moonclient.core import models, policies, pdp
 from python_moonclient.cli.parser import Parser
 from python_moonclient.cli.projects import ProjectsUtils
 
-logger = logging.getLogger("moonclient.cli.pdps")
+LOGGER = logging.getLogger("moonclient.cli.pdps")
 
 
 class ModelUtils:
@@ -19,7 +18,8 @@ class ModelUtils:
         modelz = models.check_model()
         for _model_key, _model_value in modelz["models"].items():
             if _model_key == parsed_id or _model_value['name'] == parsed_name:
-                # logger.info("Found pdp : [key='{}' , name='{}']".format(_pdp_key, _pdp_value['name']))
+                # LOGGER.info(
+                # "Found pdp : [key='{}' , name='{}']".format(_pdp_key, _pdp_value['name']))
                 return _model_key
         return None
 
@@ -28,7 +28,8 @@ class ModelUtils:
         modelz = models.check_model()
         for _model_key, _model_value in modelz["models"].items():
             if _model_key == parsed_id or _model_value['name'] == parsed_name:
-                # logger.info("Found pdp : [key='{}' , name='{}']".format(_pdp_key, _pdp_value['name']))
+                # LOGGER.info(
+                # "Found pdp : [key='{}' , name='{}']".format(_pdp_key, _pdp_value['name']))
                 return _model_value['name']
         return None
 
@@ -156,6 +157,3 @@ class SubjectCategoryAdd(Command):
         else:
             print("Error while creating subject category")
         # subject_categories = models.check_subject_category(subject_category_id)
-
-
-
diff --git a/python_moonclient/python_moonclient/cli/parser.py b/python_moonclient/python_moonclient/cli/parser.py
index edd18a25..e71cd6c9 100644
--- a/python_moonclient/python_moonclient/cli/parser.py
+++ b/python_moonclient/python_moonclient/cli/parser.py
@@ -1,10 +1,13 @@
-
 class Parser:
 
     @staticmethod
     def add_common_options(parser):
-        parser.add_argument('--consul-host', help='Set the name of the consul server (default: 127.0.0.1)', default="127.0.0.1")
-        parser.add_argument('--consul-port', help='Set the port of the consult server (default: 30005)',default="30005")
+        parser.add_argument('--consul-host',
+                            help='Set the name of the consul server (default: 127.0.0.1)',
+                            default="127.0.0.1")
+        parser.add_argument('--consul-port',
+                            help='Set the port of the consult server (default: 30005)',
+                            default="30005")
         parser.add_argument("--verbose", "-v", action='store_true', help="verbose mode")
         parser.add_argument("--debug", "-d", action='store_true', help="debug mode")
 
@@ -30,7 +33,7 @@ class Parser:
 
     @staticmethod
     def add_id_or_name_argument(parser):
-        group = parser.add_mutually_exclusive_group(required=True) 
+        group = parser.add_mutually_exclusive_group(required=True)
         Parser._add_id_argument(group)
         Parser._add_name_argument(group)
 
@@ -44,7 +47,7 @@ class Parser:
 
     @staticmethod
     def add_id_or_name_pdp_argument(parser):
-        group = parser.add_mutually_exclusive_group(required=True) 
+        group = parser.add_mutually_exclusive_group(required=True)
         Parser._add_id_pdp_argument(group)
         Parser._add_name_pdp_argument(group)
 
@@ -55,10 +58,10 @@ class Parser:
     @staticmethod
     def _add_name_pdp_argument(parser):
         parser.add_argument('--name-pdp', help='name of the pdp')
-    
+
     @staticmethod
     def add_id_or_name_project_argument(parser):
-        group = parser.add_mutually_exclusive_group(required=True) 
+        group = parser.add_mutually_exclusive_group(required=True)
         Parser._add_id_project_argument(group)
         Parser._add_name_project_argument(group)
 
@@ -92,4 +95,4 @@ class Parser:
                             help="Execute stressing tests (warning delta measures "
                                  "will be false, implies -t)")
         parser.add_argument("--write", "-w", help="Write test data to a JSON file",
-                                default="/tmp/data.json")
+                            default="/tmp/data.json")
diff --git a/python_moonclient/python_moonclient/cli/pdps.py b/python_moonclient/python_moonclient/cli/pdps.py
index f1f8fe35..a4f7bba0 100644
--- a/python_moonclient/python_moonclient/cli/pdps.py
+++ b/python_moonclient/python_moonclient/cli/pdps.py
@@ -1,13 +1,13 @@
 import logging
+from importlib.machinery import SourceFileLoader
 from cliff.lister import Lister
 from cliff.command import Command
-from importlib.machinery import SourceFileLoader
 
 from python_moonclient.core import models, policies, pdp
 from python_moonclient.cli.parser import Parser
 from python_moonclient.cli.projects import ProjectsUtils
 
-logger = logging.getLogger("moonclient.cli.pdps")
+LOGGER = logging.getLogger("moonclient.cli.pdps")
 
 
 class PdpUtils:
@@ -19,7 +19,8 @@ class PdpUtils:
         pdps = pdp.check_pdp()
         for _pdp_key, _pdp_value in pdps["pdps"].items():
             if _pdp_key == parsed_id or _pdp_value['name'] == parsed_name:
-                #logger.info("Found pdp : [key='{}' , name='{}']".format(_pdp_key, _pdp_value['name']))
+                # LOGGER.info(
+                # "Found pdp : [key='{}' , name='{}']".format(_pdp_key, _pdp_value['name']))
                 return _pdp_key
         return None
 
@@ -28,10 +29,12 @@ class PdpUtils:
         pdps = pdp.check_pdp()
         for _pdp_key, _pdp_value in pdps["pdps"].items():
             if _pdp_key == parsed_id or _pdp_value['name'] == parsed_name:
-                #logger.info("Found pdp : [key='{}' , name='{}']".format(_pdp_key, _pdp_value['name']))
+                # LOGGER.info(
+                # "Found pdp : [key='{}' , name='{}']".format(_pdp_key, _pdp_value['name']))
                 return _pdp_value['name']
         return None
 
+
 class Pdps(Lister):
     """show the list of existing pdps """
 
@@ -50,13 +53,15 @@ class Pdps(Lister):
 
         pdps = pdp.check_pdp()
 
-        return (('Key' , 'Name', 'Project id'),
-                   ((_pdp_key,  _pdp_value['name'], _pdp_value['keystone_project_id']) for _pdp_key, _pdp_value in pdps["pdps"].items())
-               )
+        return (('Key', 'Name', 'Project id'),
+                ((_pdp_key, _pdp_value['name'], _pdp_value['keystone_project_id']) for
+                 _pdp_key, _pdp_value in pdps["pdps"].items())
+                )
 
 
 class CreatePdp(Command):
     """create a new pdp from a json file and returns the newly created pdp id"""
+
     def get_parser(self, prog_name):
         parser = super().get_parser(prog_name)
         Parser.add_common_options(parser)
@@ -78,7 +83,7 @@ class CreatePdp(Command):
         pdp.init(consul_host, consul_port)
 
         if parsed_args.filename:
-            logger.info("Loading: {}".format(parsed_args.filename))
+            LOGGER.info("Loading: {}".format(parsed_args.filename))
         m = SourceFileLoader("scenario", parsed_args.filename)
         scenario = m.load_module()
 
@@ -94,11 +99,12 @@ class CreatePdp(Command):
         policy_id = policies.create_policy(scenario, model_id, meta_rule_list)
         pdp_id = pdp.create_pdp(scenario, policy_id=policy_id)
         pdp_name = PdpUtils.get_pdp_name(pdp, pdp_id, None)
-        logger.info("Pdp created : [id='{}', name='{}']".format(pdp_id, pdp_name))
+        LOGGER.info("Pdp created : [id='{}', name='{}']".format(pdp_id, pdp_name))
 
 
 class DeletePdp(Command):
     """delete an existing pdp"""
+
     def get_parser(self, prog_name):
         parser = super().get_parser(prog_name)
         Parser.add_common_options(parser)
@@ -117,36 +123,38 @@ class DeletePdp(Command):
         _search = PdpUtils.get_pdp_id(pdp, parsed_args.id, parsed_args.name)
         _pdp_key = _search
         if _pdp_key is None:
-            logger.error("Error pdp not found ")
+            LOGGER.error("Error pdp not found ")
             return
 
-        #if parsed_args.id:
+        # if parsed_args.id:
         #    logger.info("Deleting: {}".format(parsed_args.id))
         #    _search = parsed_args.id
-        #if parsed_args.name:
+        # if parsed_args.name:
         #    logger.info("Deleting: {}".format(parsed_args.name))
         #    _search = parsed_args.name
-            
-        #pdps = pdp.check_pdp()
-        #for _pdp_key, _pdp_value in pdps["pdps"].items():
+
+        # pdps = pdp.check_pdp()
+        # for _pdp_key, _pdp_value in pdps["pdps"].items():
         #    if _pdp_key == _search or _pdp_value['name'] == _search:
-        logger.info("Found {}".format(_pdp_key))
+        LOGGER.info("Found {}".format(_pdp_key))
         pdp.delete_pdp(_pdp_key)
 
         pdps = pdp.check_pdp()
-        logger.info("Listing all PDP:")
+        LOGGER.info("Listing all PDP:")
         for _pdp_key, _pdp_value in pdps["pdps"].items():
-            if _pdp_key == _search : #or _pdp_value['name'] == _search:
-                logger.error("Error in deleting {}".format(_search))
+            if _pdp_key == _search:  # or _pdp_value['name'] == _search:
+                LOGGER.error("Error in deleting {}".format(_search))
 
         return (('Key', 'Name', 'Project id'),
-                ((_pdp_key, _pdp_value['name'], _pdp_value['keystone_project_id']) for _pdp_key, _pdp_value in
+                ((_pdp_key, _pdp_value['name'], _pdp_value['keystone_project_id']) for
+                 _pdp_key, _pdp_value in
                  pdps["pdps"].items())
                 )
 
 
 class MapPdp(Command):
     """map an existing pdp to a keystone project"""
+
     def get_parser(self, prog_name):
         parser = super().get_parser(prog_name)
         Parser.add_common_options(parser)
@@ -162,19 +170,21 @@ class MapPdp(Command):
         policies.init(consul_host, consul_port)
         pdp.init(consul_host, consul_port)
 
-        #_pdp_key = PdpUtils.get_pdp_id(pdp, parsed_args.id_pdp, parsed_args.name_pdp)
+        # _pdp_key = PdpUtils.get_pdp_id(pdp, parsed_args.id_pdp, parsed_args.name_pdp)
         _pdp_name = PdpUtils.get_pdp_name(pdp, parsed_args.id_pdp, parsed_args.name_pdp)
         if _pdp_name is None:
-            logger.error("Error pdp not found ")
+            LOGGER.error("Error pdp not found ")
             return
 
-        #_project_key = ProjectsUtils.get_project_id(pdp, parsed_args.id_project, parsed_args.name_project)
-        _project_name = ProjectsUtils.get_project_name(pdp, parsed_args.id_project, parsed_args.name_project)
+        # _project_key = ProjectsUtils.get_project_id(
+        # pdp, parsed_args.id_project, parsed_args.name_project)
+        _project_name = ProjectsUtils.get_project_name(pdp, parsed_args.id_project,
+                                                       parsed_args.name_project)
         if _project_name is None:
-            logger.error("Error project not found ")
+            LOGGER.error("Error project not found ")
             return
 
-        logger.info("Mapping: {}=>{}".format(_pdp_name, _project_name))
+        LOGGER.info("Mapping: {}=>{}".format(_pdp_name, _project_name))
 
-        #pdp.map_to_keystone(pdp_id=parsed_args.id_pdp, keystone_project_id=parsed_args.id_project)
+        # pdp.map_to_keystone(pdp_id=parsed_args.id_pdp, keystone_project_id=parsed_args.id_project)
         pdp.map_to_keystone(pdp_id=_pdp_name, keystone_project_id=_project_name)
diff --git a/python_moonclient/python_moonclient/cli/policies.py b/python_moonclient/python_moonclient/cli/policies.py
index 94d13db1..af8e959b 100644
--- a/python_moonclient/python_moonclient/cli/policies.py
+++ b/python_moonclient/python_moonclient/cli/policies.py
@@ -6,7 +6,7 @@ from python_moonclient.cli.parser import Parser
 
 from python_moonclient.core import models, policies, pdp
 
-logger = logging.getLogger("moonclient.cli.pdps")
+LOGGER = logging.getLogger("moonclient.cli.pdps")
 
 
 class PoliciesUtils:
@@ -16,23 +16,25 @@ class PoliciesUtils:
     @staticmethod
     def get_policy_id(policies, parsed_id, parsed_name):
         _policies = policies.check_policy()
-        for  _policy_key, _policy_value in _policies["policies"].items():
+        for _policy_key, _policy_value in _policies["policies"].items():
             if _policy_key == parsed_id or _policy_value['name'] == parsed_name:
-                #logger.info("Found {}".format(_policy_key))
+                # logger.info("Found {}".format(_policy_key))
                 return _policy_key
         return None
 
     @staticmethod
     def get_policy_name(policies, parsed_id, parsed_name):
         _policies = policies.check_policy()
-        for  _policy_key, _policy_value in _policies["policies"].items():
+        for _policy_key, _policy_value in _policies["policies"].items():
             if _policy_key == parsed_id or _policy_value['name'] == parsed_name:
-                #logger.info("Found {}".format(_policy_key))
+                # logger.info("Found {}".format(_policy_key))
                 return _policy_value['name']
         return None
 
+
 class Policies(Lister):
     """show the list of existing policies"""
+
     def get_parser(self, prog_name):
         parser = super().get_parser(prog_name)
         Parser.add_common_options(parser)
@@ -47,9 +49,10 @@ class Policies(Lister):
         pdp.init(consul_host, consul_port)
         _policies = policies.check_policy()
 
-        return (('Key' , 'Name'),
-                   ((_policy_key,  _policy_value['name']) for _policy_key, _policy_value in _policies["policies"].items())
-               )
+        return (('Key', 'Name'),
+                ((_policy_key, _policy_value['name']) for _policy_key, _policy_value in
+                 _policies["policies"].items())
+                )
 
 
 class Subjects(Lister):
@@ -70,14 +73,15 @@ class Subjects(Lister):
 
         _policies = policies.check_subject(parsed_args.id, parsed_args.policy_id)
 
-        return (('Key' , 'Name'),
-                   ((_policy_key,  _policy_value['name']) for _policy_key, _policy_value in _policies["policies"].items())
-               )
-
+        return (('Key', 'Name'),
+                ((_policy_key, _policy_value['name']) for _policy_key, _policy_value in
+                 _policies["policies"].items())
+                )
 
 
 class DeletePolicy(Command):
     """delete an existing policy"""
+
     def get_parser(self, prog_name):
         parser = super().get_parser(prog_name)
         Parser.add_common_options(parser)
@@ -92,27 +96,28 @@ class DeletePolicy(Command):
         policies.init(consul_host, consul_port)
         pdp.init(consul_host, consul_port)
 
-        policy_id = PoliciesUtils.get_policy_id(policies,parsed_args.id, parsed_args.name)
+        policy_id = PoliciesUtils.get_policy_id(policies, parsed_args.id, parsed_args.name)
         policy_name = PoliciesUtils.get_policy_name(policies, parsed_args.id, parsed_args.name)
 
-        logger.info("Deleting: {}".format(policy_name))
+        LOGGER.info("Deleting: {}".format(policy_name))
         pdp.delete_pdp(policy_id)
 
         _policies = policies.check_policy()
-        #logger.info("Listing all Policies:")
+        # logger.info("Listing all Policies:")
         for _policy_key, _policy_value in _policies["policies"].items():
-            #print("    {} {}".format(_policy_key, _policy_value['name']))
+            # print("    {} {}".format(_policy_key, _policy_value['name']))
             if _policy_key == policy_id:
-                logger.error("Error in deleting {}".format(policy_id))
+                LOGGER.error("Error in deleting {}".format(policy_id))
 
         return (('Key', 'Value'),
-                ((_policy_key, _policy_value) for _policy_key, _policy_value in _policies["policies"].items())
+                ((_policy_key, _policy_value) for _policy_key, _policy_value in
+                 _policies["policies"].items())
                 )
 
 
-
 class SubjectDatas(Lister):
     """list the subject data """
+
     def get_parser(self, prog_name):
         parser = super().get_parser(prog_name)
         Parser.add_common_options(parser)
@@ -128,17 +133,20 @@ class SubjectDatas(Lister):
         policies.init(consul_host, consul_port)
         pdp.init(consul_host, consul_port)
 
-        subject_data = policies.check_subject_data(parsed_args.policy_id, None, parsed_args.category_id)
+        subject_data = policies.check_subject_data(parsed_args.policy_id, None,
+                                                   parsed_args.category_id)
         if len(subject_data["subject_data"]) == 0:
-            return (('Key', 'Name'),())
+            return (('Key', 'Name'), ())
 
         return (('Key', 'Name'),
-                   ((_subject_key, subject_data["subject_data"][0]["data"][_subject_key]['name']) for _subject_key in subject_data["subject_data"][0]["data"].keys())
-               )
+                ((_subject_key, subject_data["subject_data"][0]["data"][_subject_key]['name']) for
+                 _subject_key in subject_data["subject_data"][0]["data"].keys())
+                )
 
 
 class ObjectDatas(Lister):
     """list the object data"""
+
     def get_parser(self, prog_name):
         parser = super().get_parser(prog_name)
         Parser.add_common_options(parser)
@@ -154,19 +162,22 @@ class ObjectDatas(Lister):
         policies.init(consul_host, consul_port)
         pdp.init(consul_host, consul_port)
 
-        object_datas = policies.check_object_data(parsed_args.policy_id, None, parsed_args.category_id)
+        object_datas = policies.check_object_data(parsed_args.policy_id, None,
+                                                  parsed_args.category_id)
 
         if len(object_datas["object_data"]) == 0:
-            return (('Key', 'Name'),())
+            return (('Key', 'Name'), ())
         object_data = object_datas["object_data"][0]["data"]
-        res =  (('Key', 'Name'),
-                   ((_object_key, object_data[_object_key]["value"]['name']) for _object_key in list(object_data))
+        res = (('Key', 'Name'),
+               ((_object_key, object_data[_object_key]["value"]['name']) for _object_key in
+                list(object_data))
                )
         return res
 
 
 class ActionDatas(Lister):
     """list the action data"""
+
     def get_parser(self, prog_name):
         parser = super().get_parser(prog_name)
         Parser.add_common_options(parser)
@@ -182,19 +193,22 @@ class ActionDatas(Lister):
         policies.init(consul_host, consul_port)
         pdp.init(consul_host, consul_port)
 
-        action_datas = policies.check_action_data(parsed_args.policy_id, None, parsed_args.category_id)
+        action_datas = policies.check_action_data(parsed_args.policy_id, None,
+                                                  parsed_args.category_id)
 
         if len(action_datas["action_data"]) == 0:
-            return (('Key', 'Name'),())
+            return (('Key', 'Name'), ())
         action_data = action_datas["action_data"][0]["data"]
-        res =  (('Key', 'Name'),
-                   ((_action_key, action_data[_action_key]["value"]['name']) for _action_key in list(action_data))
+        res = (('Key', 'Name'),
+               ((_action_key, action_data[_action_key]["value"]['name']) for _action_key in
+                list(action_data))
                )
         return res
 
 
 class MetaRules(Lister):
     """list the meta rules"""
+
     def get_parser(self, prog_name):
         parser = super().get_parser(prog_name)
         Parser.add_common_options(parser)
@@ -211,16 +225,18 @@ class MetaRules(Lister):
         metarule_datas = policies.check_meta_rule()
 
         if len(metarule_datas["meta_rules"]) == 0:
-            return (('Key', 'Name'),())
+            return (('Key', 'Name'), ())
 
         metarule_data = metarule_datas["meta_rules"]
-        res =  (('Key', 'Name'),
-                   ((_key, metarule_data[_key]['name']) for _key in list(metarule_data))
+        res = (('Key', 'Name'),
+               ((_key, metarule_data[_key]['name']) for _key in list(metarule_data))
                )
         return res
 
+
 class CreateSubjectData(Command):
     """create a subject data according to a policy and a category"""
+
     def get_parser(self, prog_name):
         parser = super().get_parser(prog_name)
         Parser.add_common_options(parser)
@@ -237,10 +253,12 @@ class CreateSubjectData(Command):
         policies.init(consul_host, consul_port)
         pdp.init(consul_host, consul_port)
 
-        subject_data_id = policies.add_subject_data(parsed_args.policy_id, parsed_args.category_id, parsed_args.name)
+        subject_data_id = policies.add_subject_data(parsed_args.policy_id, parsed_args.category_id,
+                                                    parsed_args.name)
         if subject_data_id is not None:
             print("Subject category created with id {}".format(subject_data_id))
         else:
             print("Error while creating subject category")
-        subject_data = policies.check_subject_data(parsed_args.policy_id, None, parsed_args.category_id)
+        subject_data = policies.check_subject_data(parsed_args.policy_id, None,
+                                                   parsed_args.category_id)
         # subject_categories = models.check_subject_category(subject_category_id)
diff --git a/python_moonclient/python_moonclient/cli/projects.py b/python_moonclient/python_moonclient/cli/projects.py
index c4653a51..1caa0ace 100644
--- a/python_moonclient/python_moonclient/cli/projects.py
+++ b/python_moonclient/python_moonclient/cli/projects.py
@@ -3,7 +3,7 @@ from python_moonclient.core import models, policies, pdp
 from python_moonclient.cli.parser import Parser
 from cliff.lister import Lister
 
-logger = logging.getLogger("moonclient.cli.projects")
+LOGGER = logging.getLogger("moonclient.cli.projects")
 
 
 class ProjectsUtils:
@@ -15,7 +15,8 @@ class ProjectsUtils:
         projects = pdp.get_keystone_projects()
         for _project_value in projects['projects']:
             if _project_value['id'] == parsed_id or _project_value['name'] == parsed_name:
-                #logger.info("Found project : [key='{}' , name='{}']".format(_project_value['id'], _project_value['name']))
+                # LOGGER.info(
+                # "Found project : [key='{}' , name='{}']".format(_project_value['id'], _project_value['name']))
                 return _project_value['id']
         return None
 
@@ -24,7 +25,8 @@ class ProjectsUtils:
         projects = pdp.get_keystone_projects()
         for _project_value in projects['projects']:
             if _project_value['id'] == parsed_id or _project_value['name'] == parsed_name:
-                #logger.info("Found project : [key='{}' , name='{}']".format(_project_value['id'], _project_value['name']))
+                # LOGGER.info(
+                # "Found project : [key='{}' , name='{}']".format(_project_value['id'], _project_value['name']))
                 return _project_value['name']
         return None
 
@@ -47,10 +49,6 @@ class Projects(Lister):
 
         projects = pdp.get_keystone_projects()
 
-        return (('Id' , 'Name'),
-                   ((_project['id'],  _project['name']) for _project in projects['projects'])
-               )
-
-        
-
-
+        return (('Id', 'Name'),
+                ((_project['id'], _project['name']) for _project in projects['projects'])
+                )
diff --git a/python_moonclient/python_moonclient/cli/slaves.py b/python_moonclient/python_moonclient/cli/slaves.py
index 1880f4c2..587e9033 100644
--- a/python_moonclient/python_moonclient/cli/slaves.py
+++ b/python_moonclient/python_moonclient/cli/slaves.py
@@ -5,7 +5,7 @@ from cliff.command import Command
 from python_moonclient.core import models, policies, pdp, slaves
 from python_moonclient.cli.parser import Parser
 
-logger = logging.getLogger("moonclient.cli.slaves")
+LOGGER = logging.getLogger("moonclient.cli.slaves")
 
 
 class SlavesUtils:
@@ -17,13 +17,14 @@ class SlavesUtils:
         _slaves = slaves.get_slaves()
         for _slave_value in _slaves['slaves']:
             if _slave_value['name'] == parsed_name:
-                logger.info("Found {}".format(_slave_value['name']))
+                LOGGER.info("Found {}".format(_slave_value['name']))
                 return _slave_value['name']
         return None
 
 
 class Slaves(Lister):
     """show the list of slaves"""
+
     def get_parser(self, prog_name):
         parser = super().get_parser(prog_name)
         Parser.add_common_options(parser)
@@ -43,12 +44,14 @@ class Slaves(Lister):
         slaves.init(consul_host, consul_port)
 
         return (('Name', 'Configured'),
-                ((value['name'], value['configured']) for value in slaves.get_slaves().get('slaves', dict()))
+                ((value['name'], value['configured']) for value in
+                 slaves.get_slaves().get('slaves', dict()))
                 )
 
 
 class SetSlave(Command):
     """update an existing slave to a configured state"""
+
     def get_parser(self, prog_name):
         parser = super().get_parser(prog_name)
         Parser.add_common_options(parser)
@@ -73,14 +76,14 @@ class SetSlave(Command):
             slave_input_name = "kubernetes-admin@kubernetes"
         slaves.set_slave(slave_input_name)
 
-        #if slave_name is None:
+        # if slave_name is None:
         #    slave_name = "kubernetes-admin@kubernetes"
 
-        #if parsed_args.name:
+        # if parsed_args.name:
         #    slave_name = parsed_args.name
         print("    {} (configured=True)".format(slave_input_name))
 
-        #for value in slaves.set_slave(slave_name).get('slaves', dict()):
+        # for value in slaves.set_slave(slave_name).get('slaves', dict()):
         #    if value['configured']:
         #        print("    {} (configured)".format(value['name']))
         #    else:
@@ -89,6 +92,7 @@ class SetSlave(Command):
 
 class DeleteSlave(Command):
     """update an existing slave to a unconfigured state"""
+
     def get_parser(self, prog_name):
         parser = super().get_parser(prog_name)
         Parser.add_common_options(parser)
@@ -114,7 +118,3 @@ class DeleteSlave(Command):
 
         slaves.delete_slave(slave_input_name)
         print("    {} (configured=False)".format(slave_input_name))
-
-
-
-