aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReemMahmoud <rfawzy.ext@orange.com>2018-03-21 12:49:05 +0200
committerThomas Duval <thomas.duval@orange.com>2018-04-03 16:14:32 +0200
commit1c249823b9a15d4dd3e2e5eae90c09131bc7f09b (patch)
tree5df89ede141706880061abfd1a615a5a35eecf36
parent86a051f44f1bae736f45236ae7cdfdd1b6336709 (diff)
Rename test_models of unit_python
Add licences in some files. Change-Id: I7c473efcdb228cc030501328d93b5a6265917591 Signed-off-by: ReemMahmoud <rfawzy.ext@orange.com>
-rw-r--r--moon_manager/tests/unit_python/api/import_export_utilities.py2
-rw-r--r--moon_manager/tests/unit_python/api/test_import.py2
-rw-r--r--moon_manager/tests/unit_python/api/test_policies.py13
-rw-r--r--moon_manager/tests/unit_python/api/test_unit_models.py (renamed from moon_manager/tests/unit_python/api/test_models.py)5
4 files changed, 17 insertions, 5 deletions
diff --git a/moon_manager/tests/unit_python/api/import_export_utilities.py b/moon_manager/tests/unit_python/api/import_export_utilities.py
index 98586d02..3c921e21 100644
--- a/moon_manager/tests/unit_python/api/import_export_utilities.py
+++ b/moon_manager/tests/unit_python/api/import_export_utilities.py
@@ -4,7 +4,7 @@
# or at 'http://www.apache.org/licenses/LICENSE-2.0'.
import api.utilities as utilities
-import api.test_models as test_models
+import api.test_unit_models as test_models
import api.test_policies as test_policies
import api.test_perimeter as test_perimeter
import api.meta_data_test as test_categories
diff --git a/moon_manager/tests/unit_python/api/test_import.py b/moon_manager/tests/unit_python/api/test_import.py
index 4e970a0e..3c45f8a1 100644
--- a/moon_manager/tests/unit_python/api/test_import.py
+++ b/moon_manager/tests/unit_python/api/test_import.py
@@ -4,7 +4,7 @@
# or at 'http://www.apache.org/licenses/LICENSE-2.0'.
import api.utilities as utilities
-import api.test_models as test_models
+import api.test_unit_models as test_models
import api.test_policies as test_policies
import api.test_perimeter as test_perimeter
import api.meta_data_test as test_categories
diff --git a/moon_manager/tests/unit_python/api/test_policies.py b/moon_manager/tests/unit_python/api/test_policies.py
index 4d4e387e..40be35e6 100644
--- a/moon_manager/tests/unit_python/api/test_policies.py
+++ b/moon_manager/tests/unit_python/api/test_policies.py
@@ -1,5 +1,11 @@
+# Copyright 2018 Open Platform for NFV Project, Inc. and its contributors
+# 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'.
+
import json
import api.utilities as utilities
+from uuid import uuid4
def get_policies(client):
@@ -45,13 +51,14 @@ def test_get_policies():
def test_add_policies():
client = utilities.register_client()
- req, policies = add_policies(client, "testuser")
+ policy_name = "testuser" + uuid4().hex
+ req, policies = add_policies(client, policy_name)
assert req.status_code == 200
assert isinstance(policies, dict)
value = list(policies["policies"].values())[0]
assert "policies" in policies
- assert value['name'] == "testuser"
- assert value["description"] == "description of {}".format("testuser")
+ assert value['name'] == policy_name
+ assert value["description"] == "description of {}".format(policy_name)
assert value["model_id"] == "modelId"
assert value["genre"] == "genre"
diff --git a/moon_manager/tests/unit_python/api/test_models.py b/moon_manager/tests/unit_python/api/test_unit_models.py
index b80e19f4..6f97b1ae 100644
--- a/moon_manager/tests/unit_python/api/test_models.py
+++ b/moon_manager/tests/unit_python/api/test_unit_models.py
@@ -1,3 +1,8 @@
+# Copyright 2018 Open Platform for NFV Project, Inc. and its contributors
+# 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'.
+
import json
import api.utilities as utilities