Skip to content
This repository has been archived by the owner on May 17, 2024. It is now read-only.

Commit

Permalink
Renamed murano dashboard panel
Browse files Browse the repository at this point in the history
Changed the default dashboard name and configuration - the default
dashboard name is now 'Applications'.
The "Application Catalog" panel group was renamed to just "Catalog",
while its inner panel (previously called 'Applications') is now called
'Browse`.

UI tests altered to reflect the changes.

Change-Id: I49999d702f403d946084c5c4312d367404127b47
  • Loading branch information
Alexander Tivelkov authored and nastya-kuz committed May 12, 2016
1 parent ee7edeb commit 6c6c587
Show file tree
Hide file tree
Showing 6 changed files with 74 additions and 74 deletions.
2 changes: 1 addition & 1 deletion muranodashboard/catalog/panel.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@


class AppCatalog(horizon.Panel):
name = _('Applications')
name = _('Browse')
slug = 'catalog'


Expand Down
4 changes: 2 additions & 2 deletions muranodashboard/dashboard.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

class DeployPanels(horizon.PanelGroup):
slug = "deployment_group"
name = _("Application Catalog")
name = _("Catalog")
panels = ("environments", "catalog")


Expand All @@ -36,7 +36,7 @@ class ManagePanels(horizon.PanelGroup):


class Murano(horizon.Dashboard):
name = getattr(settings, 'MURANO_DASHBOARD_NAME', _("Murano"))
name = getattr(settings, 'MURANO_DASHBOARD_NAME', _("Applications"))
slug = "murano"
panels = (DeployPanels, ManagePanels)
default_panel = "environments"
Expand Down
4 changes: 2 additions & 2 deletions muranodashboard/local/local_settings.py.example
Original file line number Diff line number Diff line change
Expand Up @@ -558,9 +558,9 @@ MURANO_REPO_URL = 'http://apps.openstack.org/api/v1/murano_repo/liberty/'
# algorithms supported by Python's hashlib library.
#OPENSTACK_TOKEN_HASH_ALGORITHM = 'md5'

# Overrides the default dashboard name (Murano) that is displayed
# Overrides the default dashboard name (Applications) that is displayed
# in the main accordion navigation
# MURANO_DASHBOARD_NAME = "Murano"
# MURANO_DASHBOARD_NAME = "Applications"

# Specify a maximum number of limit packages.
# PACKAGES_LIMIT = 100
4 changes: 2 additions & 2 deletions muranodashboard/tests/functional/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ def log_in(self, username=None, password=None):
self.fill_field(by.By.ID, 'id_username', username)
self.fill_field(by.By.ID, 'id_password', password)
self.driver.find_element_by_xpath("//button[@type='submit']").click()
murano = self.driver.find_element_by_xpath(consts.Murano)
murano = self.driver.find_element_by_xpath(consts.Applications)
if 'collapsed' in murano.get_attribute('class'):
murano.click()

Expand Down Expand Up @@ -472,7 +472,7 @@ def modify_package(self, param, value):
self.wait_for_alert_message()

def add_app_to_env(self, app_id, app_name='TestApp'):
self.go_to_submenu('Applications')
self.go_to_submenu('Browse')
self.select_and_click_action_for_app('quick-add', app_id)
field_id = "{0}_0-name".format(app_id)
self.fill_field(by.By.ID, field_id, value=app_name)
Expand Down
6 changes: 3 additions & 3 deletions muranodashboard/tests/functional/consts.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@

# Panel's

Murano = "//*[@id='main_content']/div[2]//a[contains(text(), 'Murano')]"
Application_Catalog = Murano + "/following::a[span[contains(text(), 'Application Catalog')]]" # noqa
Manage = Murano + "/following::a[span[contains(text(), 'Manage')]]"
Applications = "//*[@id='main_content']/div[2]//a[contains(text(), 'Applications')]" # noqa
Catalog = Applications + "/following::a[span[contains(text(), 'Catalog')]]"
Manage = Applications + "/following::a[span[contains(text(), 'Manage')]]"

0 comments on commit 6c6c587

Please sign in to comment.