Merge "Rename Cloud Patch Config & Subcloud group pages"
This commit is contained in:
commit
43ba49f2e0
@ -1,5 +1,5 @@
|
||||
#
|
||||
# Copyright (c) 2018-2023 Wind River Systems, Inc.
|
||||
# Copyright (c) 2018-2024 Wind River Systems, Inc.
|
||||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
@ -345,7 +345,7 @@ class CreateCloudStrategyForm(forms.SelfHandlingForm):
|
||||
return True
|
||||
|
||||
|
||||
class CreateCloudPatchConfigForm(forms.SelfHandlingForm):
|
||||
class CreateSubcloudConfigForm(forms.SelfHandlingForm):
|
||||
failure_url = 'horizon:dc_admin:dc_orchestration:index'
|
||||
|
||||
APPLY_TYPES = (
|
||||
@ -411,8 +411,8 @@ class CreateCloudPatchConfigForm(forms.SelfHandlingForm):
|
||||
widget=forms.Select())
|
||||
|
||||
def __init__(self, request, *args, **kwargs):
|
||||
super(CreateCloudPatchConfigForm, self).__init__(request, *args,
|
||||
**kwargs)
|
||||
super(CreateSubcloudConfigForm, self).__init__(request, *args,
|
||||
**kwargs)
|
||||
subcloud_list = [(api.dc_manager.DEFAULT_CONFIG_NAME,
|
||||
api.dc_manager.DEFAULT_CONFIG_NAME), ]
|
||||
subclouds = api.dc_manager.subcloud_list(self.request)
|
||||
@ -436,7 +436,7 @@ class CreateCloudPatchConfigForm(forms.SelfHandlingForm):
|
||||
|
||||
response = api.dc_manager.config_update(request, subcloud, data)
|
||||
if not response:
|
||||
messages.error(request, "Cloud Patching Configuration "
|
||||
messages.error(request, "Subcloud Strategy Configuration "
|
||||
"creation failed")
|
||||
|
||||
except exc.APIException as e:
|
||||
@ -448,7 +448,8 @@ class CreateCloudPatchConfigForm(forms.SelfHandlingForm):
|
||||
except Exception:
|
||||
redirect = reverse(self.failure_url)
|
||||
exceptions.handle(request,
|
||||
"Cloud Patching Configuration creation failed",
|
||||
"Subcloud Strategy Configuration "
|
||||
"creation failed",
|
||||
redirect=redirect)
|
||||
return True
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
#
|
||||
# Copyright (c) 2018-2022 Wind River Systems, Inc.
|
||||
# Copyright (c) 2018-2024 Wind River Systems, Inc.
|
||||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
@ -246,35 +246,35 @@ class CloudPatchStepsTable(tables.DataTable):
|
||||
|
||||
|
||||
# Cloud Patch Config
|
||||
class CreateCloudPatchConfig(tables.LinkAction):
|
||||
name = "createcloudpatchconfig"
|
||||
url = "horizon:dc_admin:dc_orchestration:createcloudpatchconfig"
|
||||
verbose_name = _("Create New Cloud Patching Configuration")
|
||||
class CreateSubcloudStrategyConfig(tables.LinkAction):
|
||||
name = "createsubcloudstrategyconfig"
|
||||
url = "horizon:dc_admin:dc_orchestration:createsubcloudstrategyconfig"
|
||||
verbose_name = _("Create New Subcloud Strategy Configuration")
|
||||
classes = ("ajax-modal", "btn-create")
|
||||
icon = "plus"
|
||||
|
||||
|
||||
class EditCloudPatchConfig(tables.LinkAction):
|
||||
name = "editcloudpatchconfig"
|
||||
url = "horizon:dc_admin:dc_orchestration:editcloudpatchconfig"
|
||||
class EditSubcloudStrategyConfig(tables.LinkAction):
|
||||
name = "editsubcloudstrategyconfig"
|
||||
url = "horizon:dc_admin:dc_orchestration:editsubcloudstrategyconfig"
|
||||
verbose_name = _("Edit Configuration")
|
||||
classes = ("ajax-modal",)
|
||||
|
||||
|
||||
class DeleteCloudPatchConfig(tables.DeleteAction):
|
||||
class DeleteSubcloudStrategyConfig(tables.DeleteAction):
|
||||
@staticmethod
|
||||
def action_present(count):
|
||||
return ungettext_lazy(
|
||||
"Delete Cloud Patching Configuration",
|
||||
"Delete Cloud Patching Configurations",
|
||||
"Delete Subcloud Strategy Configuration",
|
||||
"Delete Subcloud Strategy Configuration",
|
||||
count
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
def action_past(count):
|
||||
return ungettext_lazy(
|
||||
"Deleted Cloud Patching Configuration",
|
||||
"Deleted Cloud Patching Configurations",
|
||||
"Deleted Subcloud Strategy Configuration",
|
||||
"Deleted Subcloud Strategy Configuration",
|
||||
count
|
||||
)
|
||||
|
||||
@ -296,7 +296,7 @@ class DeleteCloudPatchConfig(tables.DeleteAction):
|
||||
return shortcuts.redirect(url)
|
||||
|
||||
|
||||
class CloudPatchConfigTable(tables.DataTable):
|
||||
class SubcloudStrategyConfigTable(tables.DataTable):
|
||||
cloud = tables.Column('cloud', verbose_name=_('Cloud'))
|
||||
storage_apply_type = tables.Column('storage_apply_type',
|
||||
verbose_name=_('Storage Apply Type'))
|
||||
@ -316,15 +316,16 @@ class CloudPatchConfigTable(tables.DataTable):
|
||||
return obj.cloud
|
||||
|
||||
class Meta(object):
|
||||
name = "cloudpatchconfig"
|
||||
name = "subcloudstrategyconfig"
|
||||
multi_select = False
|
||||
table_actions = (CreateCloudPatchConfig,)
|
||||
row_actions = (EditCloudPatchConfig, DeleteCloudPatchConfig,)
|
||||
verbose_name = _("Cloud Patching Configurations")
|
||||
table_actions = (CreateSubcloudStrategyConfig,)
|
||||
row_actions = (EditSubcloudStrategyConfig,
|
||||
DeleteSubcloudStrategyConfig,)
|
||||
verbose_name = _("Subcloud Strategy Configurations")
|
||||
hidden_title = False
|
||||
|
||||
|
||||
# Subcloud Group Management
|
||||
# Subcloud Groups
|
||||
class EditSubcloudGroup(tables.LinkAction):
|
||||
name = "editsubcloudgroup"
|
||||
url = "horizon:dc_admin:dc_orchestration:editsubcloudgroup"
|
||||
@ -375,7 +376,7 @@ class CreateSubcloudGroup(tables.LinkAction):
|
||||
icon = "plus"
|
||||
|
||||
|
||||
class SubcloudGroupManagementTable(tables.DataTable):
|
||||
class SubcloudGroupsTable(tables.DataTable):
|
||||
name = tables.Column('name', verbose_name=_('Name'))
|
||||
description = tables.Column('description', verbose_name=_('Description'))
|
||||
update_apply_type = tables.Column(
|
||||
@ -398,5 +399,5 @@ class SubcloudGroupManagementTable(tables.DataTable):
|
||||
multi_select = False
|
||||
table_actions = (CreateSubcloudGroup,)
|
||||
row_actions = (EditSubcloudGroup, DeleteSubcloudGroup,)
|
||||
verbose_name = _("Subcloud Group Management")
|
||||
verbose_name = _("Subcloud Groups")
|
||||
hidden_title = False
|
||||
|
@ -1,5 +1,5 @@
|
||||
#
|
||||
# Copyright (c) 2018-2022 Wind River Systems, Inc.
|
||||
# Copyright (c) 2018-2024 Wind River Systems, Inc.
|
||||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
@ -51,15 +51,15 @@ class CloudOrchestrationTab(tabs.TableTab):
|
||||
return steps
|
||||
|
||||
|
||||
class CloudPatchConfigTab(tabs.TableTab):
|
||||
table_classes = (tables.CloudPatchConfigTable,)
|
||||
name = _("Cloud Patching Configurations")
|
||||
slug = "cloud_patch_config"
|
||||
class SubcloudStrategyConfigTab(tabs.TableTab):
|
||||
table_classes = (tables.SubcloudStrategyConfigTable,)
|
||||
name = _("Subcloud Strategy Configurations")
|
||||
slug = "subcloud_strategy_config"
|
||||
template_name = ("dc_admin/dc_orchestration/"
|
||||
"_cloud_patch_config.html")
|
||||
"_subcloud_strategy_config.html")
|
||||
preload = False
|
||||
|
||||
def get_cloudpatchconfig_data(self):
|
||||
def get_subcloudstrategyconfig_data(self):
|
||||
request = self.request
|
||||
steps = []
|
||||
try:
|
||||
@ -72,11 +72,11 @@ class CloudPatchConfigTab(tabs.TableTab):
|
||||
|
||||
|
||||
class SubcloudGroupTab(tabs.TableTab):
|
||||
table_classes = (tables.SubcloudGroupManagementTable,)
|
||||
name = _("Subcloud Group Management")
|
||||
slug = "subcloud_group_managment"
|
||||
table_classes = (tables.SubcloudGroupsTable,)
|
||||
name = _("Subcloud Groups")
|
||||
slug = "subcloud_groups"
|
||||
template_name =\
|
||||
("dc_admin/dc_orchestration/_subcloud_group_mgmt.html")
|
||||
("dc_admin/dc_orchestration/_subcloud_groups.html")
|
||||
preload = False
|
||||
|
||||
def get_subcloudgroupmgmt_data(self):
|
||||
@ -92,5 +92,5 @@ class SubcloudGroupTab(tabs.TableTab):
|
||||
|
||||
class DCSoftwareManagementTabs(tabs.TabGroup):
|
||||
slug = "dc_orchestration_tabs"
|
||||
tabs = (CloudOrchestrationTab, CloudPatchConfigTab, SubcloudGroupTab)
|
||||
tabs = (CloudOrchestrationTab, SubcloudStrategyConfigTab, SubcloudGroupTab)
|
||||
sticky = True
|
||||
|
@ -1,9 +1,9 @@
|
||||
{% extends "horizon/common/_modal_form.html" %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block form_action %}{% url 'horizon:dc_admin:dc_orchestration:createcloudpatchconfig' %}{% endblock %}
|
||||
{% block form_action %}{% url 'horizon:dc_admin:dc_orchestration:createsubcloudstrategyconfig' %}{% endblock %}
|
||||
|
||||
{% block modal-header %}{% trans "Create New Cloud Patching Configuration" %}{% endblock %}
|
||||
{% block modal-header %}{% trans "Create New Subcloud Strategy Configuration" %}{% endblock %}
|
||||
|
||||
{% block modal-body %}
|
||||
<div class="left">
|
||||
@ -14,7 +14,7 @@
|
||||
<div class="right">
|
||||
<h3>{% trans "Description:" %}</h3>
|
||||
<p>
|
||||
{% trans "Create a configuration for a specific subcloud to use the specified patch strategy settings instead of the defaults values." %}
|
||||
{% trans "Create a configuration for a specific subcloud to use the specified strategy settings instead of the defaults values." %}
|
||||
</p>
|
||||
<p>
|
||||
{% trans "Note: for Simplex systems, the default instance action must be set to stop-start (since migration is not possible on a single-node system)." %}
|
||||
@ -24,5 +24,5 @@
|
||||
|
||||
{% block modal-footer %}
|
||||
<a class="btn btn-default cancel" data-dismiss="modal">Cancel</a>
|
||||
<input class="btn btn-primary pull-right" type="submit" value="{% trans "Create Cloud Patching Configuration" %}" />
|
||||
<input class="btn btn-primary pull-right" type="submit" value="{% trans "Create Subcloud Strategy Configuration" %}" />
|
||||
{% endblock %}
|
@ -1,9 +1,9 @@
|
||||
{% extends "horizon/common/_modal_form.html" %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block form_action %}{% url 'horizon:dc_admin:dc_orchestration:editcloudpatchconfig' subcloud %}{% endblock %}
|
||||
{% block form_action %}{% url 'horizon:dc_admin:dc_orchestration:editsubcloudstrategyconfig' subcloud %}{% endblock %}
|
||||
|
||||
{% block modal-header %}{% trans "Edit Cloud Patch Configuration" %}{% endblock %}
|
||||
{% block modal-header %}{% trans "Edit Subcloud Strategy Configuration" %}{% endblock %}
|
||||
|
||||
{% block modal-body %}
|
||||
<div class="left">
|
||||
@ -14,7 +14,7 @@
|
||||
<div class="right">
|
||||
<h3>{% trans "Description:" %}</h3>
|
||||
<p>
|
||||
{% trans "Edit a configuration for a specific subcloud to use the specified patch strategy settings instead of the defaults values." %}
|
||||
{% trans "Edit a configuration for a specific subcloud to use the specified strategy settings instead of the defaults values." %}
|
||||
</p>
|
||||
<p>
|
||||
{% trans "Note: for Simplex systems, the default instance action must be set to stop-start (since migration is not possible on a single-node system)." %}
|
||||
@ -24,5 +24,5 @@
|
||||
|
||||
{% block modal-footer %}
|
||||
<a class="btn btn-default cancel" data-dismiss="modal">Cancel</a>
|
||||
<input class="btn btn-primary pull-right" type="submit" value="{% trans "Edit Cloud Patching Configuration" %}" />
|
||||
<input class="btn btn-primary pull-right" type="submit" value="{% trans "Edit Subcloud Strategy Configuration" %}" />
|
||||
{% endblock %}
|
@ -1,5 +1,5 @@
|
||||
{% load i18n sizeformat %}
|
||||
|
||||
{% block main %}
|
||||
{{ cloudpatchconfig_table.render }}
|
||||
{{ subcloudstrategyconfig_table.render }}
|
||||
{% endblock %}
|
@ -1,11 +0,0 @@
|
||||
{% extends 'base.html' %}
|
||||
{% load i18n %}
|
||||
{% block title %}{% trans "Create New Cloud Patching Configuration" %}{% endblock %}
|
||||
|
||||
{% block page_header %}
|
||||
{% include "horizon/common/_page_header.html" with title=_("Create New Cloud Patching Configuration") %}
|
||||
{% endblock page_header %}
|
||||
|
||||
{% block main %}
|
||||
{% include 'dc_admin/dc_orchestration/_create_cloud_patch_config.html' %}
|
||||
{% endblock %}
|
@ -0,0 +1,11 @@
|
||||
{% extends 'base.html' %}
|
||||
{% load i18n %}
|
||||
{% block title %}{% trans "Create New Subcloud Strategy Configuration" %}{% endblock %}
|
||||
|
||||
{% block page_header %}
|
||||
{% include "horizon/common/_page_header.html" with title=_("Create New Subcloud Strategy Configuration") %}
|
||||
{% endblock page_header %}
|
||||
|
||||
{% block main %}
|
||||
{% include 'dc_admin/dc_orchestration/_create_subcloud_strategy_config.html' %}
|
||||
{% endblock %}
|
@ -1,11 +0,0 @@
|
||||
{% extends 'base.html' %}
|
||||
{% load i18n %}
|
||||
{% block title %}{% trans "Edit Cloud Patching Configuration" %}{% endblock %}
|
||||
|
||||
{% block page_header %}
|
||||
{% include "horizon/common/_page_header.html" with title=_("Edit Cloud Patching Configuration") %}
|
||||
{% endblock page_header %}
|
||||
|
||||
{% block main %}
|
||||
{% include 'dc_admin/dc_orchestration/_edit_cloud_patch_config.html' %}
|
||||
{% endblock %}
|
@ -0,0 +1,11 @@
|
||||
{% extends 'base.html' %}
|
||||
{% load i18n %}
|
||||
{% block title %}{% trans "Edit Subcloud Strategy Configuration" %}{% endblock %}
|
||||
|
||||
{% block page_header %}
|
||||
{% include "horizon/common/_page_header.html" with title=_("Edit Subcloud Strategy Configuration") %}
|
||||
{% endblock page_header %}
|
||||
|
||||
{% block main %}
|
||||
{% include 'dc_admin/dc_orchestration/_edit_subcloud_strategy_config.html' %}
|
||||
{% endblock %}
|
@ -1,5 +1,5 @@
|
||||
#
|
||||
# Copyright (c) 2018-2022 Wind River Systems, Inc.
|
||||
# Copyright (c) 2018-2024 Wind River Systems, Inc.
|
||||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
@ -8,18 +8,18 @@ from django.conf.urls import url
|
||||
|
||||
from starlingx_dashboard.dashboards.dc_admin.dc_orchestration.views \
|
||||
import ApplyCloudStrategyView
|
||||
from starlingx_dashboard.dashboards.dc_admin.dc_orchestration.views \
|
||||
import CreateCloudPatchConfigView
|
||||
from starlingx_dashboard.dashboards.dc_admin.dc_orchestration.views \
|
||||
import CreateCloudStrategyView
|
||||
from starlingx_dashboard.dashboards.dc_admin.dc_orchestration.views \
|
||||
import CreateSubcloudGroupView
|
||||
from starlingx_dashboard.dashboards.dc_admin.dc_orchestration.views \
|
||||
import CreateSubcloudStrategyConfigView
|
||||
from starlingx_dashboard.dashboards.dc_admin.dc_orchestration.views \
|
||||
import DetailPatchView
|
||||
from starlingx_dashboard.dashboards.dc_admin.dc_orchestration.views \
|
||||
import EditCloudPatchConfigView
|
||||
from starlingx_dashboard.dashboards.dc_admin.dc_orchestration.views \
|
||||
import EditSubcloudGroupView
|
||||
from starlingx_dashboard.dashboards.dc_admin.dc_orchestration.views \
|
||||
import EditSubCloudStrategyConfigView
|
||||
from starlingx_dashboard.dashboards.dc_admin.dc_orchestration.views \
|
||||
import IndexView
|
||||
|
||||
@ -31,11 +31,12 @@ urlpatterns = [
|
||||
name='createcloudstrategy'),
|
||||
url(r'^applycloudstrategy/$', ApplyCloudStrategyView.as_view(),
|
||||
name='applycloudstrategy'),
|
||||
url(r'^createcloudpatchconfig/$', CreateCloudPatchConfigView.as_view(),
|
||||
name='createcloudpatchconfig'),
|
||||
url(r'^(?P<subcloud>[^/]+)/editcloudpatchconfig/$',
|
||||
EditCloudPatchConfigView.as_view(),
|
||||
name='editcloudpatchconfig'),
|
||||
url(r'^createsubcloudstrategyconfig/$',
|
||||
CreateSubcloudStrategyConfigView.as_view(),
|
||||
name='createsubcloudstrategyconfig'),
|
||||
url(r'^(?P<subcloud>[^/]+)/editsubcloudstrategyconfig/$',
|
||||
EditSubCloudStrategyConfigView.as_view(),
|
||||
name='editsubcloudstrategyconfig'),
|
||||
url(r'^createsubcloudgroup/$', CreateSubcloudGroupView.as_view(),
|
||||
name='createsubcloudgroup'),
|
||||
url(r'^(?P<subcloud_group>[^/]+)/editsubcloudgroup/$',
|
||||
|
@ -1,5 +1,5 @@
|
||||
#
|
||||
# Copyright (c) 2018-2022 Wind River Systems, Inc.
|
||||
# Copyright (c) 2018-2024 Wind River Systems, Inc.
|
||||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
@ -19,10 +19,10 @@ from starlingx_dashboard.dashboards.admin.software_management.views import \
|
||||
DetailPatchView as AdminDetailPatchView
|
||||
from starlingx_dashboard.dashboards.dc_admin.dc_orchestration.forms \
|
||||
import ApplyCloudStrategyForm
|
||||
from starlingx_dashboard.dashboards.dc_admin.dc_orchestration.forms \
|
||||
import CreateCloudPatchConfigForm
|
||||
from starlingx_dashboard.dashboards.dc_admin.dc_orchestration.forms \
|
||||
import CreateCloudStrategyForm
|
||||
from starlingx_dashboard.dashboards.dc_admin.dc_orchestration.forms \
|
||||
import CreateSubcloudConfigForm
|
||||
from starlingx_dashboard.dashboards.dc_admin.dc_orchestration.forms \
|
||||
import CreateSubcloudGroupForm
|
||||
from starlingx_dashboard.dashboards.dc_admin.dc_orchestration.forms \
|
||||
@ -91,23 +91,23 @@ class ApplyCloudStrategyView(forms.ModalFormView):
|
||||
return context
|
||||
|
||||
|
||||
class CreateCloudPatchConfigView(forms.ModalFormView):
|
||||
form_class = CreateCloudPatchConfigForm
|
||||
class CreateSubcloudStrategyConfigView(forms.ModalFormView):
|
||||
form_class = CreateSubcloudConfigForm
|
||||
template_name = 'dc_admin/dc_orchestration/' \
|
||||
'create_cloud_patch_config.html'
|
||||
'create_subcloud_strategy_config.html'
|
||||
context_object_name = 'config'
|
||||
success_url = reverse_lazy("horizon:dc_admin:dc_orchestration:index")
|
||||
|
||||
|
||||
class EditCloudPatchConfigView(forms.ModalFormView):
|
||||
form_class = CreateCloudPatchConfigForm
|
||||
class EditSubCloudStrategyConfigView(forms.ModalFormView):
|
||||
form_class = CreateSubcloudConfigForm
|
||||
template_name = 'dc_admin/dc_orchestration/' \
|
||||
'edit_cloud_patch_config.html'
|
||||
'edit_subcloud_strategy_config.html'
|
||||
context_object_name = 'config'
|
||||
success_url = reverse_lazy("horizon:dc_admin:dc_orchestration:index")
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super(EditCloudPatchConfigView, self).get_context_data(
|
||||
context = super(EditSubCloudStrategyConfigView, self).get_context_data(
|
||||
**kwargs)
|
||||
context['subcloud'] = self.kwargs['subcloud']
|
||||
return context
|
||||
|
Loading…
Reference in New Issue
Block a user