Skip to content

Commit f7cc3c9

Browse files
author
Hoang Nguyen
authored
UI - zone wizard - fix undefined property when setting RBD primary storage (#5167)
* zone wizard launch: fix undefined property RBD primary storage * simplycode by #4956
1 parent 16d0795 commit f7cc3c9

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

ui/src/views/infra/zone/ZoneWizardLaunchZone.vue

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1271,8 +1271,8 @@ export default {
12711271
params.zoneid = this.stepData.zoneReturned.id
12721272
params.podId = this.stepData.podReturned.id
12731273
params.clusterid = this.stepData.clusterReturned.id
1274-
params.name = this.prefillContent.primaryStorageName ? this.prefillContent.primaryStorageName.value : null
1275-
params.scope = this.prefillContent.primaryStorageScope ? this.prefillContent.primaryStorageScope.value : null
1274+
params.name = this.prefillContent.primaryStorageName?.value || null
1275+
params.scope = this.prefillContent.primaryStorageScope?.value || null
12761276
12771277
if (params.scope === 'zone') {
12781278
const hypervisor = this.prefillContent.hypervisor.value
@@ -1283,79 +1283,79 @@ export default {
12831283
}
12841284
}
12851285
1286-
var server = this.prefillContent.primaryStorageServer ? this.prefillContent.primaryStorageServer.value : null
1286+
var server = this.prefillContent.primaryStorageServer?.value || null
12871287
let url = ''
12881288
const protocol = this.prefillContent.primaryStorageProtocol.value
12891289
12901290
if (protocol === 'nfs') {
1291-
let path = this.prefillContent.primaryStoragePath.value
1291+
let path = this.prefillContent.primaryStoragePath?.value || ''
12921292
if (path.substring(0, 1) !== '/') {
12931293
path = '/' + path
12941294
}
12951295
url = this.nfsURL(server, path)
12961296
} else if (protocol === 'SMB') {
1297-
let path = this.prefillContent.primaryStoragePath.value
1297+
let path = this.prefillContent.primaryStoragePath?.value || ''
12981298
if (path.substring(0, 1) !== '/') {
12991299
path = '/' + path
13001300
}
13011301
url = this.smbURL(server, path)
1302-
params['details[0].user'] = this.prefillContent.primaryStorageSMBUsername.value
1303-
params['details[0].password'] = this.prefillContent.primaryStorageSMBPassword.value
1304-
params['details[0].domain'] = this.prefillContent.primaryStorageSMBDomain.value
1302+
params['details[0].user'] = this.prefillContent.primaryStorageSMBUsername?.value || null
1303+
params['details[0].password'] = this.prefillContent.primaryStorageSMBPassword?.value || null
1304+
params['details[0].domain'] = this.prefillContent.primaryStorageSMBDomain?.value || null
13051305
} else if (protocol === 'PreSetup') {
13061306
let path = ''
13071307
if (this.stepData.clusterReturned.hypervisortype === 'XenServer') {
1308-
path = this.prefillContent.primaryStorageSRLabel.value
1308+
path = this.prefillContent.primaryStorageSRLabel?.value || ''
13091309
server = 'localhost'
13101310
} else {
1311-
path = this.prefillContent.primaryStoragePath.value
1311+
path = this.prefillContent.primaryStoragePath?.value || ''
13121312
}
13131313
if (path.substring(0, 1) !== '/') {
13141314
path = '/' + path
13151315
}
13161316
url = this.presetupURL(server, path)
13171317
} else if (protocol === 'ocfs2') {
1318-
let path = this.prefillContent.primaryStoragePath.value
1318+
let path = this.prefillContent.primaryStoragePath?.value || ''
13191319
if (path.substring(0, 1) !== '/') {
13201320
path = '/' + path
13211321
}
13221322
url = this.ocfs2URL(server, path)
13231323
} else if (protocol === 'SharedMountPoint') {
1324-
let path = this.prefillContent.primaryStoragePath.value
1324+
let path = this.prefillContent.primaryStoragePath?.value || ''
13251325
if (path.substring(0, 1) !== '/') {
13261326
path = '/' + path
13271327
}
13281328
url = this.sharedMountPointURL(server, path)
13291329
} else if (protocol === 'clvm') {
1330-
let vg = this.prefillContent.primaryStorageVolumeGroup.value
1330+
let vg = this.prefillContent.primaryStorageVolumeGroup?.value || ''
13311331
if (vg.substring(0, 1) !== '/') {
13321332
vg = '/' + vg
13331333
}
13341334
url = this.clvmURL(vg)
13351335
} else if (protocol === 'rbd') {
1336-
const rbdmonitor = this.prefillContent.primaryStorageRADOSMonitor.value
1337-
const rbdpool = this.prefillContent.primaryStorageRADOSPool.value
1338-
const rbdid = this.prefillContent.primaryStorageRADOSUser.value
1339-
const rbdsecret = this.prefillContent.primaryStorage.value
1336+
const rbdmonitor = this.prefillContent.primaryStorageRADOSMonitor?.value || ''
1337+
const rbdpool = this.prefillContent.primaryStorageRADOSPool?.value || ''
1338+
const rbdid = this.prefillContent.primaryStorageRADOSUser?.value || ''
1339+
const rbdsecret = this.prefillContent.primaryStorageRADOSSecret?.value || ''
13401340
url = this.rbdURL(rbdmonitor, rbdpool, rbdid, rbdsecret)
13411341
} else if (protocol === 'vmfs') {
1342-
let path = this.prefillContent.primaryStorageVmfsDatacenter.value
1342+
let path = this.prefillContent.primaryStorageVmfsDatacenter?.value || ''
13431343
if (path.substring(0, 1) !== '/') {
13441344
path = '/' + path
13451345
}
1346-
path += '/' + this.prefillContent.primaryStorageVmfsDatastore.value
1346+
path += '/' + this.prefillContent.primaryStorageVmfsDatastore?.value || ''
13471347
url = this.vmfsURL('dummy', path)
13481348
} else {
1349-
let iqn = this.prefillContent.primaryStorageTargetIQN.value
1349+
let iqn = this.prefillContent.primaryStorageTargetIQN?.value || ''
13501350
if (iqn.substring(0, 1) !== '/') {
13511351
iqn = '/' + iqn
13521352
}
1353-
const lun = this.prefillContent.primaryStorageLUN.value
1353+
const lun = this.prefillContent.primaryStorageLUN?.value || ''
13541354
url = this.iscsiURL(server, iqn, lun)
13551355
}
13561356
13571357
params.url = url
1358-
params.tags = this.prefillContent.primaryStorageTags.value
1358+
params.tags = this.prefillContent.primaryStorageTags?.value || ''
13591359
13601360
try {
13611361
if (!this.stepData.stepMove.includes('createStoragePool')) {

0 commit comments

Comments
 (0)