diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 499e975c..6cdcaa0c 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -33,12 +33,14 @@ Project Hosting Details * https://wiki.openstack.org/wiki/Meetings#Murano_meeting * Code Hosting - * https://git.openstack.org/cgit/stackforge/murano-api + * https://git.openstack.org/cgit/stackforge/murano * https://git.openstack.org/cgit/stackforge/murano-agent * https://git.openstack.org/cgit/stackforge/murano-dashboard + * https://git.openstack.org/cgit/stackforge/python-muranoclient + * Code Review * https://review.openstack.org/#/q/murano+AND+status:+open,n,z diff --git a/README.rst b/README.rst index 2d155571..55cb6029 100644 --- a/README.rst +++ b/README.rst @@ -17,7 +17,7 @@ Project status, bugs, and blueprints are tracked on Launchpad: Developer documentation can be found here: - https://murano-api.readthedocs.org + https://murano.readthedocs.org Additional resources are linked from the project wiki page: diff --git a/contrib/devstack/lib/murano b/contrib/devstack/lib/murano index 8c4f6b42..cd56ea23 100644 --- a/contrib/devstack/lib/murano +++ b/contrib/devstack/lib/murano @@ -21,13 +21,13 @@ set -o xtrace # -------- # Set up default repos -MURANO_REPO=${MURANO_REPO:-${GIT_BASE}/stackforge/murano-api.git} +MURANO_REPO=${MURANO_REPO:-${GIT_BASE}/stackforge/murano.git} MURANO_BRANCH=${MURANO_BRANCH:-master} # Set up default directories -MURANO_DIR=$DEST/murano-api +MURANO_DIR=$DEST/murano MURANO_CONF_DIR=${MURANO_CONF_DIR:-/etc/murano} -MURANO_CONF_FILE=${MURANO_CONF_DIR}/murano-api.conf +MURANO_CONF_FILE=${MURANO_CONF_DIR}/murano.conf MURANO_DEBUG=${MURANO_DEBUG:-True} MURANO_SERVICE_HOST=${MURANO_SERVICE_HOST:-$SERVICE_HOST} @@ -128,8 +128,8 @@ function configure_murano { mkdir_chown_stack "$MURANO_CONF_DIR" # Copy over Murano configuration file and configure common parameters. - cp $MURANO_DIR/etc/murano/murano-api.conf.sample $MURANO_CONF_FILE - cp $MURANO_DIR/etc/murano/murano-api-paste.ini $MURANO_CONF_DIR + cp $MURANO_DIR/etc/murano/murano.conf.sample $MURANO_CONF_FILE + cp $MURANO_DIR/etc/murano/murano-paste.ini $MURANO_CONF_DIR iniset $MURANO_CONF_FILE DEFAULT debug $MURANO_DEBUG iniset $MURANO_CONF_FILE DEFAULT use_syslog $SYSLOG @@ -183,8 +183,8 @@ function install_murano() { # start_murano() - Start running processes, including screen function start_murano() { - screen_it murano-api "cd $MURANO_DIR && $MURANO_BIN_DIR/murano-api --config-file $MURANO_CONF_DIR/murano-api.conf" - screen_it murano-engine "cd $MURANO_DIR && $MURANO_BIN_DIR/murano-engine --config-file $MURANO_CONF_DIR/murano-api.conf" + screen_it murano-api "cd $MURANO_DIR && $MURANO_BIN_DIR/murano-api --config-file $MURANO_CONF_DIR/murano.conf" + screen_it murano-engine "cd $MURANO_DIR && $MURANO_BIN_DIR/murano-engine --config-file $MURANO_CONF_DIR/murano.conf" } @@ -192,6 +192,7 @@ function start_murano() { function stop_murano() { # Kill the Murano screen windows screen -S $SCREEN_NAME -p murano-api -X kill + screen -S $SCREEN_NAME -p murano-engine -X kill } diff --git a/doc/source/conf.py b/doc/source/conf.py index 062ebba6..dad41095 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -23,7 +23,7 @@ sys.path.insert(0, os.path.abspath('../')) sys.path.insert(0, os.path.abspath('./')) sys.path.insert(0, os.path.abspath('.')) -from muranoapi import __version_info as version +from murano import __version_info as version # Supress warnings for docs that aren't used yet #unused_docs = [ @@ -82,13 +82,3 @@ html_sidebars = { '**': ['localtoc.html', 'relations.html', 'searchbox.html', 'sourcelink.html'] } - -# -- Options for man page output -------------------------------------------- - -# Grouping the document tree for man pages. -# List of tuples 'sourcefile', 'target', u'title', u'Authors name', 'manual' - -man_pages = [ - ('man/muranoapi', 'murano-api', u'Murano API Server', - [u'OpenStack Foundation'], 1) -] diff --git a/etc/murano/murano-api-paste.ini b/etc/murano/murano-paste.ini similarity index 58% rename from etc/murano/murano-api-paste.ini rename to etc/murano/murano-paste.ini index e8e59c57..612ef203 100644 --- a/etc/murano/murano-api-paste.ini +++ b/etc/murano/murano-paste.ini @@ -1,8 +1,8 @@ -[pipeline:muranoapi] +[pipeline:murano] pipeline = versionnegotiation authtoken context rootapp [filter:context] -paste.filter_factory = muranoapi.api.middleware.context:ContextMiddleware.factory +paste.filter_factory = murano.api.middleware.context:ContextMiddleware.factory #For more information see Auth-Token Middleware with Username and Password #http://docs.openstack.org/developer/keystone/configuringservices.html @@ -15,10 +15,10 @@ use = egg:Paste#urlmap /v1: apiv1app [app:apiversions] -paste.app_factory = muranoapi.api.versions:create_resource +paste.app_factory = murano.api.versions:create_resource [app:apiv1app] -paste.app_factory = muranoapi.api.v1.router:API.factory +paste.app_factory = murano.api.v1.router:API.factory [filter:versionnegotiation] -paste.filter_factory = muranoapi.api.middleware.version_negotiation:VersionNegotiationFilter.factory +paste.filter_factory = murano.api.middleware.version_negotiation:VersionNegotiationFilter.factory diff --git a/etc/murano/murano-api.conf.sample b/etc/murano/murano.conf.sample similarity index 100% rename from etc/murano/murano-api.conf.sample rename to etc/murano/murano.conf.sample diff --git a/functionaltests/post_test_hook.sh b/functionaltests/post_test_hook.sh index 09107fa2..f78b23bd 100755 --- a/functionaltests/post_test_hook.sh +++ b/functionaltests/post_test_hook.sh @@ -14,11 +14,11 @@ # This script is executed inside post_test_hook function in devstack gate. -cd /opt/stack/new/murano-api/functionaltests +cd /opt/stack/new/murano/functionaltests sudo ./run_tests.sh RETVAL=$? # Copy tempest log files to be published among other logs upon job completion -sudo cp /opt/stack/new/murano-api/functionaltests/tempest.log /opt/stack/logs +sudo cp /opt/stack/new/murano/functionaltests/tempest.log /opt/stack/logs exit $RETVAL \ No newline at end of file diff --git a/functionaltests/pre_test_hook.sh b/functionaltests/pre_test_hook.sh index e3e8b078..df384823 100755 --- a/functionaltests/pre_test_hook.sh +++ b/functionaltests/pre_test_hook.sh @@ -15,7 +15,7 @@ # This script is executed inside pre_test_hook function in desvstack gate. # Install Murano devstack integration -MURANO_BASE=/opt/stack/new/murano-api/contrib/devstack +MURANO_BASE=/opt/stack/new/murano/contrib/devstack DEVSTACK_BASE=/opt/stack/new/devstack cp $MURANO_BASE/lib/* $DEVSTACK_BASE/lib cp $MURANO_BASE/extras.d/* $DEVSTACK_BASE/extras.d diff --git a/muranoapi/__init__.py b/murano/__init__.py similarity index 85% rename from muranoapi/__init__.py rename to murano/__init__.py index 6ed66623..28894586 100644 --- a/muranoapi/__init__.py +++ b/murano/__init__.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from muranoapi.openstack.common.gettextutils import _ # noqa +from murano.openstack.common.gettextutils import _ # noqa from pbr import version -__version_info = version.VersionInfo('murano-api') +__version_info = version.VersionInfo('murano') __version__ = __version_info.cached_version_string() diff --git a/muranoapi/api/__init__.py b/murano/api/__init__.py similarity index 100% rename from muranoapi/api/__init__.py rename to murano/api/__init__.py diff --git a/muranoapi/api/middleware/__init__.py b/murano/api/middleware/__init__.py similarity index 100% rename from muranoapi/api/middleware/__init__.py rename to murano/api/middleware/__init__.py diff --git a/muranoapi/api/middleware/context.py b/murano/api/middleware/context.py similarity index 84% rename from muranoapi/api/middleware/context.py rename to murano/api/middleware/context.py index e9d7204c..2763e16b 100644 --- a/muranoapi/api/middleware/context.py +++ b/murano/api/middleware/context.py @@ -14,10 +14,10 @@ from oslo.config import cfg -import muranoapi.context -from muranoapi.openstack.common.gettextutils import _ # noqa -import muranoapi.openstack.common.log as logging -from muranoapi.openstack.common import wsgi +import murano.context +from murano.openstack.common.gettextutils import _ # noqa +import murano.openstack.common.log as logging +from murano.openstack.common import wsgi context_opts = [ cfg.StrOpt('admin_role', default='admin', @@ -34,7 +34,7 @@ class ContextMiddleware(wsgi.Middleware): def process_request(self, req): """Convert authentication information into a request context - Generate a muranoapi.context.RequestContext object from the available + Generate a murano.context.RequestContext object from the available authentication headers and store on the 'context' attribute of the req object. @@ -49,7 +49,7 @@ class ContextMiddleware(wsgi.Middleware): 'is_admin': CONF.admin_role in [ role.strip() for role in req.headers.get('X-Roles').split(',')] } - req.context = muranoapi.context.RequestContext(**kwargs) + req.context = murano.context.RequestContext(**kwargs) @classmethod def factory(cls, global_conf, **local_conf): diff --git a/muranoapi/api/middleware/version_negotiation.py b/murano/api/middleware/version_negotiation.py similarity index 94% rename from muranoapi/api/middleware/version_negotiation.py rename to murano/api/middleware/version_negotiation.py index 2c91f4ef..136e5fdc 100644 --- a/muranoapi/api/middleware/version_negotiation.py +++ b/murano/api/middleware/version_negotiation.py @@ -20,10 +20,10 @@ return from oslo.config import cfg -from muranoapi.api import versions -from muranoapi.openstack.common.gettextutils import _ # noqa -import muranoapi.openstack.common.log as logging -from muranoapi.openstack.common import wsgi +from murano.api import versions +from murano.openstack.common.gettextutils import _ # noqa +import murano.openstack.common.log as logging +from murano.openstack.common import wsgi CONF = cfg.CONF LOG = logging.getLogger(__name__) diff --git a/muranoapi/api/v1/__init__.py b/murano/api/v1/__init__.py similarity index 97% rename from muranoapi/api/v1/__init__.py rename to murano/api/v1/__init__.py index e25c5552..a794bb9d 100644 --- a/muranoapi/api/v1/__init__.py +++ b/murano/api/v1/__init__.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from muranoapi.db import models -from muranoapi.db import session as db_session +from murano.db import models +from murano.db import session as db_session stats = None diff --git a/muranoapi/api/v1/catalog.py b/murano/api/v1/catalog.py similarity index 92% rename from muranoapi/api/v1/catalog.py rename to murano/api/v1/catalog.py index 27249bba..fe624241 100644 --- a/muranoapi/api/v1/catalog.py +++ b/murano/api/v1/catalog.py @@ -21,24 +21,24 @@ import tempfile from oslo.config import cfg from webob import exc -import muranoapi.api.v1 -from muranoapi.api.v1 import schemas -from muranoapi.db.catalog import api as db_api -from muranoapi.openstack.common.db import exception as db_exc -from muranoapi.openstack.common import exception -from muranoapi.openstack.common.gettextutils import _ # noqa -from muranoapi.openstack.common import log as logging -from muranoapi.openstack.common import wsgi -from muranoapi.packages import application_package as app_pkg -from muranoapi.packages import exceptions as pkg_exc +import murano.api.v1 +from murano.api.v1 import schemas +from murano.db.catalog import api as db_api +from murano.openstack.common.db import exception as db_exc +from murano.openstack.common import exception +from murano.openstack.common.gettextutils import _ # noqa +from murano.openstack.common import log as logging +from murano.openstack.common import wsgi +from murano.packages import application_package as app_pkg +from murano.packages import exceptions as pkg_exc LOG = logging.getLogger(__name__) CONF = cfg.CONF -SUPPORTED_PARAMS = muranoapi.api.v1.SUPPORTED_PARAMS -LIST_PARAMS = muranoapi.api.v1.LIST_PARAMS -ORDER_VALUES = muranoapi.api.v1.ORDER_VALUES -PKG_PARAMS_MAP = muranoapi.api.v1.PKG_PARAMS_MAP +SUPPORTED_PARAMS = murano.api.v1.SUPPORTED_PARAMS +LIST_PARAMS = murano.api.v1.LIST_PARAMS +ORDER_VALUES = murano.api.v1.ORDER_VALUES +PKG_PARAMS_MAP = murano.api.v1.PKG_PARAMS_MAP def _check_content_type(req, content_type): diff --git a/muranoapi/api/v1/deployments.py b/murano/api/v1/deployments.py similarity index 93% rename from muranoapi/api/v1/deployments.py rename to murano/api/v1/deployments.py index 214e975c..74774903 100644 --- a/muranoapi/api/v1/deployments.py +++ b/murano/api/v1/deployments.py @@ -14,14 +14,14 @@ from sqlalchemy import desc from webob import exc -from muranoapi.api.v1 import request_statistics -from muranoapi.common import utils -from muranoapi.db import models -from muranoapi.db import session as db_session +from murano.api.v1 import request_statistics +from murano.common import utils +from murano.db import models +from murano.db import session as db_session -from muranoapi.openstack.common.gettextutils import _ # noqa -from muranoapi.openstack.common import log as logging -from muranoapi.openstack.common import wsgi +from murano.openstack.common.gettextutils import _ # noqa +from murano.openstack.common import log as logging +from murano.openstack.common import wsgi LOG = logging.getLogger(__name__) diff --git a/muranoapi/api/v1/environments.py b/murano/api/v1/environments.py similarity index 92% rename from muranoapi/api/v1/environments.py rename to murano/api/v1/environments.py index f0eac7ae..52625a11 100644 --- a/muranoapi/api/v1/environments.py +++ b/murano/api/v1/environments.py @@ -15,16 +15,16 @@ from sqlalchemy import desc from webob import exc -from muranoapi.api.v1 import request_statistics -from muranoapi.common import utils -from muranoapi.db import models -from muranoapi.db.services import core_services -from muranoapi.db.services import environments as envs -from muranoapi.db import session as db_session +from murano.api.v1 import request_statistics +from murano.common import utils +from murano.db import models +from murano.db.services import core_services +from murano.db.services import environments as envs +from murano.db import session as db_session -from muranoapi.openstack.common.gettextutils import _ # noqa -from muranoapi.openstack.common import log as logging -from muranoapi.openstack.common import wsgi +from murano.openstack.common.gettextutils import _ # noqa +from murano.openstack.common import log as logging +from murano.openstack.common import wsgi LOG = logging.getLogger(__name__) diff --git a/muranoapi/api/v1/instance_statistics.py b/murano/api/v1/instance_statistics.py similarity index 88% rename from muranoapi/api/v1/instance_statistics.py rename to murano/api/v1/instance_statistics.py index 6712f31f..bf249e78 100644 --- a/muranoapi/api/v1/instance_statistics.py +++ b/murano/api/v1/instance_statistics.py @@ -12,12 +12,12 @@ # License for the specific language governing permissions and limitations # under the License. -from muranoapi.api.v1 import request_statistics -from muranoapi.db.services import instances +from murano.api.v1 import request_statistics +from murano.db.services import instances -from muranoapi.openstack.common.gettextutils import _ # noqa -from muranoapi.openstack.common import log as logging -from muranoapi.openstack.common import wsgi +from murano.openstack.common.gettextutils import _ # noqa +from murano.openstack.common import log as logging +from murano.openstack.common import wsgi LOG = logging.getLogger(__name__) diff --git a/muranoapi/api/v1/request_statistics.py b/murano/api/v1/request_statistics.py similarity index 95% rename from muranoapi/api/v1/request_statistics.py rename to murano/api/v1/request_statistics.py index b9938613..d895dc12 100644 --- a/muranoapi/api/v1/request_statistics.py +++ b/murano/api/v1/request_statistics.py @@ -14,10 +14,10 @@ import time -from muranoapi.api import v1 -from muranoapi.db.services import stats -from muranoapi.openstack.common import log as logging -from muranoapi.openstack.common import wsgi +from murano.api import v1 +from murano.db.services import stats +from murano.openstack.common import log as logging +from murano.openstack.common import wsgi LOG = logging.getLogger(__name__) diff --git a/muranoapi/api/v1/router.py b/murano/api/v1/router.py similarity index 96% rename from muranoapi/api/v1/router.py rename to murano/api/v1/router.py index e7fe64ab..f36a2f57 100644 --- a/muranoapi/api/v1/router.py +++ b/murano/api/v1/router.py @@ -13,14 +13,14 @@ # under the License. import routes -from muranoapi.api.v1 import catalog -from muranoapi.api.v1 import deployments -from muranoapi.api.v1 import environments -from muranoapi.api.v1 import instance_statistics -from muranoapi.api.v1 import request_statistics -from muranoapi.api.v1 import services -from muranoapi.api.v1 import sessions -from muranoapi.openstack.common import wsgi +from murano.api.v1 import catalog +from murano.api.v1 import deployments +from murano.api.v1 import environments +from murano.api.v1 import instance_statistics +from murano.api.v1 import request_statistics +from murano.api.v1 import services +from murano.api.v1 import sessions +from murano.openstack.common import wsgi class API(wsgi.Router): diff --git a/muranoapi/api/v1/schemas.py b/murano/api/v1/schemas.py similarity index 100% rename from muranoapi/api/v1/schemas.py rename to murano/api/v1/schemas.py diff --git a/muranoapi/api/v1/services.py b/murano/api/v1/services.py similarity index 91% rename from muranoapi/api/v1/services.py rename to murano/api/v1/services.py index 6fe234c1..bf2649ac 100644 --- a/muranoapi/api/v1/services.py +++ b/murano/api/v1/services.py @@ -16,13 +16,13 @@ import functools as func from webob import exc -from muranoapi.api.v1 import request_statistics -from muranoapi.common.helpers import token_sanitizer -from muranoapi.db.services import core_services -from muranoapi.openstack.common.gettextutils import _ # noqa -from muranoapi.openstack.common import log as logging -from muranoapi.openstack.common import wsgi -from muranoapi import utils +from murano.api.v1 import request_statistics +from murano.common.helpers import token_sanitizer +from murano.db.services import core_services +from murano.openstack.common.gettextutils import _ # noqa +from murano.openstack.common import log as logging +from murano.openstack.common import wsgi +from murano import utils LOG = logging.getLogger(__name__) diff --git a/muranoapi/api/v1/sessions.py b/murano/api/v1/sessions.py similarity index 93% rename from muranoapi/api/v1/sessions.py rename to murano/api/v1/sessions.py index 663cbf69..abfef58b 100644 --- a/muranoapi/api/v1/sessions.py +++ b/murano/api/v1/sessions.py @@ -14,15 +14,15 @@ from webob import exc -from muranoapi.api.v1 import request_statistics -from muranoapi.db import models -from muranoapi.db.services import environments as envs -from muranoapi.db.services import sessions -from muranoapi.db import session as db_session +from murano.api.v1 import request_statistics +from murano.db import models +from murano.db.services import environments as envs +from murano.db.services import sessions +from murano.db import session as db_session -from muranoapi.openstack.common.gettextutils import _ # noqa -from muranoapi.openstack.common import log as logging -from muranoapi.openstack.common import wsgi +from murano.openstack.common.gettextutils import _ # noqa +from murano.openstack.common import log as logging +from murano.openstack.common import wsgi LOG = logging.getLogger(__name__) diff --git a/muranoapi/api/versions.py b/murano/api/versions.py similarity index 95% rename from muranoapi/api/versions.py rename to murano/api/versions.py index c76b4076..61ad3958 100644 --- a/muranoapi/api/versions.py +++ b/murano/api/versions.py @@ -17,8 +17,8 @@ import httplib from oslo.config import cfg import webob.dec -from muranoapi.openstack.common import jsonutils -from muranoapi.openstack.common import wsgi +from murano.openstack.common import jsonutils +from murano.openstack.common import wsgi CONF = cfg.CONF diff --git a/muranoapi/cmd/__init__.py b/murano/cmd/__init__.py similarity index 100% rename from muranoapi/cmd/__init__.py rename to murano/cmd/__init__.py diff --git a/muranoapi/cmd/api.py b/murano/cmd/api.py similarity index 74% rename from muranoapi/cmd/api.py rename to murano/cmd/api.py index f519167c..934bc1f1 100644 --- a/muranoapi/cmd/api.py +++ b/murano/cmd/api.py @@ -20,30 +20,30 @@ import sys import eventlet eventlet.monkey_patch() -# If ../muranoapi/__init__.py exists, add ../ to Python search path, so that +# If ../murano/__init__.py exists, add ../ to Python search path, so that # it will override what happens to be installed in /usr/(local/)lib/python... root = os.path.join(os.path.abspath(__file__), os.pardir, os.pardir, os.pardir) -if os.path.exists(os.path.join(root, 'muranoapi', '__init__.py')): +if os.path.exists(os.path.join(root, 'murano', '__init__.py')): sys.path.insert(0, root) -from muranoapi.api.v1 import request_statistics -from muranoapi.common import config -from muranoapi.common import server -from muranoapi.common import statservice as stats -from muranoapi.openstack.common import log -from muranoapi.openstack.common import service -from muranoapi.openstack.common import wsgi +from murano.api.v1 import request_statistics +from murano.common import config +from murano.common import server +from murano.common import statservice as stats +from murano.openstack.common import log +from murano.openstack.common import service +from murano.openstack.common import wsgi def main(): try: config.parse_args() - log.setup('muranoapi') + log.setup('murano') request_statistics.init_stats() launcher = service.ServiceLauncher() - app = config.load_paste_app('muranoapi') + app = config.load_paste_app('murano') port, host = (config.CONF.bind_port, config.CONF.bind_host) launcher.launch_service(wsgi.Service(app, port, host)) diff --git a/muranoapi/cmd/engine.py b/murano/cmd/engine.py similarity index 78% rename from muranoapi/cmd/engine.py rename to murano/cmd/engine.py index 7deb2aed..c53c20fd 100644 --- a/muranoapi/cmd/engine.py +++ b/murano/cmd/engine.py @@ -20,22 +20,22 @@ import sys import eventlet eventlet.monkey_patch() -# If ../muranoapi/__init__.py exists, add ../ to Python search path, so that +# If ../murano/__init__.py exists, add ../ to Python search path, so that # it will override what happens to be installed in /usr/(local/)lib/python... root = os.path.join(os.path.abspath(__file__), os.pardir, os.pardir, os.pardir) -if os.path.exists(os.path.join(root, 'muranoapi', '__init__.py')): +if os.path.exists(os.path.join(root, 'murano', '__init__.py')): sys.path.insert(0, root) -from muranoapi.common import config -from muranoapi.common import engine -from muranoapi.openstack.common import log -from muranoapi.openstack.common import service +from murano.common import config +from murano.common import engine +from murano.openstack.common import log +from murano.openstack.common import service def main(): try: config.parse_args() - log.setup('muranoapi') + log.setup('murano') launcher = service.ServiceLauncher() launcher.launch_service(engine.get_rpc_service()) diff --git a/muranoapi/cmd/manage.py b/murano/cmd/manage.py similarity index 90% rename from muranoapi/cmd/manage.py rename to murano/cmd/manage.py index 5005e1fb..3399dd11 100644 --- a/muranoapi/cmd/manage.py +++ b/murano/cmd/manage.py @@ -21,13 +21,13 @@ import traceback from oslo.config import cfg -import muranoapi -from muranoapi.common import consts -from muranoapi.db.catalog import api as db_catalog_api -from muranoapi.db import session as db_session -from muranoapi.openstack.common.db import exception as db_exception -from muranoapi.openstack.common import log as logging -from muranoapi.packages import application_package +import murano +from murano.common import consts +from murano.db.catalog import api as db_catalog_api +from murano.db import session as db_session +from murano.openstack.common.db import exception as db_exception +from murano.openstack.common import log as logging +from murano.packages import application_package CONF = cfg.CONF @@ -161,11 +161,11 @@ command_opt = cfg.SubCommandOpt('command', def main(): CONF.register_cli_opt(command_opt) try: - default_config_files = cfg.find_config_files('murano-api', 'murano') - CONF(sys.argv[1:], project='murano-api', prog='murano-manage', - version=muranoapi.__version__, + default_config_files = cfg.find_config_files('murano', 'murano') + CONF(sys.argv[1:], project='murano', prog='murano-manage', + version=murano.__version__, default_config_files=default_config_files) - logging.setup("murano-api") + logging.setup("murano") except RuntimeError as e: LOG.error("failed to initialize murano-manage: %s" % e) sys.exit("ERROR: %s" % e) diff --git a/muranoapi/common/__init__.py b/murano/common/__init__.py similarity index 100% rename from muranoapi/common/__init__.py rename to murano/common/__init__.py diff --git a/muranoapi/common/config.py b/murano/common/config.py similarity index 97% rename from muranoapi/common/config.py rename to murano/common/config.py index 34ba0e62..80e6844e 100644 --- a/muranoapi/common/config.py +++ b/murano/common/config.py @@ -26,8 +26,8 @@ import tempfile from oslo.config import cfg from paste import deploy -import muranoapi -from muranoapi.openstack.common.gettextutils import _ # noqa +import murano +from murano.openstack.common.gettextutils import _ # noqa paste_deploy_opts = [ cfg.StrOpt('flavor'), @@ -125,14 +125,14 @@ CONF.register_opts(stats_opt, group='stats') CONF.register_opts(networking_opts, group='networking') CONF.import_opt('connection', - 'muranoapi.openstack.common.db.options', + 'murano.openstack.common.db.options', group='database') def parse_args(args=None, usage=None, default_config_files=None): CONF(args=args, - project='muranoapi', - version=muranoapi.__version__, + project='murano', + version=murano.__version__, usage=usage, default_config_files=default_config_files) diff --git a/muranoapi/common/consts.py b/murano/common/consts.py similarity index 100% rename from muranoapi/common/consts.py rename to murano/common/consts.py diff --git a/muranoapi/common/engine.py b/murano/common/engine.py similarity index 84% rename from muranoapi/common/engine.py rename to murano/common/engine.py index 9445a5eb..05fa646a 100644 --- a/muranoapi/common/engine.py +++ b/murano/common/engine.py @@ -19,18 +19,18 @@ import anyjson from oslo import messaging from oslo.messaging import target -from muranoapi.common import config -from muranoapi.common.helpers import token_sanitizer -from muranoapi.common import rpc -from muranoapi.dsl import executor -from muranoapi.dsl import results_serializer -from muranoapi.engine import environment -from muranoapi.engine import package_class_loader -from muranoapi.engine import package_loader -from muranoapi.engine.system import status_reporter -import muranoapi.engine.system.system_objects as system_objects -from muranoapi.openstack.common.gettextutils import _ # noqa -from muranoapi.openstack.common import log as logging +from murano.common import config +from murano.common.helpers import token_sanitizer +from murano.common import rpc +from murano.dsl import executor +from murano.dsl import results_serializer +from murano.engine import environment +from murano.engine import package_class_loader +from murano.engine import package_loader +from murano.engine.system import status_reporter +import murano.engine.system.system_objects as system_objects +from murano.openstack.common.gettextutils import _ # noqa +from murano.openstack.common import log as logging RPC_SERVICE = None diff --git a/muranoapi/common/helpers/__init__.py b/murano/common/helpers/__init__.py similarity index 100% rename from muranoapi/common/helpers/__init__.py rename to murano/common/helpers/__init__.py diff --git a/muranoapi/common/helpers/token_sanitizer.py b/murano/common/helpers/token_sanitizer.py similarity index 100% rename from muranoapi/common/helpers/token_sanitizer.py rename to murano/common/helpers/token_sanitizer.py diff --git a/muranoapi/common/messaging/__init__.py b/murano/common/messaging/__init__.py similarity index 100% rename from muranoapi/common/messaging/__init__.py rename to murano/common/messaging/__init__.py diff --git a/muranoapi/common/messaging/message.py b/murano/common/messaging/message.py similarity index 100% rename from muranoapi/common/messaging/message.py rename to murano/common/messaging/message.py diff --git a/muranoapi/common/messaging/mqclient.py b/murano/common/messaging/mqclient.py similarity index 100% rename from muranoapi/common/messaging/mqclient.py rename to murano/common/messaging/mqclient.py diff --git a/muranoapi/common/messaging/subscription.py b/murano/common/messaging/subscription.py similarity index 97% rename from muranoapi/common/messaging/subscription.py rename to murano/common/messaging/subscription.py index c0890a23..10689f57 100644 --- a/muranoapi/common/messaging/subscription.py +++ b/murano/common/messaging/subscription.py @@ -19,7 +19,7 @@ import time from eventlet import patcher kombu = patcher.import_patched('kombu') -from muranoapi.common.messaging import message +from murano.common.messaging import message class Subscription(object): diff --git a/muranoapi/common/rpc.py b/murano/common/rpc.py similarity index 97% rename from muranoapi/common/rpc.py rename to murano/common/rpc.py index 01051994..7d5409c3 100644 --- a/muranoapi/common/rpc.py +++ b/murano/common/rpc.py @@ -16,7 +16,7 @@ from oslo import messaging from oslo.messaging import rpc from oslo.messaging import target -from muranoapi.common import config +from murano.common import config TRANSPORT = None diff --git a/muranoapi/common/server.py b/murano/common/server.py similarity index 94% rename from muranoapi/common/server.py rename to murano/common/server.py index 581b4ff2..5b9798fd 100644 --- a/muranoapi/common/server.py +++ b/murano/common/server.py @@ -20,14 +20,14 @@ from oslo.messaging import target from sqlalchemy import desc -from muranoapi.common import config -from muranoapi.common.helpers import token_sanitizer -from muranoapi.db import models -from muranoapi.db.services import instances -from muranoapi.db import session -from muranoapi.openstack.common.gettextutils import _ # noqa -from muranoapi.openstack.common import log as logging -from muranoapi.openstack.common import timeutils +from murano.common import config +from murano.common.helpers import token_sanitizer +from murano.db import models +from murano.db.services import instances +from murano.db import session +from murano.openstack.common.gettextutils import _ # noqa +from murano.openstack.common import log as logging +from murano.openstack.common import timeutils RPC_SERVICE = None diff --git a/muranoapi/common/statservice.py b/murano/common/statservice.py similarity index 91% rename from muranoapi/common/statservice.py rename to murano/common/statservice.py index 67b0c70f..8a0474c0 100644 --- a/muranoapi/common/statservice.py +++ b/murano/common/statservice.py @@ -18,14 +18,14 @@ import psutil import socket import time -from muranoapi.api import v1 -from muranoapi.api.v1 import request_statistics -from muranoapi.common import config +from murano.api import v1 +from murano.api.v1 import request_statistics +from murano.common import config -from muranoapi.db.services import stats as db_stats -from muranoapi.openstack.common.gettextutils import _ # noqa -from muranoapi.openstack.common import log as logging -from muranoapi.openstack.common import service +from murano.db.services import stats as db_stats +from murano.openstack.common.gettextutils import _ # noqa +from murano.openstack.common import log as logging +from murano.openstack.common import service CONF_STATS = config.CONF.stats diff --git a/muranoapi/common/utils.py b/murano/common/utils.py similarity index 98% rename from muranoapi/common/utils.py rename to murano/common/utils.py index 37011aac..412241ea 100644 --- a/muranoapi/common/utils.py +++ b/murano/common/utils.py @@ -19,8 +19,8 @@ import types import eventlet import jsonschema -from muranoapi.openstack.common.gettextutils import _ # noqa -from muranoapi.openstack.common import log as logging +from murano.openstack.common.gettextutils import _ # noqa +from murano.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/muranoapi/common/uuidutils.py b/murano/common/uuidutils.py similarity index 100% rename from muranoapi/common/uuidutils.py rename to murano/common/uuidutils.py diff --git a/muranoapi/context.py b/murano/context.py similarity index 100% rename from muranoapi/context.py rename to murano/context.py diff --git a/muranoapi/db/__init__.py b/murano/db/__init__.py similarity index 100% rename from muranoapi/db/__init__.py rename to murano/db/__init__.py diff --git a/muranoapi/db/catalog/__init__.py b/murano/db/catalog/__init__.py similarity index 100% rename from muranoapi/db/catalog/__init__.py rename to murano/db/catalog/__init__.py diff --git a/muranoapi/db/catalog/api.py b/murano/db/catalog/api.py similarity index 98% rename from muranoapi/db/catalog/api.py rename to murano/db/catalog/api.py index 95214ce5..069e4ac4 100644 --- a/muranoapi/db/catalog/api.py +++ b/murano/db/catalog/api.py @@ -17,10 +17,10 @@ from sqlalchemy.orm import attributes from sqlalchemy import sql from webob import exc -from muranoapi.db import models -from muranoapi.db import session as db_session -from muranoapi.openstack.common.gettextutils import _ # noqa -from muranoapi.openstack.common import log as logging +from murano.db import models +from murano.db import session as db_session +from murano.openstack.common.gettextutils import _ # noqa +from murano.openstack.common import log as logging SEARCH_MAPPING = {'fqn': 'fully_qualified_name', 'name': 'name', diff --git a/muranoapi/db/migrate_repo/README b/murano/db/migrate_repo/README similarity index 100% rename from muranoapi/db/migrate_repo/README rename to murano/db/migrate_repo/README diff --git a/muranoapi/db/migrate_repo/__init__.py b/murano/db/migrate_repo/__init__.py similarity index 100% rename from muranoapi/db/migrate_repo/__init__.py rename to murano/db/migrate_repo/__init__.py diff --git a/muranoapi/db/migrate_repo/manage.py b/murano/db/migrate_repo/manage.py similarity index 100% rename from muranoapi/db/migrate_repo/manage.py rename to murano/db/migrate_repo/manage.py diff --git a/muranoapi/db/migrate_repo/migrate.cfg b/murano/db/migrate_repo/migrate.cfg similarity index 100% rename from muranoapi/db/migrate_repo/migrate.cfg rename to murano/db/migrate_repo/migrate.cfg diff --git a/muranoapi/db/migrate_repo/versions/001_add_initial_tables.py b/murano/db/migrate_repo/versions/001_add_initial_tables.py similarity index 100% rename from muranoapi/db/migrate_repo/versions/001_add_initial_tables.py rename to murano/db/migrate_repo/versions/001_add_initial_tables.py diff --git a/muranoapi/db/migrate_repo/versions/002_add_networking_field.py b/murano/db/migrate_repo/versions/002_add_networking_field.py similarity index 100% rename from muranoapi/db/migrate_repo/versions/002_add_networking_field.py rename to murano/db/migrate_repo/versions/002_add_networking_field.py diff --git a/muranoapi/db/migrate_repo/versions/003_add_stats_table.py b/murano/db/migrate_repo/versions/003_add_stats_table.py similarity index 100% rename from muranoapi/db/migrate_repo/versions/003_add_stats_table.py rename to murano/db/migrate_repo/versions/003_add_stats_table.py diff --git a/muranoapi/db/migrate_repo/versions/004_add_repository_tables.py b/murano/db/migrate_repo/versions/004_add_repository_tables.py similarity index 100% rename from muranoapi/db/migrate_repo/versions/004_add_repository_tables.py rename to murano/db/migrate_repo/versions/004_add_repository_tables.py diff --git a/muranoapi/db/migrate_repo/versions/005_add_instance_table.py b/murano/db/migrate_repo/versions/005_add_instance_table.py similarity index 100% rename from muranoapi/db/migrate_repo/versions/005_add_instance_table.py rename to murano/db/migrate_repo/versions/005_add_instance_table.py diff --git a/muranoapi/db/migrate_repo/versions/006_add_default_categories.py b/murano/db/migrate_repo/versions/006_add_default_categories.py similarity index 93% rename from muranoapi/db/migrate_repo/versions/006_add_default_categories.py rename to murano/db/migrate_repo/versions/006_add_default_categories.py index 8b4860b8..562f2a4d 100644 --- a/muranoapi/db/migrate_repo/versions/006_add_default_categories.py +++ b/murano/db/migrate_repo/versions/006_add_default_categories.py @@ -15,8 +15,8 @@ from sqlalchemy import schema import uuid -from muranoapi.common import consts -from muranoapi.openstack.common import timeutils +from murano.common import consts +from murano.openstack.common import timeutils meta = schema.MetaData() diff --git a/muranoapi/db/migrate_repo/versions/007_instance_table_extended.py b/murano/db/migrate_repo/versions/007_instance_table_extended.py similarity index 100% rename from muranoapi/db/migrate_repo/versions/007_instance_table_extended.py rename to murano/db/migrate_repo/versions/007_instance_table_extended.py diff --git a/muranoapi/db/migrate_repo/versions/008_cpu_stats.py b/murano/db/migrate_repo/versions/008_cpu_stats.py similarity index 100% rename from muranoapi/db/migrate_repo/versions/008_cpu_stats.py rename to murano/db/migrate_repo/versions/008_cpu_stats.py diff --git a/muranoapi/db/migrate_repo/versions/009_increase_package_name_length.py b/murano/db/migrate_repo/versions/009_increase_package_name_length.py similarity index 100% rename from muranoapi/db/migrate_repo/versions/009_increase_package_name_length.py rename to murano/db/migrate_repo/versions/009_increase_package_name_length.py diff --git a/muranoapi/db/migrate_repo/versions/__init__.py b/murano/db/migrate_repo/versions/__init__.py similarity index 100% rename from muranoapi/db/migrate_repo/versions/__init__.py rename to murano/db/migrate_repo/versions/__init__.py diff --git a/muranoapi/db/models.py b/murano/db/models.py similarity index 98% rename from muranoapi/db/models.py rename to murano/db/models.py index 89c0b561..33a1cd7c 100644 --- a/muranoapi/db/models.py +++ b/murano/db/models.py @@ -13,7 +13,7 @@ # under the License. """ -SQLAlchemy models for muranoapi data +SQLAlchemy models for murano data """ import anyjson @@ -22,9 +22,9 @@ from sqlalchemy.ext import compiler as sa_compiler from sqlalchemy.ext import declarative as sa_decl from sqlalchemy import orm as sa_orm -from muranoapi.common import uuidutils -from muranoapi.db import session as db_session -from muranoapi.openstack.common import timeutils +from murano.common import uuidutils +from murano.db import session as db_session +from murano.openstack.common import timeutils BASE = sa_decl.declarative_base() diff --git a/muranoapi/db/services/__init__.py b/murano/db/services/__init__.py similarity index 100% rename from muranoapi/db/services/__init__.py rename to murano/db/services/__init__.py diff --git a/muranoapi/db/services/core_services.py b/murano/db/services/core_services.py similarity index 96% rename from muranoapi/db/services/core_services.py rename to murano/db/services/core_services.py index 84f1bc5d..283a3fdf 100644 --- a/muranoapi/db/services/core_services.py +++ b/murano/db/services/core_services.py @@ -13,9 +13,9 @@ # under the License. import types -from muranoapi.common import utils -from muranoapi.db.services import environments as envs -from muranoapi.openstack.common import timeutils +from murano.common import utils +from murano.db.services import environments as envs +from murano.openstack.common import timeutils class CoreServices(object): diff --git a/muranoapi/db/services/environments.py b/murano/db/services/environments.py similarity index 97% rename from muranoapi/db/services/environments.py rename to murano/db/services/environments.py index c4a4dd3a..b56dac9d 100644 --- a/muranoapi/db/services/environments.py +++ b/murano/db/services/environments.py @@ -14,12 +14,12 @@ import collections -from muranoapi.common import rpc -from muranoapi.common import uuidutils +from murano.common import rpc +from murano.common import uuidutils -from muranoapi.db import models -from muranoapi.db.services import sessions -from muranoapi.db import session as db_session +from murano.db import models +from murano.db.services import sessions +from murano.db import session as db_session EnvironmentStatus = collections.namedtuple('EnvironmentStatus', [ diff --git a/muranoapi/db/services/instances.py b/murano/db/services/instances.py similarity index 95% rename from muranoapi/db/services/instances.py rename to murano/db/services/instances.py index c34daf84..58846d12 100644 --- a/muranoapi/db/services/instances.py +++ b/murano/db/services/instances.py @@ -16,10 +16,10 @@ import sqlalchemy from sqlalchemy.sql import func -from muranoapi.db import models -from muranoapi.db import session as db_session -from muranoapi.openstack.common.db import exception -from muranoapi.openstack.common import timeutils +from murano.db import models +from murano.db import session as db_session +from murano.openstack.common.db import exception +from murano.openstack.common import timeutils UNCLASSIFIED = 0 diff --git a/muranoapi/db/services/sessions.py b/murano/db/services/sessions.py similarity index 97% rename from muranoapi/db/services/sessions.py rename to murano/db/services/sessions.py index efd9d4b6..a232471a 100644 --- a/muranoapi/db/services/sessions.py +++ b/murano/db/services/sessions.py @@ -13,10 +13,10 @@ # under the License. import collections -from muranoapi.common.helpers import token_sanitizer -from muranoapi.common import rpc -from muranoapi.db import models -from muranoapi.db import session as db_session +from murano.common.helpers import token_sanitizer +from murano.common import rpc +from murano.db import models +from murano.db import session as db_session SessionState = collections.namedtuple('SessionState', [ diff --git a/muranoapi/db/services/stats.py b/murano/db/services/stats.py similarity index 95% rename from muranoapi/db/services/stats.py rename to murano/db/services/stats.py index 577fc272..67765981 100644 --- a/muranoapi/db/services/stats.py +++ b/murano/db/services/stats.py @@ -13,8 +13,8 @@ # under the License. -from muranoapi.db import models as m -from muranoapi.db import session as db_session +from murano.db import models as m +from murano.db import session as db_session class Statistics(object): diff --git a/muranoapi/db/session.py b/murano/db/session.py similarity index 89% rename from muranoapi/db/session.py rename to murano/db/session.py index a5051f33..1c6259a9 100644 --- a/muranoapi/db/session.py +++ b/murano/db/session.py @@ -19,10 +19,10 @@ import os from migrate import exceptions as versioning_exceptions from migrate.versioning import api as versioning_api -from muranoapi.common import config -from muranoapi.db import migrate_repo -from muranoapi.openstack.common.db.sqlalchemy import session as db_session -from muranoapi.openstack.common import log as logging +from murano.common import config +from murano.db import migrate_repo +from murano.openstack.common.db.sqlalchemy import session as db_session +from murano.openstack.common import log as logging LOG = logging.getLogger(__name__) CONF = config.CONF diff --git a/muranoapi/dsl/__init__.py b/murano/dsl/__init__.py similarity index 100% rename from muranoapi/dsl/__init__.py rename to murano/dsl/__init__.py diff --git a/muranoapi/dsl/attribute_store.py b/murano/dsl/attribute_store.py similarity index 96% rename from muranoapi/dsl/attribute_store.py rename to murano/dsl/attribute_store.py index a3e6c9af..dd5038bd 100644 --- a/muranoapi/dsl/attribute_store.py +++ b/murano/dsl/attribute_store.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -import muranoapi.dsl.murano_object as murano_object +import murano.dsl.murano_object as murano_object class AttributeStore(object): diff --git a/muranoapi/dsl/class_loader.py b/murano/dsl/class_loader.py similarity index 93% rename from muranoapi/dsl/class_loader.py rename to murano/dsl/class_loader.py index 4c67cd5c..a7ffad48 100644 --- a/muranoapi/dsl/class_loader.py +++ b/murano/dsl/class_loader.py @@ -18,13 +18,13 @@ import types import yaql import yaql.context -import muranoapi.dsl.exceptions as exceptions -import muranoapi.dsl.helpers as helpers -import muranoapi.dsl.murano_class as murano_class -import muranoapi.dsl.murano_object as murano_object -import muranoapi.dsl.namespace_resolver as namespace_resolver -import muranoapi.dsl.principal_objects as principal_objects -import muranoapi.dsl.typespec as typespec +import murano.dsl.exceptions as exceptions +import murano.dsl.helpers as helpers +import murano.dsl.murano_class as murano_class +import murano.dsl.murano_object as murano_object +import murano.dsl.namespace_resolver as namespace_resolver +import murano.dsl.principal_objects as principal_objects +import murano.dsl.typespec as typespec class MuranoClassLoader(object): diff --git a/muranoapi/dsl/exceptions.py b/murano/dsl/exceptions.py similarity index 100% rename from muranoapi/dsl/exceptions.py rename to murano/dsl/exceptions.py diff --git a/muranoapi/dsl/executor.py b/murano/dsl/executor.py similarity index 96% rename from muranoapi/dsl/executor.py rename to murano/dsl/executor.py index 81f51498..27575abc 100644 --- a/muranoapi/dsl/executor.py +++ b/murano/dsl/executor.py @@ -22,15 +22,15 @@ import eventlet import eventlet.event import yaql.context -import muranoapi.dsl.attribute_store as attribute_store -import muranoapi.dsl.exceptions as exceptions -import muranoapi.dsl.expressions as expressions -import muranoapi.dsl.helpers as helpers -import muranoapi.dsl.murano_object as murano_object -import muranoapi.dsl.object_store as object_store -import muranoapi.dsl.yaql_functions as yaql_functions +import murano.dsl.attribute_store as attribute_store +import murano.dsl.exceptions as exceptions +import murano.dsl.expressions as expressions +import murano.dsl.helpers as helpers +import murano.dsl.murano_object as murano_object +import murano.dsl.object_store as object_store +import murano.dsl.yaql_functions as yaql_functions -from muranoapi.openstack.common import log as logging +from murano.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/muranoapi/dsl/expressions.py b/murano/dsl/expressions.py similarity index 94% rename from muranoapi/dsl/expressions.py rename to murano/dsl/expressions.py index e6d1b182..72fd0e62 100644 --- a/muranoapi/dsl/expressions.py +++ b/murano/dsl/expressions.py @@ -14,9 +14,9 @@ import types -import muranoapi.dsl.helpers as helpers -import muranoapi.dsl.lhs_expression as lhs_expression -import muranoapi.dsl.yaql_expression as yaql_expression +import murano.dsl.helpers as helpers +import murano.dsl.lhs_expression as lhs_expression +import murano.dsl.yaql_expression as yaql_expression _macros = [] diff --git a/muranoapi/dsl/helpers.py b/murano/dsl/helpers.py similarity index 96% rename from muranoapi/dsl/helpers.py rename to murano/dsl/helpers.py index 878a3a18..bdf0af4d 100644 --- a/muranoapi/dsl/helpers.py +++ b/murano/dsl/helpers.py @@ -21,9 +21,9 @@ import uuid import eventlet.greenpool import yaql.expressions -from muranoapi.common import utils -import muranoapi.dsl.murano_object -import muranoapi.dsl.yaql_expression as yaql_expression +from murano.common import utils +import murano.dsl.murano_object +import murano.dsl.yaql_expression as yaql_expression def serialize(value, memo=None): @@ -34,7 +34,7 @@ def serialize(value, memo=None): for d_key, d_value in value.iteritems(): result[d_key] = serialize(d_value, memo) return result - elif isinstance(value, muranoapi.dsl.murano_object.MuranoObject): + elif isinstance(value, murano.dsl.murano_object.MuranoObject): if not value.object_id in memo: memo.add(value.object_id) return serialize(value.to_dictionary(), memo) diff --git a/muranoapi/dsl/lhs_expression.py b/murano/dsl/lhs_expression.py similarity index 97% rename from muranoapi/dsl/lhs_expression.py rename to murano/dsl/lhs_expression.py index a8067158..cefa5793 100644 --- a/muranoapi/dsl/lhs_expression.py +++ b/murano/dsl/lhs_expression.py @@ -18,9 +18,9 @@ import yaql import yaql.context import yaql.expressions -import muranoapi.dsl.murano_object as murano_object -import muranoapi.dsl.type_scheme as type_scheme -import muranoapi.dsl.yaql_expression as yaql_expression +import murano.dsl.murano_object as murano_object +import murano.dsl.type_scheme as type_scheme +import murano.dsl.yaql_expression as yaql_expression class LhsExpression(object): diff --git a/muranoapi/dsl/macros.py b/murano/dsl/macros.py similarity index 97% rename from muranoapi/dsl/macros.py rename to murano/dsl/macros.py index e8f5a8d2..fa348f40 100644 --- a/muranoapi/dsl/macros.py +++ b/murano/dsl/macros.py @@ -17,10 +17,10 @@ import types import eventlet.greenpool as greenpool import yaql.context -import muranoapi.dsl.exceptions as exceptions -import muranoapi.dsl.expressions as expressions -import muranoapi.dsl.helpers as helpers -import muranoapi.dsl.yaql_expression as yaql_expression +import murano.dsl.exceptions as exceptions +import murano.dsl.expressions as expressions +import murano.dsl.helpers as helpers +import murano.dsl.yaql_expression as yaql_expression class CodeBlock(expressions.DslExpression): diff --git a/muranoapi/dsl/murano_class.py b/murano/dsl/murano_class.py similarity index 95% rename from muranoapi/dsl/murano_class.py rename to murano/dsl/murano_class.py index 6b23d813..3511c8d3 100644 --- a/muranoapi/dsl/murano_class.py +++ b/murano/dsl/murano_class.py @@ -15,10 +15,10 @@ import collections import inspect -import muranoapi.dsl.helpers as helpers -import muranoapi.dsl.murano_method as murano_method -import muranoapi.dsl.murano_object as murano_object -import muranoapi.dsl.typespec as typespec +import murano.dsl.helpers as helpers +import murano.dsl.murano_method as murano_method +import murano.dsl.murano_object as murano_object +import murano.dsl.typespec as typespec def classname(name): diff --git a/muranoapi/dsl/murano_method.py b/murano/dsl/murano_method.py similarity index 95% rename from muranoapi/dsl/murano_method.py rename to murano/dsl/murano_method.py index 22faf694..fdc9d461 100644 --- a/muranoapi/dsl/murano_method.py +++ b/murano/dsl/murano_method.py @@ -15,9 +15,9 @@ import inspect import types -import muranoapi.dsl.macros as macros -import muranoapi.dsl.typespec as typespec -import muranoapi.dsl.yaql_expression as yaql_expression +import murano.dsl.macros as macros +import murano.dsl.typespec as typespec +import murano.dsl.yaql_expression as yaql_expression try: from collections import OrderedDict # noqa diff --git a/muranoapi/dsl/murano_object.py b/murano/dsl/murano_object.py similarity index 93% rename from muranoapi/dsl/murano_object.py rename to murano/dsl/murano_object.py index a185e51a..1cc623f5 100644 --- a/muranoapi/dsl/murano_object.py +++ b/murano/dsl/murano_object.py @@ -17,10 +17,10 @@ import types import yaml import yaql.context -import muranoapi.dsl.exceptions as exceptions -import muranoapi.dsl.helpers -import muranoapi.dsl.type_scheme as type_scheme -import muranoapi.dsl.typespec as typespec +import murano.dsl.exceptions as exceptions +import murano.dsl.helpers +import murano.dsl.type_scheme as type_scheme +import murano.dsl.typespec as typespec class MuranoObject(object): @@ -30,7 +30,7 @@ class MuranoObject(object): if known_classes is None: known_classes = {} self.__parent_obj = parent_obj - self.__object_id = object_id or muranoapi.dsl.helpers.generate_id() + self.__object_id = object_id or murano.dsl.helpers.generate_id() self.__type = murano_class self.__properties = {} self.__object_store = object_store @@ -55,7 +55,7 @@ class MuranoObject(object): for i in xrange(2): for property_name in self.__type.properties: spec = self.__type.get_property(property_name) - needs_evaluation = muranoapi.dsl.helpers.needs_evaluation + needs_evaluation = murano.dsl.helpers.needs_evaluation if i == 0 and needs_evaluation(spec.default) or i == 1\ and property_name in used_names: continue @@ -137,7 +137,7 @@ class MuranoObject(object): default = self.__defaults.get(key, spec.default) child_context = yaql.context.Context(parent_context=self.__context) child_context.set_data(self) - default = muranoapi.dsl.helpers.evaluate(default, child_context, 1) + default = murano.dsl.helpers.evaluate(default, child_context, 1) self.__properties[key] = spec.validate( value, self, self.__context, self.__object_store, default) @@ -161,7 +161,7 @@ class MuranoObject(object): raise TypeError('Cannot cast') def __repr__(self): - return yaml.safe_dump(muranoapi.dsl.helpers.serialize(self)) + return yaml.safe_dump(murano.dsl.helpers.serialize(self)) def to_dictionary(self, include_hidden=False): result = {} diff --git a/muranoapi/dsl/murano_package.py b/murano/dsl/murano_package.py similarity index 100% rename from muranoapi/dsl/murano_package.py rename to murano/dsl/murano_package.py diff --git a/muranoapi/dsl/namespace_resolver.py b/murano/dsl/namespace_resolver.py similarity index 100% rename from muranoapi/dsl/namespace_resolver.py rename to murano/dsl/namespace_resolver.py diff --git a/muranoapi/dsl/object_store.py b/murano/dsl/object_store.py similarity index 98% rename from muranoapi/dsl/object_store.py rename to murano/dsl/object_store.py index a717e4e2..64170a30 100644 --- a/muranoapi/dsl/object_store.py +++ b/murano/dsl/object_store.py @@ -14,7 +14,7 @@ import inspect -import muranoapi.dsl.helpers as helpers +import murano.dsl.helpers as helpers class ObjectStore(object): diff --git a/murano/dsl/principal_objects/__init__.py b/murano/dsl/principal_objects/__init__.py new file mode 100644 index 00000000..ce6d8776 --- /dev/null +++ b/murano/dsl/principal_objects/__init__.py @@ -0,0 +1,6 @@ +import murano.dsl.principal_objects.sys_object + + +def register(class_loader): + sys_object = murano.dsl.principal_objects.sys_object + class_loader.import_class(sys_object.SysObject) diff --git a/muranoapi/dsl/principal_objects/sys_object.py b/murano/dsl/principal_objects/sys_object.py similarity index 94% rename from muranoapi/dsl/principal_objects/sys_object.py rename to murano/dsl/principal_objects/sys_object.py index eb9da528..9fd9525f 100644 --- a/muranoapi/dsl/principal_objects/sys_object.py +++ b/murano/dsl/principal_objects/sys_object.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -import muranoapi.dsl.helpers as helpers -import muranoapi.dsl.murano_class as murano_class +import murano.dsl.helpers as helpers +import murano.dsl.murano_class as murano_class @murano_class.classname('io.murano.Object') diff --git a/muranoapi/dsl/results_serializer.py b/murano/dsl/results_serializer.py similarity index 98% rename from muranoapi/dsl/results_serializer.py rename to murano/dsl/results_serializer.py index e531c3c5..7d7a4806 100644 --- a/muranoapi/dsl/results_serializer.py +++ b/murano/dsl/results_serializer.py @@ -14,7 +14,7 @@ import types -import muranoapi.dsl.murano_object as murano_object +import murano.dsl.murano_object as murano_object class ObjRef(object): diff --git a/muranoapi/dsl/type_scheme.py b/murano/dsl/type_scheme.py similarity index 95% rename from muranoapi/dsl/type_scheme.py rename to murano/dsl/type_scheme.py index eaac9cbe..80a2790f 100644 --- a/muranoapi/dsl/type_scheme.py +++ b/murano/dsl/type_scheme.py @@ -18,9 +18,9 @@ import uuid import yaql.context -import muranoapi.dsl.helpers -import muranoapi.dsl.murano_object -import muranoapi.dsl.yaql_expression as yaql_expression +import murano.dsl.helpers +import murano.dsl.murano_object +import murano.dsl.yaql_expression as yaql_expression NoValue = object() @@ -88,7 +88,7 @@ class TypeScheme(object): raise TypeError(value) @yaql.context.EvalArg('obj', arg_type=( - muranoapi.dsl.murano_object.MuranoObject, + murano.dsl.murano_object.MuranoObject, TypeScheme.ObjRef, types.NoneType )) @@ -104,7 +104,7 @@ class TypeScheme(object): raise TypeError() @yaql.context.EvalArg('obj', arg_type=( - muranoapi.dsl.murano_object.MuranoObject, + murano.dsl.murano_object.MuranoObject, TypeScheme.ObjRef, types.NoneType )) @@ -139,13 +139,13 @@ class TypeScheme(object): 'id': uuid.uuid4().hex, 'type': default_name }} - class_loader = muranoapi.dsl.helpers.get_class_loader(root_context) + class_loader = murano.dsl.helpers.get_class_loader(root_context) murano_class = class_loader.get_class(name) if not murano_class: raise TypeError() if value is None: return None - if isinstance(value, muranoapi.dsl.murano_object.MuranoObject): + if isinstance(value, murano.dsl.murano_object.MuranoObject): obj = value elif isinstance(value, types.DictionaryType): obj = object_store.load(value, this, root_context, diff --git a/muranoapi/dsl/typespec.py b/murano/dsl/typespec.py similarity index 97% rename from muranoapi/dsl/typespec.py rename to murano/dsl/typespec.py index 5bdef17f..88a4a525 100644 --- a/muranoapi/dsl/typespec.py +++ b/murano/dsl/typespec.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -import muranoapi.dsl.type_scheme as type_scheme +import murano.dsl.type_scheme as type_scheme class PropertyUsages(object): diff --git a/muranoapi/dsl/yaql_expression.py b/murano/dsl/yaql_expression.py similarity index 100% rename from muranoapi/dsl/yaql_expression.py rename to murano/dsl/yaql_expression.py diff --git a/muranoapi/dsl/yaql_functions.py b/murano/dsl/yaql_functions.py similarity index 97% rename from muranoapi/dsl/yaql_functions.py rename to murano/dsl/yaql_functions.py index 7328f74f..538e693e 100644 --- a/muranoapi/dsl/yaql_functions.py +++ b/murano/dsl/yaql_functions.py @@ -19,9 +19,9 @@ import eventlet import yaql.context import yaql.exceptions -import muranoapi.dsl.exceptions as exceptions -import muranoapi.dsl.helpers as helpers -import muranoapi.dsl.murano_object as murano_object +import murano.dsl.exceptions as exceptions +import murano.dsl.helpers as helpers +import murano.dsl.murano_object as murano_object def _resolve(name, obj): diff --git a/muranoapi/engine/__init__.py b/murano/engine/__init__.py similarity index 100% rename from muranoapi/engine/__init__.py rename to murano/engine/__init__.py diff --git a/muranoapi/engine/environment.py b/murano/engine/environment.py similarity index 100% rename from muranoapi/engine/environment.py rename to murano/engine/environment.py diff --git a/muranoapi/engine/package_class_loader.py b/murano/engine/package_class_loader.py similarity index 87% rename from muranoapi/engine/package_class_loader.py rename to murano/engine/package_class_loader.py index a2e4e7b9..0bac9ed0 100644 --- a/muranoapi/engine/package_class_loader.py +++ b/murano/engine/package_class_loader.py @@ -15,11 +15,11 @@ from oslo.config import cfg -from muranoapi.dsl import class_loader -from muranoapi.dsl import exceptions -from muranoapi.dsl import murano_package -from muranoapi.engine.system import yaql_functions -from muranoapi.openstack.common import log as logging +from murano.dsl import class_loader +from murano.dsl import exceptions +from murano.dsl import murano_package +from murano.engine.system import yaql_functions +from murano.openstack.common import log as logging CONF = cfg.CONF LOG = logging.getLogger(__name__) diff --git a/muranoapi/engine/package_loader.py b/murano/engine/package_loader.py similarity index 96% rename from muranoapi/engine/package_loader.py rename to murano/engine/package_loader.py index e294ecb0..b5d247d4 100644 --- a/muranoapi/engine/package_loader.py +++ b/murano/engine/package_loader.py @@ -25,12 +25,12 @@ from muranoclient.v1 import client as muranoclient import six import yaml -from muranoapi.common import config -from muranoapi.dsl import exceptions -from muranoapi.dsl import yaql_expression -from muranoapi.openstack.common import log as logging -from muranoapi.packages import application_package as app_pkg -from muranoapi.packages import exceptions as pkg_exc +from murano.common import config +from murano.dsl import exceptions +from murano.dsl import yaql_expression +from murano.openstack.common import log as logging +from murano.packages import application_package as app_pkg +from murano.packages import exceptions as pkg_exc LOG = logging.getLogger(__name__) diff --git a/muranoapi/engine/simple_cloader.py b/murano/engine/simple_cloader.py similarity index 89% rename from muranoapi/engine/simple_cloader.py rename to murano/engine/simple_cloader.py index b106167e..d5600df1 100644 --- a/muranoapi/engine/simple_cloader.py +++ b/murano/engine/simple_cloader.py @@ -17,9 +17,9 @@ import os.path import yaml -import muranoapi.dsl.class_loader as class_loader -import muranoapi.dsl.yaql_expression as yaql_expression -import muranoapi.engine.system.yaql_functions as yaql_functions +import murano.dsl.class_loader as class_loader +import murano.dsl.yaql_expression as yaql_expression +import murano.engine.system.yaql_functions as yaql_functions def yaql_constructor(loader, node): diff --git a/muranoapi/engine/system/__init__.py b/murano/engine/system/__init__.py similarity index 100% rename from muranoapi/engine/system/__init__.py rename to murano/engine/system/__init__.py diff --git a/muranoapi/engine/system/agent.py b/murano/engine/system/agent.py similarity index 96% rename from muranoapi/engine/system/agent.py rename to murano/engine/system/agent.py index 0f91ffe6..00246b93 100644 --- a/muranoapi/engine/system/agent.py +++ b/murano/engine/system/agent.py @@ -20,11 +20,11 @@ import uuid import eventlet.event -import muranoapi.common.messaging as messaging -import muranoapi.dsl.murano_class as murano_class -import muranoapi.dsl.murano_object as murano_object -import muranoapi.dsl.yaql_expression as yaql_expression -import muranoapi.engine.system.common as common +import murano.common.messaging as messaging +import murano.dsl.murano_class as murano_class +import murano.dsl.murano_object as murano_object +import murano.dsl.yaql_expression as yaql_expression +import murano.engine.system.common as common class AgentException(Exception): diff --git a/muranoapi/engine/system/agent_listener.py b/murano/engine/system/agent_listener.py similarity index 93% rename from muranoapi/engine/system/agent_listener.py rename to murano/engine/system/agent_listener.py index 55187ec2..87221388 100644 --- a/muranoapi/engine/system/agent_listener.py +++ b/murano/engine/system/agent_listener.py @@ -15,9 +15,9 @@ import eventlet -import muranoapi.dsl.murano_class as murano_class -import muranoapi.dsl.murano_object as murano_object -import muranoapi.engine.system.common as common +import murano.dsl.murano_class as murano_class +import murano.dsl.murano_object as murano_object +import murano.engine.system.common as common from muranoapi.openstack.common import log as logging diff --git a/muranoapi/engine/system/common.py b/murano/engine/system/common.py similarity index 91% rename from muranoapi/engine/system/common.py rename to murano/engine/system/common.py index 7add2256..384598db 100644 --- a/muranoapi/engine/system/common.py +++ b/murano/engine/system/common.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import muranoapi.common.config as config -import muranoapi.common.messaging as messaging +import murano.common.config as config +import murano.common.messaging as messaging def create_rmq_client(): diff --git a/muranoapi/engine/system/heat_stack.py b/murano/engine/system/heat_stack.py similarity index 96% rename from muranoapi/engine/system/heat_stack.py rename to murano/engine/system/heat_stack.py index c870f129..e0519c76 100644 --- a/muranoapi/engine/system/heat_stack.py +++ b/murano/engine/system/heat_stack.py @@ -19,12 +19,12 @@ import heatclient.exc as heat_exc import keystoneclient.v2_0.client as ksclient -import muranoapi.common.config as config +import murano.common.config as config -import muranoapi.dsl.helpers as helpers -import muranoapi.dsl.murano_class as murano_class -import muranoapi.dsl.murano_object as murano_object -import muranoapi.openstack.common.log as logging +import murano.dsl.helpers as helpers +import murano.dsl.murano_class as murano_class +import murano.dsl.murano_object as murano_object +import murano.openstack.common.log as logging log = logging.getLogger(__name__) diff --git a/muranoapi/engine/system/instance_reporter.py b/murano/engine/system/instance_reporter.py similarity index 93% rename from muranoapi/engine/system/instance_reporter.py rename to murano/engine/system/instance_reporter.py index da64264b..0ea76f84 100644 --- a/muranoapi/engine/system/instance_reporter.py +++ b/murano/engine/system/instance_reporter.py @@ -15,10 +15,10 @@ from oslo import messaging -from muranoapi.common import config -from muranoapi.common import uuidutils -from muranoapi.dsl import murano_class -from muranoapi.openstack.common import log as logging +from murano.common import config +from murano.common import uuidutils +from murano.dsl import murano_class +from murano.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/muranoapi/engine/system/net_explorer.py b/murano/engine/system/net_explorer.py similarity index 96% rename from muranoapi/engine/system/net_explorer.py rename to murano/engine/system/net_explorer.py index 996d82d6..6f7ae921 100644 --- a/muranoapi/engine/system/net_explorer.py +++ b/murano/engine/system/net_explorer.py @@ -20,10 +20,10 @@ import netaddr from netaddr.strategy import ipv4 import neutronclient.v2_0.client as nclient -import muranoapi.common.config as config -import muranoapi.dsl.helpers as helpers -import muranoapi.dsl.murano_class as murano_class -import muranoapi.dsl.murano_object as murano_object +import murano.common.config as config +import murano.dsl.helpers as helpers +import murano.dsl.murano_class as murano_class +import murano.dsl.murano_object as murano_object @murano_class.classname('io.murano.system.NetworkExplorer') diff --git a/muranoapi/engine/system/resource_manager.py b/murano/engine/system/resource_manager.py similarity index 95% rename from muranoapi/engine/system/resource_manager.py rename to murano/engine/system/resource_manager.py index 8820fcfe..8a1da9a3 100644 --- a/muranoapi/engine/system/resource_manager.py +++ b/murano/engine/system/resource_manager.py @@ -16,7 +16,7 @@ import json as jsonlib import yaml as yamllib -import muranoapi.dsl.murano_object as murano_object +import murano.dsl.murano_object as murano_object class ResourceManager(murano_object.MuranoObject): diff --git a/muranoapi/engine/system/status_reporter.py b/murano/engine/system/status_reporter.py similarity index 90% rename from muranoapi/engine/system/status_reporter.py rename to murano/engine/system/status_reporter.py index 484ff4c5..5ccfb446 100644 --- a/muranoapi/engine/system/status_reporter.py +++ b/murano/engine/system/status_reporter.py @@ -15,10 +15,10 @@ from oslo import messaging -from muranoapi.common import config -from muranoapi.common import uuidutils -from muranoapi.dsl import murano_class -from muranoapi.openstack.common import log as logging +from murano.common import config +from murano.common import uuidutils +from murano.dsl import murano_class +from murano.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/muranoapi/engine/system/system_objects.py b/murano/engine/system/system_objects.py similarity index 82% rename from muranoapi/engine/system/system_objects.py rename to murano/engine/system/system_objects.py index 80ab51ff..a6a2e679 100644 --- a/muranoapi/engine/system/system_objects.py +++ b/murano/engine/system/system_objects.py @@ -15,14 +15,14 @@ import inspect -from muranoapi.dsl import murano_class -from muranoapi.engine.system import agent -from muranoapi.engine.system import agent_listener -from muranoapi.engine.system import heat_stack -from muranoapi.engine.system import instance_reporter -from muranoapi.engine.system import net_explorer -from muranoapi.engine.system import resource_manager -from muranoapi.engine.system import status_reporter +from murano.dsl import murano_class +from murano.engine.system import agent +from murano.engine.system import agent_listener +from murano.engine.system import heat_stack +from murano.engine.system import instance_reporter +from murano.engine.system import net_explorer +from murano.engine.system import resource_manager +from murano.engine.system import status_reporter def _auto_register(class_loader): diff --git a/muranoapi/engine/system/yaql_functions.py b/murano/engine/system/yaql_functions.py similarity index 98% rename from muranoapi/engine/system/yaql_functions.py rename to murano/engine/system/yaql_functions.py index 0e02c1be..1624fe25 100644 --- a/muranoapi/engine/system/yaql_functions.py +++ b/murano/engine/system/yaql_functions.py @@ -23,8 +23,8 @@ import jsonpointer import yaql.context import yaql.functions.builtin as yaql_builtin -import muranoapi.common.config as cfg -import muranoapi.dsl.helpers as helpers +import murano.common.config as cfg +import murano.dsl.helpers as helpers def _transform_json(json, mappings): diff --git a/muranoapi/locale/muranoapi.pot b/murano/locale/murano.pot similarity index 59% rename from muranoapi/locale/muranoapi.pot rename to murano/locale/murano.pot index 987edeca..dfc13861 100644 --- a/muranoapi/locale/muranoapi.pot +++ b/murano/locale/murano.pot @@ -17,412 +17,412 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -#: muranoapi/api/v1/environments.py:33 +#: murano/api/v1/environments.py:33 msgid "Environments:List" msgstr "" -#: muranoapi/api/v1/environments.py:43 +#: murano/api/v1/environments.py:43 msgid "Environments:Create " msgstr "" -#: muranoapi/api/v1/environments.py:51 +#: murano/api/v1/environments.py:51 msgid "Environments:Show " msgstr "" -#: muranoapi/api/v1/environments.py:80 +#: murano/api/v1/environments.py:80 msgid "Environments:Update " msgstr "" -#: muranoapi/api/v1/environments.py:100 +#: murano/api/v1/environments.py:100 msgid "Environments:Delete " msgstr "" -#: muranoapi/api/v1/services.py:44 +#: murano/api/v1/services.py:44 msgid "Services:Get " msgstr "" -#: muranoapi/api/v1/services.py:61 +#: murano/api/v1/services.py:61 msgid "Services:Post " msgstr "" -#: muranoapi/api/v1/services.py:75 +#: murano/api/v1/services.py:75 msgid "Services:Put " msgstr "" -#: muranoapi/api/v1/services.py:90 +#: murano/api/v1/services.py:90 msgid "Services:Put " msgstr "" -#: muranoapi/api/v1/sessions.py:30 +#: murano/api/v1/sessions.py:30 msgid "Session:Configure " msgstr "" -#: muranoapi/api/v1/sessions.py:58 +#: murano/api/v1/sessions.py:58 msgid "Session:Show " msgstr "" -#: muranoapi/api/v1/sessions.py:86 +#: murano/api/v1/sessions.py:86 msgid "Session:Delete " msgstr "" -#: muranoapi/api/v1/sessions.py:118 +#: murano/api/v1/sessions.py:118 msgid "Session:Deploy " msgstr "" -#: muranoapi/common/config.py:64 +#: murano/common/config.py:64 msgid "A boolean that determines if the database will be automatically created." msgstr "" -#: muranoapi/common/config.py:131 +#: murano/common/config.py:131 msgid "Invalid syslog facility" msgstr "" -#: muranoapi/common/config.py:205 +#: murano/common/config.py:205 #, python-format msgid "Loading %(app_name)s from %(conf_file)s" msgstr "" -#: muranoapi/common/config.py:216 +#: murano/common/config.py:216 #, python-format msgid "" "Unable to load %(app_name)s from configuration file %(conf_file)s.\n" "Got: %(e)r" msgstr "" -#: muranoapi/common/service.py:101 +#: murano/common/service.py:101 msgid "" "Got result message from orchestration engine:\n" "{0}" msgstr "" -#: muranoapi/common/service.py:105 +#: murano/common/service.py:105 msgid "Result for environment {0} is dropped. Environment is deleted" msgstr "" -#: muranoapi/common/service.py:112 +#: murano/common/service.py:112 msgid "" "Environment result could not be handled, specified environment does not " "found in database" msgstr "" -#: muranoapi/common/service.py:162 +#: murano/common/service.py:162 msgid "" "Got report message from orchestration engine:\n" "{0}" msgstr "" -#: muranoapi/db/session.py:38 +#: murano/db/session.py:38 msgid "auto-creating DB" msgstr "" -#: muranoapi/db/session.py:41 +#: murano/db/session.py:41 msgid "not auto-creating DB" msgstr "" -#: muranoapi/openstack/common/eventlet_backdoor.py:141 +#: murano/openstack/common/eventlet_backdoor.py:141 #, python-format msgid "Eventlet backdoor listening on %(port)s for process %(pid)d" msgstr "" -#: muranoapi/openstack/common/exception.py:103 +#: murano/openstack/common/exception.py:103 msgid "Uncaught exception" msgstr "" -#: muranoapi/openstack/common/excutils.py:62 +#: murano/openstack/common/excutils.py:62 #, python-format msgid "Original exception being dropped: %s" msgstr "" -#: muranoapi/openstack/common/excutils.py:90 +#: murano/openstack/common/excutils.py:90 #, python-format msgid "Unexpected exception occurred %d time(s)... retrying." msgstr "" -#: muranoapi/openstack/common/fileutils.py:64 +#: murano/openstack/common/fileutils.py:64 #, python-format msgid "Reloading cached file %s" msgstr "" -#: muranoapi/openstack/common/lockutils.py:100 +#: murano/openstack/common/lockutils.py:100 #, python-format msgid "Could not release the acquired lock `%s`" msgstr "" -#: muranoapi/openstack/common/lockutils.py:166 +#: murano/openstack/common/lockutils.py:166 #, python-format msgid "Got semaphore \"%(lock)s\"" msgstr "" -#: muranoapi/openstack/common/lockutils.py:175 +#: murano/openstack/common/lockutils.py:175 #, python-format msgid "Attempting to grab file lock \"%(lock)s\"" msgstr "" -#: muranoapi/openstack/common/lockutils.py:185 +#: murano/openstack/common/lockutils.py:185 #, python-format msgid "Created lock path: %s" msgstr "" -#: muranoapi/openstack/common/lockutils.py:203 +#: murano/openstack/common/lockutils.py:203 #, python-format msgid "Got file lock \"%(lock)s\" at %(path)s" msgstr "" -#: muranoapi/openstack/common/lockutils.py:207 +#: murano/openstack/common/lockutils.py:207 #, python-format msgid "Released file lock \"%(lock)s\" at %(path)s" msgstr "" -#: muranoapi/openstack/common/lockutils.py:244 +#: murano/openstack/common/lockutils.py:244 #, python-format msgid "Got semaphore / lock \"%(function)s\"" msgstr "" -#: muranoapi/openstack/common/lockutils.py:248 +#: murano/openstack/common/lockutils.py:248 #, python-format msgid "Semaphore / lock released \"%(function)s\"" msgstr "" -#: muranoapi/openstack/common/log.py:244 +#: murano/openstack/common/log.py:244 #, python-format msgid "Deprecated: %s" msgstr "" -#: muranoapi/openstack/common/log.py:336 +#: murano/openstack/common/log.py:336 #, python-format msgid "Error loading logging config %(log_config)s: %(err_msg)s" msgstr "" -#: muranoapi/openstack/common/log.py:386 +#: murano/openstack/common/log.py:386 #, python-format msgid "syslog facility must be one of: %s" msgstr "" -#: muranoapi/openstack/common/log.py:556 +#: murano/openstack/common/log.py:556 #, python-format msgid "Fatal call to deprecated config: %(msg)s" msgstr "" -#: muranoapi/openstack/common/loopingcall.py:84 +#: murano/openstack/common/loopingcall.py:84 #, python-format msgid "task run outlasted interval by %s sec" msgstr "" -#: muranoapi/openstack/common/loopingcall.py:91 +#: murano/openstack/common/loopingcall.py:91 msgid "in fixed duration looping call" msgstr "" -#: muranoapi/openstack/common/loopingcall.py:131 +#: murano/openstack/common/loopingcall.py:131 #, python-format msgid "Dynamic looping call sleeping for %.02f seconds" msgstr "" -#: muranoapi/openstack/common/loopingcall.py:138 +#: murano/openstack/common/loopingcall.py:138 msgid "in dynamic looping call" msgstr "" -#: muranoapi/openstack/common/service.py:103 -#: muranoapi/openstack/common/service.py:271 +#: murano/openstack/common/service.py:103 +#: murano/openstack/common/service.py:271 msgid "Full set of CONF:" msgstr "" -#: muranoapi/openstack/common/service.py:112 -#: muranoapi/openstack/common/service.py:214 +#: murano/openstack/common/service.py:112 +#: murano/openstack/common/service.py:214 #, python-format msgid "Caught %s, exiting" msgstr "" -#: muranoapi/openstack/common/service.py:123 +#: murano/openstack/common/service.py:123 msgid "Exception during rpc cleanup." msgstr "" -#: muranoapi/openstack/common/service.py:159 +#: murano/openstack/common/service.py:159 msgid "Parent process has died unexpectedly, exiting" msgstr "" -#: muranoapi/openstack/common/service.py:196 +#: murano/openstack/common/service.py:196 msgid "Forking too fast, sleeping" msgstr "" -#: muranoapi/openstack/common/service.py:219 +#: murano/openstack/common/service.py:219 msgid "Unhandled exception" msgstr "" -#: muranoapi/openstack/common/service.py:226 +#: murano/openstack/common/service.py:226 #, python-format msgid "Started child %d" msgstr "" -#: muranoapi/openstack/common/service.py:236 +#: murano/openstack/common/service.py:236 #, python-format msgid "Starting %d workers" msgstr "" -#: muranoapi/openstack/common/service.py:253 +#: murano/openstack/common/service.py:253 #, python-format msgid "Child %(pid)d killed by signal %(sig)d" msgstr "" -#: muranoapi/openstack/common/service.py:257 +#: murano/openstack/common/service.py:257 #, python-format msgid "Child %(pid)s exited with status %(code)d" msgstr "" -#: muranoapi/openstack/common/service.py:261 +#: murano/openstack/common/service.py:261 #, python-format msgid "pid %d not in child list" msgstr "" -#: muranoapi/openstack/common/service.py:289 +#: murano/openstack/common/service.py:289 #, python-format msgid "Caught %s, stopping children" msgstr "" -#: muranoapi/openstack/common/service.py:300 +#: murano/openstack/common/service.py:300 #, python-format msgid "Waiting on %d children to exit" msgstr "" -#: muranoapi/openstack/common/sslutils.py:52 +#: murano/openstack/common/sslutils.py:52 #, python-format msgid "Unable to find cert_file : %s" msgstr "" -#: muranoapi/openstack/common/sslutils.py:55 +#: murano/openstack/common/sslutils.py:55 #, python-format msgid "Unable to find ca_file : %s" msgstr "" -#: muranoapi/openstack/common/sslutils.py:58 +#: murano/openstack/common/sslutils.py:58 #, python-format msgid "Unable to find key_file : %s" msgstr "" -#: muranoapi/openstack/common/sslutils.py:61 +#: murano/openstack/common/sslutils.py:61 msgid "" "When running server in SSL mode, you must specify both a cert_file and " "key_file option value in your configuration file" msgstr "" -#: muranoapi/openstack/common/sslutils.py:100 +#: murano/openstack/common/sslutils.py:100 #, python-format msgid "Invalid SSL version : %s" msgstr "" -#: muranoapi/openstack/common/wsgi.py:110 +#: murano/openstack/common/wsgi.py:110 #, python-format msgid "Could not bind to %(host)s:%(port)s after trying for 30 seconds" msgstr "" -#: muranoapi/openstack/common/wsgi.py:372 +#: murano/openstack/common/wsgi.py:372 msgid "Unsupported Content-Type" msgstr "" -#: muranoapi/openstack/common/wsgi.py:375 +#: murano/openstack/common/wsgi.py:375 msgid "Malformed request body" msgstr "" -#: muranoapi/openstack/common/wsgi.py:660 +#: murano/openstack/common/wsgi.py:660 msgid "Empty body provided in request" msgstr "" -#: muranoapi/openstack/common/wsgi.py:666 +#: murano/openstack/common/wsgi.py:666 msgid "Unrecognized Content-Type provided in request" msgstr "" -#: muranoapi/openstack/common/wsgi.py:670 +#: murano/openstack/common/wsgi.py:670 msgid "No Content-Type provided in request" msgstr "" -#: muranoapi/openstack/common/wsgi.py:676 +#: murano/openstack/common/wsgi.py:676 msgid "Unable to deserialize body as provided Content-Type" msgstr "" -#: muranoapi/openstack/common/wsgi.py:726 +#: murano/openstack/common/wsgi.py:726 msgid "cannot understand JSON" msgstr "" -#: muranoapi/openstack/common/wsgi.py:750 +#: murano/openstack/common/wsgi.py:750 msgid "cannot understand XML" msgstr "" -#: muranoapi/openstack/common/db/exception.py:44 +#: murano/openstack/common/db/exception.py:44 msgid "Invalid Parameter: Unicode is not supported by the current database." msgstr "" -#: muranoapi/openstack/common/db/sqlalchemy/session.py:508 +#: murano/openstack/common/db/sqlalchemy/session.py:508 msgid "DB exception wrapped." msgstr "" -#: muranoapi/openstack/common/db/sqlalchemy/session.py:570 +#: murano/openstack/common/db/sqlalchemy/session.py:570 #, python-format msgid "Got mysql server has gone away: %s" msgstr "" -#: muranoapi/openstack/common/db/sqlalchemy/session.py:650 +#: murano/openstack/common/db/sqlalchemy/session.py:650 #, python-format msgid "SQL connection failed. %s attempts left." msgstr "" -#: muranoapi/openstack/common/db/sqlalchemy/utils.py:49 +#: murano/openstack/common/db/sqlalchemy/utils.py:49 msgid "Sort key supplied was not valid." msgstr "" -#: muranoapi/openstack/common/db/sqlalchemy/utils.py:88 +#: murano/openstack/common/db/sqlalchemy/utils.py:88 msgid "Id not in sort_keys; is sort_keys unique?" msgstr "" -#: muranoapi/openstack/common/db/sqlalchemy/utils.py:110 +#: murano/openstack/common/db/sqlalchemy/utils.py:110 msgid "Unknown sort direction, must be 'desc' or 'asc'" msgstr "" -#: muranoapi/openstack/common/db/sqlalchemy/utils.py:181 +#: murano/openstack/common/db/sqlalchemy/utils.py:181 #, python-format msgid "" "Please specify column %s in col_name_col_instance param. It is required " "because column has unsupported type by sqlite)." msgstr "" -#: muranoapi/openstack/common/db/sqlalchemy/utils.py:187 +#: murano/openstack/common/db/sqlalchemy/utils.py:187 #, python-format msgid "" "col_name_col_instance param has wrong type of column instance for column " "%s It should be instance of sqlalchemy.Column." msgstr "" -#: muranoapi/openstack/common/db/sqlalchemy/utils.py:230 +#: murano/openstack/common/db/sqlalchemy/utils.py:230 #, python-format msgid "Deleting duplicated row with id: %(id)s from table: %(table)s" msgstr "" -#: muranoapi/openstack/common/db/sqlalchemy/utils.py:252 +#: murano/openstack/common/db/sqlalchemy/utils.py:252 msgid "Unsupported id columns type" msgstr "" -#: muranoapi/openstack/common/notifier/api.py:129 +#: murano/openstack/common/notifier/api.py:129 #, python-format msgid "%s not in valid priorities" msgstr "" -#: muranoapi/openstack/common/notifier/api.py:145 +#: murano/openstack/common/notifier/api.py:145 #, python-format msgid "" "Problem '%(e)s' attempting to send to notification system. " "Payload=%(payload)s" msgstr "" -#: muranoapi/openstack/common/notifier/api.py:164 +#: murano/openstack/common/notifier/api.py:164 #, python-format msgid "Failed to load notifier %s. These notifications will not be sent." msgstr "" -#: muranoapi/openstack/common/notifier/rpc_notifier.py:45 -#: muranoapi/openstack/common/notifier/rpc_notifier2.py:51 +#: murano/openstack/common/notifier/rpc_notifier.py:45 +#: murano/openstack/common/notifier/rpc_notifier2.py:51 #, python-format msgid "Could not send notification to %(topic)s. Payload=%(message)s" msgstr "" -#: muranoapi/openstack/common/rpc/__init__.py:106 +#: murano/openstack/common/rpc/__init__.py:106 #, python-format msgid "" "A RPC is being made while holding a lock. The locks currently held are " @@ -430,420 +430,420 @@ msgid "" "following: [%(stack)s]." msgstr "" -#: muranoapi/openstack/common/rpc/amqp.py:75 +#: murano/openstack/common/rpc/amqp.py:75 msgid "Pool creating new connection" msgstr "" -#: muranoapi/openstack/common/rpc/amqp.py:202 +#: murano/openstack/common/rpc/amqp.py:202 #, python-format msgid "No calling threads waiting for msg_id : %(msg_id)s, message : %(data)s" msgstr "" -#: muranoapi/openstack/common/rpc/amqp.py:205 +#: murano/openstack/common/rpc/amqp.py:205 #, python-format msgid "_call_waiters: %s" msgstr "" -#: muranoapi/openstack/common/rpc/amqp.py:212 +#: murano/openstack/common/rpc/amqp.py:212 #, python-format msgid "" "Number of call waiters is greater than warning threshhold: %d. There " "could be a MulticallProxyWaiter leak." msgstr "" -#: muranoapi/openstack/common/rpc/amqp.py:290 +#: murano/openstack/common/rpc/amqp.py:290 #, python-format msgid "unpacked context: %s" msgstr "" -#: muranoapi/openstack/common/rpc/amqp.py:336 +#: murano/openstack/common/rpc/amqp.py:336 #, python-format msgid "UNIQUE_ID is %s." msgstr "" -#: muranoapi/openstack/common/rpc/amqp.py:408 +#: murano/openstack/common/rpc/amqp.py:408 #, python-format msgid "received %s" msgstr "" -#: muranoapi/openstack/common/rpc/amqp.py:416 +#: murano/openstack/common/rpc/amqp.py:416 #, python-format msgid "no method for message: %s" msgstr "" -#: muranoapi/openstack/common/rpc/amqp.py:417 +#: murano/openstack/common/rpc/amqp.py:417 #, python-format msgid "No method for message: %s" msgstr "" -#: muranoapi/openstack/common/rpc/amqp.py:445 -#: muranoapi/openstack/common/rpc/impl_zmq.py:280 +#: murano/openstack/common/rpc/amqp.py:445 +#: murano/openstack/common/rpc/impl_zmq.py:280 #, python-format msgid "Expected exception during message handling (%s)" msgstr "" -#: muranoapi/openstack/common/rpc/amqp.py:453 -#: muranoapi/openstack/common/rpc/impl_zmq.py:286 +#: murano/openstack/common/rpc/amqp.py:453 +#: murano/openstack/common/rpc/impl_zmq.py:286 msgid "Exception during message handling" msgstr "" -#: muranoapi/openstack/common/rpc/amqp.py:527 +#: murano/openstack/common/rpc/amqp.py:527 #, python-format msgid "Making synchronous call on %s ..." msgstr "" -#: muranoapi/openstack/common/rpc/amqp.py:530 +#: murano/openstack/common/rpc/amqp.py:530 #, python-format msgid "MSG_ID is %s" msgstr "" -#: muranoapi/openstack/common/rpc/amqp.py:556 +#: murano/openstack/common/rpc/amqp.py:556 #, python-format msgid "Making asynchronous cast on %s..." msgstr "" -#: muranoapi/openstack/common/rpc/amqp.py:565 +#: murano/openstack/common/rpc/amqp.py:565 msgid "Making asynchronous fanout cast..." msgstr "" -#: muranoapi/openstack/common/rpc/amqp.py:593 +#: murano/openstack/common/rpc/amqp.py:593 #, python-format msgid "Sending %(event_type)s on %(topic)s" msgstr "" -#: muranoapi/openstack/common/rpc/common.py:77 +#: murano/openstack/common/rpc/common.py:77 msgid "An unknown RPC related exception occurred." msgstr "" -#: muranoapi/openstack/common/rpc/common.py:89 +#: murano/openstack/common/rpc/common.py:89 msgid "Exception in string format operation" msgstr "" -#: muranoapi/openstack/common/rpc/common.py:107 +#: murano/openstack/common/rpc/common.py:107 #, python-format msgid "" "Remote error: %(exc_type)s %(value)s\n" "%(traceback)s." msgstr "" -#: muranoapi/openstack/common/rpc/common.py:124 +#: murano/openstack/common/rpc/common.py:124 #, python-format msgid "" "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:" " \"%(method)s\" info: \"%(info)s\"" msgstr "" -#: muranoapi/openstack/common/rpc/common.py:141 -#: muranoapi/openstack/common/rpc/common.py:142 -#: muranoapi/openstack/common/rpc/common.py:143 +#: murano/openstack/common/rpc/common.py:141 +#: murano/openstack/common/rpc/common.py:142 +#: murano/openstack/common/rpc/common.py:143 msgid "" msgstr "" -#: muranoapi/openstack/common/rpc/common.py:147 +#: murano/openstack/common/rpc/common.py:147 #, python-format msgid "Found duplicate message(%(msg_id)s). Skipping it." msgstr "" -#: muranoapi/openstack/common/rpc/common.py:151 +#: murano/openstack/common/rpc/common.py:151 msgid "Invalid reuse of an RPC connection." msgstr "" -#: muranoapi/openstack/common/rpc/common.py:155 +#: murano/openstack/common/rpc/common.py:155 #, python-format msgid "Specified RPC version, %(version)s, not supported by this endpoint." msgstr "" -#: muranoapi/openstack/common/rpc/common.py:160 +#: murano/openstack/common/rpc/common.py:160 #, python-format msgid "" "Specified RPC envelope version, %(version)s, not supported by this " "endpoint." msgstr "" -#: muranoapi/openstack/common/rpc/common.py:165 +#: murano/openstack/common/rpc/common.py:165 #, python-format msgid "Specified RPC version cap, %(version_cap)s, is too low" msgstr "" -#: muranoapi/openstack/common/rpc/common.py:289 +#: murano/openstack/common/rpc/common.py:289 #, python-format msgid "Returning exception %s to caller" msgstr "" -#: muranoapi/openstack/common/rpc/impl_kombu.py:162 +#: murano/openstack/common/rpc/impl_kombu.py:162 msgid "Failed to process message ... skipping it." msgstr "" -#: muranoapi/openstack/common/rpc/impl_kombu.py:165 +#: murano/openstack/common/rpc/impl_kombu.py:165 msgid "Failed to process message ... will requeue." msgstr "" -#: muranoapi/openstack/common/rpc/impl_kombu.py:506 +#: murano/openstack/common/rpc/impl_kombu.py:506 #, python-format msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d" msgstr "" -#: muranoapi/openstack/common/rpc/impl_kombu.py:528 +#: murano/openstack/common/rpc/impl_kombu.py:528 #, python-format msgid "Connected to AMQP server on %(hostname)s:%(port)d" msgstr "" -#: muranoapi/openstack/common/rpc/impl_kombu.py:565 +#: murano/openstack/common/rpc/impl_kombu.py:565 #, python-format msgid "" "Unable to connect to AMQP server on %(hostname)s:%(port)d after " "%(max_retries)d tries: %(err_str)s" msgstr "" -#: muranoapi/openstack/common/rpc/impl_kombu.py:579 +#: murano/openstack/common/rpc/impl_kombu.py:579 #, python-format msgid "" "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying " "again in %(sleep_time)d seconds." msgstr "" -#: muranoapi/openstack/common/rpc/impl_kombu.py:633 -#: muranoapi/openstack/common/rpc/impl_qpid.py:492 +#: murano/openstack/common/rpc/impl_kombu.py:633 +#: murano/openstack/common/rpc/impl_qpid.py:492 #, python-format msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s" msgstr "" -#: muranoapi/openstack/common/rpc/impl_kombu.py:651 -#: muranoapi/openstack/common/rpc/impl_qpid.py:507 +#: murano/openstack/common/rpc/impl_kombu.py:651 +#: murano/openstack/common/rpc/impl_qpid.py:507 #, python-format msgid "Timed out waiting for RPC response: %s" msgstr "" -#: muranoapi/openstack/common/rpc/impl_kombu.py:655 -#: muranoapi/openstack/common/rpc/impl_qpid.py:511 +#: murano/openstack/common/rpc/impl_kombu.py:655 +#: murano/openstack/common/rpc/impl_qpid.py:511 #, python-format msgid "Failed to consume message from queue: %s" msgstr "" -#: muranoapi/openstack/common/rpc/impl_kombu.py:694 -#: muranoapi/openstack/common/rpc/impl_qpid.py:546 +#: murano/openstack/common/rpc/impl_kombu.py:694 +#: murano/openstack/common/rpc/impl_qpid.py:546 #, python-format msgid "Failed to publish message to topic '%(topic)s': %(err_str)s" msgstr "" -#: muranoapi/openstack/common/rpc/impl_qpid.py:161 +#: murano/openstack/common/rpc/impl_qpid.py:161 msgid "Failed to process message... skipping it." msgstr "" -#: muranoapi/openstack/common/rpc/impl_qpid.py:434 +#: murano/openstack/common/rpc/impl_qpid.py:434 #, python-format msgid "Unable to connect to AMQP server: %(e)s. Sleeping %(delay)s seconds" msgstr "" -#: muranoapi/openstack/common/rpc/impl_qpid.py:440 +#: murano/openstack/common/rpc/impl_qpid.py:440 #, python-format msgid "Connected to AMQP server on %s" msgstr "" -#: muranoapi/openstack/common/rpc/impl_qpid.py:453 +#: murano/openstack/common/rpc/impl_qpid.py:453 msgid "Re-established AMQP queues" msgstr "" -#: muranoapi/openstack/common/rpc/impl_qpid.py:519 +#: murano/openstack/common/rpc/impl_qpid.py:519 msgid "Error processing message. Skipping it." msgstr "" -#: muranoapi/openstack/common/rpc/impl_zmq.py:96 +#: murano/openstack/common/rpc/impl_zmq.py:96 msgid "JSON serialization failed." msgstr "" -#: muranoapi/openstack/common/rpc/impl_zmq.py:101 +#: murano/openstack/common/rpc/impl_zmq.py:101 #, python-format msgid "Deserializing: %s" msgstr "" -#: muranoapi/openstack/common/rpc/impl_zmq.py:136 +#: murano/openstack/common/rpc/impl_zmq.py:136 #, python-format msgid "Connecting to %(addr)s with %(type)s" msgstr "" -#: muranoapi/openstack/common/rpc/impl_zmq.py:137 +#: murano/openstack/common/rpc/impl_zmq.py:137 #, python-format msgid "-> Subscribed to %(subscribe)s" msgstr "" -#: muranoapi/openstack/common/rpc/impl_zmq.py:138 +#: murano/openstack/common/rpc/impl_zmq.py:138 #, python-format msgid "-> bind: %(bind)s" msgstr "" -#: muranoapi/openstack/common/rpc/impl_zmq.py:146 +#: murano/openstack/common/rpc/impl_zmq.py:146 msgid "Could not open socket." msgstr "" -#: muranoapi/openstack/common/rpc/impl_zmq.py:158 +#: murano/openstack/common/rpc/impl_zmq.py:158 #, python-format msgid "Subscribing to %s" msgstr "" -#: muranoapi/openstack/common/rpc/impl_zmq.py:200 +#: murano/openstack/common/rpc/impl_zmq.py:200 msgid "You cannot recv on this socket." msgstr "" -#: muranoapi/openstack/common/rpc/impl_zmq.py:205 +#: murano/openstack/common/rpc/impl_zmq.py:205 msgid "You cannot send on this socket." msgstr "" -#: muranoapi/openstack/common/rpc/impl_zmq.py:267 +#: murano/openstack/common/rpc/impl_zmq.py:267 #, python-format msgid "Running func with context: %s" msgstr "" -#: muranoapi/openstack/common/rpc/impl_zmq.py:305 +#: murano/openstack/common/rpc/impl_zmq.py:305 msgid "Sending reply" msgstr "" -#: muranoapi/openstack/common/rpc/impl_zmq.py:339 +#: murano/openstack/common/rpc/impl_zmq.py:339 msgid "RPC message did not include method." msgstr "" -#: muranoapi/openstack/common/rpc/impl_zmq.py:371 +#: murano/openstack/common/rpc/impl_zmq.py:371 msgid "Registering reactor" msgstr "" -#: muranoapi/openstack/common/rpc/impl_zmq.py:383 +#: murano/openstack/common/rpc/impl_zmq.py:383 msgid "In reactor registered" msgstr "" -#: muranoapi/openstack/common/rpc/impl_zmq.py:387 +#: murano/openstack/common/rpc/impl_zmq.py:387 msgid "Consuming socket" msgstr "" -#: muranoapi/openstack/common/rpc/impl_zmq.py:437 +#: murano/openstack/common/rpc/impl_zmq.py:437 #, python-format msgid "Creating proxy for topic: %s" msgstr "" -#: muranoapi/openstack/common/rpc/impl_zmq.py:443 +#: murano/openstack/common/rpc/impl_zmq.py:443 msgid "Topic contained dangerous characters." msgstr "" -#: muranoapi/openstack/common/rpc/impl_zmq.py:475 +#: murano/openstack/common/rpc/impl_zmq.py:475 msgid "Topic socket file creation failed." msgstr "" -#: muranoapi/openstack/common/rpc/impl_zmq.py:481 +#: murano/openstack/common/rpc/impl_zmq.py:481 #, python-format msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message." msgstr "" -#: muranoapi/openstack/common/rpc/impl_zmq.py:497 +#: murano/openstack/common/rpc/impl_zmq.py:497 #, python-format msgid "Required IPC directory does not exist at %s" msgstr "" -#: muranoapi/openstack/common/rpc/impl_zmq.py:506 +#: murano/openstack/common/rpc/impl_zmq.py:506 #, python-format msgid "Permission denied to IPC directory at %s" msgstr "" -#: muranoapi/openstack/common/rpc/impl_zmq.py:509 +#: murano/openstack/common/rpc/impl_zmq.py:509 msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use." msgstr "" -#: muranoapi/openstack/common/rpc/impl_zmq.py:543 +#: murano/openstack/common/rpc/impl_zmq.py:543 #, python-format msgid "CONSUMER RECEIVED DATA: %s" msgstr "" -#: muranoapi/openstack/common/rpc/impl_zmq.py:562 +#: murano/openstack/common/rpc/impl_zmq.py:562 msgid "ZMQ Envelope version unsupported or unknown." msgstr "" -#: muranoapi/openstack/common/rpc/impl_zmq.py:590 +#: murano/openstack/common/rpc/impl_zmq.py:590 msgid "Skipping topic registration. Already registered." msgstr "" -#: muranoapi/openstack/common/rpc/impl_zmq.py:597 +#: murano/openstack/common/rpc/impl_zmq.py:597 #, python-format msgid "Consumer is a zmq.%s" msgstr "" -#: muranoapi/openstack/common/rpc/impl_zmq.py:649 +#: murano/openstack/common/rpc/impl_zmq.py:649 msgid "Creating payload" msgstr "" -#: muranoapi/openstack/common/rpc/impl_zmq.py:662 +#: murano/openstack/common/rpc/impl_zmq.py:662 msgid "Creating queue socket for reply waiter" msgstr "" -#: muranoapi/openstack/common/rpc/impl_zmq.py:675 +#: murano/openstack/common/rpc/impl_zmq.py:675 msgid "Sending cast" msgstr "" -#: muranoapi/openstack/common/rpc/impl_zmq.py:678 +#: murano/openstack/common/rpc/impl_zmq.py:678 msgid "Cast sent; Waiting reply" msgstr "" -#: muranoapi/openstack/common/rpc/impl_zmq.py:681 +#: murano/openstack/common/rpc/impl_zmq.py:681 #, python-format msgid "Received message: %s" msgstr "" -#: muranoapi/openstack/common/rpc/impl_zmq.py:682 +#: murano/openstack/common/rpc/impl_zmq.py:682 msgid "Unpacking response" msgstr "" -#: muranoapi/openstack/common/rpc/impl_zmq.py:691 +#: murano/openstack/common/rpc/impl_zmq.py:691 msgid "Unsupported or unknown ZMQ envelope returned." msgstr "" -#: muranoapi/openstack/common/rpc/impl_zmq.py:698 +#: murano/openstack/common/rpc/impl_zmq.py:698 msgid "RPC Message Invalid." msgstr "" -#: muranoapi/openstack/common/rpc/impl_zmq.py:721 +#: murano/openstack/common/rpc/impl_zmq.py:721 #, python-format msgid "%(msg)s" msgstr "" -#: muranoapi/openstack/common/rpc/impl_zmq.py:724 +#: murano/openstack/common/rpc/impl_zmq.py:724 #, python-format msgid "Sending message(s) to: %s" msgstr "" -#: muranoapi/openstack/common/rpc/impl_zmq.py:728 +#: murano/openstack/common/rpc/impl_zmq.py:728 msgid "No matchmaker results. Not casting." msgstr "" -#: muranoapi/openstack/common/rpc/impl_zmq.py:731 +#: murano/openstack/common/rpc/impl_zmq.py:731 msgid "No match from matchmaker." msgstr "" -#: muranoapi/openstack/common/rpc/impl_zmq.py:813 +#: murano/openstack/common/rpc/impl_zmq.py:813 #, python-format msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead" msgstr "" -#: muranoapi/openstack/common/rpc/matchmaker.py:47 +#: murano/openstack/common/rpc/matchmaker.py:47 msgid "Match not found by MatchMaker." msgstr "" -#: muranoapi/openstack/common/rpc/matchmaker.py:81 +#: murano/openstack/common/rpc/matchmaker.py:81 msgid "Matchmaker does not implement registration or heartbeat." msgstr "" -#: muranoapi/openstack/common/rpc/matchmaker.py:217 +#: murano/openstack/common/rpc/matchmaker.py:217 #, python-format msgid "Matchmaker unregistered: %(key)s, %(host)s" msgstr "" -#: muranoapi/openstack/common/rpc/matchmaker.py:229 +#: murano/openstack/common/rpc/matchmaker.py:229 msgid "Register before starting heartbeat." msgstr "" -#: muranoapi/openstack/common/rpc/matchmaker_ring.py:79 -#: muranoapi/openstack/common/rpc/matchmaker_ring.py:97 +#: murano/openstack/common/rpc/matchmaker_ring.py:79 +#: murano/openstack/common/rpc/matchmaker_ring.py:97 #, python-format msgid "No key defining hosts for topic '%s', see ringfile" msgstr "" -#: muranoapi/openstack/common/rpc/service.py:49 +#: murano/openstack/common/rpc/service.py:49 #, python-format msgid "Creating Consumer connection for Service %s" msgstr "" diff --git a/muranoapi/openstack/__init__.py b/murano/openstack/__init__.py similarity index 100% rename from muranoapi/openstack/__init__.py rename to murano/openstack/__init__.py diff --git a/muranoapi/openstack/common/__init__.py b/murano/openstack/common/__init__.py similarity index 100% rename from muranoapi/openstack/common/__init__.py rename to murano/openstack/common/__init__.py diff --git a/muranoapi/openstack/common/config/__init__.py b/murano/openstack/common/config/__init__.py similarity index 100% rename from muranoapi/openstack/common/config/__init__.py rename to murano/openstack/common/config/__init__.py diff --git a/muranoapi/openstack/common/config/generator.py b/murano/openstack/common/config/generator.py similarity index 98% rename from muranoapi/openstack/common/config/generator.py rename to murano/openstack/common/config/generator.py index 8a4d7899..882bcebc 100644 --- a/muranoapi/openstack/common/config/generator.py +++ b/murano/openstack/common/config/generator.py @@ -31,10 +31,10 @@ from oslo.config import cfg import six import stevedore.named -from muranoapi.openstack.common import gettextutils -from muranoapi.openstack.common import importutils +from murano.openstack.common import gettextutils +from murano.openstack.common import importutils -gettextutils.install('muranoapi') +gettextutils.install('murano') STROPT = "StrOpt" BOOLOPT = "BoolOpt" @@ -230,7 +230,7 @@ def _sanitize_default(name, value): elif value == _get_my_ip(): return '10.0.0.1' elif value in (socket.gethostname(), socket.getfqdn()) and 'host' in name: - return 'muranoapi' + return 'murano' elif value.strip() != value: return '"%s"' % value return value diff --git a/muranoapi/openstack/common/context.py b/murano/openstack/common/context.py similarity index 100% rename from muranoapi/openstack/common/context.py rename to murano/openstack/common/context.py diff --git a/muranoapi/openstack/common/db/__init__.py b/murano/openstack/common/db/__init__.py similarity index 100% rename from muranoapi/openstack/common/db/__init__.py rename to murano/openstack/common/db/__init__.py diff --git a/muranoapi/openstack/common/db/api.py b/murano/openstack/common/db/api.py similarity index 97% rename from muranoapi/openstack/common/db/api.py rename to murano/openstack/common/db/api.py index 49daf2c1..2ea13afa 100644 --- a/muranoapi/openstack/common/db/api.py +++ b/murano/openstack/common/db/api.py @@ -25,9 +25,9 @@ import logging import threading import time -from muranoapi.openstack.common.db import exception -from muranoapi.openstack.common.gettextutils import _LE -from muranoapi.openstack.common import importutils +from murano.openstack.common.db import exception +from murano.openstack.common.gettextutils import _LE +from murano.openstack.common import importutils LOG = logging.getLogger(__name__) diff --git a/muranoapi/openstack/common/db/exception.py b/murano/openstack/common/db/exception.py similarity index 97% rename from muranoapi/openstack/common/db/exception.py rename to murano/openstack/common/db/exception.py index ead87bd4..c5501e96 100644 --- a/muranoapi/openstack/common/db/exception.py +++ b/murano/openstack/common/db/exception.py @@ -18,7 +18,7 @@ import six -from muranoapi.openstack.common.gettextutils import _ +from murano.openstack.common.gettextutils import _ class DBError(Exception): diff --git a/muranoapi/openstack/common/db/options.py b/murano/openstack/common/db/options.py similarity index 99% rename from muranoapi/openstack/common/db/options.py rename to murano/openstack/common/db/options.py index b380f086..6e35d425 100644 --- a/muranoapi/openstack/common/db/options.py +++ b/murano/openstack/common/db/options.py @@ -18,7 +18,7 @@ from oslo.config import cfg database_opts = [ cfg.StrOpt('sqlite_db', deprecated_group='DEFAULT', - default='muranoapi.sqlite', + default='murano.sqlite', help='The file name to use with SQLite'), cfg.BoolOpt('sqlite_synchronous', deprecated_group='DEFAULT', diff --git a/muranoapi/openstack/common/db/sqlalchemy/__init__.py b/murano/openstack/common/db/sqlalchemy/__init__.py similarity index 100% rename from muranoapi/openstack/common/db/sqlalchemy/__init__.py rename to murano/openstack/common/db/sqlalchemy/__init__.py diff --git a/muranoapi/openstack/common/db/sqlalchemy/migration.py b/murano/openstack/common/db/sqlalchemy/migration.py similarity index 98% rename from muranoapi/openstack/common/db/sqlalchemy/migration.py rename to murano/openstack/common/db/sqlalchemy/migration.py index 044158d6..e98db13b 100644 --- a/muranoapi/openstack/common/db/sqlalchemy/migration.py +++ b/murano/openstack/common/db/sqlalchemy/migration.py @@ -50,8 +50,8 @@ from migrate.versioning.repository import Repository import sqlalchemy from sqlalchemy.schema import UniqueConstraint -from muranoapi.openstack.common.db import exception -from muranoapi.openstack.common.gettextutils import _ +from murano.openstack.common.db import exception +from murano.openstack.common.gettextutils import _ def _get_unique_constraints(self, table): diff --git a/muranoapi/openstack/common/db/sqlalchemy/models.py b/murano/openstack/common/db/sqlalchemy/models.py similarity index 98% rename from muranoapi/openstack/common/db/sqlalchemy/models.py rename to murano/openstack/common/db/sqlalchemy/models.py index fa003e4f..2b54119c 100644 --- a/muranoapi/openstack/common/db/sqlalchemy/models.py +++ b/murano/openstack/common/db/sqlalchemy/models.py @@ -26,7 +26,7 @@ from sqlalchemy import Column, Integer from sqlalchemy import DateTime from sqlalchemy.orm import object_mapper -from muranoapi.openstack.common import timeutils +from murano.openstack.common import timeutils class ModelBase(object): diff --git a/muranoapi/openstack/common/db/sqlalchemy/provision.py b/murano/openstack/common/db/sqlalchemy/provision.py similarity index 98% rename from muranoapi/openstack/common/db/sqlalchemy/provision.py rename to murano/openstack/common/db/sqlalchemy/provision.py index f32c8222..8284534a 100644 --- a/muranoapi/openstack/common/db/sqlalchemy/provision.py +++ b/murano/openstack/common/db/sqlalchemy/provision.py @@ -23,7 +23,7 @@ import string from six import moves import sqlalchemy -from muranoapi.openstack.common.db import exception as exc +from murano.openstack.common.db import exception as exc SQL_CONNECTION = os.getenv('OS_TEST_DBAPI_ADMIN_CONNECTION', 'sqlite://') diff --git a/muranoapi/openstack/common/db/sqlalchemy/session.py b/murano/openstack/common/db/sqlalchemy/session.py similarity index 98% rename from muranoapi/openstack/common/db/sqlalchemy/session.py rename to murano/openstack/common/db/sqlalchemy/session.py index 666abf99..41360b41 100644 --- a/muranoapi/openstack/common/db/sqlalchemy/session.py +++ b/murano/openstack/common/db/sqlalchemy/session.py @@ -290,9 +290,9 @@ import sqlalchemy.orm from sqlalchemy.pool import NullPool, StaticPool from sqlalchemy.sql.expression import literal_column -from muranoapi.openstack.common.db import exception -from muranoapi.openstack.common.gettextutils import _LE, _LW, _LI -from muranoapi.openstack.common import timeutils +from murano.openstack.common.db import exception +from murano.openstack.common.gettextutils import _LE, _LW, _LI +from murano.openstack.common import timeutils LOG = logging.getLogger(__name__) @@ -719,8 +719,8 @@ def _patch_mysqldb_with_stacktrace_comments(): # db/api is just a wrapper around db/sqlalchemy/api if filename.endswith('db/api.py'): continue - # only trace inside muranoapi - index = filename.rfind('muranoapi') + # only trace inside murano + index = filename.rfind('murano') if index == -1: continue stack += "File:%s:%s Method:%s() Line:%s | " \ @@ -739,13 +739,13 @@ def _patch_mysqldb_with_stacktrace_comments(): class EngineFacade(object): """A helper class for removing of global engine instances from - muranoapi.db. + murano.db. - As a library, muranoapi.db can't decide where to store/when to create + As a library, murano.db can't decide where to store/when to create engine and sessionmaker instances, so this must be left for a target application. - On the other hand, in order to simplify the adoption of muranoapi.db + On the other hand, in order to simplify the adoption of murano.db changes, we'll provide a helper class, which creates engine and sessionmaker on its instantiation and provides get_engine()/get_session() methods that are compatible with corresponding utility functions that @@ -753,7 +753,7 @@ class EngineFacade(object): engine/sessionmaker instances will still be global (and they are meant to be global), but they will be stored in the app context, rather that in the - muranoapi.db context. + murano.db context. Note: using of this helper is completely optional and you are encouraged to integrate engine/sessionmaker instances into your apps any way you like diff --git a/muranoapi/openstack/common/db/sqlalchemy/test_base.py b/murano/openstack/common/db/sqlalchemy/test_base.py similarity index 96% rename from muranoapi/openstack/common/db/sqlalchemy/test_base.py rename to murano/openstack/common/db/sqlalchemy/test_base.py index c9daa235..95b97e8a 100644 --- a/muranoapi/openstack/common/db/sqlalchemy/test_base.py +++ b/murano/openstack/common/db/sqlalchemy/test_base.py @@ -20,9 +20,9 @@ import os import fixtures import six -from muranoapi.openstack.common.db.sqlalchemy import session -from muranoapi.openstack.common.db.sqlalchemy import utils -from muranoapi.openstack.common import test +from murano.openstack.common.db.sqlalchemy import session +from murano.openstack.common.db.sqlalchemy import utils +from murano.openstack.common import test class DbFixture(fixtures.Fixture): diff --git a/muranoapi/openstack/common/db/sqlalchemy/test_migrations.py b/murano/openstack/common/db/sqlalchemy/test_migrations.py similarity index 98% rename from muranoapi/openstack/common/db/sqlalchemy/test_migrations.py rename to murano/openstack/common/db/sqlalchemy/test_migrations.py index 20e70305..8fd9a658 100644 --- a/muranoapi/openstack/common/db/sqlalchemy/test_migrations.py +++ b/murano/openstack/common/db/sqlalchemy/test_migrations.py @@ -25,9 +25,9 @@ from six.moves.urllib import parse import sqlalchemy import sqlalchemy.exc -from muranoapi.openstack.common.db.sqlalchemy import utils -from muranoapi.openstack.common.gettextutils import _LE -from muranoapi.openstack.common import test +from murano.openstack.common.db.sqlalchemy import utils +from murano.openstack.common.gettextutils import _LE +from murano.openstack.common import test LOG = logging.getLogger(__name__) diff --git a/muranoapi/openstack/common/db/sqlalchemy/utils.py b/murano/openstack/common/db/sqlalchemy/utils.py similarity index 99% rename from muranoapi/openstack/common/db/sqlalchemy/utils.py rename to murano/openstack/common/db/sqlalchemy/utils.py index 47b3ad63..b4f31a4a 100644 --- a/muranoapi/openstack/common/db/sqlalchemy/utils.py +++ b/murano/openstack/common/db/sqlalchemy/utils.py @@ -38,10 +38,10 @@ from sqlalchemy import String from sqlalchemy import Table from sqlalchemy.types import NullType -from muranoapi.openstack.common import context as request_context -from muranoapi.openstack.common.db.sqlalchemy import models -from muranoapi.openstack.common.gettextutils import _, _LI, _LW -from muranoapi.openstack.common import timeutils +from murano.openstack.common import context as request_context +from murano.openstack.common.db.sqlalchemy import models +from murano.openstack.common.gettextutils import _, _LI, _LW +from murano.openstack.common import timeutils LOG = logging.getLogger(__name__) diff --git a/muranoapi/openstack/common/eventlet_backdoor.py b/murano/openstack/common/eventlet_backdoor.py similarity index 97% rename from muranoapi/openstack/common/eventlet_backdoor.py rename to murano/openstack/common/eventlet_backdoor.py index ab7e0bad..77e4ebf5 100644 --- a/muranoapi/openstack/common/eventlet_backdoor.py +++ b/murano/openstack/common/eventlet_backdoor.py @@ -29,8 +29,8 @@ import eventlet.backdoor import greenlet from oslo.config import cfg -from muranoapi.openstack.common.gettextutils import _LI -from muranoapi.openstack.common import log as logging +from murano.openstack.common.gettextutils import _LI +from murano.openstack.common import log as logging help_for_backdoor_port = ( "Acceptable values are 0, , and :, where 0 results " diff --git a/muranoapi/openstack/common/exception.py b/murano/openstack/common/exception.py similarity index 98% rename from muranoapi/openstack/common/exception.py rename to murano/openstack/common/exception.py index db55cd21..f051dba8 100644 --- a/muranoapi/openstack/common/exception.py +++ b/murano/openstack/common/exception.py @@ -21,7 +21,7 @@ Exceptions common to OpenStack projects import logging -from muranoapi.openstack.common.gettextutils import _ # noqa +from murano.openstack.common.gettextutils import _ # noqa _FATAL_EXCEPTION_FORMAT_ERRORS = False diff --git a/muranoapi/openstack/common/excutils.py b/murano/openstack/common/excutils.py similarity index 98% rename from muranoapi/openstack/common/excutils.py rename to murano/openstack/common/excutils.py index 9661b68e..cc65e0c0 100644 --- a/muranoapi/openstack/common/excutils.py +++ b/murano/openstack/common/excutils.py @@ -24,7 +24,7 @@ import traceback import six -from muranoapi.openstack.common.gettextutils import _LE +from murano.openstack.common.gettextutils import _LE class save_and_reraise_exception(object): diff --git a/muranoapi/openstack/common/fileutils.py b/murano/openstack/common/fileutils.py similarity index 97% rename from muranoapi/openstack/common/fileutils.py rename to murano/openstack/common/fileutils.py index e52cefc5..c25fcf80 100644 --- a/muranoapi/openstack/common/fileutils.py +++ b/murano/openstack/common/fileutils.py @@ -18,8 +18,8 @@ import errno import os import tempfile -from muranoapi.openstack.common import excutils -from muranoapi.openstack.common import log as logging +from murano.openstack.common import excutils +from murano.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/muranoapi/openstack/common/gettextutils.py b/murano/openstack/common/gettextutils.py similarity index 97% rename from muranoapi/openstack/common/gettextutils.py rename to murano/openstack/common/gettextutils.py index 16b0335b..f8af7435 100644 --- a/muranoapi/openstack/common/gettextutils.py +++ b/murano/openstack/common/gettextutils.py @@ -19,7 +19,7 @@ gettext for openstack-common modules. Usual usage in an openstack.common module: - from muranoapi.openstack.common.gettextutils import _ + from murano.openstack.common.gettextutils import _ """ import copy @@ -33,15 +33,15 @@ import re from babel import localedata import six -_localedir = os.environ.get('muranoapi'.upper() + '_LOCALEDIR') -_t = gettext.translation('muranoapi', localedir=_localedir, fallback=True) +_localedir = os.environ.get('murano'.upper() + '_LOCALEDIR') +_t = gettext.translation('murano', localedir=_localedir, fallback=True) # We use separate translation catalogs for each log level, so set up a # mapping between the log level name and the translator. The domain # for the log level is project_name + "-log-" + log_level so messages # for each level end up in their own catalog. _t_log_levels = dict( - (level, gettext.translation('muranoapi' + '-log-' + level, + (level, gettext.translation('murano' + '-log-' + level, localedir=_localedir, fallback=True)) for level in ['info', 'warning', 'error', 'critical'] @@ -65,7 +65,7 @@ def enable_lazy(): def _(msg): if USE_LAZY: - return Message(msg, domain='muranoapi') + return Message(msg, domain='murano') else: if six.PY3: return _t.gettext(msg) @@ -76,7 +76,7 @@ def _log_translation(msg, level): """Build a single translation of a log message """ if USE_LAZY: - return Message(msg, domain='muranoapi' + '-log-' + level) + return Message(msg, domain='murano' + '-log-' + level) else: translator = _t_log_levels[level] if six.PY3: @@ -153,7 +153,7 @@ class Message(six.text_type): """ def __new__(cls, msgid, msgtext=None, params=None, - domain='muranoapi', *args): + domain='murano', *args): """Create a new Message object. In order for translation to work gettext requires a message ID, this diff --git a/muranoapi/openstack/common/importutils.py b/murano/openstack/common/importutils.py similarity index 98% rename from muranoapi/openstack/common/importutils.py rename to murano/openstack/common/importutils.py index 713a5859..66048d77 100644 --- a/muranoapi/openstack/common/importutils.py +++ b/murano/openstack/common/importutils.py @@ -59,7 +59,7 @@ def import_module(import_str): def import_versioned_module(version, submodule=None): - module = 'muranoapi.v%s' % version + module = 'murano.v%s' % version if submodule: module = '.'.join((module, submodule)) return import_module(module) diff --git a/muranoapi/openstack/common/jsonutils.py b/murano/openstack/common/jsonutils.py similarity index 97% rename from muranoapi/openstack/common/jsonutils.py rename to murano/openstack/common/jsonutils.py index 3b4d9086..1f0e4695 100644 --- a/muranoapi/openstack/common/jsonutils.py +++ b/murano/openstack/common/jsonutils.py @@ -40,9 +40,9 @@ import json import six import six.moves.xmlrpc_client as xmlrpclib -from muranoapi.openstack.common import gettextutils -from muranoapi.openstack.common import importutils -from muranoapi.openstack.common import timeutils +from murano.openstack.common import gettextutils +from murano.openstack.common import importutils +from murano.openstack.common import timeutils netaddr = importutils.try_import("netaddr") diff --git a/muranoapi/openstack/common/local.py b/murano/openstack/common/local.py similarity index 100% rename from muranoapi/openstack/common/local.py rename to murano/openstack/common/local.py diff --git a/muranoapi/openstack/common/lockutils.py b/murano/openstack/common/lockutils.py similarity index 98% rename from muranoapi/openstack/common/lockutils.py rename to murano/openstack/common/lockutils.py index 6fe3b23a..b363a197 100644 --- a/muranoapi/openstack/common/lockutils.py +++ b/murano/openstack/common/lockutils.py @@ -28,9 +28,9 @@ import weakref from oslo.config import cfg -from muranoapi.openstack.common import fileutils -from muranoapi.openstack.common.gettextutils import _, _LE, _LI -from muranoapi.openstack.common import log as logging +from murano.openstack.common import fileutils +from murano.openstack.common.gettextutils import _, _LE, _LI +from murano.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/muranoapi/openstack/common/log.py b/murano/openstack/common/log.py similarity index 98% rename from muranoapi/openstack/common/log.py rename to murano/openstack/common/log.py index 01c768f6..41f4c4be 100644 --- a/muranoapi/openstack/common/log.py +++ b/murano/openstack/common/log.py @@ -41,10 +41,10 @@ from oslo.config import cfg import six from six import moves -from muranoapi.openstack.common.gettextutils import _ -from muranoapi.openstack.common import importutils -from muranoapi.openstack.common import jsonutils -from muranoapi.openstack.common import local +from murano.openstack.common.gettextutils import _ +from murano.openstack.common import importutils +from murano.openstack.common import jsonutils +from murano.openstack.common import local _DEFAULT_LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S" @@ -547,7 +547,7 @@ def _setup_logging_from_conf(project, version): if CONF.publish_errors: handler = importutils.import_object( - "muranoapi.openstack.common.log_handler.PublishErrorsHandler", + "murano.openstack.common.log_handler.PublishErrorsHandler", logging.ERROR) log_root.addHandler(handler) diff --git a/muranoapi/openstack/common/loopingcall.py b/murano/openstack/common/loopingcall.py similarity index 96% rename from muranoapi/openstack/common/loopingcall.py rename to murano/openstack/common/loopingcall.py index a6fd9f74..8e862e1f 100644 --- a/muranoapi/openstack/common/loopingcall.py +++ b/murano/openstack/common/loopingcall.py @@ -20,9 +20,9 @@ import sys from eventlet import event from eventlet import greenthread -from muranoapi.openstack.common.gettextutils import _LE, _LW -from muranoapi.openstack.common import log as logging -from muranoapi.openstack.common import timeutils +from murano.openstack.common.gettextutils import _LE, _LW +from murano.openstack.common import log as logging +from murano.openstack.common import timeutils LOG = logging.getLogger(__name__) diff --git a/muranoapi/openstack/common/network_utils.py b/murano/openstack/common/network_utils.py similarity index 100% rename from muranoapi/openstack/common/network_utils.py rename to murano/openstack/common/network_utils.py diff --git a/muranoapi/openstack/common/service.py b/murano/openstack/common/service.py similarity index 97% rename from muranoapi/openstack/common/service.py rename to murano/openstack/common/service.py index 4acfadfb..f4e80061 100644 --- a/muranoapi/openstack/common/service.py +++ b/murano/openstack/common/service.py @@ -37,15 +37,15 @@ import eventlet from eventlet import event from oslo.config import cfg -from muranoapi.openstack.common import eventlet_backdoor -from muranoapi.openstack.common.gettextutils import _LE, _LI, _LW -from muranoapi.openstack.common import importutils -from muranoapi.openstack.common import log as logging -from muranoapi.openstack.common import systemd -from muranoapi.openstack.common import threadgroup +from murano.openstack.common import eventlet_backdoor +from murano.openstack.common.gettextutils import _LE, _LI, _LW +from murano.openstack.common import importutils +from murano.openstack.common import log as logging +from murano.openstack.common import systemd +from murano.openstack.common import threadgroup -rpc = importutils.try_import('muranoapi.openstack.common.rpc') +rpc = importutils.try_import('murano.openstack.common.rpc') CONF = cfg.CONF LOG = logging.getLogger(__name__) diff --git a/muranoapi/openstack/common/sslutils.py b/murano/openstack/common/sslutils.py similarity index 98% rename from muranoapi/openstack/common/sslutils.py rename to murano/openstack/common/sslutils.py index df29fe27..022eb4ff 100644 --- a/muranoapi/openstack/common/sslutils.py +++ b/murano/openstack/common/sslutils.py @@ -17,7 +17,7 @@ import ssl from oslo.config import cfg -from muranoapi.openstack.common.gettextutils import _ +from murano.openstack.common.gettextutils import _ ssl_opts = [ diff --git a/muranoapi/openstack/common/systemd.py b/murano/openstack/common/systemd.py similarity index 98% rename from muranoapi/openstack/common/systemd.py rename to murano/openstack/common/systemd.py index 7e92bfad..ad124a42 100644 --- a/muranoapi/openstack/common/systemd.py +++ b/murano/openstack/common/systemd.py @@ -20,7 +20,7 @@ import os import socket import sys -from muranoapi.openstack.common import log as logging +from murano.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/muranoapi/openstack/common/test.py b/murano/openstack/common/test.py similarity index 100% rename from muranoapi/openstack/common/test.py rename to murano/openstack/common/test.py diff --git a/muranoapi/openstack/common/threadgroup.py b/murano/openstack/common/threadgroup.py similarity index 97% rename from muranoapi/openstack/common/threadgroup.py rename to murano/openstack/common/threadgroup.py index d6a6ac93..2cff1e3c 100644 --- a/muranoapi/openstack/common/threadgroup.py +++ b/murano/openstack/common/threadgroup.py @@ -16,8 +16,8 @@ import threading import eventlet from eventlet import greenpool -from muranoapi.openstack.common import log as logging -from muranoapi.openstack.common import loopingcall +from murano.openstack.common import log as logging +from murano.openstack.common import loopingcall LOG = logging.getLogger(__name__) diff --git a/muranoapi/openstack/common/timeutils.py b/murano/openstack/common/timeutils.py similarity index 100% rename from muranoapi/openstack/common/timeutils.py rename to murano/openstack/common/timeutils.py diff --git a/muranoapi/openstack/common/versionutils.py b/murano/openstack/common/versionutils.py similarity index 97% rename from muranoapi/openstack/common/versionutils.py rename to murano/openstack/common/versionutils.py index 82e1e01a..edd13e2c 100644 --- a/muranoapi/openstack/common/versionutils.py +++ b/murano/openstack/common/versionutils.py @@ -20,8 +20,8 @@ Helpers for comparing version strings. import functools import pkg_resources -from muranoapi.openstack.common.gettextutils import _ -from muranoapi.openstack.common import log as logging +from murano.openstack.common.gettextutils import _ +from murano.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/muranoapi/openstack/common/wsgi.py b/murano/openstack/common/wsgi.py similarity index 98% rename from muranoapi/openstack/common/wsgi.py rename to murano/openstack/common/wsgi.py index 747d136d..0e5ce590 100644 --- a/muranoapi/openstack/common/wsgi.py +++ b/murano/openstack/common/wsgi.py @@ -37,14 +37,14 @@ import webob.exc from xml.dom import minidom from xml.parsers import expat -from muranoapi.api.v1 import schemas -from muranoapi.openstack.common import exception -from muranoapi.openstack.common.gettextutils import _ -from muranoapi.openstack.common import jsonutils -from muranoapi.openstack.common import log as logging -from muranoapi.openstack.common import service -from muranoapi.openstack.common import sslutils -from muranoapi.openstack.common import xmlutils +from murano.api.v1 import schemas +from murano.openstack.common import exception +from murano.openstack.common.gettextutils import _ +from murano.openstack.common import jsonutils +from murano.openstack.common import log as logging +from murano.openstack.common import service +from murano.openstack.common import sslutils +from murano.openstack.common import xmlutils socket_opts = [ cfg.IntOpt('backlog', diff --git a/muranoapi/openstack/common/xmlutils.py b/murano/openstack/common/xmlutils.py similarity index 100% rename from muranoapi/openstack/common/xmlutils.py rename to murano/openstack/common/xmlutils.py diff --git a/muranoapi/packages/__init__.py b/murano/packages/__init__.py similarity index 100% rename from muranoapi/packages/__init__.py rename to murano/packages/__init__.py diff --git a/muranoapi/packages/application_package.py b/murano/packages/application_package.py similarity index 98% rename from muranoapi/packages/application_package.py rename to murano/packages/application_package.py index ae764666..bc158ca4 100644 --- a/muranoapi/packages/application_package.py +++ b/murano/packages/application_package.py @@ -23,8 +23,8 @@ import yaml import zipfile -import muranoapi.packages.exceptions as e -import muranoapi.packages.versions.v1 +import murano.packages.exceptions as e +import murano.packages.versions.v1 class DummyLoader(yaml.Loader): @@ -190,7 +190,7 @@ class ApplicationPackage(object): def load_from_dir(source_directory, filename='manifest.yaml', preload=False, loader=DummyLoader): - formats = {'1.0': muranoapi.packages.versions.v1} + formats = {'1.0': murano.packages.versions.v1} if not os.path.isdir(source_directory) or not os.path.exists( source_directory): diff --git a/muranoapi/packages/exceptions.py b/murano/packages/exceptions.py similarity index 96% rename from muranoapi/packages/exceptions.py rename to murano/packages/exceptions.py index 4e2c47f7..2ac50209 100644 --- a/muranoapi/packages/exceptions.py +++ b/murano/packages/exceptions.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import muranoapi.openstack.common.exception as e +import murano.openstack.common.exception as e class PackageClassLoadError(e.Error): diff --git a/muranoapi/packages/versions/__init__.py b/murano/packages/versions/__init__.py similarity index 100% rename from muranoapi/packages/versions/__init__.py rename to murano/packages/versions/__init__.py diff --git a/muranoapi/packages/versions/v1.py b/murano/packages/versions/v1.py similarity index 85% rename from muranoapi/packages/versions/v1.py rename to murano/packages/versions/v1.py index b5290489..295d7b4f 100644 --- a/muranoapi/packages/versions/v1.py +++ b/murano/packages/versions/v1.py @@ -15,20 +15,20 @@ import re -import muranoapi.packages.application_package -import muranoapi.packages.exceptions as e +import murano.packages.application_package +import murano.packages.exceptions as e # noinspection PyProtectedMember def load(package, yaml_content): package._full_name = yaml_content.get('FullName') if not package._full_name: - raise muranoapi.packages.exceptions.PackageFormatError( + raise murano.packages.exceptions.PackageFormatError( 'FullName not specified') _check_full_name(package._full_name) package._package_type = yaml_content.get('Type') if not package._package_type or package._package_type not in \ - muranoapi.packages.application_package.PackageTypes.ALL: + murano.packages.application_package.PackageTypes.ALL: raise e.PackageFormatError('Invalid Package Type') package._display_name = yaml_content.get('Name', package._full_name) package._description = yaml_content.get('Description') @@ -40,7 +40,7 @@ def load(package, yaml_content): def _check_full_name(full_name): - error = muranoapi.packages.exceptions.PackageFormatError( + error = murano.packages.exceptions.PackageFormatError( 'Invalid FullName') if re.match(r'^[\w\.]+$', full_name): if full_name.startswith('.') or full_name.endswith('.'): diff --git a/muranoapi/tests/__init__.py b/murano/tests/__init__.py similarity index 100% rename from muranoapi/tests/__init__.py rename to murano/tests/__init__.py diff --git a/muranoapi/tests/common/__init__.py b/murano/tests/common/__init__.py similarity index 100% rename from muranoapi/tests/common/__init__.py rename to murano/tests/common/__init__.py diff --git a/muranoapi/tests/common/helpers/__init__.py b/murano/tests/common/helpers/__init__.py similarity index 100% rename from muranoapi/tests/common/helpers/__init__.py rename to murano/tests/common/helpers/__init__.py diff --git a/muranoapi/tests/common/helpers/token_sanitizer_tests.py b/murano/tests/common/helpers/token_sanitizer_tests.py similarity index 97% rename from muranoapi/tests/common/helpers/token_sanitizer_tests.py rename to murano/tests/common/helpers/token_sanitizer_tests.py index 84cca769..1e3df7b8 100644 --- a/muranoapi/tests/common/helpers/token_sanitizer_tests.py +++ b/murano/tests/common/helpers/token_sanitizer_tests.py @@ -14,7 +14,7 @@ import unittest2 as unittest -from muranoapi.common.helpers import token_sanitizer +from murano.common.helpers import token_sanitizer class TokenSanitizerTests(unittest.TestCase): diff --git a/muranoapi/tests/common/is_different_tests.py b/murano/tests/common/is_different_tests.py similarity index 98% rename from muranoapi/tests/common/is_different_tests.py rename to murano/tests/common/is_different_tests.py index 1178617d..7303dcf4 100644 --- a/muranoapi/tests/common/is_different_tests.py +++ b/murano/tests/common/is_different_tests.py @@ -14,7 +14,7 @@ import unittest2 as unittest -from muranoapi.common import utils +from murano.common import utils class IsDifferentTests(unittest.TestCase): diff --git a/muranoapi/tests/common/traverse_helper_tests.py b/murano/tests/common/traverse_helper_tests.py similarity index 99% rename from muranoapi/tests/common/traverse_helper_tests.py rename to murano/tests/common/traverse_helper_tests.py index 488d8a45..24dac3ec 100644 --- a/muranoapi/tests/common/traverse_helper_tests.py +++ b/murano/tests/common/traverse_helper_tests.py @@ -14,7 +14,7 @@ import unittest2 as unittest -from muranoapi.common import utils +from murano.common import utils class TraverseHelperTests(unittest.TestCase): diff --git a/muranoapi/tests/language/io.murano.language.tests/ExampleTestCase.yaml b/murano/tests/language/io.murano.language.tests/ExampleTestCase.yaml similarity index 100% rename from muranoapi/tests/language/io.murano.language.tests/ExampleTestCase.yaml rename to murano/tests/language/io.murano.language.tests/ExampleTestCase.yaml diff --git a/muranoapi/tests/language/io.murano.language.tests/manifest.yaml b/murano/tests/language/io.murano.language.tests/manifest.yaml similarity index 100% rename from muranoapi/tests/language/io.murano.language.tests/manifest.yaml rename to murano/tests/language/io.murano.language.tests/manifest.yaml diff --git a/muranoapi/tests/nose_plugins/__init__.py b/murano/tests/nose_plugins/__init__.py similarity index 100% rename from muranoapi/tests/nose_plugins/__init__.py rename to murano/tests/nose_plugins/__init__.py diff --git a/muranoapi/tests/nose_plugins/munit.py b/murano/tests/nose_plugins/munit.py similarity index 95% rename from muranoapi/tests/nose_plugins/munit.py rename to murano/tests/nose_plugins/munit.py index 9f7763d3..65962bd2 100644 --- a/muranoapi/tests/nose_plugins/munit.py +++ b/murano/tests/nose_plugins/munit.py @@ -22,12 +22,12 @@ import yaml import nose import unittest2 as unittest -from muranoapi.common import uuidutils -from muranoapi.dsl import executor -from muranoapi.dsl import murano_class -from muranoapi.dsl import namespace_resolver -from muranoapi.engine import simple_cloader -from muranoapi.engine.system import system_objects +from murano.common import uuidutils +from murano.dsl import executor +from murano.dsl import murano_class +from murano.dsl import namespace_resolver +from murano.engine import simple_cloader +from murano.engine.system import system_objects LOG = logging.getLogger('nose.plugins.munit') diff --git a/muranoapi/tests/test_engine.py b/murano/tests/test_engine.py similarity index 97% rename from muranoapi/tests/test_engine.py rename to murano/tests/test_engine.py index 324badff..989e55db 100644 --- a/muranoapi/tests/test_engine.py +++ b/murano/tests/test_engine.py @@ -19,13 +19,13 @@ import mock import unittest2 as unittest import yaql -import muranoapi.dsl.exceptions as exceptions -import muranoapi.dsl.helpers as helpers -import muranoapi.dsl.murano_class as murano_class -import muranoapi.dsl.murano_object as murano_object -import muranoapi.dsl.namespace_resolver as ns_resolver -import muranoapi.dsl.typespec as typespec -import muranoapi.dsl.yaql_expression as yaql_expression +import murano.dsl.exceptions as exceptions +import murano.dsl.helpers as helpers +import murano.dsl.murano_class as murano_class +import murano.dsl.murano_object as murano_object +import murano.dsl.namespace_resolver as ns_resolver +import murano.dsl.typespec as typespec +import murano.dsl.yaql_expression as yaql_expression ROOT_CLASS = 'io.murano.Object' @@ -258,7 +258,7 @@ class TestObjectsManipulation(unittest.TestCase): def test_object_id(self): _id = 'some_id' - patch_at = 'muranoapi.dsl.helpers.generate_id' + patch_at = 'murano.dsl.helpers.generate_id' obj = murano_object.MuranoObject(self.cls, None, None, None, object_id=_id) @@ -363,7 +363,7 @@ class TestObjectsManipulation(unittest.TestCase): obj = cls.new(None, None, None, {}) with mock.patch('yaql.context.Context'): - with mock.patch('muranoapi.engine.helpers') as helpers_mock: + with mock.patch('murano.engine.helpers') as helpers_mock: helpers_mock.evaluate = lambda val, ctx, _: val obj.set_property('someProperty', 10) @@ -378,7 +378,7 @@ class TestObjectsManipulation(unittest.TestCase): typespec.PropertySpec({'Default': 0}, self.resolver)) obj = cls.new(None, None, None, {}) - with mock.patch('muranoapi.engine.helpers') as helpers_mock: + with mock.patch('murano.engine.helpers') as helpers_mock: with mock.patch('yaql.context.Context'): helpers_mock.evaluate = lambda val, ctx, _: val obj.set_property('rootProperty', 20) diff --git a/muranoapi/tests/test_log.py b/murano/tests/test_log.py similarity index 97% rename from muranoapi/tests/test_log.py rename to murano/tests/test_log.py index c5d48594..65c3f6b4 100644 --- a/muranoapi/tests/test_log.py +++ b/murano/tests/test_log.py @@ -15,7 +15,7 @@ import logging import unittest -from muranoapi.openstack.common import log +from murano.openstack.common import log class SysLogHandlersTestCase(unittest.TestCase): diff --git a/muranoapi/utils.py b/murano/utils.py similarity index 91% rename from muranoapi/utils.py rename to murano/utils.py index 2467ddd7..aca037b7 100644 --- a/muranoapi/utils.py +++ b/murano/utils.py @@ -16,11 +16,11 @@ import functools from webob import exc -from muranoapi.db import models -from muranoapi.db.services import sessions -from muranoapi.db import session as db_session -from muranoapi.openstack.common.gettextutils import _ # noqa -from muranoapi.openstack.common import log as logging +from murano.db import models +from murano.db.services import sessions +from murano.db import session as db_session +from murano.openstack.common.gettextutils import _ # noqa +from murano.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/muranoapi/dsl/principal_objects/__init__.py b/muranoapi/dsl/principal_objects/__init__.py deleted file mode 100644 index aaad60a9..00000000 --- a/muranoapi/dsl/principal_objects/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -import muranoapi.dsl.principal_objects.sys_object - - -def register(class_loader): - sys_object = muranoapi.dsl.principal_objects.sys_object - class_loader.import_class(sys_object.SysObject) diff --git a/openstack-common.conf b/openstack-common.conf index 56a5a3fe..8fbc435a 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -23,4 +23,4 @@ module=fileutils module=lockutils # The base module to hold the copy of openstack.common -base=muranoapi +base=murano diff --git a/run_tests.sh b/run_tests.sh index 5963ce8a..47c52bbb 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -29,7 +29,7 @@ function process_option { -f|--force) let force=1;; -u|--update) update=1;; --unittests-only) noseopts="$noseopts --exclude-dir=functionaltests";; - -c|--coverage) noseopts="$noseopts --with-coverage --cover-package=muranoapi";; + -c|--coverage) noseopts="$noseopts --with-coverage --cover-package=murano";; -*) noseopts="$noseopts $1";; *) noseargs="$noseargs $1" esac diff --git a/setup.cfg b/setup.cfg index 9fcc8a81..a0619531 100644 --- a/setup.cfg +++ b/setup.cfg @@ -14,14 +14,14 @@ [metadata] -name = murano-api +name = murano version = 0.4.1 summary = Murano API description-file = README.rst license = Apache License, Version 2.0 -author = Mirantis, Inc. -author-email = murano-all@lists.openstack.org +author = OpenStack +author-email = openstack-dev@lists.openstack.org home-page = https://launchpad.net/murano classifier = Development Status :: 5 - Production/Stable @@ -34,7 +34,7 @@ classifier = [files] packages = - muranoapi + murano [global] setup-hooks = @@ -42,9 +42,9 @@ setup-hooks = [entry_points] console_scripts = - murano-api = muranoapi.cmd.api:main - murano-engine = muranoapi.cmd.engine:main - murano-manage = muranoapi.cmd.manage:main + murano-api = murano.cmd.api:main + murano-engine = murano.cmd.engine:main + murano-manage = murano.cmd.manage:main [build_sphinx] all_files = 1 @@ -57,15 +57,15 @@ tag_date = 0 tag_svn_revision = 0 [compile_catalog] -directory = muranoapi/locale -domain = muranoapi +directory = murano/locale +domain = murano [update_catalog] -domain = muranoapi -output_dir = muranoapi/locale -input_file = muranoapi/locale/muranoapi.pot +domain = murano +output_dir = murano/locale +input_file = murano/locale/murano.pot [extract_messages] keywords = _ gettext ngettext l_ lazy_gettext mapping_file = babel.cfg -output_file = muranoapi/locale/muranoapi.pot +output_file = murano/locale/murano.pot diff --git a/tools/config/check_uptodate.sh b/tools/config/check_uptodate.sh index a86c2ee1..70e4f151 100755 --- a/tools/config/check_uptodate.sh +++ b/tools/config/check_uptodate.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash PROJECT_NAME=${PROJECT_NAME:-murano} -CFGFILE_NAME=murano-api.conf.sample +CFGFILE_NAME=murano.conf.sample if [ -e etc/${PROJECT_NAME}/${CFGFILE_NAME} ]; then CFGFILE=etc/${PROJECT_NAME}/${CFGFILE_NAME} @@ -15,7 +15,7 @@ fi TEMPDIR=`mktemp -d /tmp/${PROJECT_NAME}.XXXXXX` trap "rm -rf $TEMPDIR" EXIT -tools/config/generate_sample.sh -b ./ -p muranoapi -o ${TEMPDIR} +tools/config/generate_sample.sh -b ./ -p murano -o ${TEMPDIR} if ! diff -u ${TEMPDIR}/${CFGFILE_NAME} ${CFGFILE} then diff --git a/tools/config/generate_sample.sh b/tools/config/generate_sample.sh index 69f73be9..52cf52e0 100755 --- a/tools/config/generate_sample.sh +++ b/tools/config/generate_sample.sh @@ -107,7 +107,7 @@ export EVENTLET_NO_GREENDNS=yes OS_VARS=$(set | sed -n '/^OS_/s/=[^=]*$//gp' | xargs) [ "$OS_VARS" ] && eval "unset \$OS_VARS" -DEFAULT_MODULEPATH=muranoapi.openstack.common.config.generator +DEFAULT_MODULEPATH=murano.openstack.common.config.generator MODULEPATH=${MODULEPATH:-$DEFAULT_MODULEPATH} OUTPUTFILE=$OUTPUTDIR/$PACKAGENAME.conf.sample python -m $MODULEPATH $MODULES $LIBRARIES $FILES > $OUTPUTFILE diff --git a/tox.ini b/tox.ini index dfa0806a..1606e534 100644 --- a/tox.ini +++ b/tox.ini @@ -14,7 +14,7 @@ setenv = VIRTUAL_ENV={envdir} NOSE_OPENSTACK_SHOW_ELAPSED=1 deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt -commands = nosetests -w muranoapi/tests +commands = nosetests -w murano/tests [testenv:pep8] commands = @@ -24,7 +24,7 @@ commands = commands = {posargs} [testenv:cover] -commands = nosetests --cover-erase --cover-package=muranoapi --with-xcoverage +commands = nosetests --cover-erase --cover-package=murano --with-xcoverage [testenv:docs] commands = @@ -48,7 +48,7 @@ deps = file://{toxinidir}/.cache.bundle [testenv:jenkinscover] deps = file://{toxinidir}/.cache.bundle setenv = NOSE_WITH_XUNIT=1 -commands = nosetests --cover-erase --cover-package=muranoapi --with-xcoverage +commands = nosetests --cover-erase --cover-package=murano --with-xcoverage [testenv:jenkinsvenv] deps = file://{toxinidir}/.cache.bundle