aboutsummaryrefslogtreecommitdiffstats
path: root/moonv4/moon_authz
diff options
context:
space:
mode:
Diffstat (limited to 'moonv4/moon_authz')
-rw-r--r--moonv4/moon_authz/Dockerfile2
-rw-r--r--moonv4/moon_authz/moon_authz/api/authorization.py2
-rw-r--r--moonv4/moon_authz/moon_authz/api/generic.py2
-rw-r--r--moonv4/moon_authz/moon_authz/http_server.py4
-rw-r--r--moonv4/moon_authz/moon_authz/server.py2
-rw-r--r--moonv4/moon_authz/requirements.txt7
-rw-r--r--moonv4/moon_authz/tests/unit_python/requirements.txt4
-rw-r--r--moonv4/moon_authz/tests/unit_python/test_authz.py8
8 files changed, 14 insertions, 17 deletions
diff --git a/moonv4/moon_authz/Dockerfile b/moonv4/moon_authz/Dockerfile
index 4189c333..7ab172b0 100644
--- a/moonv4/moon_authz/Dockerfile
+++ b/moonv4/moon_authz/Dockerfile
@@ -6,7 +6,7 @@ RUN pip3 install pip --upgrade
ADD . /root
WORKDIR /root/
RUN pip3 install -r requirements.txt --upgrade
-#RUN pip3 install /root/dist/* --upgrade
+RUN pip3 install /root/dist/* --upgrade
RUN pip3 install .
CMD ["python3", "-m", "moon_authz"] \ No newline at end of file
diff --git a/moonv4/moon_authz/moon_authz/api/authorization.py b/moonv4/moon_authz/moon_authz/api/authorization.py
index caa41082..4cd8de06 100644
--- a/moonv4/moon_authz/moon_authz/api/authorization.py
+++ b/moonv4/moon_authz/moon_authz/api/authorization.py
@@ -8,7 +8,7 @@ import itertools
import pickle
from uuid import uuid4
import logging
-from moon_utilities import exceptions
+from python_moonutilities import exceptions
import flask
from flask import request
from flask_restful import Resource
diff --git a/moonv4/moon_authz/moon_authz/api/generic.py b/moonv4/moon_authz/moon_authz/api/generic.py
index 66169b15..f4e13e42 100644
--- a/moonv4/moon_authz/moon_authz/api/generic.py
+++ b/moonv4/moon_authz/moon_authz/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_authz.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_authz/moon_authz/http_server.py b/moonv4/moon_authz/moon_authz/http_server.py
index b6818a9f..50e878d3 100644
--- a/moonv4/moon_authz/moon_authz/http_server.py
+++ b/moonv4/moon_authz/moon_authz/http_server.py
@@ -7,10 +7,10 @@ from flask import Flask, request
# from flask_cors import CORS, cross_origin
from flask_restful import Resource, Api, reqparse
import logging
-from moon_utilities import exceptions
from moon_authz import __version__
from moon_authz.api.authorization import Authz
-from moon_utilities.cache import Cache
+from python_moonutilities.cache import Cache
+from python_moonutilities import exceptions
logger = logging.getLogger("moon." + __name__)
diff --git a/moonv4/moon_authz/moon_authz/server.py b/moonv4/moon_authz/moon_authz/server.py
index 40143ba9..974012dc 100644
--- a/moonv4/moon_authz/moon_authz/server.py
+++ b/moonv4/moon_authz/moon_authz/server.py
@@ -6,7 +6,7 @@
import os
from oslo_log import log as logging
from moon_authz.http_server import HTTPServer as Server
-from moon_utilities import configuration
+from python_moonutilities import configuration
LOG = logging.getLogger("moon.server")
DOMAIN = "moon_authz"
diff --git a/moonv4/moon_authz/requirements.txt b/moonv4/moon_authz/requirements.txt
index 344bec52..8cad7a7a 100644
--- a/moonv4/moon_authz/requirements.txt
+++ b/moonv4/moon_authz/requirements.txt
@@ -1,8 +1,5 @@
-kombu !=4.0.1,!=4.0.0
-oslo.log
flask
-oslo.config
flask_restful
flask_cors
-moon_db
-moon_utilities
+python_moondb
+python_moonutilities
diff --git a/moonv4/moon_authz/tests/unit_python/requirements.txt b/moonv4/moon_authz/tests/unit_python/requirements.txt
index 8bd8449f..21975ce3 100644
--- a/moonv4/moon_authz/tests/unit_python/requirements.txt
+++ b/moonv4/moon_authz/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
diff --git a/moonv4/moon_authz/tests/unit_python/test_authz.py b/moonv4/moon_authz/tests/unit_python/test_authz.py
index 147f7c5d..f98abebc 100644
--- a/moonv4/moon_authz/tests/unit_python/test_authz.py
+++ b/moonv4/moon_authz/tests/unit_python/test_authz.py
@@ -12,8 +12,8 @@ def get_json(data):
def test_authz_true(context):
import moon_authz.server
- 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
server = moon_authz.server.main()
client = server.app.test_client()
CACHE = Cache()
@@ -33,8 +33,8 @@ def test_authz_true(context):
def test_user_not_allowed(context):
import moon_authz.server
- 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
server = moon_authz.server.main()
client = server.app.test_client()
CACHE = Cache()