You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by su...@apache.org on 2025/07/30 13:00:33 UTC
(cloudstack) branch main updated (f73cb5621df -> 70468a62584)
This is an automated email from the ASF dual-hosted git repository.
sureshanaparti pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from f73cb5621df Refactoring retention of backup schedules (#11223)
add 4d2beea7773 logger fix
add 2d025bd0749 kvm: fix regression 5a52ca78ae5e165211c618525613c3d62cfd1b28 (#11342)
add 1dc134a3ecf UI: Display NSX Provider only when NSX is the selected Isolation method (#11142)
add 294aef5ecff Fix listCapacity sort by usage (#11316)
add 7e0414354a9 Merge branch '4.19' into 4.20
new 70468a62584 Merge branch '4.20'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../api/command/admin/resource/ListCapacityCmd.java | 6 ++++--
.../com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java | 4 +---
.../src/main/java/com/cloud/network/NetworkServiceImpl.java | 1 -
ui/src/views/infra/zone/ZoneWizardLaunchZone.vue | 13 +++++++++++++
4 files changed, 18 insertions(+), 6 deletions(-)
(cloudstack) 01/01: Merge branch '4.20'
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sureshanaparti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 70468a6258409f71cc52d638c15f6004b26810fa
Merge: f73cb5621df 7e0414354a9
Author: Suresh Kumar Anaparti <su...@gmail.com>
AuthorDate: Wed Jul 30 18:30:07 2025 +0530
Merge branch '4.20'
.../api/command/admin/resource/ListCapacityCmd.java | 6 ++++--
.../com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java | 4 +---
.../src/main/java/com/cloud/network/NetworkServiceImpl.java | 1 -
ui/src/views/infra/zone/ZoneWizardLaunchZone.vue | 13 +++++++++++++
4 files changed, 18 insertions(+), 6 deletions(-)
diff --cc ui/src/views/infra/zone/ZoneWizardLaunchZone.vue
index 1286967643c,31e3fadc9f6..16d384e5288
--- a/ui/src/views/infra/zone/ZoneWizardLaunchZone.vue
+++ b/ui/src/views/infra/zone/ZoneWizardLaunchZone.vue
@@@ -1108,37 -1090,18 +1109,49 @@@ export default
this.setStepStatus(STATUS_FAILED)
}
},
+ async updateNsxServiceProviderStatus () {
+ const listParams = {}
+ listParams.name = 'Nsx'
+ const nsxPhysicalNetwork = this.stepData.physicalNetworksReturned.find(net => net.isolationmethods.trim().toUpperCase() === 'NSX')
+ const nsxPhysicalNetworkId = nsxPhysicalNetwork?.id || null
+ listParams.physicalNetworkId = nsxPhysicalNetworkId
+ const nsxProviderId = await this.listNetworkServiceProviders(listParams, 'nsxProvider')
+ console.log(nsxProviderId)
+ if (nsxProviderId !== null) {
+ await this.updateNetworkServiceProvider(nsxProviderId)
+ }
+ },
+ async stepAddNetrisProvider () {
+ this.setStepStatus(STATUS_FINISH)
+ this.currentStep++
+ this.addStep('message.add.netris.controller', 'netris')
+ if (this.stepData.stepMove.includes('netris')) {
+ await this.stepConfigureStorageTraffic()
+ return
+ }
+ try {
+ if (!this.stepData.stepMove.includes('addNetrisProvider')) {
+ const providerParams = {}
+ providerParams.name = this.prefillContent?.netrisName || ''
+ providerParams.url = this.prefillContent?.url || ''
+ providerParams.username = this.prefillContent?.username || ''
+ providerParams.password = this.prefillContent?.password || ''
+ providerParams.zoneid = this.stepData.zoneReturned.id
+ providerParams.sitename = this.prefillContent?.siteName || ''
+ providerParams.tenantname = this.prefillContent?.tenantName || ''
+ providerParams.netristag = this.prefillContent?.netrisTag || ''
+
+ await this.addNetrisProvider(providerParams)
+ this.stepData.stepMove.push('addNetrisProvider')
+ }
+ this.stepData.stepMove.push('netris')
+ await this.stepConfigureStorageTraffic()
+ } catch (e) {
+ this.messageError = e
+ this.processStatus = STATUS_FAILED
+ this.setStepStatus(STATUS_FAILED)
+ }
+ },
async stepConfigureStorageTraffic () {
let targetNetwork = false
this.prefillContent.physicalNetworks.forEach(physicalNetwork => {