KEERO-318 - Fix all occurrences of old names (keero, glazier) in Dashboard

.gitignore

@@ -9,7 +9,7 @@ coverage.xml
 pep8.txt
 pylint.txt
 reports
-tabula/local/local_settings.py
+muranodashboard/local/local_settings.py
 /static/
 docs/build/
 docs/source/sourcecode

doc/source/conf.py

@@ -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('../../tabula'),
+sys.path = [os.path.abspath('../../muranodashboard'),
             os.path.abspath('../..')] + sys.path
 
 # -- General configuration ---------------------------------------------------
@@ -64,7 +64,7 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'Tabula'
+project = u'Dashboard'
 copyright = u'2013, Mirantis, Inc'
 
 # The version info for the project you're documenting, acts as replacement for
@@ -72,11 +72,11 @@ copyright = u'2013, Mirantis, Inc'
 # built documents.
 #
 # The short X.Y version.
-from tabula.version import version_info as tabula_version
+from muranodashboard.version import version_info as muranodashboard_version
 # The full version, including alpha/beta/rc tags.
-release = tabula_version.version_string_with_vcs()
+release = muranodashboard_version.version_string_with_vcs()
 # The short X.Y version.
-version = tabula_version.canonical_version_string()
+version = muranodashboard_version.canonical_version_string()
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -113,7 +113,7 @@ show_authors = True
 pygments_style = 'sphinx'
 
 # A list of ignored prefixes for module index sorting.
-modindex_common_prefix = ['tabula.']
+modindex_common_prefix = ['muranodashboard.']
 
 # -- Options for man page output --------------------------------------------
 
@@ -197,7 +197,7 @@ html_use_index = False
 #html_file_suffix = ''
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'tabuladoc'
+htmlhelp_basename = 'muranodashboarddoc'
 
 
 # -- Options for LaTeX output ------------------------------------------------
@@ -212,8 +212,8 @@ htmlhelp_basename = 'tabuladoc'
 # (source start file, target name, title, author,
 # documentclass [howto/manual]).
 latex_documents = [
-    ('index', 'Tabula.tex', u'Tabula Documentation',
-     u'Keero Team', 'manual'),
+    ('index', 'Dashboard.tex', u'Dashboard Documentation',
+     u'Murano Team', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of

doc/source/index.rst

@@ -15,15 +15,15 @@
       under the License.
 
 ==============================================
-Welcome to Tabula, the Keero Project Web UI!
+Welcome to Dashboard, the Murano Project Web UI!
 ==============================================
 
-Tabula is a project that provides Web UI to Keero Project.
+Dashboard is a project that provides Web UI to Murano Project.
 
-This document describes Tabula for contributors of the project, and assumes
-that you are already familiar with Portas from an `end-user perspective`_.
+This document describes Murano Dashboard for contributors of the project, and assumes
+that you are already familiar with Murano from an `end-user perspective`_.
 
-.. _`end-user perspective`: http://keero.mirantis.com/
+.. _`end-user perspective`: http://murano.mirantis.com/
 
 This documentation is generated by the Sphinx toolkit and lives in the source
 tree.
@@ -32,23 +32,23 @@ Installation Guide
 ==================
 Install
 -------
-1. Check out sources to some directory (<home>/keero)::
+1. Check out sources to some directory (<home>/murano-dashboard)::
 
-    user@work:~/$ git clone ssh://<user>@gerrit.mirantis.com:29418/keero/keero.git
+    user@work:~/$ git clone https://github.com/Mirantis/murano-dashboard
 
 2. Install virtualenv::
 
-    user@work:~/$ cd keero/tabula && sudo python ./tools/install_venv.py
+    user@work:~/$ cd murano-dashboard && sudo python ./tools/install_venv.py
 
 Configure
 ---------
 1. Copy configuration file from template::
 
-    user@work:~/$ cp keero/tabula/tabula/local/local_settings.py.example keero/tabula/tabula/local/local_settings.py
+    user@work:~/$ cp murano-dashboard/muranodashboard/local/local_settings.py.example murano-dashboard/muranodashboard/local/local_settings.py
 
 2. Open configuration file for editing::
 
-    user@work:~/$ cd keero/tabula/tabula/local/ && nano local_settings.py
+    user@work:~/$ cd murano-dashboard/muranodashboard/local/ && nano local_settings.py
 
 2. Configure according to you environment::
 
@@ -60,6 +60,6 @@ Configure
 
 Run
 ----
-Run Tabula in virtualenv::
+Run Dashboard in virtualenv::
 
-    user@work:~/$ cd keero/tabula && sudo ./tools/with_venv.sh python manage.py runserver 0.0.0.0:8080
+    user@work:~/$ cd murano-dashboard && sudo ./tools/with_venv.sh python manage.py runserver 0.0.0.0:8080

manage.py

@@ -5,6 +5,6 @@ import os
 
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "glazierdashboard.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "muranodashboard.settings")
     from django.core.management import execute_from_command_line
     execute_from_command_line(sys.argv)

muranodashboard/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 tabula.openstack.common import setup
+            from muranodashboard.openstack.common import setup
             return setup.get_version(self.package)
 
     def release_string(self):

muranodashboard/panel/api.py

@@ -15,50 +15,50 @@
 
 import logging
 
-from glazierclient.v1.client import Client as glazier_client
+from muranoclient.v1.client import Client as murano_client
 
 log = logging.getLogger(__name__)
 
 
-def glazierclient(request):
+def muranoclient(request):
     url = "http://127.0.0.1:8082"
-    log.debug('glazierclient connection created using token "%s" and url "%s"'
+    log.debug('muranoclient connection created using token "%s" and url "%s"'
               % (request.user.token, url))
-    return glazier_client(endpoint=url, token=request.user.token.token['id'])
+    return murano_client(endpoint=url, token=request.user.token.token['id'])
 
 
 def environment_create(request, parameters):
-    env = glazierclient(request).environments.create(parameters.get('name', ''))
+    env = muranoclient(request).environments.create(parameters.get('name', ''))
     log.debug('Environment::Create {0}'.format(env))
     return env
 
 
 def environment_delete(request, environment_id):
-    result = glazierclient(request).environments.delete(environment_id)
+    result = muranoclient(request).environments.delete(environment_id)
     log.debug('Environment::Delete Id:{0}'.format(environment_id))
     return result
 
 
 def environment_get(request, environment_id):
-    env = glazierclient(request).environments.get(environment_id)
+    env = muranoclient(request).environments.get(environment_id)
     log.debug('Environment::Get {0}'.format(env))
     return env
 
 
 def environments_list(request):
     log.debug('Environment::List')
-    return glazierclient(request).environments.list()
+    return muranoclient(request).environments.list()
 
 
 def environment_deploy(request, environment_id):
-    sessions = glazierclient(request).sessions.list(environment_id)
+    sessions = muranoclient(request).sessions.list(environment_id)
     for session in sessions:
         if session.state == 'open':
             session_id = session.id
     if not session_id:
         return "Sorry, nothing to deploy."
     log.debug('Obtained session with Id: {0}'.format(session_id))
-    result = glazierclient(request).sessions.deploy(environment_id, session_id)
+    result = muranoclient(request).sessions.deploy(environment_id, session_id)
     log.debug('Environment with Id: {0} deployed in session '
               'with Id: {1}'.format(environment_id, session_id))
     return result
@@ -66,23 +66,23 @@ def environment_deploy(request, environment_id):
 
 def service_create(request, environment_id, parameters):
     session_id = None
-    sessions = glazierclient(request).sessions.list(environment_id)
+    sessions = muranoclient(request).sessions.list(environment_id)
 
     for s in sessions:
         if s.state == 'open':
             session_id = s.id
         else:
-            glazierclient(request).sessions.delete(environment_id, s.id)
+            muranoclient(request).sessions.delete(environment_id, s.id)
 
     if session_id is None:
-        session_id = glazierclient(request).sessions.configure(environment_id).id
+        session_id = muranoclient(request).sessions.configure(environment_id).id
 
     if parameters['service_type'] == 'Active Directory':
-        service = glazierclient(request)\
+        service = muranoclient(request)\
             .activeDirectories\
             .create(environment_id, session_id, parameters)
     else:
-        service = glazierclient(request)\
+        service = muranoclient(request)\
             .webServers.create(environment_id, session_id, parameters)
 
     log.debug('Service::Create {0}'.format(service))
@@ -96,18 +96,18 @@ def get_time(obj):
 def services_list(request, environment_id):
     services = []
     session_id = None
-    sessions = glazierclient(request).sessions.list(environment_id)
+    sessions = muranoclient(request).sessions.list(environment_id)
     for s in sessions:
         session_id = s.id
 
     if session_id:
-        services = glazierclient(request).activeDirectories.\
+        services = muranoclient(request).activeDirectories.\
                             list(environment_id, session_id)
-        services += glazierclient(request).webServers.\
+        services += muranoclient(request).webServers.\
                             list(environment_id, session_id)
 
         for i in range(len(services)):
-            reports = glazierclient(request).sessions. \
+            reports = muranoclient(request).sessions. \
                 reports(environment_id, session_id,
                         services[i].id)
 
@@ -121,13 +121,13 @@ def services_list(request, environment_id):
 def get_active_directories(request, environment_id):
     services = []
     session_id = None
-    sessions = glazierclient(request).sessions.list(environment_id)
+    sessions = muranoclient(request).sessions.list(environment_id)
 
     for s in sessions:
         session_id = s.id
 
     if session_id:
-        services = glazierclient(request)\
+        services = muranoclient(request)\
                    .activeDirectories\
                    .list(environment_id, session_id)
 
@@ -168,13 +168,13 @@ def get_service_datails(request, service_id):
 def get_status_message_for_service(request, service_id):
     environment_id = get_data_center_id_for_service(request, service_id)
     session_id = None
-    sessions = glazierclient(request).sessions.list(environment_id)
+    sessions = muranoclient(request).sessions.list(environment_id)
 
     for s in sessions:
         session_id = s.id
 
     if session_id:
-        reports = glazierclient(request).sessions.\
+        reports = muranoclient(request).sessions.\
                   reports(environment_id, session_id, service_id)
 
     result = 'Initialization.... \n'
@@ -191,7 +191,7 @@ def service_delete(request, environment_id, service_id):
     services = services_list(request, environment_id)
 
     session_id = None
-    sessions = glazierclient(request).sessions.list(environment_id)
+    sessions = muranoclient(request).sessions.list(environment_id)
     for session in sessions:
         if session.state == 'open':
             session_id = session.id
@@ -202,10 +202,10 @@ def service_delete(request, environment_id, service_id):
     for service in services:
         if service.id is service_id:
             if service.type is 'Active Directory':
-                glazierclient(request).activeDirectories.delete(environment_id,
+                muranoclient(request).activeDirectories.delete(environment_id,
                                                                 session_id,
                                                                 service_id)
             elif service.type is 'IIS':
-                glazierclient(request).webServers.delete(environment_id,
+                muranoclient(request).webServers.delete(environment_id,
                                                          session_id,
                                                          service_id)

muranodashboard/panel/forms.py

@@ -19,7 +19,7 @@ import string
 from django import forms
 from django.utils.translation import ugettext_lazy as _
 import re
-from glazierdashboard.tabula import api
+from muranodashboard.panel import api
 
 log = logging.getLogger(__name__)
 
@@ -111,7 +111,7 @@ class WizardFormIISConfiguration(forms.Form):
         super(WizardFormIISConfiguration, self).__init__(*args, **kwargs)
 
         link = request.__dict__['META']['HTTP_REFERER']
-        environment_id = re.search('tabula/(\S+)', link).group(0)[7:-1]
+        environment_id = re.search('murano/(\S+)', link).group(0)[7:-1]
 
         domains = api.get_active_directories(request, environment_id)
 

muranodashboard/panel/overrides.py

@@ -15,7 +15,7 @@
 
 import horizon
 
-from panel import tabula
+from panel import Panel
 
 project = horizon.get_dashboard('project')
-project.register(tabula)
+project.register(Panel)

muranodashboard/panel/panel.py

@@ -18,9 +18,9 @@ from django.utils.translation import ugettext_lazy as _
 from openstack_dashboard.dashboards.project import dashboard
 
 
-class tabula(horizon.Panel):
+class Panel(horizon.Panel):
     name = _("Environments")
-    slug = 'tabula'
+    slug = 'murano'
 
 
-dashboard.Project.register(tabula)
+dashboard.Project.register(Panel)

muranodashboard/panel/tables.py

@@ -19,7 +19,7 @@ import re
 from django.utils.translation import ugettext_lazy as _
 from horizon import messages
 from horizon import tables
-from glazierdashboard.tabula import api
+from muranodashboard.panel import api
 
 LOG = logging.getLogger(__name__)
 
@@ -27,7 +27,7 @@ LOG = logging.getLogger(__name__)
 class CreateService(tables.LinkAction):
     name = 'CreateService'
     verbose_name = _('Create Service')
-    url = 'horizon:project:tabula:create'
+    url = 'horizon:project:murano:create'
     classes = ('btn-launch', 'ajax-modal')
 
     def allowed(self, request, datum):
@@ -40,7 +40,7 @@ class CreateService(tables.LinkAction):
 class CreateEnvironment(tables.LinkAction):
     name = 'CreateEnvironment'
     verbose_name = _('Create Environment')
-    url = 'horizon:project:tabula:create_dc'
+    url = 'horizon:project:murano:create_dc'
     classes = ('btn-launch', 'ajax-modal')
 
     def allowed(self, request, datum):
@@ -78,7 +78,7 @@ class DeleteService(tables.BatchAction):
 
     def action(self, request, service_id):
         link = request.__dict__['META']['HTTP_REFERER']
-        datacenter_id = re.search('tabula/(\S+)', link).group(0)[7:-1]
+        datacenter_id = re.search('murano/(\S+)', link).group(0)[7:-1]
 
         try:
             api.service_delete(request, datacenter_id, service_id)
@@ -105,7 +105,7 @@ class DeployEnvironment(tables.BatchAction):
 class ShowEnvironmentServices(tables.LinkAction):
     name = 'edit'
     verbose_name = _('Services')
-    url = 'horizon:project:tabula:services'
+    url = 'horizon:project:murano:services'
 
     def allowed(self, request, instance):
         return True
@@ -124,7 +124,7 @@ class UpdateServiceRow(tables.Row):
     def get_data(self, request, service_id):
 
         link = request.__dict__['META']['HTTP_REFERER']
-        environment_id = re.search('tabula/(\S+)', link).group(0)[7:-1]
+        environment_id = re.search('murano/(\S+)', link).group(0)[7:-1]
 
         service = api.service_get(request, environment_id, service_id)
 
@@ -147,7 +147,7 @@ class EnvironmentsTable(tables.DataTable):
     )
 
     name = tables.Column('name',
-                         link=('horizon:project:tabula:services'),
+                         link=('horizon:project:murano:services'),
                          verbose_name=_('Name'))
 
     status = tables.Column('status', verbose_name=_('Status'),
@@ -156,7 +156,7 @@ class EnvironmentsTable(tables.DataTable):
                            display_choices=STATUS_DISPLAY_CHOICES)
 
     class Meta:
-        name = 'tabula'
+        name = 'murano'
         verbose_name = _('Environments')
         row_class = UpdateEnvironmentRow
         status_columns = ['status']
@@ -173,7 +173,7 @@ class ServicesTable(tables.DataTable):
     )
 
     name = tables.Column('name', verbose_name=_('Name'),
-                         link=('horizon:project:tabula:service_details'))
+                         link=('horizon:project:murano:service_details'))
 
     _type = tables.Column('service_type', verbose_name=_('Type'))
 

muranodashboard/panel/tabs.py

@@ -19,7 +19,7 @@ from horizon import exceptions
 from horizon import tabs
 import logging
 
-from glazierdashboard.tabula import api
+from muranodashboard.panel import api
 
 
 LOG = logging.getLogger(__name__)

muranodashboard/panel/urls.py

@@ -19,7 +19,7 @@ from .views import IndexView, Services, CreateEnvironmentView, DetailServiceView
 from .views import Wizard
 from .forms import WizardFormServiceType, WizardFormConfiguration
 
-VIEW_MOD = 'openstack_dashboard.dashboards.project.tabula.views'
+VIEW_MOD = 'openstack_dashboard.dashboards.project.murano.views'
 
 urlpatterns = patterns(VIEW_MOD,
                        url(r'^$', IndexView.as_view(), name='index'),

muranodashboard/panel/views.py

@@ -27,7 +27,7 @@ from horizon import tables
 from horizon import workflows
 from horizon.forms.views import ModalFormMixin
 
-from glazierdashboard.tabula import api
+from muranodashboard.panel import api
 
 from .tables import EnvironmentsTable, ServicesTable
 from .workflows import CreateEnvironment
@@ -46,9 +46,9 @@ class Wizard(ModalFormMixin, SessionWizardView, generic.FormView):
 
     def done(self, form_list, **kwargs):
         link = self.request.__dict__['META']['HTTP_REFERER']
-        environment_id = re.search('tabula/(\S+)', link).group(0)[7:-1]
+        environment_id = re.search('murano/(\S+)', link).group(0)[7:-1]
 
-        url = "/project/tabula/%s/" % environment_id
+        url = "/project/murano/%s/" % environment_id
 
         service_type = form_list[0].data.get('0-service', '')
         parameters = {'service_type': service_type}
@@ -180,7 +180,7 @@ class DetailServiceView(tabs.TabView):
                 service_id = self.kwargs['service_id']
                 service = api.get_service_datails(self.request, service_id)
             except:
-                redirect = reverse('horizon:project:tabula:index')
+                redirect = reverse('horizon:project:murano:index')
                 exceptions.handle(self.request,
                                   _('Unable to retrieve details for '
                                     'service "%s".') % service_id,

muranodashboard/panel/workflows.py

@@ -24,7 +24,7 @@ from horizon import exceptions
 from horizon import forms
 from horizon import workflows
 
-from glazierdashboard.tabula import api
+from muranodashboard.panel import api
 
 
 LOG = logging.getLogger(__name__)
@@ -80,7 +80,7 @@ class CreateEnvironment(workflows.Workflow):
     finalize_button_name = _("Create")
     success_message = _('Created environment "%s".')
     failure_message = _('Unable to create environment "%s".')
-    success_url = "horizon:project:tabula:index"
+    success_url = "horizon:project:murano:index"
     default_steps = (SelectProjectUser, ConfigureEnvironment)
 
     def format_status_message(self, message):

muranodashboard/settings.py

@@ -39,7 +39,7 @@ HORIZON_CONFIG = {
     'exceptions': {'recoverable': exceptions.RECOVERABLE,
                    'not_found': exceptions.NOT_FOUND,
                    'unauthorized': exceptions.UNAUTHORIZED},
-    'customization_module': 'tabula.overrides'
+    'customization_module': 'panel.overrides'
 }
 
 
@@ -89,7 +89,7 @@ COMPRESS_CSS_FILTERS = (
 )
 
 COMPRESS_ENABLED = True
-COMPRESS_OUTPUT_DIR = 'tabula'
+COMPRESS_OUTPUT_DIR = 'muranodashboard'
 COMPRESS_CSS_HASHING_METHOD = 'hash'
 COMPRESS_PARSER = 'compressor.parser.HtmlParser'
 

muranodashboard/templates/_services_tabs.html

@@ -1,7 +1,7 @@
 {% extends "horizon/common/_modal_form.html" %}
 {% load i18n horizon humanize %}
 
-{% block form_action %}{% url horizon:project:tabula:create %}?{{ request.POST.urlencode }}{% endblock %}
+{% block form_action %}{% url horizon:project:murano:create %}?{{ request.POST.urlencode }}{% endblock %}
 
 {% block modal_id %}create_service{% endblock %}
 {% block modal-header %}{% trans "Create Service" %}{% endblock %}

muranodashboard/version.py

@@ -15,6 +15,6 @@
 #    under the License.
 
 
-from tabula.openstack.common import version as common_version
+from muranodashboard.openstack.common import version as common_version
 
-version_info = common_version.VersionInfo('tabula')
+version_info = common_version.VersionInfo('muranodashboard')

openstack-common.conf

@@ -4,4 +4,4 @@
 modules=setup,importutils,version
 
 # The base module to hold the copy of openstack.common
-base=tabula
+base=muranodashboard

setup.py

@@ -21,20 +21,20 @@
 
 import setuptools
 
-from glazierdashboard.openstack.common import setup
+from muranodashboard.openstack.common import setup
 
 requires = setup.parse_requirements()
 depend_links = setup.parse_dependency_links()
-project = 'glazierdashboard'
+project = 'muranodashboard'
 
 setuptools.setup(
     name=project,
     version=setup.get_version(project, '2013.1'),
-    description="The OpenStack Dashboard.",
+    description="The Murano Dashboard.",
     license='Apache 2.0',
     author='Mirantis Inc',
     author_email='tnurlygayanov@mirantis.com',
-    url='https://github.com/Mirantis/glazier-dashboard',
+    url='https://github.com/Mirantis/murano-dashboard',
     packages=setuptools.find_packages(exclude=['bin']),
     cmdclass=setup.get_cmdclass(),
     include_package_data=True,

tools/install_venv.py

@@ -28,12 +28,12 @@ import install_venv_common as install_venv
 
 def print_help():
     help = """
- Tabula development environment setup is complete.
+ Dashboard development environment setup is complete.
 
- Tabula development uses virtualenv to track and manage Python dependencies
+ Dashboard development uses virtualenv to track and manage Python dependencies
  while in development and testing.
 
- To activate the Tabula virtualenv for the extent of your current shell session
+ To activate the Dashboard virtualenv for the extent of your current shell session
  you can run:
 
  $ source .venv/bin/activate
@@ -54,7 +54,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 = 'tabula'
+    project = 'muranodashboard'
     install = install_venv.InstallVenv(root, venv, pip_requires, test_requires,
                                        py_version, project)
     options = install.parse_args(argv)