8 files changed, 38 insertions, 8 deletions
diff --git a/moon_manager/Dockerfile b/moon_manager/Dockerfile
index b5eb4e02..630c275b 100644
--- a/moon_manager/Dockerfile
+++ b/moon_manager/Dockerfile
@@ -3,6 +3,8 @@ FROM python:3
 ADD . /root
 WORKDIR /root/
 RUN pip3 install -r requirements.txt
+RUN if [ -d /root/dist ]; then for FILE in $(ls /root/dist/*.tar.gz); do pip install $FILE --upgrade; done; fi
+RUN if [ -d /root/dist ]; then for FILE in $(ls /root/dist/*.whl); do pip install $FILE --upgrade; done; fi
 RUN pip3 install .
 
 CMD ["python3", "-m", "moon_manager"]
 \ No newline at end of file
diff --git a/moon_manager/MANIFEST.in b/moon_manager/MANIFEST.in
index 1f674d50..cf4d2e4e 100644
--- a/moon_manager/MANIFEST.in
+++ b/moon_manager/MANIFEST.in
@@ -3,7 +3,7 @@
 # license which can be found in the file 'LICENSE' in this package distribution
 # or at 'http://www.apache.org/licenses/LICENSE-2.0'.
 
-include README.rst
+include README.md
 include LICENSE
 include setup.py
 include requirements.txt
diff --git a/moon_manager/moon_manager/http_server.py b/moon_manager/moon_manager/http_server.py
index 128d5b74..a7258a75 100644
--- a/moon_manager/moon_manager/http_server.py
+++ b/moon_manager/moon_manager/http_server.py
@@ -100,7 +100,7 @@ class Root(Resource):
                 if _method in dir(item):
                     _methods.append(_method)
             tree[item.__name__]["methods"] = _methods
-            tree[item.__name__]["description"] = item.__doc__.strip()
+            tree[item.__name__]["description"] = item.__doc__.strip() if item.__doc__ else ""
         return {
             "version": __version__,
             "tree": tree
@@ -147,7 +147,7 @@ class HTTPServer(Server):
         while True:
             try:
                 PDPManager.get_pdp(user_id="admin", pdp_id=None)
-            except sqlalchemy.exc.ProgrammingError:
+            except (sqlalchemy.exc.ProgrammingError, sqlalchemy.exc.InternalError):
                 time.sleep(1)
                 if first:
                     logger.warning("Waiting for the database...")
diff --git a/moon_manager/tests/functional_pod/run_functional_tests.sh b/moon_manager/tests/functional_pod/run_functional_tests.sh
index 7a95a491..960e9480 100644
--- a/moon_manager/tests/functional_pod/run_functional_tests.sh
+++ b/moon_manager/tests/functional_pod/run_functional_tests.sh
@@ -1,4 +1,11 @@
 #!/usr/bin/env bash
 
+if [ -d /data/dist ];
+then
+    pip install /data/dist/*.tar.gz --upgrade
+    pip install /data/dist/*.whl --upgrade
+fi
+
+
 cd /data/tests/functional_pod
 pytest .
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 3c205d1d..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
 
@@ -34,6 +39,14 @@ def delete_models_without_id(client):
     return req
 
 
+def clean_models():
+    client = utilities.register_client()
+    req, models= get_models(client)
+    for key, value in models['models'].items():
+        print(key)
+        print(value)
+        client.delete("/models/{}".format(key))
+
 def test_get_models():
     client = utilities.register_client()
     req, models= get_models(client)
@@ -43,6 +56,7 @@ def test_get_models():
 
 
 def test_add_models():
+    clean_models()
     client = utilities.register_client()
     req, models = add_models(client, "testuser")
     assert req.status_code == 200