From 2e35a7e46f0929438c1c206e3116caa829f07dc6 Mon Sep 17 00:00:00 2001 From: Thomas Duval Date: Fri, 5 Oct 2018 16:54:37 +0200 Subject: Update code to 4.6 official version Change-Id: Ibd0da0e476e24b2685f54693efc11f7a58d40a62 --- .../python_moonclient/cli/policies.py | 90 +++++++++++++--------- 1 file changed, 54 insertions(+), 36 deletions(-) (limited to 'python_moonclient/python_moonclient/cli/policies.py') 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) -- cgit 1.2.3-korg