diff options
author | Thomas Duval <thomas.duval@orange.com> | 2017-11-22 11:26:41 +0100 |
---|---|---|
committer | Thomas Duval <thomas.duval@orange.com> | 2017-11-22 11:26:41 +0100 |
commit | dcf2ce1b8cd039b3a13e7c70ef94ce968ffc4de0 (patch) | |
tree | 5bf8e2a2071525c28f76b99a0e1eec8945528a66 /moonv4/templates/moonforming/populate_default_values.py | |
parent | cb739df188d2c7c465a3d4fbc857c6417e2a3073 (diff) |
Add waiting code for Keystone, re-add the ability to connect a PDP to the "admin" Keystone project and fix some bugs
Change-Id: Ic3afdb1306a72bd09f9071e96aabfae602153e94
Diffstat (limited to 'moonv4/templates/moonforming/populate_default_values.py')
-rw-r--r-- | moonv4/templates/moonforming/populate_default_values.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/moonv4/templates/moonforming/populate_default_values.py b/moonv4/templates/moonforming/populate_default_values.py index 10b66201..fa099458 100644 --- a/moonv4/templates/moonforming/populate_default_values.py +++ b/moonv4/templates/moonforming/populate_default_values.py @@ -32,7 +32,7 @@ requests_log = logging.getLogger("requests.packages.urllib3") requests_log.setLevel(logging.WARNING) requests_log.propagate = True -logger = logging.getLogger(__name__) +logger = logging.getLogger("moonforming") if args.filename: print("Loading: {}".format(args.filename[0])) @@ -204,13 +204,13 @@ def create_policy(model_id, meta_rule_list): def create_pdp(policy_id=None): logger.info("Creating PDP {}".format(scenario.pdp_name)) - # projects = get_keystone_projects() - # project_id = args.keystone_pid - # if not project_id: - # for _project in projects['projects']: - # if _project['name'] == "admin": - # project_id = _project['id'] - # assert project_id + projects = get_keystone_projects() + project_id = args.keystone_pid + if not project_id: + for _project in projects['projects']: + if _project['name'] == "admin": + project_id = _project['id'] + assert project_id pdps = check_pdp()["pdps"] for pdp_id, pdp_value in pdps.items(): if scenario.pdp_name == pdp_value["name"]: @@ -218,7 +218,7 @@ def create_pdp(policy_id=None): logger.debug("Found existing PDP named {} (will add policy {})".format(scenario.pdp_name, policy_id)) return pdp_id _pdp_id = add_pdp(name=scenario.pdp_name, policy_id=policy_id) - # map_to_keystone(pdp_id=_pdp_id, keystone_project_id=project_id) + map_to_keystone(pdp_id=_pdp_id, keystone_project_id=project_id) return _pdp_id if __name__ == "__main__": |