Renaming cue service to message-broker
Also changingg all occurrences of 'queues' to 'messagebroker' Change-Id: I3744a0ad8175a74da7e96dcbf7836f6ae5548919
This commit is contained in:
parent
0d14b0dd33
commit
e15df6b681
|
@ -5,6 +5,7 @@ AUTHORS
|
|||
ChangeLog
|
||||
.DS_Store
|
||||
cuedashboard.egg*
|
||||
cue_dashboard.egg*
|
||||
build/
|
||||
.eggs/
|
||||
.idea/
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
PANEL_GROUP = 'queuesgroup'
|
||||
PANEL_GROUP_NAME = _('Messaging')
|
||||
PANEL_GROUP = 'messagebroker'
|
||||
PANEL_GROUP_NAME = _('Message Broker')
|
||||
PANEL_GROUP_DASHBOARD = 'project'
|
|
@ -14,10 +14,10 @@
|
|||
# Copyright [2014] Hewlett-Packard Development Company, L.P.
|
||||
# limitations under the License.
|
||||
|
||||
PANEL = 'queues'
|
||||
PANEL_GROUP = 'queuesgroup'
|
||||
PANEL = 'messagebroker'
|
||||
PANEL_GROUP = 'messagebroker'
|
||||
PANEL_DASHBOARD = 'project'
|
||||
ADD_PANEL = 'cuedashboard.queues.panel.CuePanel'
|
||||
ADD_PANEL = 'cuedashboard.messagebroker.panel.CuePanel'
|
||||
ADD_INSTALLED_APPS = [
|
||||
'cuedashboard',
|
||||
]
|
|
@ -22,5 +22,5 @@ import horizon
|
|||
|
||||
class CuePanel(horizon.Panel):
|
||||
name = _("Clusters")
|
||||
slug = 'queues'
|
||||
permissions = ('openstack.services.message_queue',)
|
||||
slug = 'messagebroker'
|
||||
permissions = ('openstack.services.message-broker',)
|
|
@ -26,7 +26,7 @@ from horizon import tables
|
|||
class CreateCluster(tables.LinkAction):
|
||||
name = "create"
|
||||
verbose_name = _("Create Cluster")
|
||||
url = "horizon:project:queues:create"
|
||||
url = "horizon:project:messagebroker:create"
|
||||
classes = ("ajax-modal", "btn-create")
|
||||
|
||||
|
||||
|
@ -73,7 +73,7 @@ def format_endpoints(cluster):
|
|||
class ClusterTable(tables.DataTable):
|
||||
name = tables.Column("name",
|
||||
verbose_name=_("Name"),
|
||||
link='horizon:project:queues:detail')
|
||||
link='horizon:project:messagebroker:detail')
|
||||
size = tables.Column("size", verbose_name=_("Cluster Size"),)
|
||||
endpoint = tables.Column(format_endpoints, verbose_name=_("Endpoints"))
|
||||
status = tables.Column("status", verbose_name=_("Status"))
|
|
@ -21,7 +21,7 @@ from horizon import tabs
|
|||
class OverviewTab(tabs.Tab):
|
||||
name = _("Overview")
|
||||
slug = "overview"
|
||||
template_name = "project/queues/_detail_overview.html"
|
||||
template_name = "project/messagebroker/_detail_overview.html"
|
||||
|
||||
def get_context_data(self, request):
|
||||
return {"cluster": self.tab_group.kwargs['cluster']}
|
|
@ -16,7 +16,7 @@
|
|||
# Copyright [2014] Hewlett-Packard Development Company, L.P.
|
||||
# limitations under the License.
|
||||
|
||||
from cuedashboard.queues import views
|
||||
from cuedashboard.messagebroker import views
|
||||
|
||||
from django.conf.urls import patterns
|
||||
from django.conf.urls import url
|
|
@ -17,9 +17,9 @@
|
|||
# limitations under the License.
|
||||
|
||||
from cuedashboard import api
|
||||
from cuedashboard.queues.tables import ClusterTable
|
||||
from cuedashboard.queues.tabs import ClusterDetailTabs
|
||||
from cuedashboard.queues import workflows as cue_workflows
|
||||
from cuedashboard.messagebroker.tables import ClusterTable
|
||||
from cuedashboard.messagebroker.tabs import ClusterDetailTabs
|
||||
from cuedashboard.messagebroker import workflows as cue_workflows
|
||||
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
@ -31,7 +31,7 @@ from horizon import workflows
|
|||
|
||||
class IndexView(tables.DataTableView):
|
||||
table_class = ClusterTable
|
||||
template_name = 'queues/index.html'
|
||||
template_name = 'messagebroker/index.html'
|
||||
page_title = _("Clusters")
|
||||
|
||||
def get_data(self):
|
||||
|
@ -40,13 +40,13 @@ class IndexView(tables.DataTableView):
|
|||
|
||||
class CreateClusterView(workflows.WorkflowView):
|
||||
workflow_class = cue_workflows.CreateCluster
|
||||
template_name = "queues/launch.html"
|
||||
template_name = "messagebroker/launch.html"
|
||||
page_title = _("Create Cluster")
|
||||
|
||||
|
||||
class DetailView(horizon_tabs.TabbedTableView):
|
||||
tab_group_class = ClusterDetailTabs
|
||||
template_name = 'queues/detail.html'
|
||||
template_name = 'messagebroker/detail.html'
|
||||
page_title = _("Cluster Details: {{ cluster.name }}")
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
|
@ -78,4 +78,4 @@ class DetailView(horizon_tabs.TabbedTableView):
|
|||
|
||||
@staticmethod
|
||||
def get_redirect_url():
|
||||
return reverse('horizon:project:queues:index')
|
||||
return reverse('horizon:project:messagebroker:index')
|
|
@ -91,7 +91,7 @@ class SetInstanceDetailsAction(workflows.Action):
|
|||
|
||||
class Meta(object):
|
||||
name = _("Details")
|
||||
help_text_template = "queues/_launch_details_help.html"
|
||||
help_text_template = "messagebroker/_launch_details_help.html"
|
||||
|
||||
@memoized.memoized_method
|
||||
def flavors(self, request):
|
||||
|
@ -99,7 +99,7 @@ class SetInstanceDetailsAction(workflows.Action):
|
|||
return api.nova.flavor_list(request)
|
||||
except Exception:
|
||||
LOG.exception("Exception while obtaining flavors list")
|
||||
redirect = reverse("horizon:project:queues:index")
|
||||
redirect = reverse("horizon:project:messagebroker:index")
|
||||
exceptions.handle(request,
|
||||
_('Unable to obtain flavors.'),
|
||||
redirect=redirect)
|
||||
|
@ -150,7 +150,7 @@ class CreateCluster(workflows.Workflow):
|
|||
finalize_button_name = _("Create")
|
||||
success_message = _('Created cluster named "%(name)s".')
|
||||
failure_message = _('Unable to create cluster named "%(name)s".')
|
||||
success_url = "horizon:project:queues:index"
|
||||
success_url = "horizon:project:messagebroker:index"
|
||||
default_steps = (SetClusterDetails,)
|
||||
|
||||
def __init__(self, request=None, context_seed=None, entry_point=None,
|
||||
|
@ -166,7 +166,7 @@ class CreateCluster(workflows.Workflow):
|
|||
|
||||
def handle(self, request, context):
|
||||
try:
|
||||
LOG.info("Launching message queue cluster with parameters "
|
||||
LOG.info("Launching message broker cluster with parameters "
|
||||
"{name=%s, flavor=%s, size=%s, nics=%s}",
|
||||
context['name'], context['flavor'],
|
||||
context['size'], context['network'])
|
|
@ -5,7 +5,7 @@
|
|||
{% block main %}
|
||||
<div class="row">
|
||||
<div class="col-sm-12">
|
||||
{% include "queues/_detail_overview.html" %}
|
||||
{% include "messagebroker/_detail_overview.html" %}
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
|
@ -1,6 +1,6 @@
|
|||
import testtools
|
||||
|
||||
import cuedashboard.queues.tables as tables
|
||||
import cuedashboard.messagebroker.tables as tables
|
||||
|
||||
|
||||
class FakeTest(testtools.TestCase):
|
||||
|
|
Loading…
Reference in New Issue