starlingx
/
gui
Code Issues Proposed changes

Merge "Horizon service not enabled-active in SM."

This commit is contained in:
Zuul 2022-05-16 15:56:24 +00:00 committed by Gerrit Code Review
parent 96877e8658 c091858a76
commit 404f8c6fc0
7 changed files with 47 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
starlingx-dashboard/debian/deb_folder/rules
View File

@ -4,12 +4,12 @@ export DH_VERBOSE = 1
export PBR_VERSION=1.0
export PYBUILD_NAME=starlingx-dashboard
export ROOT=debian/tmp
export DATA_DIR=$(ROOT)/usr/share
export OS_DIR=$(DATA_DIR)/openstack-dashboard/openstack_dashboard
export DATA_DIR=$(ROOT)/usr/lib/python3/dist-packages
export OS_DIR=$(DATA_DIR)/openstack_dashboard
export ENABLED_DIR=$(OS_DIR)/enabled
export STX_THEMES_DIR=$(OS_DIR)/themes/starlingx
export LOCAL_SETTINGS_DIR=$(OS_DIR)/local/local_settings.d
export STX_THEMES_DIR=$(ROOT)/usr/share/openstack-dashboard/themes/starlingx
export LOCAL_SETTINGS_DIR=$(ROOT)/etc/openstack-dashboard/local_settings.d
export STX_TEMPLATES_DIR=$(OS_DIR)/starlingx_templates
export OVERRIDES_DIR=$(OS_DIR)/overrides
@ -17,7 +17,6 @@ export OVERRIDES_DIR=$(OS_DIR)/overrides
dh $@ --with python3 --buildsystem=pybuild
override_dh_install:
python3 setup.py install --install-layout=deb --root $(ROOT)
python3 setup.py bdist_wheel \
@ -44,4 +43,4 @@ override_dh_install:
dh_install
override_dh_auto_test:
echo "do nothing"
echo "do nothing"

1
starlingx-dashboard/debian/deb_folder/starlingx-dashboard.dirs Normal file
View File

@ -0,0 +1 @@
var/log/horizon/

10
starlingx-dashboard/debian/deb_folder/starlingx-dashboard.install
View File

@ -1,8 +1,8 @@
/usr/share/openstack-dashboard/openstack_dashboard/enabled/*
/usr/share/openstack-dashboard/openstack_dashboard/themes/starlingx/*
/usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.d/*
/usr/share/openstack-dashboard/openstack_dashboard/starlingx_templates/*
/usr/share/openstack-dashboard/openstack_dashboard/overrides/*
usr/lib/python3/dist-packages/openstack_dashboard/enabled
usr/share/openstack-dashboard/themes/starlingx
etc/openstack-dashboard/local_settings.d
usr/lib/python3/dist-packages/openstack_dashboard/starlingx_templates/*
usr/lib/python3/dist-packages/openstack_dashboard/overrides/*
usr/lib/python3/dist-packages/starlingx_dashboard-*.egg-info/*
usr/lib/python3/dist-packages/starlingx_dashboard/*

1
starlingx-dashboard/debian/deb_folder/starlingx-dashboard.postinst Normal file
View File

@ -0,0 +1 @@
chmod 755 /var/log/horizon/

10
starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/sensors/tables.py
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2013-2018 Wind River Systems, Inc.
# Copyright (c) 2013-2022 Wind River Systems, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#
@ -8,7 +8,7 @@ import logging
from django import template
from django.urls import reverse # noqa
from django.utils.translation import string_concat # noqa
from django.utils.text import format_lazy
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ungettext_lazy
@ -40,8 +40,10 @@ class AddSensorGroup(tables.LinkAction):
if not host._administrative == 'locked':
if "disabled" not in self.classes:
self.classes = [c for c in self.classes] + ['disabled']
self.verbose_name = string_concat(self.verbose_name, ' ',
_("(Node Unlocked)"))
self.verbose_name = format_lazy(
'{verbose_name} {node_unlocked}',
verbose_name=self.verbose_name,
node_unlocked=_("(Node Unlocked)"))
return True # The action should always be displayed

31
starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/storages/tables.py
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2013-2021 Wind River Systems, Inc.
# Copyright (c) 2013-2022 Wind River Systems, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#
@ -9,7 +9,7 @@ import re
from django import template
from django.urls import reverse # noqa
from django.utils.translation import string_concat # noqa
from django.utils.text import format_lazy
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ungettext_lazy
@ -49,9 +49,10 @@ class CreateStorageVolume(tables.LinkAction):
host._personality == sysinv.PERSONALITY_STORAGE and
"disabled" not in self.classes):
self.classes = [c for c in self.classes] + ['disabled']
self.verbose_name = string_concat(self.verbose_name, ' ',
_("(Node Unlocked)"))
self.verbose_name = format_lazy(
'{verbose_name} {node_unlocked}',
verbose_name=self.verbose_name,
node_unlocked=_("(Node Unlocked)"))
return True
@ -375,8 +376,10 @@ class AddLocalVolumeGroup(tables.LinkAction):
if host.config_required is False:
if "disabled" not in self.classes:
self.classes = [c for c in self.classes] + ['disabled']
self.verbose_name = string_concat(self.verbose_name, ' ',
_("(Node Unlocked)"))
self.verbose_name = format_lazy(
'{verbose_name} {node_unlocked}',
verbose_name=self.verbose_name,
node_unlocked=_("(Node Unlocked)"))
# LVGs that are considered as "present" in the system are those
# in an adding or provisioned state.
@ -393,9 +396,10 @@ class AddLocalVolumeGroup(tables.LinkAction):
if not any(allowed_lvgs):
if "disabled" not in self.classes:
self.classes = [c for c in self.classes] + ['disabled']
self.verbose_name = string_concat(self.verbose_name, ' ',
_("(All Added)"))
self.verbose_name = format_lazy(
'{verbose_name} {all_added}',
verbose_name=self.verbose_name,
all_added=_("(All Added)"))
return True # The action should always be displayed
@ -509,9 +513,10 @@ class AddPhysicalVolume(tables.LinkAction):
host.config_required is False:
if "disabled" not in self.classes:
self.classes = [c for c in self.classes] + ['disabled']
self.verbose_name = string_concat(self.verbose_name, ' ',
_("(Node Unlocked)"))
self.verbose_name = format_lazy(
'{verbose_name} {node_unlocked}',
verbose_name=self.verbose_name,
node_unlocked=_("(Node Unlocked)"))
return True # The action should always be displayed

21
starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/system_config/tables.py
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2013-2019 Wind River Systems, Inc.
# Copyright (c) 2013-2022 Wind River Systems, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#
@ -8,6 +8,7 @@ import logging
from cgtsclient import exc
from django.urls import reverse # noqa
from django.utils.translation import ugettext as __
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ungettext_lazy
@ -196,45 +197,45 @@ class UpdateOAMRow(tables.Row):
class cOAMTable(tables.DataTable):
region_config = tables.Column(
'region_config',
verbose_name=_('OAM Region Config'),
verbose_name=__('OAM Region Config'),
hidden=True)
oam_subnet = tables.Column(
'oam_subnet',
# link="horizon:admin:system_config:detail_cdns",
verbose_name=_('OAM Subnet'))
verbose_name=__('OAM Subnet'))
oam_floating_ip = tables.Column(
'oam_floating_ip',
# link="horizon:admin:system_config:detail_cdns",
verbose_name=_('OAM Floating IP'))
verbose_name=__('OAM Floating IP'))
oam_gateway_ip = tables.Column(
'oam_gateway_ip',
# link="horizon:admin:system_config:detail_cdns",
verbose_name=_('OAM Gateway IP'))
verbose_name=__('OAM Gateway IP'))
oam_c0_ip = tables.Column(
'oam_c0_ip',
# link="horizon:admin:system_config:detail_cdns",
verbose_name=_('OAM controller-0 IP'))
verbose_name=__('OAM controller-0 IP'))
oam_c1_ip = tables.Column(
'oam_c1_ip',
verbose_name=_('OAM controller-1 IP'))
verbose_name=__('OAM controller-1 IP'))
# This is optional for non region config
oam_start_ip = tables.Column(
'oam_start_ip',
# hidden=(region_config.transform.strip() == "True"),
hidden=True,
verbose_name=_('OAM Start IP'))
verbose_name=__('OAM Start IP'))
oam_end_ip = tables.Column(
'oam_end_ip',
# hidden=(region_config.transform.strip() != "True"),
hidden=True,
verbose_name=_('OAM End IP'))
verbose_name=__('OAM End IP'))
def get_object_id(self, datum):
return str(datum.uuid)
@ -246,7 +247,7 @@ class cOAMTable(tables.DataTable):
super(cOAMTable, self).__init__(request, *args, **kwargs)
if stx_api.sysinv.is_system_mode_simplex(request):
self.columns['oam_floating_ip'].verbose_name = _('OAM IP')
self.columns['oam_floating_ip'].verbose_name = __('OAM IP')
del self.columns['oam_c0_ip']
del self.columns['oam_c1_ip']