Skip to content

bugfix/CSTACKEX-135: added Netapp ontap screen during zone creation #39

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
piyush5netapp merged 2 commits into from
Apr 15, 2026
Merged

bugfix/CSTACKEX-135: added Netapp ontap screen during zone creation #39

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb42a47
bugfix/CSTACKEX-135: added Netapp ontap screen during zone creation
Mar 27, 2026
ce20ab8
bugfix/CSTACKEX-135: commensr resolution
Apr 9, 2026
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
15 changes: 15 additions & 0 deletions ui/src/views/infra/zone/StaticInputsForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,12 @@ export default {
message: this.$t(field.message)
})
}
if (field.number) {
Comment thread
piyush5netapp marked this conversation as resolved.
Outdated
this.rules[field.key].push({
validator: this.checkNumberFormat,
message: this.$t('message.error.number')
})
}
Copy link

Copilot AI Apr 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new field.number validation looks unused: a repo-wide search shows no field definitions passing number: true, so this validator and rule branch won’t run for any current forms. Either add number: true to the relevant numeric/string-numeric fields (e.g., capacity fields) or remove this to avoid carrying dead code.

Suggested change
if (field.number) {
this.rules[field.key].push({
validator: this.checkNumberFormat,
message: this.$t('message.error.number')
})
}

Copilot uses AI. Check for mistakes.
},
getPrefilled (field) {
if (field.key === 'authmethod' && this.hypervisor !== 'KVM') {
Expand Down Expand Up @@ -247,6 +253,15 @@ export default {
return Promise.resolve()
}
},
async checkNumberFormat (rule, value) {
if (!value || value === '') {
return Promise.resolve()
} else if (!/^\d+$/.test(String(value).replace(/,/g, ''))) {
return Promise.reject(rule.message)
} else {
return Promise.resolve()
}
},
isDisplayInput (field) {
if (!field.display && !field.hidden) {
return true
Expand Down
56 changes: 52 additions & 4 deletions ui/src/views/infra/zone/ZoneWizardAddResources.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,14 +589,14 @@ export default {
title: 'label.capacityiops',
key: 'capacityIops',
hidden: {
provider: ['DefaultPrimary', 'PowerFlex', 'Linstor']
provider: ['DefaultPrimary', 'PowerFlex', 'Linstor', 'NetApp ONTAP']
}
},
{
title: 'label.url',
key: 'url',
hidden: {
provider: ['DefaultPrimary', 'PowerFlex', 'Linstor']
provider: ['DefaultPrimary', 'PowerFlex', 'Linstor', 'NetApp ONTAP']
}
Comment thread
piyush5netapp marked this conversation as resolved.
},
{
Expand Down Expand Up @@ -636,6 +636,43 @@ export default {
provider: 'PowerFlex'
}
},
{
title: 'label.ontap.ip',
key: 'ontapIP',
required: true,
placeHolder: 'message.error.input.value',
display: {
provider: 'NetApp ONTAP'
}
},
{
title: 'label.username',
key: 'ontapUsername',
required: true,
placeHolder: 'message.error.input.value',
display: {
provider: 'NetApp ONTAP'
}
},
{
title: 'label.password',
key: 'ontapPassword',
required: true,
placeHolder: 'message.error.input.value',
password: true,
display: {
provider: 'NetApp ONTAP'
}
},
{
title: 'label.ontap.svm.name',
key: 'ontapSvmName',
required: true,
placeHolder: 'message.error.input.value',
display: {
provider: 'NetApp ONTAP'
}
},
{
title: 'label.storage.tags',
key: 'primaryStorageTags',
Expand Down Expand Up @@ -909,9 +946,9 @@ export default {
},
watch: {
'prefillContent.provider' (newVal, oldVal) {
if (['SolidFire', 'PowerFlex'].includes(newVal) && !['SolidFire', 'PowerFlex'].includes(oldVal)) {
if (['SolidFire', 'PowerFlex', 'NetApp ONTAP'].includes(newVal) && !['SolidFire', 'PowerFlex', 'NetApp ONTAP'].includes(oldVal)) {
this.$emit('fieldsChanged', { primaryStorageProtocol: undefined })
} else if (!['SolidFire', 'PowerFlex'].includes(newVal) && ['SolidFire', 'PowerFlex'].includes(oldVal)) {
} else if (!['SolidFire', 'PowerFlex', 'NetApp ONTAP'].includes(newVal) && ['SolidFire', 'PowerFlex', 'NetApp ONTAP'].includes(oldVal)) {
this.$emit('fieldsChanged', { primaryStorageProtocol: undefined })
}

Expand Down Expand Up @@ -996,6 +1033,17 @@ export default {
this.primaryStorageScopes = scope
},
fetchProtocol () {
const provider = this.prefillContent?.provider || null
if (provider === 'NetApp ONTAP') {
this.primaryStorageProtocols = [
{ id: 'NFS3', description: 'NFS3' },
{ id: 'ISCSI', description: 'ISCSI' }
]
if (!['NFS3', 'ISCSI'].includes(this.prefillContent?.primaryStorageProtocol)) {
this.$emit('fieldsChanged', { primaryStorageProtocol: 'NFS3' })
}
return
}
const hypervisor = this.prefillContent?.hypervisor || null
const protocols = []
if (hypervisor === 'KVM') {
Expand Down
18 changes: 17 additions & 1 deletion ui/src/views/infra/zone/ZoneWizardLaunchZone.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1584,7 +1584,7 @@ export default {
}

params.url = url
if (this.prefillContent.provider !== 'DefaultPrimary' && this.prefillContent.provider !== 'PowerFlex') {
if (this.prefillContent.provider !== 'DefaultPrimary' && this.prefillContent.provider !== 'PowerFlex' && this.prefillContent.provider !== 'NetApp ONTAP') {
if (this.prefillContent.managed) {
params.managed = true
} else {
Expand All @@ -1604,6 +1604,18 @@ export default {
params.url = this.powerflexURL(this.prefillContent.powerflexGateway, this.prefillContent.powerflexGatewayUsername,
this.prefillContent.powerflexGatewayPassword, this.prefillContent.powerflexStoragePool)
}
if (this.prefillContent.provider === 'NetApp ONTAP') {
params['details[0].storageIP'] = this.prefillContent.ontapIP
params['details[0].username'] = this.prefillContent.ontapUsername
params['details[0].password'] = btoa(this.prefillContent.ontapPassword)
params['details[0].svmName'] = this.prefillContent.ontapSvmName
params['details[0].protocol'] = this.prefillContent.primaryStorageProtocol
params.managed = true
params.url = this.ontapURL(this.prefillContent.ontapIP)
if (this.prefillContent.capacityBytes && this.prefillContent.capacityBytes.length > 0) {
params.capacityBytes = this.prefillContent.capacityBytes.split(',').join('')
}
}

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

Expand Down Expand Up @@ -2486,6 +2498,10 @@ export default {
var url = 'powerflex://' + encodeURIComponent(username) + ':' + encodeURIComponent(password) + '@' +
gateway + '/' + encodeURIComponent(pool)
return url
},
ontapURL (ontapIp) {
var url = 'https://' + ontapIp
return url
}
}
}
Expand Down
Loading