Skip to content

UI - zone wizard - fix undefined property when setting RBD primary storage #5167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sureshanaparti merged 2 commits into from
Jul 9, 2021
Merged

UI - zone wizard - fix undefined property when setting RBD primary storage #5167

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
541e0b1
zone wizard launch: fix undefined property RBD primary storage
Jun 30, 2021
40a07d5
simplycode by #4956
Jun 30, 2021
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
44 changes: 22 additions & 22 deletions ui/src/views/infra/zone/ZoneWizardLaunchZone.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1271,8 +1271,8 @@ export default {
params.zoneid = this.stepData.zoneReturned.id
params.podId = this.stepData.podReturned.id
params.clusterid = this.stepData.clusterReturned.id
params.name = this.prefillContent.primaryStorageName ? this.prefillContent.primaryStorageName.value : null
params.scope = this.prefillContent.primaryStorageScope ? this.prefillContent.primaryStorageScope.value : null
params.name = this.prefillContent.primaryStorageName?.value || null
params.scope = this.prefillContent.primaryStorageScope?.value || null

if (params.scope === 'zone') {
const hypervisor = this.prefillContent.hypervisor.value
Expand All @@ -1283,79 +1283,79 @@ export default {
}
}

var server = this.prefillContent.primaryStorageServer ? this.prefillContent.primaryStorageServer.value : null
var server = this.prefillContent.primaryStorageServer?.value || null
let url = ''
const protocol = this.prefillContent.primaryStorageProtocol.value

if (protocol === 'nfs') {
let path = this.prefillContent.primaryStoragePath.value
let path = this.prefillContent.primaryStoragePath?.value || ''
if (path.substring(0, 1) !== '/') {
path = '/' + path
}
url = this.nfsURL(server, path)
} else if (protocol === 'SMB') {
let path = this.prefillContent.primaryStoragePath.value
let path = this.prefillContent.primaryStoragePath?.value || ''
if (path.substring(0, 1) !== '/') {
path = '/' + path
}
url = this.smbURL(server, path)
params['details[0].user'] = this.prefillContent.primaryStorageSMBUsername.value
params['details[0].password'] = this.prefillContent.primaryStorageSMBPassword.value
params['details[0].domain'] = this.prefillContent.primaryStorageSMBDomain.value
params['details[0].user'] = this.prefillContent.primaryStorageSMBUsername?.value || null
params['details[0].password'] = this.prefillContent.primaryStorageSMBPassword?.value || null
params['details[0].domain'] = this.prefillContent.primaryStorageSMBDomain?.value || null
} else if (protocol === 'PreSetup') {
let path = ''
if (this.stepData.clusterReturned.hypervisortype === 'XenServer') {
path = this.prefillContent.primaryStorageSRLabel.value
path = this.prefillContent.primaryStorageSRLabel?.value || ''
server = 'localhost'
} else {
path = this.prefillContent.primaryStoragePath.value
path = this.prefillContent.primaryStoragePath?.value || ''
}
if (path.substring(0, 1) !== '/') {
path = '/' + path
}
url = this.presetupURL(server, path)
} else if (protocol === 'ocfs2') {
let path = this.prefillContent.primaryStoragePath.value
let path = this.prefillContent.primaryStoragePath?.value || ''
if (path.substring(0, 1) !== '/') {
path = '/' + path
}
url = this.ocfs2URL(server, path)
} else if (protocol === 'SharedMountPoint') {
let path = this.prefillContent.primaryStoragePath.value
let path = this.prefillContent.primaryStoragePath?.value || ''
if (path.substring(0, 1) !== '/') {
path = '/' + path
}
url = this.sharedMountPointURL(server, path)
} else if (protocol === 'clvm') {
let vg = this.prefillContent.primaryStorageVolumeGroup.value
let vg = this.prefillContent.primaryStorageVolumeGroup?.value || ''
if (vg.substring(0, 1) !== '/') {
vg = '/' + vg
}
url = this.clvmURL(vg)
} else if (protocol === 'rbd') {
const rbdmonitor = this.prefillContent.primaryStorageRADOSMonitor.value
const rbdpool = this.prefillContent.primaryStorageRADOSPool.value
const rbdid = this.prefillContent.primaryStorageRADOSUser.value
const rbdsecret = this.prefillContent.primaryStorage.value
const rbdmonitor = this.prefillContent.primaryStorageRADOSMonitor?.value || ''
const rbdpool = this.prefillContent.primaryStorageRADOSPool?.value || ''
const rbdid = this.prefillContent.primaryStorageRADOSUser?.value || ''
const rbdsecret = this.prefillContent.primaryStorageRADOSSecret?.value || ''
url = this.rbdURL(rbdmonitor, rbdpool, rbdid, rbdsecret)
} else if (protocol === 'vmfs') {
let path = this.prefillContent.primaryStorageVmfsDatacenter.value
let path = this.prefillContent.primaryStorageVmfsDatacenter?.value || ''
if (path.substring(0, 1) !== '/') {
path = '/' + path
}
path += '/' + this.prefillContent.primaryStorageVmfsDatastore.value
path += '/' + this.prefillContent.primaryStorageVmfsDatastore?.value || ''
url = this.vmfsURL('dummy', path)
} else {
let iqn = this.prefillContent.primaryStorageTargetIQN.value
let iqn = this.prefillContent.primaryStorageTargetIQN?.value || ''
if (iqn.substring(0, 1) !== '/') {
iqn = '/' + iqn
}
const lun = this.prefillContent.primaryStorageLUN.value
const lun = this.prefillContent.primaryStorageLUN?.value || ''
url = this.iscsiURL(server, iqn, lun)
}

params.url = url
params.tags = this.prefillContent.primaryStorageTags.value
params.tags = this.prefillContent.primaryStorageTags?.value || ''

try {
if (!this.stepData.stepMove.includes('createStoragePool')) {
Expand Down