Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5658,7 +5658,6 @@ private PhysicalNetworkServiceProvider addNSXProviderToPhysicalNetwork(long phys
}

addProviderToPhysicalNetwork(physicalNetworkId, Provider.Nsx.getName(), null, null);
enableProvider(Provider.Nsx.getName());
}
return null;
}
Expand Down
16 changes: 14 additions & 2 deletions ui/src/views/infra/zone/ZoneWizardLaunchZone.vue
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,6 @@ export default {
if (physicalNetwork.isolationMethod === 'NSX' &&
physicalNetwork.traffics.findIndex(traffic => traffic.type === 'public' || traffic.type === 'guest') > -1) {
this.stepData.isNsxZone = true
this.stepData.tungstenPhysicalNetworkId = physicalNetworkReturned.id
}
} else {
this.stepData.physicalNetworkReturned = this.stepData.physicalNetworkItem['createPhysicalNetwork' + index]
Expand Down Expand Up @@ -980,7 +979,7 @@ export default {
return
}

if (idx === 0) {
if (idx === 0 && this.stepData.isNsxZone) {
await this.stepConfigurePublicTraffic('message.configuring.nsx.public.traffic', 'nsxPublicTraffic', 1)
} else {
if (this.stepData.isTungstenZone) {
Expand Down Expand Up @@ -1080,6 +1079,7 @@ export default {
providerParams.transportzone = this.prefillContent?.transportZone || ''

await this.addNsxController(providerParams)
await this.updateNsxServiceProviderStatus()
this.stepData.stepMove.push('addNsxController')
}
this.stepData.stepMove.push('nsx')
Expand All @@ -1090,6 +1090,18 @@ 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 stepConfigureStorageTraffic () {
let targetNetwork = false
this.prefillContent.physicalNetworks.forEach(physicalNetwork => {
Expand Down
Loading