mirror of https://github.com/apache/cloudstack.git
Merge release branch 4.18 to 4.19
* 4.18: UI: ignore error when list public ips for CKS clusters on Shared network (#8489)
This commit is contained in:
commit
80adf5ead1
|
|
@ -205,7 +205,7 @@ export default {
|
|||
virtualmachines: [],
|
||||
vmColumns: [],
|
||||
networkLoading: false,
|
||||
network: {},
|
||||
network: null,
|
||||
publicIpAddress: null,
|
||||
currentTab: 'details',
|
||||
cksSshStartingPort: 2222,
|
||||
|
|
@ -386,7 +386,27 @@ export default {
|
|||
this.virtualmachines.map(x => { x.ipaddress = x.nic[0].ipaddress })
|
||||
this.instanceLoading = false
|
||||
},
|
||||
fetchPublicIpAddress () {
|
||||
fetchNetwork () {
|
||||
this.networkLoading = true
|
||||
return new Promise((resolve, reject) => {
|
||||
api('listNetworks', {
|
||||
listAll: true,
|
||||
id: this.resource.networkid
|
||||
}).then(json => {
|
||||
const networks = json.listnetworksresponse.network
|
||||
if (this.arrayHasItems(networks)) {
|
||||
this.network = networks[0]
|
||||
}
|
||||
})
|
||||
this.networkLoading = false
|
||||
})
|
||||
},
|
||||
async fetchPublicIpAddress () {
|
||||
await this.fetchNetwork()
|
||||
if (this.network && this.network.type === 'Shared') {
|
||||
this.publicIpAddress = null
|
||||
return
|
||||
}
|
||||
this.networkLoading = true
|
||||
var params = {
|
||||
listAll: true,
|
||||
|
|
|
|||
Loading…
Reference in New Issue