etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.16'

This commit is contained in:
nvazquez 2022-05-04 23:16:01 -03:00
parent 3dcb93d981 556f9dac0f
commit 5bdfa35b3d
No known key found for this signature in database
GPG Key ID: 656E1BCC8CB54F84
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ui/src/views/network/CreateIsolatedNetworkForm.vue
View File

@ -376,15 +376,19 @@ export default {
} else { // from guest network section
var params = {}
this.networkOfferingLoading = true
api('listVPCs', params).then(json => {
const listVPCs = json.listvpcsresponse.vpc
var vpcAvailable = this.arrayHasItems(listVPCs)
if (vpcAvailable === false) {
this.fetchNetworkOfferingData(false)
} else {
this.fetchNetworkOfferingData()
}
})
if ('listVPCs' in this.$store.getters.apis) {
api('listVPCs', params).then(json => {
const listVPCs = json.listvpcsresponse.vpc
var vpcAvailable = this.arrayHasItems(listVPCs)
if (vpcAvailable === false) {
this.fetchNetworkOfferingData(false)
} else {
this.fetchNetworkOfferingData()
}
})
} else {
this.fetchNetworkOfferingData(false)
}
}
},
fetchNetworkOfferingData (forVpc) {

22
ui/src/views/network/CreateL2NetworkForm.vue
View File

@ -346,15 +346,19 @@ export default {
} else { // from guest network section
var params = {}
this.networkOfferingLoading = true
api('listVPCs', params).then(json => {
const listVPCs = json.listvpcsresponse.vpc
var vpcAvailable = this.arrayHasItems(listVPCs)
if (vpcAvailable === false) {
this.fetchNetworkOfferingData(false)
} else {
this.fetchNetworkOfferingData()
}
})
if ('listVPCs' in this.$store.getters.apis) {
api('listVPCs', params).then(json => {
const listVPCs = json.listvpcsresponse.vpc
var vpcAvailable = this.arrayHasItems(listVPCs)
if (vpcAvailable === false) {
this.fetchNetworkOfferingData(false)
} else {
this.fetchNetworkOfferingData()
}
})
} else {
this.fetchNetworkOfferingData(false)
}
}
},
fetchNetworkOfferingData (forVpc) {