#!/usr/bin/env bash
-# usage: moon_update.sh {build,upload,copy} {db,utilities} <GPG_ID>
+# usage: moon_update.sh {build,upload,copy} {python_moondb,python_moonutilities} <GPG_ID>
CMD=$1
COMPONENT=$2
GPG_ID=$3
-VERSION=moon_${COMPONENT}-$(grep __version__ moon_${COMPONENT}/moon_${COMPONENT}/__init__.py | cut -d "\"" -f 2)
+VERSION=${COMPONENT}-$(grep __version__ ${COMPONENT}/${COMPONENT}/__init__.py | cut -d "\"" -f 2)
-cd moon_${COMPONENT}
+cd ${COMPONENT}
python3 setup.py sdist bdist_wheel
# Instead of "A0A96E75", use your own GPG ID
rm dist/*.asc 2>/dev/null
gpg --detach-sign -u "${GPG_ID}" -a dist/${VERSION}-py3-none-any.whl
- gpg --detach-sign -u "${GPG_ID}" -a dist/${VERSION}.tar.gz
+ gpg --detach-sign -u "${GPG_ID}" -a dist/${VERSION/_/-}.tar.gz
twine upload dist/${VERSION}-py3-none-any.whl dist/${VERSION}-py3-none-any.whl.asc
- twine upload dist/${VERSION}.tar.gz dist/${VERSION}.tar.gz.asc
+ twine upload dist/${VERSION/_/-}.tar.gz dist/${VERSION/_/-}.tar.gz.asc
fi
-rm -f ../moon_manager/dist/moon_${COMPONENT}*
-rm -f ../moon_orchestrator/dist/moon_${COMPONENT}*
-rm -f ../moon_wrapper/dist/moon_${COMPONENT}*
-rm -f ../moon_interface/dist/moon_${COMPONENT}*
-rm -f ../moon_authz/dist/moon_${COMPONENT}*
+rm -f ../moon_manager/dist/${COMPONENT}*
+rm -f ../moon_orchestrator/dist/${COMPONENT}*
+rm -f ../moon_wrapper/dist/${COMPONENT}*
+rm -f ../moon_interface/dist/${COMPONENT}*
+rm -f ../moon_authz/dist/${COMPONENT}*
if [ "$CMD" = "copy" ]; then
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
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
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"
# 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__)
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"
-kombu !=4.0.1,!=4.0.0
-oslo.log
flask
-oslo.config
flask_restful
flask_cors
-moon_db
-moon_utilities
+python_moondb
+python_moonutilities
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
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()
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()
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/
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"
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")
import re
import requests
import time
-from moon_utilities import configuration, exceptions
+from python_moonutilities import configuration, exceptions
__version__ = "0.1.0"
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")
# 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")
flask
flask_restful
flask_cors
-moon_utilities
\ No newline at end of file
+python_moonutilities
\ No newline at end of file
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)
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
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__)
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"
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'])
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"
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"
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"
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"
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"
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"
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"
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"
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"
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")
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")
flask
flask_restful
flask_cors
-moon_utilities
-moon_db
+python_moonutilities
+python_moondb
docker-py
}]}
)
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)
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
from flask_restful import Resource, request
import logging
import moon_orchestrator.api
-from moon_utilities.security_functions import check_auth
+from python_moonutilities.security_functions import check_auth
__version__ = "0.1.0"
from flask import request
from flask_restful import Resource
-from moon_utilities.security_functions import check_auth
+from python_moonutilities.security_functions import check_auth
import logging
LOG = logging.getLogger("moon.orchestrator.api.pods")
from kubernetes import client, config
import logging
import urllib3.exceptions
-from moon_utilities import configuration
+from python_moonutilities import configuration
LOG = logging.getLogger("moon.orchestrator.drivers")
from moon_orchestrator import __version__
from moon_orchestrator.api.pods import Pods
from moon_orchestrator.api.generic import Logs, Status
-from moon_utilities import configuration, exceptions
-from moon_utilities.misc import get_random_name
+from python_moonutilities import configuration, exceptions
+from python_moonutilities.misc import get_random_name
from moon_orchestrator.drivers import get_driver
LOG = logging.getLogger("moon.orchestrator.http")
import os
import logging
-from moon_utilities import configuration, exceptions
+from python_moonutilities import configuration, exceptions
from moon_orchestrator.http_server import HTTPServer
LOG = logging.getLogger("moon.orchestrator")
flask_restful
flask_cors
werkzeug
-moon_utilities
-moon_db
+python_moonutilities
+python_moondb
kubernetes
pyaml
\ No newline at end of file
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
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"
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"
# 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")
# 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")
flask_restful
flask_cors
werkzeug
-moon_utilities
\ No newline at end of file
+python_moonutilities
\ No newline at end of file
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)
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
https://git.opnfv.org/moon
-moon_utilities is a common Python lib for other Moon Python packages
+python_moonutilities is a common Python lib for other Moon Python packages
## Build
### Build Python Package
1.2.3
-----
- Cleanup moon_db code
+
+1.2.4
+-----
+- Update the name of the library (from moon_db)
+
# license which can be found in the file 'LICENSE' in this package distribution
# or at 'http://www.apache.org/licenses/LICENSE-2.0'.
-__version__ = "1.2.3"
+__version__ = "1.2.4"
import json
from uuid import uuid4
from oslo_log import log as logging
-from moon_utilities import exceptions, configuration
+from python_moonutilities import exceptions, configuration
from python_moonutilities.security_functions import filter_input, login, logout
from python_moondb.api.managers import Managers
1.4.1
-----
- Cleanup moon_utilities code
+
+1.4.2
+-----
+- Update the name of the library (from moon_utilities)
# license which can be found in the file 'LICENSE' in this package distribution
# or at 'http://www.apache.org/licenses/LICENSE-2.0'.
-__version__ = "1.4.1"
+__version__ = "1.4.2"
def test_authz_request():
- from moon_utilities import cache
+ from python_moonutilities import cache
c = cache.Cache()
assert isinstance(c.authz_requests, dict)
def test_get_subject_success():
- from moon_utilities import cache
+ from python_moonutilities import cache
cache_obj = cache.Cache()
policy_id = 'policy_id_1'
name = 'subject_name'
def test_get_subject_failure():
- from moon_utilities import cache
+ from python_moonutilities import cache
cache_obj = cache.Cache()
policy_id = 'policy_id_1'
name = 'invalid name'
def test_get_object_success():
- from moon_utilities import cache
+ from python_moonutilities import cache
cache_obj = cache.Cache()
policy_id = 'policy_id_1'
name = 'object_name'
def test_get_object_failure():
- from moon_utilities import cache
+ from python_moonutilities import cache
cache_obj = cache.Cache()
policy_id = 'policy_id_1'
name = 'invalid name'
def test_get_action_success():
- from moon_utilities import cache
+ from python_moonutilities import cache
cache_obj = cache.Cache()
policy_id = 'policy_id_1'
name = 'action_name'
def test_get_action_failure():
- from moon_utilities import cache
+ from python_moonutilities import cache
cache_obj = cache.Cache()
policy_id = 'policy_id_1'
name = 'invalid name'
def test_cache_manager():
- from moon_utilities import cache
+ from python_moonutilities import cache
cache_obj = cache.Cache()
assert cache_obj.pdp is not None
assert cache_obj.meta_rules is not None
def test_get_components():
- from moon_utilities import configuration
+ from python_moonutilities import configuration
assert isinstance(configuration.get_components(), dict)
FROM python:3
WORKDIR /usr/src/app
-RUN pip install --no-cache-dir --upgrade requests pyyaml moon_utilities moon_db
+RUN pip install --no-cache-dir --upgrade requests pyyaml python_moonutilities python_moondb
ENV POPULATE_ARGS "-v"
Code Review / moon.git / commitdiff