aboutsummaryrefslogtreecommitdiffstats
path: root/moonv4/moon_wrapper
diff options
context:
space:
mode:
Diffstat (limited to 'moonv4/moon_wrapper')
-rw-r--r--moonv4/moon_wrapper/moon_wrapper/api/generic.py2
-rw-r--r--moonv4/moon_wrapper/moon_wrapper/api/wrapper.py9
-rw-r--r--moonv4/moon_wrapper/moon_wrapper/http_server.py5
-rw-r--r--moonv4/moon_wrapper/moon_wrapper/server.py2
-rw-r--r--moonv4/moon_wrapper/requirements.txt2
-rw-r--r--moonv4/moon_wrapper/tests/unit_python/conftest.py4
-rw-r--r--moonv4/moon_wrapper/tests/unit_python/requirements.txt4
7 files changed, 10 insertions, 18 deletions
diff --git a/moonv4/moon_wrapper/moon_wrapper/api/generic.py b/moonv4/moon_wrapper/moon_wrapper/api/generic.py
index 68687ddb..7dd44fb4 100644
--- a/moonv4/moon_wrapper/moon_wrapper/api/generic.py
+++ b/moonv4/moon_wrapper/moon_wrapper/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_wrapper.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_wrapper/moon_wrapper/api/wrapper.py b/moonv4/moon_wrapper/moon_wrapper/api/wrapper.py
index 32eb4e68..e1ce783a 100644
--- a/moonv4/moon_wrapper/moon_wrapper/api/wrapper.py
+++ b/moonv4/moon_wrapper/moon_wrapper/api/wrapper.py
@@ -12,14 +12,7 @@ from flask_restful import Resource
import logging
import json
import requests
-from moon_utilities import exceptions
-import time
-from uuid import uuid4
-
-# from moon_interface.api.authz import pdp_in_cache, pdp_in_manager, container_exist, \
-# create_containers, create_authz_request
-# from moon_interface.authz_requests import AuthzRequest
-from moon_utilities import configuration
+from python_moonutilities import exceptions
__version__ = "0.1.0"
diff --git a/moonv4/moon_wrapper/moon_wrapper/http_server.py b/moonv4/moon_wrapper/moon_wrapper/http_server.py
index 39951089..1b429bc5 100644
--- a/moonv4/moon_wrapper/moon_wrapper/http_server.py
+++ b/moonv4/moon_wrapper/moon_wrapper/http_server.py
@@ -4,14 +4,13 @@
# or at 'http://www.apache.org/licenses/LICENSE-2.0'.
from flask import Flask, jsonify
-from flask_cors import CORS, cross_origin
from flask_restful import Resource, Api
import logging
from moon_wrapper import __version__
from moon_wrapper.api.generic import Status, Logs, API
from moon_wrapper.api.wrapper import Wrapper
-from moon_utilities.cache import Cache
-from moon_utilities import configuration, exceptions
+from python_moonutilities.cache import Cache
+from python_moonutilities import configuration, exceptions
logger = logging.getLogger("moon.wrapper.http")
diff --git a/moonv4/moon_wrapper/moon_wrapper/server.py b/moonv4/moon_wrapper/moon_wrapper/server.py
index a3461018..2f236c4f 100644
--- a/moonv4/moon_wrapper/moon_wrapper/server.py
+++ b/moonv4/moon_wrapper/moon_wrapper/server.py
@@ -4,7 +4,7 @@
# or at 'http://www.apache.org/licenses/LICENSE-2.0'.
import logging
-from moon_utilities import configuration, exceptions
+from python_moonutilities import configuration, exceptions
from moon_wrapper.http_server import HTTPServer
LOG = logging.getLogger("moon.wrapper")
diff --git a/moonv4/moon_wrapper/requirements.txt b/moonv4/moon_wrapper/requirements.txt
index 85ec611f..c1bd9a2f 100644
--- a/moonv4/moon_wrapper/requirements.txt
+++ b/moonv4/moon_wrapper/requirements.txt
@@ -2,4 +2,4 @@ flask
flask_restful
flask_cors
werkzeug
-moon_utilities \ No newline at end of file
+python_moonutilities \ No newline at end of file
diff --git a/moonv4/moon_wrapper/tests/unit_python/conftest.py b/moonv4/moon_wrapper/tests/unit_python/conftest.py
index 61c3da71..b160ebf6 100644
--- a/moonv4/moon_wrapper/tests/unit_python/conftest.py
+++ b/moonv4/moon_wrapper/tests/unit_python/conftest.py
@@ -206,8 +206,8 @@ def set_env_variables():
def get_pickled_context():
- from moon_utilities.security_functions import Context
- from moon_utilities.cache import Cache
+ from python_moonutilities.security_functions import Context
+ from python_moonutilities.cache import Cache
CACHE = Cache()
CACHE.update()
_context = Context(context(), CACHE)
diff --git a/moonv4/moon_wrapper/tests/unit_python/requirements.txt b/moonv4/moon_wrapper/tests/unit_python/requirements.txt
index 8bd8449f..21975ce3 100644
--- a/moonv4/moon_wrapper/tests/unit_python/requirements.txt
+++ b/moonv4/moon_wrapper/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