23 files changed, 41 insertions, 42 deletions
diff --git a/moonv4/moon_utilities/README.md b/moonv4/moon_utilities/README.md
deleted file mode 100644
index bbc1d458..00000000
--- a/moonv4/moon_utilities/README.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# Moon Python Utilities Package
-This package contains the core module for the Moon project.
-It is designed to provide authorization feature to all OpenStack components.
-
-For any other information, refer to the parent project:
-
-    https://git.opnfv.org/moon
-
-moon_utilities is a common Python lib for other Moon Python packages
-
-## Build
-### Build Python Package
-```bash
-cd ${MOON_HOME}/moonv4/moon_utilities
-python3 setup.py sdist bdist_wheel
-```
-
-### Push Python Package to PIP
-```bash
-cd ${MOON_HOME}/moonv4/moon_utilities
-gpg --detach-sign -u "${GPG_ID}" -a dist/moon_utilities-X.Y.Z-py3-none-any.whl
-gpg --detach-sign -u "${GPG_ID}" -a dist/moon_utilities-X.Y.Z.tar.gz
-twine upload dist/moon_db-X.Y.Z-py3-none-any.whl dist/moon_utilities-X.Y.Z-py3-none-any.whl.asc
-twine upload dist/moon_db-X.Y.Z.tar.gz dist/moon_uutilities-X.Y.Z.tar.gz.asc
-```
-
-## Test
-### Python Unit Test
-launch Docker for Python unit tests
-```bash
-cd ${MOON_HOME}/moonv4/moon_utilities
-docker run --rm --volume $(pwd):/data wukongsun/moon_python_unit_test:latest
-```
diff --git a/moonv4/moon_utilities/Changelog b/moonv4/python_moonutilities/Changelog
index 952c2aa1..3eaf7894 100644
--- a/moonv4/moon_utilities/Changelog
+++ b/moonv4/python_moonutilities/Changelog
@@ -62,4 +62,3 @@ CHANGES
 1.4.1
 -----
 - Cleanup moon_utilities code
-
diff --git a/moonv4/moon_utilities/LICENSE b/moonv4/python_moonutilities/LICENSE
index d6456956..d6456956 100644
--- a/moonv4/moon_utilities/LICENSE
+++ b/moonv4/python_moonutilities/LICENSE
diff --git a/moonv4/moon_utilities/MANIFEST.in b/moonv4/python_moonutilities/MANIFEST.in
index b764e35c..b764e35c 100644
--- a/moonv4/moon_utilities/MANIFEST.in
+++ b/moonv4/python_moonutilities/MANIFEST.in
diff --git a/moonv4/python_moonutilities/README.md b/moonv4/python_moonutilities/README.md
new file mode 100644
index 00000000..8e21966a
--- /dev/null
+++ b/moonv4/python_moonutilities/README.md
@@ -0,0 +1,33 @@
+# python-moonutilities Package
+This package contains the core module for the Moon project.
+It is designed to provide authorization feature to all OpenStack components.
+
+For any other information, refer to the parent project:
+
+    https://git.opnfv.org/moon
+
+python-moonutilities is a common Python lib for other Moon Python packages
+
+## Build
+### Build Python Package
+```bash
+cd ${MOON_HOME}/python_moonutilities
+python3 setup.py sdist bdist_wheel
+```
+
+### Push Python Package to PIP
+```bash
+cd ${MOON_HOME}/python_moonutilities
+gpg --detach-sign -u "${GPG_ID}" -a dist/python_moonutilities-X.Y.Z-py3-none-any.whl
+gpg --detach-sign -u "${GPG_ID}" -a dist/python_moonutilities-X.Y.Z.tar.gz
+twine upload dist/python_moonutilities-X.Y.Z-py3-none-any.whl dist/python_moonutilities-X.Y.Z-py3-none-any.whl.asc
+twine upload dist/python_moonutilities-X.Y.Z.tar.gz dist/python_moonutilities-X.Y.Z.tar.gz.asc
+```
+
+## Test
+### Python Unit Test
+launch Docker for Python unit tests
+```bash
+cd ${MOON_HOME}/python_moonutilities
+docker run --rm --volume $(pwd):/data wukongsun/moon_python_unit_test:latest
+```
diff --git a/moonv4/moon_utilities/moon_utilities/__init__.py b/moonv4/python_moonutilities/python_moonutilities/__init__.py
index e3ad9307..e3ad9307 100644
--- a/moonv4/moon_utilities/moon_utilities/__init__.py
+++ b/moonv4/python_moonutilities/python_moonutilities/__init__.py
diff --git a/moonv4/moon_utilities/moon_utilities/api.py b/moonv4/python_moonutilities/python_moonutilities/api.py
index 8e80c21d..8e80c21d 100644
--- a/moonv4/moon_utilities/moon_utilities/api.py
+++ b/moonv4/python_moonutilities/python_moonutilities/api.py
diff --git a/moonv4/moon_utilities/moon_utilities/auth.py b/moonv4/python_moonutilities/python_moonutilities/auth.py
index 10dda3ed..7656f4e7 100644
--- a/moonv4/moon_utilities/moon_utilities/auth.py
+++ b/moonv4/python_moonutilities/python_moonutilities/auth.py
@@ -9,7 +9,7 @@ import time
 from functools import wraps
 from flask import request
 from oslo_log import log as logging
-from moon_utilities import exceptions, configuration
+from python_moonutilities import exceptions, configuration
 
 
 LOG = logging.getLogger(__name__)
diff --git a/moonv4/moon_utilities/moon_utilities/cache.py b/moonv4/python_moonutilities/python_moonutilities/cache.py
index 8c6ee3bf..93e3daca 100644
--- a/moonv4/moon_utilities/moon_utilities/cache.py
+++ b/moonv4/python_moonutilities/python_moonutilities/cache.py
@@ -2,7 +2,7 @@ import logging
 import time
 import requests
 from uuid import uuid4
-from moon_utilities import configuration, exceptions
+from python_moonutilities import configuration, exceptions
 
 LOG = logging.getLogger("moon.utilities.cache")
 
diff --git a/moonv4/moon_utilities/moon_utilities/configuration.py b/moonv4/python_moonutilities/python_moonutilities/configuration.py
index cda75de5..f0ef74a6 100644
--- a/moonv4/moon_utilities/moon_utilities/configuration.py
+++ b/moonv4/python_moonutilities/python_moonutilities/configuration.py
@@ -9,7 +9,7 @@ import json
 import requests
 import logging
 import logging.config
-from moon_utilities import exceptions
+from python_moonutilities import exceptions
 
 LOG = logging.getLogger("moon.utilities")
 
diff --git a/moonv4/moon_utilities/moon_utilities/exceptions.py b/moonv4/python_moonutilities/python_moonutilities/exceptions.py
index eb606432..5bbab2be 100644
--- a/moonv4/moon_utilities/moon_utilities/exceptions.py
+++ b/moonv4/python_moonutilities/python_moonutilities/exceptions.py
@@ -5,6 +5,7 @@
 
 from oslo_log import log as logging
 from werkzeug.exceptions import HTTPException
+
 LOG = logging.getLogger("moon.utilities.exceptions")
 _ = str
 
diff --git a/moonv4/moon_utilities/moon_utilities/misc.py b/moonv4/python_moonutilities/python_moonutilities/misc.py
index b83523c3..b83523c3 100644
--- a/moonv4/moon_utilities/moon_utilities/misc.py
+++ b/moonv4/python_moonutilities/python_moonutilities/misc.py
diff --git a/moonv4/moon_utilities/moon_utilities/security_functions.py b/moonv4/python_moonutilities/python_moonutilities/security_functions.py
index 50ab4daf..6d9307fe 100644
--- a/moonv4/moon_utilities/moon_utilities/security_functions.py
+++ b/moonv4/python_moonutilities/python_moonutilities/security_functions.py
@@ -13,8 +13,7 @@ import time
 from functools import wraps
 from flask import request
 import logging
-from moon_utilities import exceptions
-from moon_utilities import configuration
+from python_moonutilities import exceptions, configuration
 
 LOG = logging.getLogger("moon.utilities." + __name__)
 
diff --git a/moonv4/moon_utilities/requirements.txt b/moonv4/python_moonutilities/requirements.txt
index 5b80e5f2..5b80e5f2 100644
--- a/moonv4/moon_utilities/requirements.txt
+++ b/moonv4/python_moonutilities/requirements.txt
diff --git a/moonv4/moon_utilities/setup.py b/moonv4/python_moonutilities/setup.py
index 21e11419..4a2eef5d 100644
--- a/moonv4/moon_utilities/setup.py
+++ b/moonv4/python_moonutilities/setup.py
@@ -4,16 +4,16 @@
 # or at 'http://www.apache.org/licenses/LICENSE-2.0'.
 
 from setuptools import setup, find_packages
-import moon_utilities
+import python_moonutilities
 
 with open('requirements.txt') as f:
     required = f.read().splitlines()
 
 setup(
 
-    name='moon_utilities',
+    name='python-moonutilities',
 
-    version=moon_utilities.__version__,
+    version=python_moonutilities.__version__,
 
     packages=find_packages(),
 
diff --git a/moonv4/moon_utilities/tests/unit_python/conftest.py b/moonv4/python_moonutilities/tests/unit_python/conftest.py
index 7217586a..7217586a 100644
--- a/moonv4/moon_utilities/tests/unit_python/conftest.py
+++ b/moonv4/python_moonutilities/tests/unit_python/conftest.py
diff --git a/moonv4/moon_utilities/tests/unit_python/mock_cache.py b/moonv4/python_moonutilities/tests/unit_python/mock_cache.py
index b2b287a9..b2b287a9 100644
--- a/moonv4/moon_utilities/tests/unit_python/mock_cache.py
+++ b/moonv4/python_moonutilities/tests/unit_python/mock_cache.py
diff --git a/moonv4/moon_utilities/tests/unit_python/mock_components.py b/moonv4/python_moonutilities/tests/unit_python/mock_components.py
index a0319e1a..a0319e1a 100644
--- a/moonv4/moon_utilities/tests/unit_python/mock_components.py
+++ b/moonv4/python_moonutilities/tests/unit_python/mock_components.py
diff --git a/moonv4/moon_utilities/tests/unit_python/mock_keystone.py b/moonv4/python_moonutilities/tests/unit_python/mock_keystone.py
index c0b26b88..c0b26b88 100644
--- a/moonv4/moon_utilities/tests/unit_python/mock_keystone.py
+++ b/moonv4/python_moonutilities/tests/unit_python/mock_keystone.py
diff --git a/moonv4/moon_utilities/tests/unit_python/requirements.txt b/moonv4/python_moonutilities/tests/unit_python/requirements.txt
index 3c1ad607..3c1ad607 100644
--- a/moonv4/moon_utilities/tests/unit_python/requirements.txt
+++ b/moonv4/python_moonutilities/tests/unit_python/requirements.txt
diff --git a/moonv4/moon_utilities/tests/unit_python/test_cache.py b/moonv4/python_moonutilities/tests/unit_python/test_cache.py
index 3d4f7292..3d4f7292 100644
--- a/moonv4/moon_utilities/tests/unit_python/test_cache.py
+++ b/moonv4/python_moonutilities/tests/unit_python/test_cache.py
diff --git a/moonv4/moon_utilities/tests/unit_python/test_configuration.py b/moonv4/python_moonutilities/tests/unit_python/test_configuration.py
index 0ebff995..0ebff995 100644
--- a/moonv4/moon_utilities/tests/unit_python/test_configuration.py
+++ b/moonv4/python_moonutilities/tests/unit_python/test_configuration.py
diff --git a/moonv4/moon_utilities/tests/unit_python/utilities.py b/moonv4/python_moonutilities/tests/unit_python/utilities.py
index 1d79d890..1d79d890 100644
--- a/moonv4/moon_utilities/tests/unit_python/utilities.py
+++ b/moonv4/python_moonutilities/tests/unit_python/utilities.py