Merge "Update code to 4.6 official version"

5 files changed, 47 insertions, 27 deletions

diff --git a/python_moondb/tests/unit_python/helpers/data_helper.py b/python_moondb/tests/unit_python/helpers/data_helper.py
index 20d9ae9a..8a8238f5 100644
--- a/python_moondb/tests/unit_python/helpers/data_helper.py
+++ b/python_moondb/tests/unit_python/helpers/data_helper.py
@@ -15,7 +15,7 @@ def add_action_data(policy_id, data_id=None, category_id=None, value=None):
 
 def delete_action_data(policy_id, data_id):
     from python_moondb.core import PolicyManager
-    PolicyManager.delete_action_data("", policy_id, data_id)
+    PolicyManager.delete_action_data("",policy_id=policy_id, data_id=data_id)
 
 
 def get_object_data(policy_id, data_id=None, category_id=None):
@@ -30,7 +30,7 @@ def add_object_data(policy_id, data_id=None, category_id=None, value=None):
 
 def delete_object_data(policy_id, data_id):
     from python_moondb.core import PolicyManager
-    PolicyManager.delete_object_data("", policy_id, data_id)
+    PolicyManager.delete_object_data("", policy_id=policy_id, data_id=data_id)
 
 
 def get_subject_data(policy_id, data_id=None, category_id=None):
@@ -45,7 +45,7 @@ def add_subject_data(policy_id, data_id=None, category_id=None, value=None):
 
 def delete_subject_data(policy_id, data_id):
     from python_moondb.core import PolicyManager
-    PolicyManager.delete_subject_data("", policy_id, data_id)
+    PolicyManager.delete_subject_data("", policy_id=policy_id, data_id=data_id)
 
 
 def get_actions(policy_id, perimeter_id=None):
diff --git a/python_moondb/tests/unit_python/helpers/meta_rule_helper.py b/python_moondb/tests/unit_python/helpers/meta_rule_helper.py
index 80d138c6..87af250a 100644
--- a/python_moondb/tests/unit_python/helpers/meta_rule_helper.py
+++ b/python_moondb/tests/unit_python/helpers/meta_rule_helper.py
@@ -6,7 +6,7 @@
 from helpers import mock_data
 
 
-def set_meta_rule(meta_rule_id, value=None):
+def update_meta_rule(meta_rule_id, value=None):
     from python_moondb.core import ModelManager
     if not value:
         action_category_id = mock_data.create_action_category("action_category_id1")
@@ -19,7 +19,7 @@ def set_meta_rule(meta_rule_id, value=None):
             "object_categories": [object_category_id],
             "action_categories": [action_category_id]
         }
-    return ModelManager.set_meta_rule(user_id=None, meta_rule_id=meta_rule_id, value=value)
+    return ModelManager.update_meta_rule(user_id=None, meta_rule_id=meta_rule_id, value=value)
 
 
 def add_meta_rule(meta_rule_id=None, value=None):
diff --git a/python_moondb/tests/unit_python/helpers/mock_data.py b/python_moondb/tests/unit_python/helpers/mock_data.py
index 82eebe88..0d65ea02 100644
--- a/python_moondb/tests/unit_python/helpers/mock_data.py
+++ b/python_moondb/tests/unit_python/helpers/mock_data.py
@@ -8,6 +8,7 @@ from .policy_helper import *
 from .data_helper import *
 from .model_helper import *
 from .meta_rule_helper import *
+from uuid import uuid4
 
 
 def create_subject_category(name):
@@ -58,12 +59,19 @@ def create_pdp(policies_ids):
     return value
 
 
-def create_new_policy(subject_category_name=None, object_category_name=None, action_category_name=None,
-                      model_name="test_model", policy_name="policy_1", meta_rule_name="meta_rule1"):
+def create_new_policy(subject_category_name="subjectCategory", object_category_name="objectCategory",
+                      action_category_name="actionCategory",
+                      model_name="test_model", policy_name="policy_name",
+                      meta_rule_name="meta_rule_"):
+    if policy_name == "policy_name":
+        policy_name = "policy_name_" + uuid4().hex
+
     subject_category_id, object_category_id, action_category_id, meta_rule_id = create_new_meta_rule(
-        subject_category_name=subject_category_name,
-        object_category_name=object_category_name,
-        action_category_name=action_category_name, meta_rule_name=meta_rule_name)
+        subject_category_name=subject_category_name + uuid4().hex,
+        object_category_name=object_category_name + uuid4().hex,
+        action_category_name=action_category_name + uuid4().hex,
+        meta_rule_name=meta_rule_name + uuid4().hex
+    )
     model = add_model(value=create_model(meta_rule_id, model_name))
     model_id = list(model.keys())[0]
     value = create_policy(model_id, policy_name)
@@ -73,8 +81,12 @@ def create_new_policy(subject_category_name=None, object_category_name=None, act
     return subject_category_id, object_category_id, action_category_id, meta_rule_id, policy_id
 
 
-def create_new_meta_rule(subject_category_name=None, object_category_name=None, action_category_name=None,
-                         meta_rule_name="meta_rule1"):
+def create_new_meta_rule(subject_category_name="subject_category" + uuid4().hex,
+                         object_category_name="object_category" + uuid4().hex,
+                         action_category_name="action_category" + uuid4().hex,
+                         meta_rule_name="meta_rule" + uuid4().hex):
+    from python_moondb.core import ModelManager
+
     subject_category_id = create_subject_category(subject_category_name)
     object_category_id = create_object_category(object_category_name)
     action_category_id = create_action_category(action_category_name)
@@ -84,7 +96,8 @@ def create_new_meta_rule(subject_category_name=None, object_category_name=None,
              "object_categories": [object_category_id],
              "action_categories": [action_category_id]
              }
-    meta_rule = add_meta_rule(value=value)
+    # meta_rule = add_meta_rule(value=value)
+    meta_rule = ModelManager.add_meta_rule(user_id=None, meta_rule_id=None, value=value)
     return subject_category_id, object_category_id, action_category_id, list(meta_rule.keys())[0]
 
 
@@ -117,8 +130,8 @@ def create_action(policy_id):
 
 def create_subject_data(policy_id, category_id):
     value = {
-        "name": "subject-security-level",
-        "description": {"low": "", "medium": "", "high": ""},
+        "name": uuid4().hex,
+        "description": {uuid4().hex: "", uuid4().hex: "", uuid4().hex: ""},
     }
     subject_data = add_subject_data(policy_id=policy_id, category_id=category_id, value=value).get('data')
     assert subject_data
@@ -127,8 +140,8 @@ def create_subject_data(policy_id, category_id):
 
 def create_object_data(policy_id, category_id):
     value = {
-        "name": "object-security-level",
-        "description": {"low": "", "medium": "", "high": ""},
+        "name": uuid4().hex,
+        "description": {uuid4().hex: "", uuid4().hex: "", uuid4().hex: ""},
     }
     object_data = add_object_data(policy_id=policy_id, category_id=category_id, value=value).get('data')
     return list(object_data.keys())[0]
@@ -136,9 +149,8 @@ def create_object_data(policy_id, category_id):
 
 def create_action_data(policy_id, category_id):
     value = {
-        "name": "action-type",
-        "description": {"vm-action": "", "storage-action": "", },
+        "name": uuid4().hex,
+        "description": {uuid4().hex: "", uuid4().hex: "", uuid4().hex: ""},
     }
     action_data = add_action_data(policy_id=policy_id, category_id=category_id, value=value).get('data')
     return list(action_data.keys())[0]
-
diff --git a/python_moondb/tests/unit_python/helpers/model_helper.py b/python_moondb/tests/unit_python/helpers/model_helper.py
index 58946a99..98a6271d 100644
--- a/python_moondb/tests/unit_python/helpers/model_helper.py
+++ b/python_moondb/tests/unit_python/helpers/model_helper.py
@@ -4,7 +4,7 @@
 # or at 'http://www.apache.org/licenses/LICENSE-2.0'.
 
 from helpers import mock_data
-
+from uuid import  uuid4
 
 def get_models(model_id=None):
     from python_moondb.core import ModelManager
@@ -14,10 +14,7 @@ def get_models(model_id=None):
 def add_model(model_id=None, value=None):
     from python_moondb.core import ModelManager
     if not value:
-        subject_category_id, object_category_id, action_category_id, meta_rule_id = mock_data.create_new_meta_rule(
-            subject_category_name="subject_category1",
-            object_category_name="object_category1",
-            action_category_name="action_category1")
+        subject_category_id, object_category_id, action_category_id, meta_rule_id = mock_data.create_new_meta_rule()
         name = "MLS" if model_id is None else "MLS " + model_id
         value = {
             "name": name,
diff --git a/python_moondb/tests/unit_python/helpers/policy_helper.py b/python_moondb/tests/unit_python/helpers/policy_helper.py
index c932ee3a..93d81c62 100644
--- a/python_moondb/tests/unit_python/helpers/policy_helper.py
+++ b/python_moondb/tests/unit_python/helpers/policy_helper.py
@@ -2,6 +2,8 @@
 # This software is distributed under the terms and conditions of the 'Apache-2.0'
 # license which can be found in the file 'LICENSE' in this package distribution
 # or at 'http://www.apache.org/licenses/LICENSE-2.0'.
+from  helpers import mock_data as mock_data
+from helpers import meta_rule_helper
 
 def get_policies():
     from python_moondb.core import PolicyManager
@@ -45,11 +47,20 @@ def get_rules(policy_id=None, meta_rule_id=None, rule_id=None):
     return PolicyManager.get_rules("", policy_id, meta_rule_id, rule_id)
 
 
-def add_rule(policy_id=None, meta_rule_id=None, value=None):
+def add_rule(policy_id, meta_rule_id, value=None):
     from python_moondb.core import PolicyManager
     if not value:
+        meta_rule = meta_rule_helper.get_meta_rules(meta_rule_id)
+        sub_cat_id = meta_rule[meta_rule_id]['subject_categories'][0]
+        ob_cat_id = meta_rule[meta_rule_id]['object_categories'][0]
+        act_cat_id = meta_rule[meta_rule_id]['action_categories'][0]
+
+        subject_data_id = mock_data.create_subject_data(policy_id=policy_id, category_id=sub_cat_id)
+        object_data_id = mock_data.create_object_data(policy_id=policy_id, category_id=ob_cat_id)
+        action_data_id = mock_data.create_action_data(policy_id=policy_id, category_id=act_cat_id)
+
         value = {
-            "rule": ("high", "medium", "vm-action"),
+            "rule": (subject_data_id, object_data_id, action_data_id),
             "instructions": ({"decision": "grant"}),
             "enabled": "",
         }