diff options
Diffstat (limited to 'moonv4/moon_interface')
10 files changed, 14 insertions, 14 deletions
diff --git a/moonv4/moon_interface/Dockerfile b/moonv4/moon_interface/Dockerfile index 268aba48..82160cc9 100644 --- a/moonv4/moon_interface/Dockerfile +++ b/moonv4/moon_interface/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:latest RUN apt update && apt install python3.5 python3-pip -y -RUN pip3 install moon_utilities moon_db pip --upgrade +RUN pip3 install python_moonutilities python_moondb pip --upgrade ADD . /root WORKDIR /root/ diff --git a/moonv4/moon_interface/moon_interface/api/generic.py b/moonv4/moon_interface/moon_interface/api/generic.py index 702f33cf..51de9214 100644 --- a/moonv4/moon_interface/moon_interface/api/generic.py +++ b/moonv4/moon_interface/moon_interface/api/generic.py @@ -9,7 +9,7 @@ Those API are helping API used to manage the Moon platform. from flask_restful import Resource, request import logging import moon_interface.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_interface/moon_interface/authz_requests.py b/moonv4/moon_interface/moon_interface/authz_requests.py index c09ee957..3f99cb93 100644 --- a/moonv4/moon_interface/moon_interface/authz_requests.py +++ b/moonv4/moon_interface/moon_interface/authz_requests.py @@ -7,9 +7,9 @@ import logging import itertools import pickle import requests -from moon_utilities import configuration, exceptions -from moon_utilities.security_functions import Context -from moon_utilities.cache import Cache +from python_moonutilities import configuration, exceptions +from python_moonutilities.security_functions import Context +from python_moonutilities.cache import Cache LOG = logging.getLogger("moon.interface.authz_requests") diff --git a/moonv4/moon_interface/moon_interface/containers.py b/moonv4/moon_interface/moon_interface/containers.py index 1ca76a2d..4f93d742 100644 --- a/moonv4/moon_interface/moon_interface/containers.py +++ b/moonv4/moon_interface/moon_interface/containers.py @@ -8,7 +8,7 @@ import logging import re import requests import time -from moon_utilities import configuration, exceptions +from python_moonutilities import configuration, exceptions __version__ = "0.1.0" diff --git a/moonv4/moon_interface/moon_interface/http_server.py b/moonv4/moon_interface/moon_interface/http_server.py index 387699f8..890bb82f 100644 --- a/moonv4/moon_interface/moon_interface/http_server.py +++ b/moonv4/moon_interface/moon_interface/http_server.py @@ -11,7 +11,7 @@ from moon_interface import __version__ from moon_interface.api.generic import Status, Logs, API from moon_interface.api.authz import Authz from moon_interface.authz_requests import CACHE -from moon_utilities import configuration, exceptions +from python_moonutilities import configuration, exceptions logger = logging.getLogger("moon.interface.http") diff --git a/moonv4/moon_interface/moon_interface/server.py b/moonv4/moon_interface/moon_interface/server.py index 7043e2f9..e53b4504 100644 --- a/moonv4/moon_interface/moon_interface/server.py +++ b/moonv4/moon_interface/moon_interface/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_interface.http_server import HTTPServer LOG = logging.getLogger("moon.interface") diff --git a/moonv4/moon_interface/requirements.txt b/moonv4/moon_interface/requirements.txt index 36332aa4..7aa2b6df 100644 --- a/moonv4/moon_interface/requirements.txt +++ b/moonv4/moon_interface/requirements.txt @@ -1,4 +1,4 @@ flask flask_restful flask_cors -moon_utilities
\ No newline at end of file +python_moonutilities
\ No newline at end of file diff --git a/moonv4/moon_interface/tests/unit_python/conftest.py b/moonv4/moon_interface/tests/unit_python/conftest.py index 7edcd32d..1f4e8cfa 100644 --- a/moonv4/moon_interface/tests/unit_python/conftest.py +++ b/moonv4/moon_interface/tests/unit_python/conftest.py @@ -205,8 +205,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_interface/tests/unit_python/requirements.txt b/moonv4/moon_interface/tests/unit_python/requirements.txt index 8bd8449f..21975ce3 100644 --- a/moonv4/moon_interface/tests/unit_python/requirements.txt +++ b/moonv4/moon_interface/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_interface/tools/get_keystone_token.py b/moonv4/moon_interface/tools/get_keystone_token.py index a153f4db..1856aab8 100644 --- a/moonv4/moon_interface/tools/get_keystone_token.py +++ b/moonv4/moon_interface/tools/get_keystone_token.py @@ -1,7 +1,7 @@ import requests from oslo_config import cfg from oslo_log import log as logging -from moon_utilities import exceptions +from python_moonutilities import exceptions CONF = cfg.CONF LOG = logging.getLogger(__name__) |