aboutsummaryrefslogtreecommitdiffstats
path: root/python_moonclient/python_moonclient/core/models.py
diff options
context:
space:
mode:
authorfrancois.cellier <francois.cellier@orange.com>2018-02-27 13:51:25 +0100
committerfrancois.cellier <francois.cellier@orange.com>2018-03-08 14:30:45 +0100
commit7343cf25ad890e18b2f5b8d35c6acfc821dfd5ec (patch)
tree635e01c4a17326a05c4ec40b3df48d2d33a0de59 /python_moonclient/python_moonclient/core/models.py
parentc5104c3308f7aa6cb44a678a25c553c027c249be (diff)
Add import and export pdps
Change-Id: I2c9b1f2b86af862887df4b890cd8b11db7c308ee
Diffstat (limited to 'python_moonclient/python_moonclient/core/models.py')
-rw-r--r--python_moonclient/python_moonclient/core/models.py20
1 files changed, 14 insertions, 6 deletions
diff --git a/python_moonclient/python_moonclient/core/models.py b/python_moonclient/python_moonclient/core/models.py
index ba6c9a92..709b4a7a 100644
--- a/python_moonclient/python_moonclient/core/models.py
+++ b/python_moonclient/python_moonclient/core/models.py
@@ -81,14 +81,16 @@ def add_subject_category(name="subject_cat_1"):
return category_id
-def check_subject_category(category_id):
+def check_subject_category(category_id=None):
req = requests.get(URL.format("/subject_categories"))
req.raise_for_status()
result = req.json()
check_subject_category_in_result(result)
check_optionnal_result(result)
- check_subject_categories_name(category_template["name"], category_id, result)
+ if category_id is not None:
+ check_subject_categories_name(category_template["name"], category_id, result)
+ return result
def delete_subject_category(category_id):
@@ -110,13 +112,15 @@ def add_object_category(name="object_cat_1"):
return category_id
-def check_object_category(category_id):
+def check_object_category(category_id=None):
req = requests.get(URL.format("/object_categories"))
req.raise_for_status()
result = req.json()
check_object_category_in_result(result)
check_optionnal_result(result)
- check_object_categories_name(category_template["name"], category_id, result)
+ if category_id is not None:
+ check_object_categories_name(category_template["name"], category_id, result)
+ return result
def delete_object_category(category_id):
@@ -138,13 +142,16 @@ def add_action_category(name="action_cat_1"):
return category_id
-def check_action_category(category_id):
+def check_action_category(category_id=None):
req = requests.get(URL.format("/action_categories"))
req.raise_for_status()
result = req.json()
+ print(result)
check_action_category_in_result(result)
check_optionnal_result(result)
- check_action_categories_name(category_template["name"], category_id, result)
+ if category_id is not None:
+ check_action_categories_name(category_template["name"], category_id, result)
+ return result
def delete_action_category(category_id):
@@ -207,6 +214,7 @@ def check_meta_rule(meta_rule_id, scat_id=None, ocat_id=None, acat_id=None):
check_ocat_id_in_dict(ocat_id, result['meta_rules'][meta_rule_id]["object_categories"])
if acat_id:
check_acat_id_in_dict(acat_id, result['meta_rules'][meta_rule_id]["action_categories"])
+ return result
def delete_meta_rule(meta_rule_id):