diff options
Diffstat (limited to 'python_moonclient/python_moonclient/cli/pdps.py')
| -rw-r--r-- | python_moonclient/python_moonclient/cli/pdps.py | 64 |
1 files changed, 37 insertions, 27 deletions
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) |