From f145391f0367c74650cb6af3f0f5b99654b93d63 Mon Sep 17 00:00:00 2001 From: Stan Lagun Date: Thu, 25 Apr 2013 10:13:42 +0400 Subject: [PATCH] KEERO-315 - Fix all occurrences of old names (keero, glazier) in REST API --- README.rst | 6 +- bin/{glazier-api => murano-api} | 18 ++--- doc/source/conf.py | 20 ++--- doc/source/index.rst | 46 +++++------ doc/source/man/glazierapi.rst | 18 ++--- etc/glazier-api-paste.ini | 8 +- etc/glazier-api.conf | 10 +-- {glazierapi => muranoapi}/__init__.py | 0 {glazierapi => muranoapi}/api/__init__.py | 0 .../api/middleware/__init__.py | 0 .../api/middleware/context.py | 10 +-- {glazierapi => muranoapi}/api/v1/__init__.py | 4 +- .../api/v1/active_directories.py | 10 +-- .../api/v1/environments.py | 12 +-- {glazierapi => muranoapi}/api/v1/router.py | 4 +- {glazierapi => muranoapi}/api/v1/sessions.py | 10 +-- .../api/v1/webservers.py | 10 +-- {glazierapi => muranoapi}/common/__init__.py | 0 {glazierapi => muranoapi}/common/config.py | 22 +++--- {glazierapi => muranoapi}/common/service.py | 10 +-- {glazierapi => muranoapi}/common/uuidutils.py | 0 {glazierapi => muranoapi}/context.py | 2 +- {glazierapi => muranoapi}/db/__init__.py | 2 +- .../db/migrate_repo/README | 0 .../db/migrate_repo/__init__.py | 0 .../db/migrate_repo/manage.py | 0 .../db/migrate_repo/migrate.cfg | 4 +- .../versions/001_add_initial_tables.py | 0 .../versions/002_add_session_table.py | 0 .../versions/003_add_status_table.py | 0 .../004_add_description_column_to_session.py | 0 .../005_remove_obsolete_service_table.py | 0 .../006_add_entity_id_column_to_status.py | 0 .../db/migrate_repo/versions/__init__.py | 0 {glazierapi => muranoapi}/db/models.py | 8 +- {glazierapi => muranoapi}/db/session.py | 4 +- .../locale/ru/LC_MESSAGES/glazierapi.po | 78 +++++++++---------- .../openstack/__init__.py | 0 .../openstack/common/__init__.py | 0 .../openstack/common/eventlet_backdoor.py | 0 .../openstack/common/exception.py | 2 +- .../openstack/common/gettextutils.py | 2 +- .../openstack/common/importutils.py | 0 .../openstack/common/jsonutils.py | 4 +- .../openstack/common/local.py | 0 .../openstack/common/log.py | 10 +-- .../openstack/common/loopingcall.py | 6 +- .../openstack/common/notifier/__init__.py | 0 .../openstack/common/notifier/api.py | 12 +-- .../openstack/common/notifier/log_notifier.py | 6 +- .../common/notifier/no_op_notifier.py | 0 .../common/notifier/rabbit_notifier.py | 6 +- .../openstack/common/notifier/rpc_notifier.py | 8 +- .../common/notifier/rpc_notifier2.py | 8 +- .../common/notifier/test_notifier.py | 0 .../openstack/common/service.py | 12 +-- .../openstack/common/setup.py | 0 .../openstack/common/sslutils.py | 2 +- .../openstack/common/threadgroup.py | 4 +- .../openstack/common/timeutils.py | 0 .../openstack/common/uuidutils.py | 0 .../openstack/common/version.py | 2 +- .../openstack/common/wsgi.py | 14 ++-- .../openstack/common/xmlutils.py | 0 {glazierapi => muranoapi}/tests/__init__.py | 0 .../tests/api/__init__.py | 0 .../tests/api/simple_test.py | 0 .../tests/sanity_tests.py | 2 +- {glazierapi => muranoapi}/utils.py | 4 +- {glazierapi => muranoapi}/version.py | 4 +- openstack-common.conf | 2 +- run_tests.sh | 6 +- setup.cfg | 14 ++-- setup.py | 10 +-- tools/install_venv.py | 10 +-- tox.ini | 6 +- 76 files changed, 236 insertions(+), 236 deletions(-) rename bin/{glazier-api => murano-api} (76%) mode change 100755 => 100644 rename {glazierapi => muranoapi}/__init__.py (100%) rename {glazierapi => muranoapi}/api/__init__.py (100%) rename {glazierapi => muranoapi}/api/middleware/__init__.py (100%) rename {glazierapi => muranoapi}/api/middleware/context.py (91%) rename {glazierapi => muranoapi}/api/v1/__init__.py (96%) rename {glazierapi => muranoapi}/api/v1/active_directories.py (92%) rename {glazierapi => muranoapi}/api/v1/environments.py (94%) rename {glazierapi => muranoapi}/api/v1/router.py (98%) rename {glazierapi => muranoapi}/api/v1/sessions.py (96%) rename {glazierapi => muranoapi}/api/v1/webservers.py (91%) rename {glazierapi => muranoapi}/common/__init__.py (100%) rename {glazierapi => muranoapi}/common/config.py (89%) rename {glazierapi => muranoapi}/common/service.py (93%) rename {glazierapi => muranoapi}/common/uuidutils.py (100%) rename {glazierapi => muranoapi}/context.py (97%) rename {glazierapi => muranoapi}/db/__init__.py (93%) rename {glazierapi => muranoapi}/db/migrate_repo/README (100%) rename {glazierapi => muranoapi}/db/migrate_repo/__init__.py (100%) rename {glazierapi => muranoapi}/db/migrate_repo/manage.py (100%) rename {glazierapi => muranoapi}/db/migrate_repo/migrate.cfg (91%) rename {glazierapi => muranoapi}/db/migrate_repo/versions/001_add_initial_tables.py (100%) rename {glazierapi => muranoapi}/db/migrate_repo/versions/002_add_session_table.py (100%) rename {glazierapi => muranoapi}/db/migrate_repo/versions/003_add_status_table.py (100%) rename {glazierapi => muranoapi}/db/migrate_repo/versions/004_add_description_column_to_session.py (100%) rename {glazierapi => muranoapi}/db/migrate_repo/versions/005_remove_obsolete_service_table.py (100%) rename {glazierapi => muranoapi}/db/migrate_repo/versions/006_add_entity_id_column_to_status.py (100%) rename {glazierapi => muranoapi}/db/migrate_repo/versions/__init__.py (100%) rename {glazierapi => muranoapi}/db/models.py (96%) rename {glazierapi => muranoapi}/db/session.py (97%) rename {glazierapi => muranoapi}/locale/ru/LC_MESSAGES/glazierapi.po (63%) rename {glazierapi => muranoapi}/openstack/__init__.py (100%) rename {glazierapi => muranoapi}/openstack/common/__init__.py (100%) rename {glazierapi => muranoapi}/openstack/common/eventlet_backdoor.py (100%) rename {glazierapi => muranoapi}/openstack/common/exception.py (98%) rename {glazierapi => muranoapi}/openstack/common/gettextutils.py (93%) rename {glazierapi => muranoapi}/openstack/common/importutils.py (100%) rename {glazierapi => muranoapi}/openstack/common/jsonutils.py (98%) rename {glazierapi => muranoapi}/openstack/common/local.py (100%) rename {glazierapi => muranoapi}/openstack/common/log.py (98%) rename {glazierapi => muranoapi}/openstack/common/loopingcall.py (94%) rename {glazierapi => muranoapi}/openstack/common/notifier/__init__.py (100%) rename {glazierapi => muranoapi}/openstack/common/notifier/api.py (94%) rename {glazierapi => muranoapi}/openstack/common/notifier/log_notifier.py (87%) rename {glazierapi => muranoapi}/openstack/common/notifier/no_op_notifier.py (100%) rename {glazierapi => muranoapi}/openstack/common/notifier/rabbit_notifier.py (84%) rename {glazierapi => muranoapi}/openstack/common/notifier/rpc_notifier.py (87%) rename {glazierapi => muranoapi}/openstack/common/notifier/rpc_notifier2.py (88%) rename {glazierapi => muranoapi}/openstack/common/notifier/test_notifier.py (100%) rename {glazierapi => muranoapi}/openstack/common/service.py (96%) rename {glazierapi => muranoapi}/openstack/common/setup.py (100%) rename {glazierapi => muranoapi}/openstack/common/sslutils.py (97%) rename {glazierapi => muranoapi}/openstack/common/threadgroup.py (96%) rename {glazierapi => muranoapi}/openstack/common/timeutils.py (100%) rename {glazierapi => muranoapi}/openstack/common/uuidutils.py (100%) rename {glazierapi => muranoapi}/openstack/common/version.py (98%) rename {glazierapi => muranoapi}/openstack/common/wsgi.py (98%) rename {glazierapi => muranoapi}/openstack/common/xmlutils.py (100%) rename {glazierapi => muranoapi}/tests/__init__.py (100%) rename {glazierapi => muranoapi}/tests/api/__init__.py (100%) rename {glazierapi => muranoapi}/tests/api/simple_test.py (100%) rename {glazierapi => muranoapi}/tests/sanity_tests.py (96%) rename {glazierapi => muranoapi}/utils.py (93%) rename {glazierapi => muranoapi}/version.py (83%) diff --git a/README.rst b/README.rst index 02ee2a7c0..782ac64a0 100644 --- a/README.rst +++ b/README.rst @@ -1,7 +1,7 @@ -Glazier API README +Murano API README ===================== -Glazier API is a project that provides access to engine via API. +Murano API is a project that provides access to engine via API. SEE ALSO -------- -* `Glazier `__ +* `Murano `__ diff --git a/bin/glazier-api b/bin/murano-api old mode 100755 new mode 100644 similarity index 76% rename from bin/glazier-api rename to bin/murano-api index 249621904..420f76412 --- a/bin/glazier-api +++ b/bin/murano-api @@ -18,27 +18,27 @@ import gettext import os import sys -# If ../glazierapi/__init__.py exists, add ../ to Python search path, so that +# If ../muranoapi/__init__.py exists, add ../ to Python search path, so that # it will override what happens to be installed in /usr/(local/)lib/python... -from glazierapi.common.service import TaskResultHandlerService +from muranoapi.common.service import TaskResultHandlerService possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]), os.pardir, os.pardir)) -if os.path.exists(os.path.join(possible_topdir, 'portas', '__init__.py')): +if os.path.exists(os.path.join(possible_topdir, 'muranoapi', '__init__.py')): sys.path.insert(0, possible_topdir) -from glazierapi.common import config -from glazierapi.openstack.common import log -from glazierapi.openstack.common import wsgi -from glazierapi.openstack.common import service +from muranoapi.common import config +from muranoapi.openstack.common import log +from muranoapi.openstack.common import wsgi +from muranoapi.openstack.common import service -gettext.install('glazierapi', './glazierapi/locale', unicode=1) +gettext.install('muranoapi', './muranoapi/locale', unicode=1) if __name__ == '__main__': try: config.parse_args() - log.setup('glazierapi') + log.setup('muranoapi') launcher = service.ServiceLauncher() diff --git a/doc/source/conf.py b/doc/source/conf.py index 28c8b6856..306f008ad 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -15,7 +15,7 @@ # limitations under the License. # -# Portas documentation build configuration file, created by +# Murano API documentation build configuration file, created by # sphinx-quickstart on Tue February 28 13:50:15 2013. # # This file is execfile()'d with the current directory set to its containing @@ -33,7 +33,7 @@ import sys # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. -sys.path = [os.path.abspath('../../glazierapi'), +sys.path = [os.path.abspath('../../muranoapi'), os.path.abspath('../..'), os.path.abspath('../../bin')] + sys.path @@ -65,7 +65,7 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = u'Glazier APIs' +project = u'Murano APIs' copyright = u'2013, Mirantis, Inc' # The version info for the project you're documenting, acts as replacement for @@ -73,11 +73,11 @@ copyright = u'2013, Mirantis, Inc' # built documents. # # The short X.Y version. -from glazierapi.version import version_info as portas_version +from muranoapi.version import version_info as muranoapi_version # The full version, including alpha/beta/rc tags. -release = portas_version.version_string_with_vcs() +release = muranoapi_version.version_string_with_vcs() # The short X.Y version. -version = portas_version.canonical_version_string() +version = muranoapi_version.canonical_version_string() # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -114,7 +114,7 @@ show_authors = True pygments_style = 'sphinx' # A list of ignored prefixes for module index sorting. -modindex_common_prefix = ['glazierapi.'] +modindex_common_prefix = ['muranoapi.'] # -- Options for man page output -------------------------------------------- @@ -122,7 +122,7 @@ modindex_common_prefix = ['glazierapi.'] # List of tuples 'sourcefile', 'target', u'title', u'Authors name', 'manual' man_pages = [ - ('man/glazierapi', 'glazier-api', u'Glazier API Server', + ('man/muranoapi', 'murano-api', u'Murano API Server', [u'Mirantis, Inc'], 1) ] @@ -201,7 +201,7 @@ html_use_index = False #html_file_suffix = '' # Output file base name for HTML help builder. -htmlhelp_basename = 'glazierapidoc' +htmlhelp_basename = 'muranoapidoc' # -- Options for LaTeX output ------------------------------------------------ @@ -216,7 +216,7 @@ htmlhelp_basename = 'glazierapidoc' # (source start file, target name, title, author, # documentclass [howto/manual]). latex_documents = [ - ('index', 'Glazier.tex', u'Glazier Documentation', + ('index', 'Murano.tex', u'Murano Documentation', u'Mirantis, Inc', 'manual'), ] diff --git a/doc/source/index.rst b/doc/source/index.rst index 2073f0050..143df3e59 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -14,16 +14,16 @@ under the License. ============================================== -Welcome to Glazier API Service! +Welcome to Murano API Service! ============================================== -Glazier API is a project that provides access to engine via API. +Murano API is a project that provides access to engine via API. -This document describes Glazier API for contributors of the project, -and assumes that you are already familiar with Glazier API from an +This document describes Murano API for contributors of the project, +and assumes that you are already familiar with Murano API from an `end-user perspective`_. -.. _`end-user perspective`: http://glazier.mirantis.com/ +.. _`end-user perspective`: http://murano.mirantis.com/ This documentation is generated by the Sphinx toolkit and lives in the source tree. @@ -32,19 +32,19 @@ Installation Guide ================== Install ------- -1. Check out sources to some directory (/glazier):: +1. Check out sources to some directory (/murano):: - user@work:~/$ git clone ssh://@gerrit.mirantis.com:29418/keero/keero.git + user@work:~/$ git clone https://github.com/Mirantis/murano-api.git -2. Install Glazier API:: +2. Install Murano API:: - user@work:~/$ cd glazier/api && sudo python setup.py install + user@work:~/$ cd murano/api && sudo python setup.py install Configure --------- 1. Open first configuration file for editing:: - user@work:~/$ cd glazier/api/etc && nano glazier-api.conf + user@work:~/$ cd murano/api/etc && nano murano-api.conf 2. Configure according to you environment (please note rabbitmq section):: @@ -59,9 +59,9 @@ Configure bind_port = 8082 # Log to this file. Make sure the user running skeleton-api has # permissions to write to this file! - log_file = /tmp/glazier-api.log + log_file = /tmp/murano-api.log #A valid SQLAlchemy connection string for the metadata database - sql_connection = sqlite:///glazier.sqlite + sql_connection = sqlite:///murano.sqlite [reports] results_exchange = task-results @@ -72,22 +72,22 @@ Configure [rabbitmq] host = localhost port = 5672 - virtual_host = keero - login = keero - password = keero + virtual_host = murano + login = murano + password = murano 3. Open second configuration file for editing:: - smelikyan@work:~/cd glazier/api/etc && nano glazier-api.conf + smelikyan@work:~/cd murano/api/etc && nano murano-api.conf 4. Configure according to you environment (please note filter:authtoken section):: - [pipeline:glazier-api] + [pipeline:murano-api] pipeline = authtoken context apiv1app [app:apiv1app] - paste.app_factory = glazierapi.api.v1.router:API.factory + paste.app_factory = muranoapi.api.v1.router:API.factory [filter:context] - paste.filter_factory = glazierapi.api.middleware.context:ContextMiddleware.factory + paste.filter_factory = muranoapi.api.middleware.context:ContextMiddleware.factory [filter:authtoken] paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory @@ -97,13 +97,13 @@ Configure admin_tenant_name = admin admin_user = admin admin_password = password - signing_dir = /tmp/keystone-signing-glazierapi + signing_dir = /tmp/keystone-signing-muranoapi Run ---- -Run Glazier API and supply valid configuration file:: +Run Murano API and supply valid configuration file:: - user@work:~/$ glazier-api --config-file=./glazier/api/etc/glazier-api.conf + user@work:~/$ murano-api --config-file=./murano/api/etc/murano-api.conf Man Pages ========= @@ -111,4 +111,4 @@ Man Pages .. toctree:: :maxdepth: 1 - man/glazierapi + man/muranoapi diff --git a/doc/source/man/glazierapi.rst b/doc/source/man/glazierapi.rst index a488935b8..e5d33eb61 100644 --- a/doc/source/man/glazierapi.rst +++ b/doc/source/man/glazierapi.rst @@ -14,11 +14,11 @@ under the License. ========== -glazier-api +murano-api ========== ----------------------------- -Glazier API Server +Murano API Server ----------------------------- :Author: smelikyan@mirantis.com @@ -32,12 +32,12 @@ Glazier API Server SYNOPSIS ======== - glazier-api [options] + murano-api [options] DESCRIPTION =========== -glazier-api is a server daemon that serves the Glazier API +murano-api is a server daemon that serves the Murano API OPTIONS ======= @@ -51,19 +51,19 @@ OPTIONS Config file used for running service **--bind-host=HOST** - Address of host running ``glazier-api``. Defaults to `0.0.0.0`. + Address of host running ``murano-api``. Defaults to `0.0.0.0`. **--bind-port=PORT** - Port that ``glazier-api`` listens on. Defaults to `8082`. + Port that ``murano-api`` listens on. Defaults to `8082`. FILES ===== -* /etc/glazier/glazier-api.conf -* /etc/glazier/glazier-api-paste.conf +* /etc/murano/murano-api.conf +* /etc/murano/murano-api-paste.conf SEE ALSO ======== -* `Glazier `__ +* `Murano `__ diff --git a/etc/glazier-api-paste.ini b/etc/glazier-api-paste.ini index f02d0c143..f8f3c6d7d 100644 --- a/etc/glazier-api-paste.ini +++ b/etc/glazier-api-paste.ini @@ -1,11 +1,11 @@ -[pipeline:glazier-api] +[pipeline:murano-api] pipeline = authtoken context apiv1app [app:apiv1app] -paste.app_factory = glazierapi.api.v1.router:API.factory +paste.app_factory = muranoapi.api.v1.router:API.factory [filter:context] -paste.filter_factory = glazierapi.api.middleware.context:ContextMiddleware.factory +paste.filter_factory = muranoapi.api.middleware.context:ContextMiddleware.factory [filter:authtoken] paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory @@ -15,4 +15,4 @@ auth_protocol = http admin_tenant_name = admin admin_user = admin admin_password = password -signing_dir = /tmp/keystone-signing-portas +signing_dir = /tmp/keystone-signing-muranoapi diff --git a/etc/glazier-api.conf b/etc/glazier-api.conf index 5cf698e84..cb3da5fe1 100644 --- a/etc/glazier-api.conf +++ b/etc/glazier-api.conf @@ -13,10 +13,10 @@ bind_port = 8082 # Log to this file. Make sure the user running skeleton-api has # permissions to write to this file! -log_file = /tmp/portas-api.log +log_file = /tmp/murano-api.log #A valid SQLAlchemy connection string for the metadata database -sql_connection = sqlite:///glazier.sqlite +sql_connection = sqlite:///murano.sqlite [reports] results_exchange = task-results @@ -27,6 +27,6 @@ reports_queue = task-reports [rabbitmq] host = localhost port = 5672 -virtual_host = keero -login = keero -password = keero +virtual_host = murano +login = murano +password = murano diff --git a/glazierapi/__init__.py b/muranoapi/__init__.py similarity index 100% rename from glazierapi/__init__.py rename to muranoapi/__init__.py diff --git a/glazierapi/api/__init__.py b/muranoapi/api/__init__.py similarity index 100% rename from glazierapi/api/__init__.py rename to muranoapi/api/__init__.py diff --git a/glazierapi/api/middleware/__init__.py b/muranoapi/api/middleware/__init__.py similarity index 100% rename from glazierapi/api/middleware/__init__.py rename to muranoapi/api/middleware/__init__.py diff --git a/glazierapi/api/middleware/context.py b/muranoapi/api/middleware/context.py similarity index 91% rename from glazierapi/api/middleware/context.py rename to muranoapi/api/middleware/context.py index 6d82abde1..8cbcb4601 100644 --- a/glazierapi/api/middleware/context.py +++ b/muranoapi/api/middleware/context.py @@ -18,9 +18,9 @@ from oslo.config import cfg import webob.exc -from glazierapi.openstack.common import wsgi -import glazierapi.context -import glazierapi.openstack.common.log as logging +from muranoapi.openstack.common import wsgi +import muranoapi.context +import muranoapi.openstack.common.log as logging CONF = cfg.CONF LOG = logging.getLogger(__name__) @@ -41,7 +41,7 @@ class ContextMiddleware(BaseContextMiddleware): def process_request(self, req): """Convert authentication information into a request context - Generate a glazierapi.context.RequestContext object from the available + Generate a muranoapi.context.RequestContext object from the available authentication headers and store on the 'context' attribute of the req object. @@ -75,7 +75,7 @@ class ContextMiddleware(BaseContextMiddleware): 'service_catalog': service_catalog, 'session': req.headers.get('X-Configuration-Session') } - req.context = glazierapi.context.RequestContext(**kwargs) + req.context = muranoapi.context.RequestContext(**kwargs) else: raise webob.exc.HTTPUnauthorized() diff --git a/glazierapi/api/v1/__init__.py b/muranoapi/api/v1/__init__.py similarity index 96% rename from glazierapi/api/v1/__init__.py rename to muranoapi/api/v1/__init__.py index 7a46398eb..e2331915d 100644 --- a/glazierapi/api/v1/__init__.py +++ b/muranoapi/api/v1/__init__.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License.from oslo.config import cfg -from glazierapi.db.models import Session, Environment, Status -from glazierapi.db.session import get_session +from muranoapi.db.models import Session, Environment, Status +from muranoapi.db.session import get_session def get_draft(environment_id=None, session_id=None): diff --git a/glazierapi/api/v1/active_directories.py b/muranoapi/api/v1/active_directories.py similarity index 92% rename from glazierapi/api/v1/active_directories.py rename to muranoapi/api/v1/active_directories.py index 12416b1c3..7d49e60d7 100644 --- a/glazierapi/api/v1/active_directories.py +++ b/muranoapi/api/v1/active_directories.py @@ -12,11 +12,11 @@ # License for the specific language governing permissions and limitations # under the License.from oslo.config import cfg -from glazierapi import utils -from glazierapi.api.v1 import save_draft, get_draft, get_service_status -from glazierapi.common import uuidutils -from glazierapi.openstack.common import wsgi, timeutils -from glazierapi.openstack.common import log as logging +from muranoapi import utils +from muranoapi.api.v1 import save_draft, get_draft, get_service_status +from muranoapi.common import uuidutils +from muranoapi.openstack.common import wsgi, timeutils +from muranoapi.openstack.common import log as logging log = logging.getLogger(__name__) diff --git a/glazierapi/api/v1/environments.py b/muranoapi/api/v1/environments.py similarity index 94% rename from glazierapi/api/v1/environments.py rename to muranoapi/api/v1/environments.py index 5bb67022c..9a9d9be2c 100644 --- a/glazierapi/api/v1/environments.py +++ b/muranoapi/api/v1/environments.py @@ -16,12 +16,12 @@ from amqplib.client_0_8 import Message import anyjson import eventlet from webob import exc -from glazierapi.common import config -from glazierapi.api.v1 import get_env_status -from glazierapi.db.session import get_session -from glazierapi.db.models import Environment -from glazierapi.openstack.common import wsgi -from glazierapi.openstack.common import log as logging +from muranoapi.common import config +from muranoapi.api.v1 import get_env_status +from muranoapi.db.session import get_session +from muranoapi.db.models import Environment +from muranoapi.openstack.common import wsgi +from muranoapi.openstack.common import log as logging amqp = eventlet.patcher.import_patched('amqplib.client_0_8') rabbitmq = config.CONF.rabbitmq diff --git a/glazierapi/api/v1/router.py b/muranoapi/api/v1/router.py similarity index 98% rename from glazierapi/api/v1/router.py rename to muranoapi/api/v1/router.py index 998ee316d..b7d4625aa 100644 --- a/glazierapi/api/v1/router.py +++ b/muranoapi/api/v1/router.py @@ -13,8 +13,8 @@ # under the License.from oslo.config import cfg import routes -from glazierapi.openstack.common import wsgi -from glazierapi.api.v1 import (environments, sessions, +from muranoapi.openstack.common import wsgi +from muranoapi.api.v1 import (environments, sessions, active_directories, webservers) diff --git a/glazierapi/api/v1/sessions.py b/muranoapi/api/v1/sessions.py similarity index 96% rename from glazierapi/api/v1/sessions.py rename to muranoapi/api/v1/sessions.py index 156544617..7cae207a8 100644 --- a/glazierapi/api/v1/sessions.py +++ b/muranoapi/api/v1/sessions.py @@ -16,11 +16,11 @@ from amqplib.client_0_8 import Message import anyjson import eventlet from webob import exc -from glazierapi.common import config -from glazierapi.db.models import Session, Status, Environment -from glazierapi.db.session import get_session -from glazierapi.openstack.common import wsgi -from glazierapi.openstack.common import log as logging +from muranoapi.common import config +from muranoapi.db.models import Session, Status, Environment +from muranoapi.db.session import get_session +from muranoapi.openstack.common import wsgi +from muranoapi.openstack.common import log as logging amqp = eventlet.patcher.import_patched('amqplib.client_0_8') rabbitmq = config.CONF.rabbitmq diff --git a/glazierapi/api/v1/webservers.py b/muranoapi/api/v1/webservers.py similarity index 91% rename from glazierapi/api/v1/webservers.py rename to muranoapi/api/v1/webservers.py index 876c9d2c9..e99655405 100644 --- a/glazierapi/api/v1/webservers.py +++ b/muranoapi/api/v1/webservers.py @@ -12,11 +12,11 @@ # License for the specific language governing permissions and limitations # under the License.from oslo.config import cfg -from glazierapi import utils -from glazierapi.api.v1 import save_draft, get_draft, get_service_status -from glazierapi.common import uuidutils -from glazierapi.openstack.common import wsgi, timeutils -from glazierapi.openstack.common import log as logging +from muranoapi import utils +from muranoapi.api.v1 import save_draft, get_draft, get_service_status +from muranoapi.common import uuidutils +from muranoapi.openstack.common import wsgi, timeutils +from muranoapi.openstack.common import log as logging log = logging.getLogger(__name__) diff --git a/glazierapi/common/__init__.py b/muranoapi/common/__init__.py similarity index 100% rename from glazierapi/common/__init__.py rename to muranoapi/common/__init__.py diff --git a/glazierapi/common/config.py b/muranoapi/common/config.py similarity index 89% rename from glazierapi/common/config.py rename to muranoapi/common/config.py index a5bfd8544..10901c706 100644 --- a/glazierapi/common/config.py +++ b/muranoapi/common/config.py @@ -29,7 +29,7 @@ import sys from oslo.config import cfg from paste import deploy -from glazierapi.version import version_info as version +from muranoapi.version import version_info as version paste_deploy_opts = [ cfg.StrOpt('flavor'), @@ -65,20 +65,20 @@ CONF.register_opts(reports_opts, group='reports') CONF.register_opts(rabbit_opts, group='rabbitmq') -CONF.import_opt('verbose', 'glazierapi.openstack.common.log') -CONF.import_opt('debug', 'glazierapi.openstack.common.log') -CONF.import_opt('log_dir', 'glazierapi.openstack.common.log') -CONF.import_opt('log_file', 'glazierapi.openstack.common.log') -CONF.import_opt('log_config', 'glazierapi.openstack.common.log') -CONF.import_opt('log_format', 'glazierapi.openstack.common.log') -CONF.import_opt('log_date_format', 'glazierapi.openstack.common.log') -CONF.import_opt('use_syslog', 'glazierapi.openstack.common.log') -CONF.import_opt('syslog_log_facility', 'glazierapi.openstack.common.log') +CONF.import_opt('verbose', 'muranoapi.openstack.common.log') +CONF.import_opt('debug', 'muranoapi.openstack.common.log') +CONF.import_opt('log_dir', 'muranoapi.openstack.common.log') +CONF.import_opt('log_file', 'muranoapi.openstack.common.log') +CONF.import_opt('log_config', 'muranoapi.openstack.common.log') +CONF.import_opt('log_format', 'muranoapi.openstack.common.log') +CONF.import_opt('log_date_format', 'muranoapi.openstack.common.log') +CONF.import_opt('use_syslog', 'muranoapi.openstack.common.log') +CONF.import_opt('syslog_log_facility', 'muranoapi.openstack.common.log') def parse_args(args=None, usage=None, default_config_files=None): CONF(args=args, - project='glazierapi', + project='muranoapi', version=version.cached_version_string(), usage=usage, default_config_files=default_config_files) diff --git a/glazierapi/common/service.py b/muranoapi/common/service.py similarity index 93% rename from glazierapi/common/service.py rename to muranoapi/common/service.py index 8b2d73427..0f5d0c47a 100644 --- a/glazierapi/common/service.py +++ b/muranoapi/common/service.py @@ -14,14 +14,14 @@ import anyjson from eventlet import patcher -from glazierapi.db.models import Status, Session, Environment -from glazierapi.db.session import get_session +from muranoapi.db.models import Status, Session, Environment +from muranoapi.db.session import get_session amqp = patcher.import_patched('amqplib.client_0_8') -from glazierapi.openstack.common import service -from glazierapi.openstack.common import log as logging -from glazierapi.common import config +from muranoapi.openstack.common import service +from muranoapi.openstack.common import log as logging +from muranoapi.common import config conf = config.CONF.reports rabbitmq = config.CONF.rabbitmq diff --git a/glazierapi/common/uuidutils.py b/muranoapi/common/uuidutils.py similarity index 100% rename from glazierapi/common/uuidutils.py rename to muranoapi/common/uuidutils.py diff --git a/glazierapi/context.py b/muranoapi/context.py similarity index 97% rename from glazierapi/context.py rename to muranoapi/context.py index 2bea96f5c..97ea15919 100644 --- a/glazierapi/context.py +++ b/muranoapi/context.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from glazierapi.openstack.common import uuidutils +from muranoapi.openstack.common import uuidutils class RequestContext(object): diff --git a/glazierapi/db/__init__.py b/muranoapi/db/__init__.py similarity index 93% rename from glazierapi/db/__init__.py rename to muranoapi/db/__init__.py index 374c13289..cb0f3b941 100644 --- a/glazierapi/db/__init__.py +++ b/muranoapi/db/__init__.py @@ -15,7 +15,7 @@ from oslo.config import cfg sql_connection_opt = cfg.StrOpt('sql_connection', - default='sqlite:///glazierapi.sqlite', + default='sqlite:///muranoapi.sqlite', secret=True, metavar='CONNECTION', help='A valid SQLAlchemy connection ' diff --git a/glazierapi/db/migrate_repo/README b/muranoapi/db/migrate_repo/README similarity index 100% rename from glazierapi/db/migrate_repo/README rename to muranoapi/db/migrate_repo/README diff --git a/glazierapi/db/migrate_repo/__init__.py b/muranoapi/db/migrate_repo/__init__.py similarity index 100% rename from glazierapi/db/migrate_repo/__init__.py rename to muranoapi/db/migrate_repo/__init__.py diff --git a/glazierapi/db/migrate_repo/manage.py b/muranoapi/db/migrate_repo/manage.py similarity index 100% rename from glazierapi/db/migrate_repo/manage.py rename to muranoapi/db/migrate_repo/manage.py diff --git a/glazierapi/db/migrate_repo/migrate.cfg b/muranoapi/db/migrate_repo/migrate.cfg similarity index 91% rename from glazierapi/db/migrate_repo/migrate.cfg rename to muranoapi/db/migrate_repo/migrate.cfg index 0f60e5a1d..4fe14f42c 100644 --- a/glazierapi/db/migrate_repo/migrate.cfg +++ b/muranoapi/db/migrate_repo/migrate.cfg @@ -1,7 +1,7 @@ [db_settings] # Used to identify which repository this database is versioned under. # You can use the name of your project. -repository_id=Glazier Migrations +repository_id=Murano Migrations # The name of the database table used to track the schema version. # This name shouldn't already be used by your project. @@ -16,5 +16,5 @@ version_table=migrate_version # Databases in this list MUST compile successfully during a commit, or the # entire commit will fail. List the databases your application will actually # be using to ensure your updates to that database work properly. -# This must be a list; example: ['glazier','sqlite'] +# This must be a list; example: ['sqlite'] required_dbs=[] diff --git a/glazierapi/db/migrate_repo/versions/001_add_initial_tables.py b/muranoapi/db/migrate_repo/versions/001_add_initial_tables.py similarity index 100% rename from glazierapi/db/migrate_repo/versions/001_add_initial_tables.py rename to muranoapi/db/migrate_repo/versions/001_add_initial_tables.py diff --git a/glazierapi/db/migrate_repo/versions/002_add_session_table.py b/muranoapi/db/migrate_repo/versions/002_add_session_table.py similarity index 100% rename from glazierapi/db/migrate_repo/versions/002_add_session_table.py rename to muranoapi/db/migrate_repo/versions/002_add_session_table.py diff --git a/glazierapi/db/migrate_repo/versions/003_add_status_table.py b/muranoapi/db/migrate_repo/versions/003_add_status_table.py similarity index 100% rename from glazierapi/db/migrate_repo/versions/003_add_status_table.py rename to muranoapi/db/migrate_repo/versions/003_add_status_table.py diff --git a/glazierapi/db/migrate_repo/versions/004_add_description_column_to_session.py b/muranoapi/db/migrate_repo/versions/004_add_description_column_to_session.py similarity index 100% rename from glazierapi/db/migrate_repo/versions/004_add_description_column_to_session.py rename to muranoapi/db/migrate_repo/versions/004_add_description_column_to_session.py diff --git a/glazierapi/db/migrate_repo/versions/005_remove_obsolete_service_table.py b/muranoapi/db/migrate_repo/versions/005_remove_obsolete_service_table.py similarity index 100% rename from glazierapi/db/migrate_repo/versions/005_remove_obsolete_service_table.py rename to muranoapi/db/migrate_repo/versions/005_remove_obsolete_service_table.py diff --git a/glazierapi/db/migrate_repo/versions/006_add_entity_id_column_to_status.py b/muranoapi/db/migrate_repo/versions/006_add_entity_id_column_to_status.py similarity index 100% rename from glazierapi/db/migrate_repo/versions/006_add_entity_id_column_to_status.py rename to muranoapi/db/migrate_repo/versions/006_add_entity_id_column_to_status.py diff --git a/glazierapi/db/migrate_repo/versions/__init__.py b/muranoapi/db/migrate_repo/versions/__init__.py similarity index 100% rename from glazierapi/db/migrate_repo/versions/__init__.py rename to muranoapi/db/migrate_repo/versions/__init__.py diff --git a/glazierapi/db/models.py b/muranoapi/db/models.py similarity index 96% rename from glazierapi/db/models.py rename to muranoapi/db/models.py index ac373d23c..a7bee04f8 100644 --- a/glazierapi/db/models.py +++ b/muranoapi/db/models.py @@ -13,7 +13,7 @@ # under the License. """ -SQLAlchemy models for glazierapi data +SQLAlchemy models for muranoapi data """ import anyjson @@ -22,10 +22,10 @@ from sqlalchemy.ext.compiler import compiles from sqlalchemy.ext.declarative import declarative_base from sqlalchemy import DateTime, Text from sqlalchemy.orm import relationship, backref, object_mapper -from glazierapi.common import uuidutils +from muranoapi.common import uuidutils -from glazierapi.openstack.common import timeutils -from glazierapi.db.session import get_session +from muranoapi.openstack.common import timeutils +from muranoapi.db.session import get_session BASE = declarative_base() diff --git a/glazierapi/db/session.py b/muranoapi/db/session.py similarity index 97% rename from glazierapi/db/session.py rename to muranoapi/db/session.py index 2d94b973e..344d39731 100644 --- a/glazierapi/db/session.py +++ b/muranoapi/db/session.py @@ -30,9 +30,9 @@ from sqlalchemy.orm import sessionmaker from sqlalchemy.pool import NullPool from sqlalchemy.exc import DisconnectionError -from glazierapi.common.config import CONF as conf +from muranoapi.common.config import CONF as conf -from glazierapi.db import migrate_repo +from muranoapi.db import migrate_repo MAKER = None diff --git a/glazierapi/locale/ru/LC_MESSAGES/glazierapi.po b/muranoapi/locale/ru/LC_MESSAGES/glazierapi.po similarity index 63% rename from glazierapi/locale/ru/LC_MESSAGES/glazierapi.po rename to muranoapi/locale/ru/LC_MESSAGES/glazierapi.po index 4ff989508..1ca2269d8 100644 --- a/glazierapi/locale/ru/LC_MESSAGES/glazierapi.po +++ b/muranoapi/locale/ru/LC_MESSAGES/glazierapi.po @@ -18,173 +18,173 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -#: portas/exefile.py:2 +#: muranoapi/exefile.py:2 msgid "Hello" msgstr "Привет!" -#: portas/openstack/common/exception.py:104 +#: muranoapi/openstack/common/exception.py:104 msgid "Uncaught exception" msgstr "" -#: portas/openstack/common/jsonutils.py:88 +#: muranoapi/openstack/common/jsonutils.py:88 #, python-format msgid "Max serialization depth exceeded on object: %d %s" msgstr "" -#: portas/openstack/common/log.py:225 +#: muranoapi/openstack/common/log.py:225 #, python-format msgid "Deprecated: %s" msgstr "" -#: portas/openstack/common/log.py:358 +#: muranoapi/openstack/common/log.py:358 #, python-format msgid "syslog facility must be one of: %s" msgstr "" -#: portas/openstack/common/log.py:518 +#: muranoapi/openstack/common/log.py:518 #, python-format msgid "Fatal call to deprecated config: %(msg)s" msgstr "" -#: portas/openstack/common/service.py:112 -#: portas/openstack/common/service.py:275 +#: muranoapi/openstack/common/service.py:112 +#: muranoapi/openstack/common/service.py:275 msgid "Full set of CONF:" msgstr "" -#: portas/openstack/common/service.py:121 -#: portas/openstack/common/service.py:218 +#: muranoapi/openstack/common/service.py:121 +#: muranoapi/openstack/common/service.py:218 #, python-format msgid "Caught %s, exiting" msgstr "" -#: portas/openstack/common/service.py:164 +#: muranoapi/openstack/common/service.py:164 msgid "Parent process has died unexpectedly, exiting" msgstr "" -#: portas/openstack/common/service.py:200 +#: muranoapi/openstack/common/service.py:200 msgid "Forking too fast, sleeping" msgstr "" -#: portas/openstack/common/service.py:223 +#: muranoapi/openstack/common/service.py:223 msgid "Unhandled exception" msgstr "" -#: portas/openstack/common/service.py:230 +#: muranoapi/openstack/common/service.py:230 #, python-format msgid "Started child %d" msgstr "" -#: portas/openstack/common/service.py:240 +#: muranoapi/openstack/common/service.py:240 #, python-format msgid "Starting %d workers" msgstr "" -#: portas/openstack/common/service.py:257 +#: muranoapi/openstack/common/service.py:257 #, python-format msgid "Child %(pid)d killed by signal %(sig)d" msgstr "" -#: portas/openstack/common/service.py:261 +#: muranoapi/openstack/common/service.py:261 #, python-format msgid "Child %(pid)s exited with status %(code)d" msgstr "" -#: portas/openstack/common/service.py:265 +#: muranoapi/openstack/common/service.py:265 #, python-format msgid "pid %d not in child list" msgstr "" -#: portas/openstack/common/service.py:293 +#: muranoapi/openstack/common/service.py:293 #, python-format msgid "Caught %s, stopping children" msgstr "" -#: portas/openstack/common/service.py:304 +#: muranoapi/openstack/common/service.py:304 #, python-format msgid "Waiting on %d children to exit" msgstr "" -#: portas/openstack/common/sslutils.py:52 +#: muranoapi/openstack/common/sslutils.py:52 #, python-format msgid "Unable to find cert_file : %s" msgstr "" -#: portas/openstack/common/sslutils.py:55 +#: muranoapi/openstack/common/sslutils.py:55 #, python-format msgid "Unable to find ca_file : %s" msgstr "" -#: portas/openstack/common/sslutils.py:58 +#: muranoapi/openstack/common/sslutils.py:58 #, python-format msgid "Unable to find key_file : %s" msgstr "" -#: portas/openstack/common/sslutils.py:61 +#: muranoapi/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 "" -#: portas/openstack/common/wsgi.py:110 +#: muranoapi/openstack/common/wsgi.py:110 #, python-format msgid "Could not bind to %(host)s:%(port)s after trying for 30 seconds" msgstr "" -#: portas/openstack/common/wsgi.py:372 +#: muranoapi/openstack/common/wsgi.py:372 msgid "Unsupported Content-Type" msgstr "" -#: portas/openstack/common/wsgi.py:375 +#: muranoapi/openstack/common/wsgi.py:375 msgid "Malformed request body" msgstr "" -#: portas/openstack/common/wsgi.py:660 +#: muranoapi/openstack/common/wsgi.py:660 msgid "Empty body provided in request" msgstr "" -#: portas/openstack/common/wsgi.py:666 +#: muranoapi/openstack/common/wsgi.py:666 msgid "Unrecognized Content-Type provided in request" msgstr "" -#: portas/openstack/common/wsgi.py:670 +#: muranoapi/openstack/common/wsgi.py:670 msgid "No Content-Type provided in request" msgstr "" -#: portas/openstack/common/wsgi.py:676 +#: muranoapi/openstack/common/wsgi.py:676 msgid "Unable to deserialize body as provided Content-Type" msgstr "" -#: portas/openstack/common/wsgi.py:726 +#: muranoapi/openstack/common/wsgi.py:726 msgid "cannot understand JSON" msgstr "" -#: portas/openstack/common/wsgi.py:750 +#: muranoapi/openstack/common/wsgi.py:750 msgid "cannot understand XML" msgstr "" -#: portas/openstack/common/notifier/api.py:126 +#: muranoapi/openstack/common/notifier/api.py:126 #, python-format msgid "%s not in valid priorities" msgstr "" -#: portas/openstack/common/notifier/api.py:142 +#: muranoapi/openstack/common/notifier/api.py:142 #, python-format msgid "" "Problem '%(e)s' attempting to send to notification system. " "Payload=%(payload)s" msgstr "" -#: portas/openstack/common/notifier/api.py:172 +#: muranoapi/openstack/common/notifier/api.py:172 #, python-format msgid "Failed to load notifier %s. These notifications will not be sent." msgstr "" -#: portas/openstack/common/notifier/rabbit_notifier.py:27 +#: muranoapi/openstack/common/notifier/rabbit_notifier.py:27 msgid "The rabbit_notifier is now deprecated. Please use rpc_notifier instead." msgstr "" -#: portas/openstack/common/notifier/rpc_notifier.py:45 -#: portas/openstack/common/notifier/rpc_notifier2.py:51 +#: muranoapi/openstack/common/notifier/rpc_notifier.py:45 +#: muranoapi/openstack/common/notifier/rpc_notifier2.py:51 #, python-format msgid "Could not send notification to %(topic)s. Payload=%(message)s" msgstr "" diff --git a/glazierapi/openstack/__init__.py b/muranoapi/openstack/__init__.py similarity index 100% rename from glazierapi/openstack/__init__.py rename to muranoapi/openstack/__init__.py diff --git a/glazierapi/openstack/common/__init__.py b/muranoapi/openstack/common/__init__.py similarity index 100% rename from glazierapi/openstack/common/__init__.py rename to muranoapi/openstack/common/__init__.py diff --git a/glazierapi/openstack/common/eventlet_backdoor.py b/muranoapi/openstack/common/eventlet_backdoor.py similarity index 100% rename from glazierapi/openstack/common/eventlet_backdoor.py rename to muranoapi/openstack/common/eventlet_backdoor.py diff --git a/glazierapi/openstack/common/exception.py b/muranoapi/openstack/common/exception.py similarity index 98% rename from glazierapi/openstack/common/exception.py rename to muranoapi/openstack/common/exception.py index 02dffa4dd..3704fab82 100644 --- a/glazierapi/openstack/common/exception.py +++ b/muranoapi/openstack/common/exception.py @@ -21,7 +21,7 @@ Exceptions common to OpenStack projects import logging -from glazierapi.openstack.common.gettextutils import _ +from muranoapi.openstack.common.gettextutils import _ _FATAL_EXCEPTION_FORMAT_ERRORS = False diff --git a/glazierapi/openstack/common/gettextutils.py b/muranoapi/openstack/common/gettextutils.py similarity index 93% rename from glazierapi/openstack/common/gettextutils.py rename to muranoapi/openstack/common/gettextutils.py index fb1a1b7b0..242a15110 100644 --- a/glazierapi/openstack/common/gettextutils.py +++ b/muranoapi/openstack/common/gettextutils.py @@ -20,7 +20,7 @@ gettext for openstack-common modules. Usual usage in an openstack.common module: - from glazierapi.openstack.common.gettextutils import _ + from muranoapi.openstack.common.gettextutils import _ """ import gettext diff --git a/glazierapi/openstack/common/importutils.py b/muranoapi/openstack/common/importutils.py similarity index 100% rename from glazierapi/openstack/common/importutils.py rename to muranoapi/openstack/common/importutils.py diff --git a/glazierapi/openstack/common/jsonutils.py b/muranoapi/openstack/common/jsonutils.py similarity index 98% rename from glazierapi/openstack/common/jsonutils.py rename to muranoapi/openstack/common/jsonutils.py index 4ef48ea60..45b37e78a 100644 --- a/glazierapi/openstack/common/jsonutils.py +++ b/muranoapi/openstack/common/jsonutils.py @@ -41,8 +41,8 @@ import json import logging import xmlrpclib -from glazierapi.openstack.common.gettextutils import _ -from glazierapi.openstack.common import timeutils +from muranoapi.openstack.common.gettextutils import _ +from muranoapi.openstack.common import timeutils LOG = logging.getLogger(__name__) diff --git a/glazierapi/openstack/common/local.py b/muranoapi/openstack/common/local.py similarity index 100% rename from glazierapi/openstack/common/local.py rename to muranoapi/openstack/common/local.py diff --git a/glazierapi/openstack/common/log.py b/muranoapi/openstack/common/log.py similarity index 98% rename from glazierapi/openstack/common/log.py rename to muranoapi/openstack/common/log.py index e8caddb94..99ad7a2c9 100644 --- a/glazierapi/openstack/common/log.py +++ b/muranoapi/openstack/common/log.py @@ -42,10 +42,10 @@ import traceback from oslo.config import cfg -from glazierapi.openstack.common.gettextutils import _ -from glazierapi.openstack.common import jsonutils -from glazierapi.openstack.common import local -from glazierapi.openstack.common import notifier +from muranoapi.openstack.common.gettextutils import _ +from muranoapi.openstack.common import jsonutils +from muranoapi.openstack.common import local +from muranoapi.openstack.common import notifier _DEFAULT_LOG_FORMAT = "%(asctime)s %(levelname)8s [%(name)s] %(message)s" @@ -305,7 +305,7 @@ class JSONFormatter(logging.Formatter): class PublishErrorsHandler(logging.Handler): def emit(self, record): - if ('glazierapi.openstack.common.notifier.log_notifier' in + if ('muranoapi.openstack.common.notifier.log_notifier' in CONF.notification_driver): return notifier.api.notify(None, 'error.publisher', diff --git a/glazierapi/openstack/common/loopingcall.py b/muranoapi/openstack/common/loopingcall.py similarity index 94% rename from glazierapi/openstack/common/loopingcall.py rename to muranoapi/openstack/common/loopingcall.py index 02420da44..68ce04a68 100644 --- a/glazierapi/openstack/common/loopingcall.py +++ b/muranoapi/openstack/common/loopingcall.py @@ -22,9 +22,9 @@ import sys from eventlet import event from eventlet import greenthread -from glazierapi.openstack.common.gettextutils import _ -from glazierapi.openstack.common import log as logging -from glazierapi.openstack.common import timeutils +from muranoapi.openstack.common.gettextutils import _ +from muranoapi.openstack.common import log as logging +from muranoapi.openstack.common import timeutils LOG = logging.getLogger(__name__) diff --git a/glazierapi/openstack/common/notifier/__init__.py b/muranoapi/openstack/common/notifier/__init__.py similarity index 100% rename from glazierapi/openstack/common/notifier/__init__.py rename to muranoapi/openstack/common/notifier/__init__.py diff --git a/glazierapi/openstack/common/notifier/api.py b/muranoapi/openstack/common/notifier/api.py similarity index 94% rename from glazierapi/openstack/common/notifier/api.py rename to muranoapi/openstack/common/notifier/api.py index 10e5f6cbb..cb1ad1bbe 100644 --- a/glazierapi/openstack/common/notifier/api.py +++ b/muranoapi/openstack/common/notifier/api.py @@ -17,12 +17,12 @@ import uuid from oslo.config import cfg -from glazierapi.openstack.common import context -from glazierapi.openstack.common.gettextutils import _ -from glazierapi.openstack.common import importutils -from glazierapi.openstack.common import jsonutils -from glazierapi.openstack.common import log as logging -from glazierapi.openstack.common import timeutils +from muranoapi.openstack.common import context +from muranoapi.openstack.common.gettextutils import _ +from muranoapi.openstack.common import importutils +from muranoapi.openstack.common import jsonutils +from muranoapi.openstack.common import log as logging +from muranoapi.openstack.common import timeutils LOG = logging.getLogger(__name__) diff --git a/glazierapi/openstack/common/notifier/log_notifier.py b/muranoapi/openstack/common/notifier/log_notifier.py similarity index 87% rename from glazierapi/openstack/common/notifier/log_notifier.py rename to muranoapi/openstack/common/notifier/log_notifier.py index aa571abd4..553eebe30 100644 --- a/glazierapi/openstack/common/notifier/log_notifier.py +++ b/muranoapi/openstack/common/notifier/log_notifier.py @@ -15,8 +15,8 @@ from oslo.config import cfg -from glazierapi.openstack.common import jsonutils -from glazierapi.openstack.common import log as logging +from muranoapi.openstack.common import jsonutils +from muranoapi.openstack.common import log as logging CONF = cfg.CONF @@ -30,6 +30,6 @@ def notify(_context, message): CONF.default_notification_level) priority = priority.lower() logger = logging.getLogger( - 'glazierapi.openstack.common.notification.%s' % + 'muranoapi.openstack.common.notification.%s' % message['event_type']) getattr(logger, priority)(jsonutils.dumps(message)) diff --git a/glazierapi/openstack/common/notifier/no_op_notifier.py b/muranoapi/openstack/common/notifier/no_op_notifier.py similarity index 100% rename from glazierapi/openstack/common/notifier/no_op_notifier.py rename to muranoapi/openstack/common/notifier/no_op_notifier.py diff --git a/glazierapi/openstack/common/notifier/rabbit_notifier.py b/muranoapi/openstack/common/notifier/rabbit_notifier.py similarity index 84% rename from glazierapi/openstack/common/notifier/rabbit_notifier.py rename to muranoapi/openstack/common/notifier/rabbit_notifier.py index 3d9c5e4d6..22ea12411 100644 --- a/glazierapi/openstack/common/notifier/rabbit_notifier.py +++ b/muranoapi/openstack/common/notifier/rabbit_notifier.py @@ -14,9 +14,9 @@ # under the License. -from glazierapi.openstack.common.gettextutils import _ -from glazierapi.openstack.common import log as logging -from glazierapi.openstack.common.notifier import rpc_notifier +from muranoapi.openstack.common.gettextutils import _ +from muranoapi.openstack.common import log as logging +from muranoapi.openstack.common.notifier import rpc_notifier LOG = logging.getLogger(__name__) diff --git a/glazierapi/openstack/common/notifier/rpc_notifier.py b/muranoapi/openstack/common/notifier/rpc_notifier.py similarity index 87% rename from glazierapi/openstack/common/notifier/rpc_notifier.py rename to muranoapi/openstack/common/notifier/rpc_notifier.py index 145ac180d..68a031b4e 100644 --- a/glazierapi/openstack/common/notifier/rpc_notifier.py +++ b/muranoapi/openstack/common/notifier/rpc_notifier.py @@ -15,10 +15,10 @@ from oslo.config import cfg -from glazierapi.openstack.common import context as req_context -from glazierapi.openstack.common.gettextutils import _ -from glazierapi.openstack.common import log as logging -from glazierapi.openstack.common import rpc +from muranoapi.openstack.common import context as req_context +from muranoapi.openstack.common.gettextutils import _ +from muranoapi.openstack.common import log as logging +from muranoapi.openstack.common import rpc LOG = logging.getLogger(__name__) diff --git a/glazierapi/openstack/common/notifier/rpc_notifier2.py b/muranoapi/openstack/common/notifier/rpc_notifier2.py similarity index 88% rename from glazierapi/openstack/common/notifier/rpc_notifier2.py rename to muranoapi/openstack/common/notifier/rpc_notifier2.py index f1e51ca68..3004330d8 100644 --- a/glazierapi/openstack/common/notifier/rpc_notifier2.py +++ b/muranoapi/openstack/common/notifier/rpc_notifier2.py @@ -17,10 +17,10 @@ from oslo.config import cfg -from glazierapi.openstack.common import context as req_context -from glazierapi.openstack.common.gettextutils import _ -from glazierapi.openstack.common import log as logging -from glazierapi.openstack.common import rpc +from muranoapi.openstack.common import context as req_context +from muranoapi.openstack.common.gettextutils import _ +from muranoapi.openstack.common import log as logging +from muranoapi.openstack.common import rpc LOG = logging.getLogger(__name__) diff --git a/glazierapi/openstack/common/notifier/test_notifier.py b/muranoapi/openstack/common/notifier/test_notifier.py similarity index 100% rename from glazierapi/openstack/common/notifier/test_notifier.py rename to muranoapi/openstack/common/notifier/test_notifier.py diff --git a/glazierapi/openstack/common/service.py b/muranoapi/openstack/common/service.py similarity index 96% rename from glazierapi/openstack/common/service.py rename to muranoapi/openstack/common/service.py index 1b89d44e3..e12fe3e43 100644 --- a/glazierapi/openstack/common/service.py +++ b/muranoapi/openstack/common/service.py @@ -30,14 +30,14 @@ import eventlet import logging as std_logging from oslo.config import cfg -from glazierapi.openstack.common import eventlet_backdoor -from glazierapi.openstack.common.gettextutils import _ -from glazierapi.openstack.common import importutils -from glazierapi.openstack.common import log as logging -from glazierapi.openstack.common import threadgroup +from muranoapi.openstack.common import eventlet_backdoor +from muranoapi.openstack.common.gettextutils import _ +from muranoapi.openstack.common import importutils +from muranoapi.openstack.common import log as logging +from muranoapi.openstack.common import threadgroup -rpc = importutils.try_import('glazierapi.openstack.common.rpc') +rpc = importutils.try_import('muranoapi.openstack.common.rpc') CONF = cfg.CONF LOG = logging.getLogger(__name__) diff --git a/glazierapi/openstack/common/setup.py b/muranoapi/openstack/common/setup.py similarity index 100% rename from glazierapi/openstack/common/setup.py rename to muranoapi/openstack/common/setup.py diff --git a/glazierapi/openstack/common/sslutils.py b/muranoapi/openstack/common/sslutils.py similarity index 97% rename from glazierapi/openstack/common/sslutils.py rename to muranoapi/openstack/common/sslutils.py index 998f4fdb9..d4127a23c 100644 --- a/glazierapi/openstack/common/sslutils.py +++ b/muranoapi/openstack/common/sslutils.py @@ -19,7 +19,7 @@ import ssl from oslo.config import cfg -from glazierapi.openstack.common.gettextutils import _ +from muranoapi.openstack.common.gettextutils import _ ssl_opts = [ diff --git a/glazierapi/openstack/common/threadgroup.py b/muranoapi/openstack/common/threadgroup.py similarity index 96% rename from glazierapi/openstack/common/threadgroup.py rename to muranoapi/openstack/common/threadgroup.py index f38e7464a..c3651535d 100644 --- a/glazierapi/openstack/common/threadgroup.py +++ b/muranoapi/openstack/common/threadgroup.py @@ -18,8 +18,8 @@ from eventlet import greenlet from eventlet import greenpool from eventlet import greenthread -from glazierapi.openstack.common import log as logging -from glazierapi.openstack.common import loopingcall +from muranoapi.openstack.common import log as logging +from muranoapi.openstack.common import loopingcall LOG = logging.getLogger(__name__) diff --git a/glazierapi/openstack/common/timeutils.py b/muranoapi/openstack/common/timeutils.py similarity index 100% rename from glazierapi/openstack/common/timeutils.py rename to muranoapi/openstack/common/timeutils.py diff --git a/glazierapi/openstack/common/uuidutils.py b/muranoapi/openstack/common/uuidutils.py similarity index 100% rename from glazierapi/openstack/common/uuidutils.py rename to muranoapi/openstack/common/uuidutils.py diff --git a/glazierapi/openstack/common/version.py b/muranoapi/openstack/common/version.py similarity index 98% rename from glazierapi/openstack/common/version.py rename to muranoapi/openstack/common/version.py index e4eb65307..f89124d5a 100644 --- a/glazierapi/openstack/common/version.py +++ b/muranoapi/openstack/common/version.py @@ -52,7 +52,7 @@ class VersionInfo(object): # The most likely cause for this is running tests in a tree # produced from a tarball where the package itself has not been # installed into anything. Revert to setup-time logic. - from glazierapi.openstack.common import setup + from muranoapi.openstack.common import setup return setup.get_version(self.package) def release_string(self): diff --git a/glazierapi/openstack/common/wsgi.py b/muranoapi/openstack/common/wsgi.py similarity index 98% rename from glazierapi/openstack/common/wsgi.py rename to muranoapi/openstack/common/wsgi.py index e4f15fc07..21c28a12a 100644 --- a/glazierapi/openstack/common/wsgi.py +++ b/muranoapi/openstack/common/wsgi.py @@ -35,13 +35,13 @@ import webob.exc from xml.dom import minidom from xml.parsers import expat -from glazierapi.openstack.common import exception -from glazierapi.openstack.common.gettextutils import _ -from glazierapi.openstack.common import jsonutils -from glazierapi.openstack.common import log as logging -from glazierapi.openstack.common import service -from glazierapi.openstack.common import sslutils -from glazierapi.openstack.common import xmlutils +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 socket_opts = [ cfg.IntOpt('backlog', diff --git a/glazierapi/openstack/common/xmlutils.py b/muranoapi/openstack/common/xmlutils.py similarity index 100% rename from glazierapi/openstack/common/xmlutils.py rename to muranoapi/openstack/common/xmlutils.py diff --git a/glazierapi/tests/__init__.py b/muranoapi/tests/__init__.py similarity index 100% rename from glazierapi/tests/__init__.py rename to muranoapi/tests/__init__.py diff --git a/glazierapi/tests/api/__init__.py b/muranoapi/tests/api/__init__.py similarity index 100% rename from glazierapi/tests/api/__init__.py rename to muranoapi/tests/api/__init__.py diff --git a/glazierapi/tests/api/simple_test.py b/muranoapi/tests/api/simple_test.py similarity index 100% rename from glazierapi/tests/api/simple_test.py rename to muranoapi/tests/api/simple_test.py diff --git a/glazierapi/tests/sanity_tests.py b/muranoapi/tests/sanity_tests.py similarity index 96% rename from glazierapi/tests/sanity_tests.py rename to muranoapi/tests/sanity_tests.py index 29e0df4f6..4d4cc8cf9 100644 --- a/glazierapi/tests/sanity_tests.py +++ b/muranoapi/tests/sanity_tests.py @@ -15,7 +15,7 @@ import unittest2 from mock import MagicMock -import glazierapi.api.v1.router as router +import muranoapi.api.v1.router as router def my_mock(link, controller, action, conditions): diff --git a/glazierapi/utils.py b/muranoapi/utils.py similarity index 93% rename from glazierapi/utils.py rename to muranoapi/utils.py index 26fa6ae10..5cba35ce9 100644 --- a/glazierapi/utils.py +++ b/muranoapi/utils.py @@ -15,8 +15,8 @@ import functools import logging from webob import exc -from glazierapi.db.models import Session -from glazierapi.db.session import get_session +from muranoapi.db.models import Session +from muranoapi.db.session import get_session log = logging.getLogger(__name__) diff --git a/glazierapi/version.py b/muranoapi/version.py similarity index 83% rename from glazierapi/version.py rename to muranoapi/version.py index a0085f36d..3399a4afc 100644 --- a/glazierapi/version.py +++ b/muranoapi/version.py @@ -12,6 +12,6 @@ # License for the specific language governing permissions and limitations # under the License. -from glazierapi.openstack.common import version as common_version +from muranoapi.openstack.common import version as common_version -version_info = common_version.VersionInfo('glazierapi') +version_info = common_version.VersionInfo('muranoapi') diff --git a/openstack-common.conf b/openstack-common.conf index 2bafe6327..a804a8642 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -4,4 +4,4 @@ modules=setup,wsgi,config,exception,gettextutils,importutils,jsonutils,log,xmlutils,sslutils,service,notifier,local,install_venv_common,version,timeutils,eventlet_backdoor,threadgroup,loopingcall,uuidutils # The base module to hold the copy of openstack.common -base=glazierapi \ No newline at end of file +base=muranoapi \ No newline at end of file diff --git a/run_tests.sh b/run_tests.sh index ec7721b3b..b4834c1e7 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -2,7 +2,7 @@ function usage { echo "Usage: $0 [OPTION]..." - echo "Run Glazier API's test suite(s)" + echo "Run Murano API's test suite(s)" echo "" echo " -V, --virtual-env Always use virtualenv. Install automatically if not present" echo " -N, --no-virtual-env Don't use virtualenv. Run tests in local environment" @@ -28,8 +28,8 @@ function process_option { -P|--no-pep8) let no_pep8=1;; -f|--force) let force=1;; -u|--update) update=1;; - --unittests-only) noseopts="$noseopts --exclude-dir=portas/tests/functional";; - -c|--coverage) noseopts="$noseopts --with-coverage --cover-package=portas";; + --unittests-only) noseopts="$noseopts --exclude-dir=muranoapi/tests/functional";; + -c|--coverage) noseopts="$noseopts --with-coverage --cover-package=muranoapi";; -*) noseopts="$noseopts $1";; *) noseargs="$noseargs $1" esac diff --git a/setup.cfg b/setup.cfg index 2b3b06e3c..9449f4af0 100644 --- a/setup.cfg +++ b/setup.cfg @@ -9,18 +9,18 @@ tag_date = 0 tag_svn_revision = 0 [compile_catalog] -directory = glazierapi/locale -domain = glazierapi +directory = muranoapi/locale +domain = muranoapi [update_catalog] -domain = glazierapi -output_dir = glazierapi/locale -input_file = glazierapi/locale/glazierapi.pot +domain = muranoapi +output_dir = muranoapi/locale +input_file = muranoapi/locale/muranoapi.pot [extract_messages] keywords = _ gettext ngettext l_ lazy_gettext mapping_file = babel.cfg -output_file = glazierapi/locale/glazierapi.pot +output_file = muranoapi/locale/muranoapi.pot [nosetests] # NOTE(jkoelker) To run the test suite under nose install the following @@ -28,6 +28,6 @@ output_file = glazierapi/locale/glazierapi.pot # tissue http://pypi.python.org/pypi/tissue (pep8 checker) # openstack-nose https://github.com/jkoelker/openstack-nose verbosity=2 -cover-package = portas +cover-package = muranoapi cover-html = true cover-erase = true \ No newline at end of file diff --git a/setup.py b/setup.py index 3d30ff4cc..194e35227 100644 --- a/setup.py +++ b/setup.py @@ -16,20 +16,20 @@ import setuptools -from glazierapi.openstack.common import setup +from muranoapi.openstack.common import setup requires = setup.parse_requirements() depend_links = setup.parse_dependency_links() -project = 'glazierapi' +project = 'muranoapi' setuptools.setup( name=project, version=setup.get_version(project, '2013.1'), - description='The Glazier Project API', + description='The Murano Project API', license='Apache License (2.0)', author='Mirantis, Inc', author_email='smelikyan@mirantis.com', - url='http://glazierapi.mirantis.com/', + url='http://muranoapi.mirantis.com/', packages=setuptools.find_packages(exclude=['bin']), test_suite='nose.collector', cmdclass=setup.get_cmdclass(), @@ -44,6 +44,6 @@ setuptools.setup( 'Environment :: No Input/Output (Daemon)', 'Environment :: OpenStack', ], - scripts=['bin/glazier-api'], + scripts=['bin/murano-api'], py_modules=[] ) diff --git a/tools/install_venv.py b/tools/install_venv.py index ecf3c45f4..8a4989203 100644 --- a/tools/install_venv.py +++ b/tools/install_venv.py @@ -20,7 +20,7 @@ # under the License. """ -Installation script for Glance's development virtualenv +Installation script for Murano API's development virtualenv """ import os @@ -32,12 +32,12 @@ import install_venv_common as install_venv def print_help(): help = """ - Glazier API development environment setup is complete. + Murano API development environment setup is complete. - Glazier API development uses virtualenv to track and manage Python dependencies + Murano API development uses virtualenv to track and manage Python dependencies while in development and testing. - To activate the Glazier API virtualenv for the extent of your current shell session + To activate the Murano API virtualenv for the extent of your current shell session you can run: $ source .venv/bin/activate @@ -58,7 +58,7 @@ def main(argv): pip_requires = os.path.join(root, 'tools', 'pip-requires') test_requires = os.path.join(root, 'tools', 'test-requires') py_version = "python%s.%s" % (sys.version_info[0], sys.version_info[1]) - project = 'glazierapi' + project = 'muranoapi' install = install_venv.InstallVenv(root, venv, pip_requires, test_requires, py_version, project) options = install.parse_args(argv) diff --git a/tox.ini b/tox.ini index 47fc9d4db..793c15946 100644 --- a/tox.ini +++ b/tox.ini @@ -14,13 +14,13 @@ commands = nosetests [testenv:pep8] deps = pep8==1.3.3 -commands = pep8 --repeat --show-source glazierapi setup.py +commands = pep8 --repeat --show-source muranoapi setup.py [testenv:venv] commands = {posargs} [testenv:cover] -commands = nosetests --cover-erase --cover-package=glazierapi --with-xcoverage +commands = nosetests --cover-erase --cover-package=muranoapi --with-xcoverage [tox:jenkins] downloadcache = ~/cache/pip @@ -38,7 +38,7 @@ deps = file://{toxinidir}/.cache.bundle [testenv:jenkinscover] deps = file://{toxinidir}/.cache.bundle setenv = NOSE_WITH_XUNIT=1 -commands = nosetests --cover-erase --cover-package=glazierapi --with-xcoverage +commands = nosetests --cover-erase --cover-package=muranoapi --with-xcoverage [testenv:jenkinsvenv] deps = file://{toxinidir}/.cache.bundle