From 3dc04f2f698c95c40809fdd53c00476ccec64a14 Mon Sep 17 00:00:00 2001
From: Christopher de Oliveira Souza
 <Christopher.DeOliveiraSouza@windriver.com>
Date: Tue, 6 Feb 2024 17:05:01 +0000
Subject: [PATCH] Revert "Add the upload-only option to the Horizon upgrade
 orchestration UI"

This reverts commit b7955a50dc6226c0cf7c5ef99c27195aac7f7cf2.

Reason for revert: this change no longer will be necessary

Change-Id: Ia3dc73452be1f429b1a50f2f969ea80cea16adb7
---
 .../dashboards/dc_admin/dc_orchestration/forms.py          | 7 +++----
 .../dc_orchestration/_cloud_strategy_orchestration.html    | 3 +--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/dc_admin/dc_orchestration/forms.py b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/dc_admin/dc_orchestration/forms.py
index bd0a8590..a1a103a1 100644
--- a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/dc_admin/dc_orchestration/forms.py
+++ b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/dc_admin/dc_orchestration/forms.py
@@ -204,13 +204,12 @@ class CreateCloudStrategyForm(forms.SelfHandlingForm):
         label=_("Upload Only"),
         initial=False,
         required=False,
-        help_text=_('Stops strategy after uploading releases to subclouds'),
+        help_text=_('Stops strategy after uploading patches to subclouds'),
         widget=forms.CheckboxInput(
             attrs={
                 'class': 'switched',
                 'data-switch-on': 'strategy_types',
-                'data-strategy_types-patch': _("Upload Only"),
-                'data-strategy_types-upgrade': _("Upload Only")
+                'data-strategy_types-patch': _("Upload Only")
             }
         )
     )
@@ -320,7 +319,7 @@ class CreateCloudStrategyForm(forms.SelfHandlingForm):
                 del data['to-version']
             del data['force-kubernetes']
 
-            if data['type'] == 'patch' or data['type'] == 'upgrade':
+            if data['type'] == 'patch':
                 data['upload-only'] = str(data['upload-only']).lower()
             else:
                 del data['upload-only']
diff --git a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/dc_admin/dc_orchestration/templates/dc_orchestration/_cloud_strategy_orchestration.html b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/dc_admin/dc_orchestration/templates/dc_orchestration/_cloud_strategy_orchestration.html
index c7d93fca..29a6d7ce 100644
--- a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/dc_admin/dc_orchestration/templates/dc_orchestration/_cloud_strategy_orchestration.html
+++ b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/dc_admin/dc_orchestration/templates/dc_orchestration/_cloud_strategy_orchestration.html
@@ -18,8 +18,7 @@
           <dt>{% trans "Stop On Failure" %}</dt>
           <dd>{{ strategy.stop_on_failure }}</dd>
           {% if strategy.extra_args %}
-            <!--TODO(cdeolive): remove patch strategy when usm is fully integrated.-->
-            {% if strategy.strategy_type == 'patch' or strategy.strategy_type == 'upgrade' %}
+            {% if strategy.strategy_type == 'patch' %}
               <dt>{% trans "Upload Only" %}</dt>
               <dd>{{ strategy.extra_args|get_value:"upload-only" }}</dd>
             {% elif strategy.strategy_type == 'prestage' %}