aboutsummaryrefslogtreecommitdiffstats
path: root/moonv4/moon_manager
diff options
context:
space:
mode:
authorThomas Duval <thomas.duval@orange.com>2017-12-22 11:12:58 +0100
committerThomas Duval <thomas.duval@orange.com>2017-12-22 11:12:58 +0100
commit07414f03ddd0c62a919b387026c1b48225edcfd9 (patch)
treeac85c442f7c349de37b42cf23c1f72dc12b3ed0e /moonv4/moon_manager
parent26eecaa8cc7352822c9037fce68e201720dc8412 (diff)
Update libraries name in the platform
Change-Id: I743254aa58e2fb57b78c23ebc9f5c69049b4905d
Diffstat (limited to 'moonv4/moon_manager')
-rw-r--r--moonv4/moon_manager/moon_manager/api/assignments.py4
-rw-r--r--moonv4/moon_manager/moon_manager/api/containers.py5
-rw-r--r--moonv4/moon_manager/moon_manager/api/data.py4
-rw-r--r--moonv4/moon_manager/moon_manager/api/generic.py2
-rw-r--r--moonv4/moon_manager/moon_manager/api/meta_data.py4
-rw-r--r--moonv4/moon_manager/moon_manager/api/meta_rules.py4
-rw-r--r--moonv4/moon_manager/moon_manager/api/models.py4
-rw-r--r--moonv4/moon_manager/moon_manager/api/pdp.py10
-rw-r--r--moonv4/moon_manager/moon_manager/api/perimeter.py4
-rw-r--r--moonv4/moon_manager/moon_manager/api/policies.py4
-rw-r--r--moonv4/moon_manager/moon_manager/api/rules.py4
-rw-r--r--moonv4/moon_manager/moon_manager/http_server.py4
-rw-r--r--moonv4/moon_manager/moon_manager/server.py2
-rw-r--r--moonv4/moon_manager/requirements.txt4
-rw-r--r--moonv4/moon_manager/tests/unit_python/conftest.py2
-rw-r--r--moonv4/moon_manager/tests/unit_python/requirements.txt4
16 files changed, 32 insertions, 33 deletions
diff --git a/moonv4/moon_manager/moon_manager/api/assignments.py b/moonv4/moon_manager/moon_manager/api/assignments.py
index 3bb6ed29..c3ac45c8 100644
--- a/moonv4/moon_manager/moon_manager/api/assignments.py
+++ b/moonv4/moon_manager/moon_manager/api/assignments.py
@@ -10,8 +10,8 @@ Assignments allow to connect data with elements of perimeter
from flask import request
from flask_restful import Resource
from oslo_log import log as logging
-from moon_utilities.security_functions import check_auth
-from moon_db.core import PolicyManager
+from python_moonutilities.security_functions import check_auth
+from python_moondb.core import PolicyManager
__version__ = "0.2.0"
diff --git a/moonv4/moon_manager/moon_manager/api/containers.py b/moonv4/moon_manager/moon_manager/api/containers.py
index 44e7baac..6dc50ea5 100644
--- a/moonv4/moon_manager/moon_manager/api/containers.py
+++ b/moonv4/moon_manager/moon_manager/api/containers.py
@@ -12,9 +12,8 @@ from docker import Client
from flask import request
from flask_restful import Resource
from oslo_log import log as logging
-from moon_utilities.security_functions import check_auth
-from moon_db.core import PDPManager
-from moon_utilities import configuration, exceptions
+from python_moonutilities.security_functions import check_auth
+from python_moonutilities import configuration
docker_conf = configuration.get_configuration("docker")['docker']
docker = Client(base_url=docker_conf['url'])
diff --git a/moonv4/moon_manager/moon_manager/api/data.py b/moonv4/moon_manager/moon_manager/api/data.py
index 85faf415..61fe92bf 100644
--- a/moonv4/moon_manager/moon_manager/api/data.py
+++ b/moonv4/moon_manager/moon_manager/api/data.py
@@ -10,8 +10,8 @@ Data are elements used to create rules
from flask import request
from flask_restful import Resource
from oslo_log import log as logging
-from moon_utilities.security_functions import check_auth
-from moon_db.core import PolicyManager
+from python_moonutilities.security_functions import check_auth
+from python_moondb.core import PolicyManager
__version__ = "0.2.0"
diff --git a/moonv4/moon_manager/moon_manager/api/generic.py b/moonv4/moon_manager/moon_manager/api/generic.py
index 9ff285c8..bd7dcdac 100644
--- a/moonv4/moon_manager/moon_manager/api/generic.py
+++ b/moonv4/moon_manager/moon_manager/api/generic.py
@@ -9,7 +9,7 @@ Those API are helping API used to manage the Moon platform.
from flask_restful import Resource, request
from oslo_log import log as logging
import moon_manager.api
-from moon_utilities.security_functions import check_auth
+from python_moonutilities.security_functions import check_auth
__version__ = "0.1.0"
diff --git a/moonv4/moon_manager/moon_manager/api/meta_data.py b/moonv4/moon_manager/moon_manager/api/meta_data.py
index 95cd58cc..9dc04cc7 100644
--- a/moonv4/moon_manager/moon_manager/api/meta_data.py
+++ b/moonv4/moon_manager/moon_manager/api/meta_data.py
@@ -10,8 +10,8 @@ Meta Data are elements used to create Meta data (skeleton of security policies)
from flask import request
from flask_restful import Resource
from oslo_log import log as logging
-from moon_utilities.security_functions import check_auth
-from moon_db.core import ModelManager
+from python_moonutilities.security_functions import check_auth
+from python_moondb.core import ModelManager
__version__ = "0.2.0"
diff --git a/moonv4/moon_manager/moon_manager/api/meta_rules.py b/moonv4/moon_manager/moon_manager/api/meta_rules.py
index 45e2b5ee..ceba0ffb 100644
--- a/moonv4/moon_manager/moon_manager/api/meta_rules.py
+++ b/moonv4/moon_manager/moon_manager/api/meta_rules.py
@@ -10,8 +10,8 @@ Meta rules are skeleton for security policies
from flask import request
from flask_restful import Resource
from oslo_log import log as logging
-from moon_utilities.security_functions import check_auth
-from moon_db.core import ModelManager
+from python_moonutilities.security_functions import check_auth
+from python_moondb.core import ModelManager
__version__ = "0.1.0"
diff --git a/moonv4/moon_manager/moon_manager/api/models.py b/moonv4/moon_manager/moon_manager/api/models.py
index 0a050c7f..62866191 100644
--- a/moonv4/moon_manager/moon_manager/api/models.py
+++ b/moonv4/moon_manager/moon_manager/api/models.py
@@ -9,8 +9,8 @@ Models aggregate multiple meta rules
from flask import request
from flask_restful import Resource
from oslo_log import log as logging
-from moon_utilities.security_functions import check_auth
-from moon_db.core import ModelManager
+from python_moonutilities.security_functions import check_auth
+from python_moondb.core import ModelManager
__version__ = "0.1.0"
diff --git a/moonv4/moon_manager/moon_manager/api/pdp.py b/moonv4/moon_manager/moon_manager/api/pdp.py
index 465f4dba..9183c25d 100644
--- a/moonv4/moon_manager/moon_manager/api/pdp.py
+++ b/moonv4/moon_manager/moon_manager/api/pdp.py
@@ -12,11 +12,11 @@ from flask_restful import Resource
import logging
import requests
import time
-from moon_utilities.security_functions import check_auth
-from moon_db.core import PDPManager
-from moon_db.core import PolicyManager
-from moon_db.core import ModelManager
-from moon_utilities import configuration
+from python_moonutilities.security_functions import check_auth
+from python_moondb.core import PDPManager
+from python_moondb.core import PolicyManager
+from python_moondb.core import ModelManager
+from python_moonutilities import configuration
__version__ = "0.1.0"
diff --git a/moonv4/moon_manager/moon_manager/api/perimeter.py b/moonv4/moon_manager/moon_manager/api/perimeter.py
index 2eb80652..8196e627 100644
--- a/moonv4/moon_manager/moon_manager/api/perimeter.py
+++ b/moonv4/moon_manager/moon_manager/api/perimeter.py
@@ -13,8 +13,8 @@
from flask import request
from flask_restful import Resource
from oslo_log import log as logging
-from moon_utilities.security_functions import check_auth
-from moon_db.core import PolicyManager
+from python_moonutilities.security_functions import check_auth
+from python_moondb.core import PolicyManager
__version__ = "0.2.0"
diff --git a/moonv4/moon_manager/moon_manager/api/policies.py b/moonv4/moon_manager/moon_manager/api/policies.py
index 8ef11a0d..f34276bb 100644
--- a/moonv4/moon_manager/moon_manager/api/policies.py
+++ b/moonv4/moon_manager/moon_manager/api/policies.py
@@ -10,8 +10,8 @@ Policies are instances of security models and implement security policies
from flask import request
from flask_restful import Resource
from oslo_log import log as logging
-from moon_utilities.security_functions import check_auth
-from moon_db.core import PolicyManager
+from python_moonutilities.security_functions import check_auth
+from python_moondb.core import PolicyManager
__version__ = "0.1.0"
diff --git a/moonv4/moon_manager/moon_manager/api/rules.py b/moonv4/moon_manager/moon_manager/api/rules.py
index f7771f1a..b25365df 100644
--- a/moonv4/moon_manager/moon_manager/api/rules.py
+++ b/moonv4/moon_manager/moon_manager/api/rules.py
@@ -9,8 +9,8 @@ Rules (TODO)
from flask import request
from flask_restful import Resource
from oslo_log import log as logging
-from moon_utilities.security_functions import check_auth
-from moon_db.core import PolicyManager
+from python_moonutilities.security_functions import check_auth
+from python_moondb.core import PolicyManager
__version__ = "0.1.0"
diff --git a/moonv4/moon_manager/moon_manager/http_server.py b/moonv4/moon_manager/moon_manager/http_server.py
index c671ed6f..584e71a2 100644
--- a/moonv4/moon_manager/moon_manager/http_server.py
+++ b/moonv4/moon_manager/moon_manager/http_server.py
@@ -21,8 +21,8 @@ from moon_manager.api.data import SubjectData, ObjectData, ActionData
from moon_manager.api.assignments import SubjectAssignments, ObjectAssignments, ActionAssignments
from moon_manager.api.rules import Rules
# from moon_manager.api.containers import Container
-from moon_utilities import configuration, exceptions
-from moon_db.core import PDPManager
+from python_moonutilities import configuration, exceptions
+from python_moondb.core import PDPManager
LOG = logging.getLogger("moon.manager.http")
diff --git a/moonv4/moon_manager/moon_manager/server.py b/moonv4/moon_manager/moon_manager/server.py
index f777fac1..bcc52cb3 100644
--- a/moonv4/moon_manager/moon_manager/server.py
+++ b/moonv4/moon_manager/moon_manager/server.py
@@ -6,7 +6,7 @@
import os
from oslo_config import cfg
from oslo_log import log as logging
-from moon_utilities import configuration, exceptions
+from python_moonutilities import configuration, exceptions
from moon_manager.http_server import HTTPServer
LOG = logging.getLogger("moon.manager")
diff --git a/moonv4/moon_manager/requirements.txt b/moonv4/moon_manager/requirements.txt
index 6b2af70b..15ba715b 100644
--- a/moonv4/moon_manager/requirements.txt
+++ b/moonv4/moon_manager/requirements.txt
@@ -1,6 +1,6 @@
flask
flask_restful
flask_cors
-moon_utilities
-moon_db
+python_moonutilities
+python_moondb
docker-py
diff --git a/moonv4/moon_manager/tests/unit_python/conftest.py b/moonv4/moon_manager/tests/unit_python/conftest.py
index d6f518f7..c59fae40 100644
--- a/moonv4/moon_manager/tests/unit_python/conftest.py
+++ b/moonv4/moon_manager/tests/unit_python/conftest.py
@@ -176,7 +176,7 @@ def no_requests(monkeypatch):
}]}
)
print("Start populating the DB.")
- from moon_db.db_manager import init_engine, main
+ from python_moondb.db_manager import init_engine, main
engine = init_engine()
print("engine={}".format(engine))
main("upgrade", logging.getLogger("db_manager"), engine)
diff --git a/moonv4/moon_manager/tests/unit_python/requirements.txt b/moonv4/moon_manager/tests/unit_python/requirements.txt
index 8bd8449f..21975ce3 100644
--- a/moonv4/moon_manager/tests/unit_python/requirements.txt
+++ b/moonv4/moon_manager/tests/unit_python/requirements.txt
@@ -1,5 +1,5 @@
flask
flask_cors
flask_restful
-moon_db
-moon_utilities \ No newline at end of file
+python_moondb
+python_moonutilities \ No newline at end of file