diff options
author | Asteroide <thomas.duval@orange.com> | 2018-03-12 13:19:44 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2018-03-12 13:19:44 +0000 |
commit | 1f25af17be6d3672e01a4a72b024afb72d57b75b (patch) | |
tree | 047a09872bc213103a103324ef5f24c4e6a5a79b /moon_manager/moon_manager/api/json_import.py | |
parent | 1196d52b9a4859e6d53179ca6d654ed35b7d9575 (diff) | |
parent | 5183b1914430ad43653e6d390da83f0f96682295 (diff) |
Merge "allow to have several policies in perimeter data json definition"
Diffstat (limited to 'moon_manager/moon_manager/api/json_import.py')
-rw-r--r-- | moon_manager/moon_manager/api/json_import.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/moon_manager/moon_manager/api/json_import.py b/moon_manager/moon_manager/api/json_import.py index a048baee..58ee526b 100644 --- a/moon_manager/moon_manager/api/json_import.py +++ b/moon_manager/moon_manager/api/json_import.py @@ -188,19 +188,20 @@ class JsonImport(Resource): JsonUtils.copy_field_if_exists(json_item_data, json_to_use, "description", str) json_policy = dict() # field_mandatory : not mandatory if there is some mandatory policies - JsonUtils.convert_name_to_id(json_item_data, json_policy, "policy", "policy_id", "policy", + JsonUtils.convert_names_to_ids(json_item_data, json_policy, "policies", "policy_id", "policy", PolicyManager, self._user_id, field_mandatory=len(mandatory_policy_ids) == 0) logger.info("json_policy {}".format(json_policy)) json_category = dict() JsonUtils.convert_name_to_id(json_item_data, json_category, "category", "category_id", type_element+"_category", ModelManager, self._user_id) logger.info("json_category {}".format(json_category)) - policy_id = None + policy_ids = [] if "policy_id" in json_policy: - policy_id = json_policy["policy_id"] + policy_ids = json_policy["policy_id"] - if policy_id is not None and policy_id not in mandatory_policy_ids: - mandatory_policy_ids.append(policy_id) + for policy_id in policy_ids: + if policy_id is not None and policy_id not in mandatory_policy_ids: + mandatory_policy_ids.append(policy_id) if len(mandatory_policy_ids) == 0: raise InvalidJson("Invalid data, the policy shall be set when importing {}".format(json_item_data)) |