Rename muranoapi to murano

Partially-implements blueprint: rename-murano-api-to-murano

Change-Id: I2d7f52ef4073bce800cedc77f81f5d242c4d5d98

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
 

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:
 

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.conf.sample $MURANO_CONF_FILE
-    cp $MURANO_DIR/etc/murano/murano-api-paste.ini $MURANO_CONF_DIR
+    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-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-api.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
 }
 
 

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)
-]

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

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

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

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()

murano/api/middleware/context.py

@@ -14,10 +14,10 @@
 
 from oslo.config import cfg
 
-import muranoapi.context
+import murano.context
-from muranoapi.openstack.common.gettextutils import _  # noqa
+from murano.openstack.common.gettextutils import _  # noqa
-import muranoapi.openstack.common.log as logging
+import murano.openstack.common.log as logging
-from muranoapi.openstack.common import wsgi
+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):

murano/api/middleware/version_negotiation.py

@@ -20,10 +20,10 @@ return
 
 from oslo.config import cfg
 
-from muranoapi.api import versions
+from murano.api import versions
-from muranoapi.openstack.common.gettextutils import _  # noqa
+from murano.openstack.common.gettextutils import _  # noqa
-import muranoapi.openstack.common.log as logging
+import murano.openstack.common.log as logging
-from muranoapi.openstack.common import wsgi
+from murano.openstack.common import wsgi
 
 CONF = cfg.CONF
 LOG = logging.getLogger(__name__)

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 murano.db import models
-from muranoapi.db import session as db_session
+from murano.db import session as db_session
 
 stats = None
 

murano/api/v1/catalog.py

@@ -21,24 +21,24 @@ import tempfile
 from oslo.config import cfg
 from webob import exc
 
-import muranoapi.api.v1
+import murano.api.v1
-from muranoapi.api.v1 import schemas
+from murano.api.v1 import schemas
-from muranoapi.db.catalog import api as db_api
+from murano.db.catalog import api as db_api
-from muranoapi.openstack.common.db import exception as db_exc
+from murano.openstack.common.db import exception as db_exc
-from muranoapi.openstack.common import exception
+from murano.openstack.common import exception
-from muranoapi.openstack.common.gettextutils import _  # noqa
+from murano.openstack.common.gettextutils import _  # noqa
-from muranoapi.openstack.common import log as logging
+from murano.openstack.common import log as logging
-from muranoapi.openstack.common import wsgi
+from murano.openstack.common import wsgi
-from muranoapi.packages import application_package as app_pkg
+from murano.packages import application_package as app_pkg
-from muranoapi.packages import exceptions as pkg_exc
+from murano.packages import exceptions as pkg_exc
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF
 
-SUPPORTED_PARAMS = muranoapi.api.v1.SUPPORTED_PARAMS
+SUPPORTED_PARAMS = murano.api.v1.SUPPORTED_PARAMS
-LIST_PARAMS = muranoapi.api.v1.LIST_PARAMS
+LIST_PARAMS = murano.api.v1.LIST_PARAMS
-ORDER_VALUES = muranoapi.api.v1.ORDER_VALUES
+ORDER_VALUES = murano.api.v1.ORDER_VALUES
-PKG_PARAMS_MAP = muranoapi.api.v1.PKG_PARAMS_MAP
+PKG_PARAMS_MAP = murano.api.v1.PKG_PARAMS_MAP
 
 
 def _check_content_type(req, content_type):

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 murano.api.v1 import request_statistics
-from muranoapi.common import utils
+from murano.common import utils
-from muranoapi.db import models
+from murano.db import models
-from muranoapi.db import session as db_session
+from murano.db import session as db_session
 
-from muranoapi.openstack.common.gettextutils import _  # noqa
+from murano.openstack.common.gettextutils import _  # noqa
-from muranoapi.openstack.common import log as logging
+from murano.openstack.common import log as logging
-from muranoapi.openstack.common import wsgi
+from murano.openstack.common import wsgi
 
 LOG = logging.getLogger(__name__)
 

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 murano.api.v1 import request_statistics
-from muranoapi.common import utils
+from murano.common import utils
-from muranoapi.db import models
+from murano.db import models
-from muranoapi.db.services import core_services
+from murano.db.services import core_services
-from muranoapi.db.services import environments as envs
+from murano.db.services import environments as envs
-from muranoapi.db import session as db_session
+from murano.db import session as db_session
 
-from muranoapi.openstack.common.gettextutils import _  # noqa
+from murano.openstack.common.gettextutils import _  # noqa
-from muranoapi.openstack.common import log as logging
+from murano.openstack.common import log as logging
-from muranoapi.openstack.common import wsgi
+from murano.openstack.common import wsgi
 
 LOG = logging.getLogger(__name__)
 

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 murano.api.v1 import request_statistics
-from muranoapi.db.services import instances
+from murano.db.services import instances
 
-from muranoapi.openstack.common.gettextutils import _  # noqa
+from murano.openstack.common.gettextutils import _  # noqa
-from muranoapi.openstack.common import log as logging
+from murano.openstack.common import log as logging
-from muranoapi.openstack.common import wsgi
+from murano.openstack.common import wsgi
 
 
 LOG = logging.getLogger(__name__)

murano/api/v1/request_statistics.py

@@ -14,10 +14,10 @@
 
 import time
 
-from muranoapi.api import v1
+from murano.api import v1
-from muranoapi.db.services import stats
+from murano.db.services import stats
-from muranoapi.openstack.common import log as logging
+from murano.openstack.common import log as logging
-from muranoapi.openstack.common import wsgi
+from murano.openstack.common import wsgi
 
 LOG = logging.getLogger(__name__)
 

murano/api/v1/router.py

@@ -13,14 +13,14 @@
 #    under the License.
 import routes
 
-from muranoapi.api.v1 import catalog
+from murano.api.v1 import catalog
-from muranoapi.api.v1 import deployments
+from murano.api.v1 import deployments
-from muranoapi.api.v1 import environments
+from murano.api.v1 import environments
-from muranoapi.api.v1 import instance_statistics
+from murano.api.v1 import instance_statistics
-from muranoapi.api.v1 import request_statistics
+from murano.api.v1 import request_statistics
-from muranoapi.api.v1 import services
+from murano.api.v1 import services
-from muranoapi.api.v1 import sessions
+from murano.api.v1 import sessions
-from muranoapi.openstack.common import wsgi
+from murano.openstack.common import wsgi
 
 
 class API(wsgi.Router):

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 murano.api.v1 import request_statistics
-from muranoapi.common.helpers import token_sanitizer
+from murano.common.helpers import token_sanitizer
-from muranoapi.db.services import core_services
+from murano.db.services import core_services
-from muranoapi.openstack.common.gettextutils import _  # noqa
+from murano.openstack.common.gettextutils import _  # noqa
-from muranoapi.openstack.common import log as logging
+from murano.openstack.common import log as logging
-from muranoapi.openstack.common import wsgi
+from murano.openstack.common import wsgi
-from muranoapi import utils
+from murano import utils
 
 
 LOG = logging.getLogger(__name__)

murano/api/v1/sessions.py

@@ -14,15 +14,15 @@
 
 from webob import exc
 
-from muranoapi.api.v1 import request_statistics
+from murano.api.v1 import request_statistics
-from muranoapi.db import models
+from murano.db import models
-from muranoapi.db.services import environments as envs
+from murano.db.services import environments as envs
-from muranoapi.db.services import sessions
+from murano.db.services import sessions
-from muranoapi.db import session as db_session
+from murano.db import session as db_session
 
-from muranoapi.openstack.common.gettextutils import _  # noqa
+from murano.openstack.common.gettextutils import _  # noqa
-from muranoapi.openstack.common import log as logging
+from murano.openstack.common import log as logging
-from muranoapi.openstack.common import wsgi
+from murano.openstack.common import wsgi
 
 
 LOG = logging.getLogger(__name__)

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 murano.openstack.common import jsonutils
-from muranoapi.openstack.common import wsgi
+from murano.openstack.common import wsgi
 
 
 CONF = cfg.CONF

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 murano.api.v1 import request_statistics
-from muranoapi.common import config
+from murano.common import config
-from muranoapi.common import server
+from murano.common import server
-from muranoapi.common import statservice as stats
+from murano.common import statservice as stats
-from muranoapi.openstack.common import log
+from murano.openstack.common import log
-from muranoapi.openstack.common import service
+from murano.openstack.common import service
-from muranoapi.openstack.common import wsgi
+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))

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 murano.common import config
-from muranoapi.common import engine
+from murano.common import engine
-from muranoapi.openstack.common import log
+from murano.openstack.common import log
-from muranoapi.openstack.common import service
+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())

murano/cmd/manage.py

@@ -21,13 +21,13 @@ import traceback
 
 from oslo.config import cfg
 
-import muranoapi
+import murano
-from muranoapi.common import consts
+from murano.common import consts
-from muranoapi.db.catalog import api as db_catalog_api
+from murano.db.catalog import api as db_catalog_api
-from muranoapi.db import session as db_session
+from murano.db import session as db_session
-from muranoapi.openstack.common.db import exception as db_exception
+from murano.openstack.common.db import exception as db_exception
-from muranoapi.openstack.common import log as logging
+from murano.openstack.common import log as logging
-from muranoapi.packages import application_package
+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')
+        default_config_files = cfg.find_config_files('murano', 'murano')
-        CONF(sys.argv[1:], project='murano-api', prog='murano-manage',
+        CONF(sys.argv[1:], project='murano', prog='murano-manage',
-             version=muranoapi.__version__,
+             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)

murano/common/config.py

@@ -26,8 +26,8 @@ import tempfile
 from oslo.config import cfg
 from paste import deploy
 
-import muranoapi
+import murano
-from muranoapi.openstack.common.gettextutils import _  # noqa
+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',
+         project='murano',
-         version=muranoapi.__version__,
+         version=murano.__version__,
          usage=usage,
          default_config_files=default_config_files)
 

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 murano.common import config
-from muranoapi.common.helpers import token_sanitizer
+from murano.common.helpers import token_sanitizer
-from muranoapi.common import rpc
+from murano.common import rpc
-from muranoapi.dsl import executor
+from murano.dsl import executor
-from muranoapi.dsl import results_serializer
+from murano.dsl import results_serializer
-from muranoapi.engine import environment
+from murano.engine import environment
-from muranoapi.engine import package_class_loader
+from murano.engine import package_class_loader
-from muranoapi.engine import package_loader
+from murano.engine import package_loader
-from muranoapi.engine.system import status_reporter
+from murano.engine.system import status_reporter
-import muranoapi.engine.system.system_objects as system_objects
+import murano.engine.system.system_objects as system_objects
-from muranoapi.openstack.common.gettextutils import _  # noqa
+from murano.openstack.common.gettextutils import _  # noqa
-from muranoapi.openstack.common import log as logging
+from murano.openstack.common import log as logging
 
 RPC_SERVICE = None
 

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):

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
 

murano/common/server.py

@@ -20,14 +20,14 @@ from oslo.messaging import target
 
 from sqlalchemy import desc
 
-from muranoapi.common import config
+from murano.common import config
-from muranoapi.common.helpers import token_sanitizer
+from murano.common.helpers import token_sanitizer
-from muranoapi.db import models
+from murano.db import models
-from muranoapi.db.services import instances
+from murano.db.services import instances
-from muranoapi.db import session
+from murano.db import session
-from muranoapi.openstack.common.gettextutils import _  # noqa
+from murano.openstack.common.gettextutils import _  # noqa
-from muranoapi.openstack.common import log as logging
+from murano.openstack.common import log as logging
-from muranoapi.openstack.common import timeutils
+from murano.openstack.common import timeutils
 
 
 RPC_SERVICE = None

murano/common/statservice.py

@@ -18,14 +18,14 @@ import psutil
 import socket
 import time
 
-from muranoapi.api import v1
+from murano.api import v1
-from muranoapi.api.v1 import request_statistics
+from murano.api.v1 import request_statistics
-from muranoapi.common import config
+from murano.common import config
 
-from muranoapi.db.services import stats as db_stats
+from murano.db.services import stats as db_stats
-from muranoapi.openstack.common.gettextutils import _  # noqa
+from murano.openstack.common.gettextutils import _  # noqa
-from muranoapi.openstack.common import log as logging
+from murano.openstack.common import log as logging
-from muranoapi.openstack.common import service
+from murano.openstack.common import service
 
 
 CONF_STATS = config.CONF.stats

murano/common/utils.py

@@ -19,8 +19,8 @@ import types
 import eventlet
 import jsonschema
 
-from muranoapi.openstack.common.gettextutils import _  # noqa
+from murano.openstack.common.gettextutils import _  # noqa
-from muranoapi.openstack.common import log as logging
+from murano.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

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 murano.db import models
-from muranoapi.db import session as db_session
+from murano.db import session as db_session
-from muranoapi.openstack.common.gettextutils import _  # noqa
+from murano.openstack.common.gettextutils import _  # noqa
-from muranoapi.openstack.common import log as logging
+from murano.openstack.common import log as logging
 
 SEARCH_MAPPING = {'fqn': 'fully_qualified_name',
                   'name': 'name',

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 murano.common import consts
-from muranoapi.openstack.common import timeutils
+from murano.openstack.common import timeutils
 
 meta = schema.MetaData()
 

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 murano.common import uuidutils
-from muranoapi.db import session as db_session
+from murano.db import session as db_session
-from muranoapi.openstack.common import timeutils
+from murano.openstack.common import timeutils
 
 
 BASE = sa_decl.declarative_base()

murano/db/services/core_services.py

@@ -13,9 +13,9 @@
 #    under the License.
 import types
 
-from muranoapi.common import utils
+from murano.common import utils
-from muranoapi.db.services import environments as envs
+from murano.db.services import environments as envs
-from muranoapi.openstack.common import timeutils
+from murano.openstack.common import timeutils
 
 
 class CoreServices(object):

murano/db/services/environments.py

@@ -14,12 +14,12 @@
 
 import collections
 
-from muranoapi.common import rpc
+from murano.common import rpc
-from muranoapi.common import uuidutils
+from murano.common import uuidutils
 
-from muranoapi.db import models
+from murano.db import models
-from muranoapi.db.services import sessions
+from murano.db.services import sessions
-from muranoapi.db import session as db_session
+from murano.db import session as db_session
 
 
 EnvironmentStatus = collections.namedtuple('EnvironmentStatus', [

murano/db/services/instances.py

@@ -16,10 +16,10 @@ import sqlalchemy
 
 from sqlalchemy.sql import func
 
-from muranoapi.db import models
+from murano.db import models
-from muranoapi.db import session as db_session
+from murano.db import session as db_session
-from muranoapi.openstack.common.db import exception
+from murano.openstack.common.db import exception
-from muranoapi.openstack.common import timeutils
+from murano.openstack.common import timeutils
 
 
 UNCLASSIFIED = 0

murano/db/services/sessions.py

@@ -13,10 +13,10 @@
 #    under the License.
 import collections
 
-from muranoapi.common.helpers import token_sanitizer
+from murano.common.helpers import token_sanitizer
-from muranoapi.common import rpc
+from murano.common import rpc
-from muranoapi.db import models
+from murano.db import models
-from muranoapi.db import session as db_session
+from murano.db import session as db_session
 
 
 SessionState = collections.namedtuple('SessionState', [

murano/db/services/stats.py

@@ -13,8 +13,8 @@
 #    under the License.
 
 
-from muranoapi.db import models as m
+from murano.db import models as m
-from muranoapi.db import session as db_session
+from murano.db import session as db_session
 
 
 class Statistics(object):

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 murano.common import config
-from muranoapi.db import migrate_repo
+from murano.db import migrate_repo
-from muranoapi.openstack.common.db.sqlalchemy import session as db_session
+from murano.openstack.common.db.sqlalchemy import session as db_session
-from muranoapi.openstack.common import log as logging
+from murano.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 CONF = config.CONF

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):

murano/dsl/class_loader.py

@@ -18,13 +18,13 @@ import types
 import yaql
 import yaql.context
 
-import muranoapi.dsl.exceptions as exceptions
+import murano.dsl.exceptions as exceptions
-import muranoapi.dsl.helpers as helpers
+import murano.dsl.helpers as helpers
-import muranoapi.dsl.murano_class as murano_class
+import murano.dsl.murano_class as murano_class
-import muranoapi.dsl.murano_object as murano_object
+import murano.dsl.murano_object as murano_object
-import muranoapi.dsl.namespace_resolver as namespace_resolver
+import murano.dsl.namespace_resolver as namespace_resolver
-import muranoapi.dsl.principal_objects as principal_objects
+import murano.dsl.principal_objects as principal_objects
-import muranoapi.dsl.typespec as typespec
+import murano.dsl.typespec as typespec
 
 
 class MuranoClassLoader(object):

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 murano.dsl.attribute_store as attribute_store
-import muranoapi.dsl.exceptions as exceptions
+import murano.dsl.exceptions as exceptions
-import muranoapi.dsl.expressions as expressions
+import murano.dsl.expressions as expressions
-import muranoapi.dsl.helpers as helpers
+import murano.dsl.helpers as helpers
-import muranoapi.dsl.murano_object as murano_object
+import murano.dsl.murano_object as murano_object
-import muranoapi.dsl.object_store as object_store
+import murano.dsl.object_store as object_store
-import muranoapi.dsl.yaql_functions as yaql_functions
+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__)
 

murano/dsl/expressions.py

@@ -14,9 +14,9 @@
 
 import types
 
-import muranoapi.dsl.helpers as helpers
+import murano.dsl.helpers as helpers
-import muranoapi.dsl.lhs_expression as lhs_expression
+import murano.dsl.lhs_expression as lhs_expression
-import muranoapi.dsl.yaql_expression as yaql_expression
+import murano.dsl.yaql_expression as yaql_expression
 
 _macros = []
 

murano/dsl/helpers.py

@@ -21,9 +21,9 @@ import uuid
 import eventlet.greenpool
 import yaql.expressions
 
-from muranoapi.common import utils
+from murano.common import utils
-import muranoapi.dsl.murano_object
+import murano.dsl.murano_object
-import muranoapi.dsl.yaql_expression as yaql_expression
+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)

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 murano.dsl.murano_object as murano_object
-import muranoapi.dsl.type_scheme as type_scheme
+import murano.dsl.type_scheme as type_scheme
-import muranoapi.dsl.yaql_expression as yaql_expression
+import murano.dsl.yaql_expression as yaql_expression
 
 
 class LhsExpression(object):

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 murano.dsl.exceptions as exceptions
-import muranoapi.dsl.expressions as expressions
+import murano.dsl.expressions as expressions
-import muranoapi.dsl.helpers as helpers
+import murano.dsl.helpers as helpers
-import muranoapi.dsl.yaql_expression as yaql_expression
+import murano.dsl.yaql_expression as yaql_expression
 
 
 class CodeBlock(expressions.DslExpression):

murano/dsl/murano_class.py

@@ -15,10 +15,10 @@
 import collections
 import inspect
 
-import muranoapi.dsl.helpers as helpers
+import murano.dsl.helpers as helpers
-import muranoapi.dsl.murano_method as murano_method
+import murano.dsl.murano_method as murano_method
-import muranoapi.dsl.murano_object as murano_object
+import murano.dsl.murano_object as murano_object
-import muranoapi.dsl.typespec as typespec
+import murano.dsl.typespec as typespec
 
 
 def classname(name):

murano/dsl/murano_method.py

@@ -15,9 +15,9 @@
 import inspect
 import types
 
-import muranoapi.dsl.macros as macros
+import murano.dsl.macros as macros
-import muranoapi.dsl.typespec as typespec
+import murano.dsl.typespec as typespec
-import muranoapi.dsl.yaql_expression as yaql_expression
+import murano.dsl.yaql_expression as yaql_expression
 
 try:
     from collections import OrderedDict  # noqa

murano/dsl/murano_object.py

@@ -17,10 +17,10 @@ import types
 import yaml
 import yaql.context
 
-import muranoapi.dsl.exceptions as exceptions
+import murano.dsl.exceptions as exceptions
-import muranoapi.dsl.helpers
+import murano.dsl.helpers
-import muranoapi.dsl.type_scheme as type_scheme
+import murano.dsl.type_scheme as type_scheme
-import muranoapi.dsl.typespec as typespec
+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 = {}

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):

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)

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 murano.dsl.helpers as helpers
-import muranoapi.dsl.murano_class as murano_class
+import murano.dsl.murano_class as murano_class
 
 
 @murano_class.classname('io.murano.Object')

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):

murano/dsl/type_scheme.py

@@ -18,9 +18,9 @@ import uuid
 
 import yaql.context
 
-import muranoapi.dsl.helpers
+import murano.dsl.helpers
-import muranoapi.dsl.murano_object
+import murano.dsl.murano_object
-import muranoapi.dsl.yaql_expression as yaql_expression
+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,

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):

murano/dsl/yaql_functions.py

@@ -19,9 +19,9 @@ import eventlet
 import yaql.context
 import yaql.exceptions
 
-import muranoapi.dsl.exceptions as exceptions
+import murano.dsl.exceptions as exceptions
-import muranoapi.dsl.helpers as helpers
+import murano.dsl.helpers as helpers
-import muranoapi.dsl.murano_object as murano_object
+import murano.dsl.murano_object as murano_object
 
 
 def _resolve(name, obj):

murano/engine/package_class_loader.py

@@ -15,11 +15,11 @@
 
 from oslo.config import cfg
 
-from muranoapi.dsl import class_loader
+from murano.dsl import class_loader
-from muranoapi.dsl import exceptions
+from murano.dsl import exceptions
-from muranoapi.dsl import murano_package
+from murano.dsl import murano_package
-from muranoapi.engine.system import yaql_functions
+from murano.engine.system import yaql_functions
-from muranoapi.openstack.common import log as logging
+from murano.openstack.common import log as logging
 
 CONF = cfg.CONF
 LOG = logging.getLogger(__name__)

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 murano.common import config
-from muranoapi.dsl import exceptions
+from murano.dsl import exceptions
-from muranoapi.dsl import yaql_expression
+from murano.dsl import yaql_expression
-from muranoapi.openstack.common import log as logging
+from murano.openstack.common import log as logging
-from muranoapi.packages import application_package as app_pkg
+from murano.packages import application_package as app_pkg
-from muranoapi.packages import exceptions as pkg_exc
+from murano.packages import exceptions as pkg_exc
 
 LOG = logging.getLogger(__name__)
 

murano/engine/simple_cloader.py

@@ -17,9 +17,9 @@ import os.path
 
 import yaml
 
-import muranoapi.dsl.class_loader as class_loader
+import murano.dsl.class_loader as class_loader
-import muranoapi.dsl.yaql_expression as yaql_expression
+import murano.dsl.yaql_expression as yaql_expression
-import muranoapi.engine.system.yaql_functions as yaql_functions
+import murano.engine.system.yaql_functions as yaql_functions
 
 
 def yaql_constructor(loader, node):

murano/engine/system/agent.py

@@ -20,11 +20,11 @@ import uuid
 
 import eventlet.event
 
-import muranoapi.common.messaging as messaging
+import murano.common.messaging as messaging
-import muranoapi.dsl.murano_class as murano_class
+import murano.dsl.murano_class as murano_class
-import muranoapi.dsl.murano_object as murano_object
+import murano.dsl.murano_object as murano_object
-import muranoapi.dsl.yaql_expression as yaql_expression
+import murano.dsl.yaql_expression as yaql_expression
-import muranoapi.engine.system.common as common
+import murano.engine.system.common as common
 
 
 class AgentException(Exception):

murano/engine/system/agent_listener.py

@@ -15,9 +15,9 @@
 
 import eventlet
 
-import muranoapi.dsl.murano_class as murano_class
+import murano.dsl.murano_class as murano_class
-import muranoapi.dsl.murano_object as murano_object
+import murano.dsl.murano_object as murano_object
-import muranoapi.engine.system.common as common
+import murano.engine.system.common as common
 
 from muranoapi.openstack.common import log as logging
 

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 murano.common.config as config
-import muranoapi.common.messaging as messaging
+import murano.common.messaging as messaging
 
 
 def create_rmq_client():