From 7d3fb3ba1f0d4a2b35a24e089ceb52f0c11a4a18 Mon Sep 17 00:00:00 2001 From: Manoj Kumar Date: Tue, 30 Sep 2025 11:39:17 +0530 Subject: [PATCH 1/3] UI: retain traffic labels during zone deployment --- .../views/infra/zone/ZoneWizardPhysicalNetworkSetupStep.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ui/src/views/infra/zone/ZoneWizardPhysicalNetworkSetupStep.vue b/ui/src/views/infra/zone/ZoneWizardPhysicalNetworkSetupStep.vue index 1117cb6ec014..58076a0092b7 100644 --- a/ui/src/views/infra/zone/ZoneWizardPhysicalNetworkSetupStep.vue +++ b/ui/src/views/infra/zone/ZoneWizardPhysicalNetworkSetupStep.vue @@ -414,7 +414,9 @@ export default { if (this.hypervisor === 'VMware') { delete this.physicalNetworks[idx].traffics[index].label } else { - this.physicalNetworks[idx].traffics[index].label = '' + if (!net.traffics[index].label) { + this.physicalNetworks[idx].traffics[index].label = '' + } } const traffic = net.traffics[index] if (traffic.type === 'storage') { From 1d996fbdcc9a7865b807d5b178d704671d43d8ed Mon Sep 17 00:00:00 2001 From: Manoj Kumar Date: Wed, 1 Oct 2025 16:11:27 +0530 Subject: [PATCH 2/3] fix primary storage creation for datastore --- ui/src/views/infra/zone/ZoneWizardAddResources.vue | 2 +- ui/src/views/infra/zone/ZoneWizardLaunchZone.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/src/views/infra/zone/ZoneWizardAddResources.vue b/ui/src/views/infra/zone/ZoneWizardAddResources.vue index c37b70d94448..4bd602f0acaa 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 ea0b9c8c9093..a787ad839cdb 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 || '' From 9fd28b5228ef04cfcec6b9eb7b582e24540c5cf5 Mon Sep 17 00:00:00 2001 From: Manoj Kumar Date: Tue, 7 Oct 2025 15:30:13 +0530 Subject: [PATCH 3/3] commit suggestion --- .../views/infra/zone/ZoneWizardPhysicalNetworkSetupStep.vue | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ui/src/views/infra/zone/ZoneWizardPhysicalNetworkSetupStep.vue b/ui/src/views/infra/zone/ZoneWizardPhysicalNetworkSetupStep.vue index 58076a0092b7..5ef0ff107be7 100644 --- a/ui/src/views/infra/zone/ZoneWizardPhysicalNetworkSetupStep.vue +++ b/ui/src/views/infra/zone/ZoneWizardPhysicalNetworkSetupStep.vue @@ -413,10 +413,8 @@ export default { for (const index in net.traffics) { if (this.hypervisor === 'VMware') { delete this.physicalNetworks[idx].traffics[index].label - } else { - if (!net.traffics[index].label) { - this.physicalNetworks[idx].traffics[index].label = '' - } + } else if (!net.traffics[index].label) { + this.physicalNetworks[idx].traffics[index].label = '' } const traffic = net.traffics[index] if (traffic.type === 'storage') {