starlingx/gui
Code Issues Proposed changes

Merge "Add the upload-only option to the Horizon upgrade orchestration UI"

Browse Source
This commit is contained in:
Zuul 2024-01-30 13:31:07 +00:00 committed by Gerrit Code Review
commit 3368e8241f
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/dc_admin/dc_orchestration/forms.py
View File

@ -204,12 +204,13 @@ class CreateCloudStrategyForm(forms.SelfHandlingForm):
label=_("Upload Only"), label=_("Upload Only"),
initial=False, initial=False,
required=False, required=False,
help_text=_('Stops strategy after uploading patches to subclouds'), help_text=_('Stops strategy after uploading releases to subclouds'),
widget=forms.CheckboxInput( widget=forms.CheckboxInput(
attrs={ attrs={
'class': 'switched', 'class': 'switched',
'data-switch-on': 'strategy_types', 'data-switch-on': 'strategy_types',
'data-strategy_types-patch': _("Upload Only") 'data-strategy_types-patch': _("Upload Only"),
'data-strategy_types-upgrade': _("Upload Only")
} }
) )
) )
@ -321,7 +322,7 @@ class CreateCloudStrategyForm(forms.SelfHandlingForm):
del data['to-version'] del data['to-version']
del data['force-kubernetes'] del data['force-kubernetes']
if data['type'] == 'patch': if data['type'] == 'patch' or data['type'] == 'upgrade':
data['upload-only'] = str(data['upload-only']).lower() data['upload-only'] = str(data['upload-only']).lower()
else: else:
del data['upload-only'] del data['upload-only']

3
starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/dc_admin/dc_orchestration/templates/dc_orchestration/_cloud_strategy_orchestration.html
View File

@ -18,7 +18,8 @@
<dt>{% trans "Stop On Failure" %}</dt> <dt>{% trans "Stop On Failure" %}</dt>
<dd>{{ strategy.stop_on_failure }}</dd> <dd>{{ strategy.stop_on_failure }}</dd>
{% if strategy.extra_args %} {% if strategy.extra_args %}
{% if strategy.strategy_type == 'patch' %} <!--TODO(cdeolive): remove patch strategy when usm is fully integrated.-->
{% if strategy.strategy_type == 'patch' or strategy.strategy_type == 'upgrade' %}
<dt>{% trans "Upload Only" %}</dt> <dt>{% trans "Upload Only" %}</dt>
<dd>{{ strategy.extra_args|get_value:"upload-only" }}</dd> <dd>{{ strategy.extra_args|get_value:"upload-only" }}</dd>
{% elif strategy.strategy_type == 'prestage' %} {% elif strategy.strategy_type == 'prestage' %}