(cloudstack) branch 4.20 updated: UI: Fix primary storage for datastore cluster and retain traffic labels during zone deployment (#11760)

[dahn]

This is an automated email from the ASF dual-hosted git repository.

dahn pushed a commit to branch 4.20
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.20 by this push:
     new 9f20979bcee UI: Fix primary storage for datastore cluster and retain 
traffic labels during zone deployment (#11760)
9f20979bcee is described below

commit 9f20979bcee61509788f0f26520ed170a2398040
Author: Manoj Kumar <manojkr.it...@gmail.com>
AuthorDate: Wed Oct 8 17:08:03 2025 +0530

    UI: Fix primary storage for datastore cluster and retain traffic labels 
during zone deployment (#11760)
---
 ui/src/views/infra/zone/ZoneWizardAddResources.vue             | 2 +-
 ui/src/views/infra/zone/ZoneWizardLaunchZone.vue               | 4 ++--
 ui/src/views/infra/zone/ZoneWizardPhysicalNetworkSetupStep.vue | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/src/views/infra/zone/ZoneWizardAddResources.vue 
b/ui/src/views/infra/zone/ZoneWizardAddResources.vue
index c37b70d9444..4bd602f0aca 100644
--- a/ui/src/views/infra/zone/ZoneWizardAddResources.vue
+++ b/ui/src/views/infra/zone/ZoneWizardAddResources.vue
@@ -396,7 +396,7 @@ export default {
           placeHolder: 'message.error.server',
           required: true,
           display: {
-            primaryStorageProtocol: ['nfs', 'iscsi', 'gluster', 'SMB', 
'Linstor']
+            primaryStorageProtocol: ['nfs', 'iscsi', 'gluster', 'SMB', 
'Linstor', 'datastorecluster', 'vmfs']
           }
         },
         {
diff --git a/ui/src/views/infra/zone/ZoneWizardLaunchZone.vue 
b/ui/src/views/infra/zone/ZoneWizardLaunchZone.vue
index ea0b9c8c909..a787ad839cd 100644
--- a/ui/src/views/infra/zone/ZoneWizardLaunchZone.vue
+++ b/ui/src/views/infra/zone/ZoneWizardLaunchZone.vue
@@ -1510,10 +1510,10 @@ export default {
         }
         path += '/' + this.prefillContent.primaryStorageVmfsDatastore
         if (protocol === 'vmfs') {
-          url = this.vmfsURL('dummy', path)
+          url = this.vmfsURL(server, path)
         }
         if (protocol === 'datastorecluster') {
-          url = this.datastoreclusterURL('dummy', path)
+          url = this.datastoreclusterURL(server, path)
         }
       } else if (protocol === 'iscsi') {
         let iqn = this.prefillContent?.primaryStorageTargetIQN || ''
diff --git a/ui/src/views/infra/zone/ZoneWizardPhysicalNetworkSetupStep.vue 
b/ui/src/views/infra/zone/ZoneWizardPhysicalNetworkSetupStep.vue
index 1117cb6ec01..5ef0ff107be 100644
--- a/ui/src/views/infra/zone/ZoneWizardPhysicalNetworkSetupStep.vue
+++ b/ui/src/views/infra/zone/ZoneWizardPhysicalNetworkSetupStep.vue
@@ -413,7 +413,7 @@ export default {
           for (const index in net.traffics) {
             if (this.hypervisor === 'VMware') {
               delete this.physicalNetworks[idx].traffics[index].label
-            } else {
+            } else if (!net.traffics[index].label) {
               this.physicalNetworks[idx].traffics[index].label = ''
             }
             const traffic = net.traffics[index]