Skip to content

UI: add a provider for primary storage when adding zone wizard #6429

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
yadvr merged 5 commits into from
Jun 20, 2022
+163 −14
Merged

UI: add a provider for primary storage when adding zone wizard #6429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
731f0ca
add provider in creating primary storage when adding new zone
Jun 1, 2022
6a9f247
add custom protocol for SolidFire/PowerFlex provider
Jun 3, 2022
f2fb207
set the custom protocol option available with the rest of the protoco…
Jun 7, 2022
d815b9c
fixes indexOf error & auto-select protocol
Jun 8, 2022
c787bdb
set server=localhost with SharedMountPoint protocol
Jun 8, 2022
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
47 changes: 35 additions & 12 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 @@ -35,7 +35,7 @@
:name="field.key"
:ref="field.key"
:label="$t(field.title)"
v-if="isDisplayInput(field.display)"
v-if="isDisplayInput(field)"
v-bind="formItemLayout"
:has-feedback="field.switch ? false : true">
<a-select
Expand All @@ -61,6 +61,11 @@
v-model:checked="form[field.key]"
v-focus="index === 0"
/>
<a-checkbox
v-else-if="field.checkbox"
v-model:checked="form[field.key]"
v-focus="index === 0">
</a-checkbox>
<a-input
v-else-if="field.password"
type="password"
Expand Down Expand Up @@ -137,6 +142,11 @@ export default {
const fieldsChanged = toRaw(changedFields)
this.$emit('fieldsChanged', fieldsChanged)
}
},
'prefillContent.provider' (val) {
if (['SolidFire', 'PowerFlex'].includes(val)) {
this.form.primaryStorageProtocol = 'custom'
}
}
},
methods: {
Expand All @@ -148,17 +158,17 @@ export default {
fillValue () {
this.fields.forEach(field => {
this.setRules(field)
const fieldExists = this.isDisplayInput(field.display)
const fieldExists = this.isDisplayInput(field)
if (!fieldExists) {
return
}
if (field.key === 'agentUserName' && !this.getPrefilled(field.key)) {
if (field.key === 'agentUserName' && !this.getPrefilled(field)) {
this.form[field.key] = 'Oracle'
} else {
if (field.switch) {
if (field.switch || field.checkbox) {
this.form[field.key] = this.isChecked(field)
} else {
this.form[field.key] = this.getPrefilled(field.key)
this.form[field.key] = this.getPrefilled(field)
}
}
})
Expand All @@ -179,8 +189,8 @@ export default {
})
}
},
getPrefilled (key) {
return this.prefillContent?.[key] || null
getPrefilled (field) {
return this.prefillContent?.[field.key] || field.value || undefined
},
handleSubmit () {
this.formRef.value.validate().then(() => {
Expand All @@ -207,7 +217,11 @@ export default {
return Promise.resolve()
}
},
isDisplayInput (conditions) {
isDisplayInput (field) {
if (!field.display && !field.hidden) {
return true
}
const conditions = field.display || field.hidden
if (!conditions || Object.keys(conditions).length === 0) {
return true
}
Expand All @@ -218,10 +232,19 @@ export default {
const fieldVal = this.form[key]
? this.form[key]
: (this.prefillContent?.[key] || null)
if (Array.isArray(condition) && !condition.includes(fieldVal)) {
isShow = false
} else if (!Array.isArray(condition) && fieldVal !== condition) {
isShow = false

if (field.hidden) {
if (Array.isArray(condition) && condition.includes(fieldVal)) {
isShow = false
} else if (!Array.isArray(condition) && fieldVal === condition) {
isShow = false
}
} else if (field.display) {
if (Array.isArray(condition) && !condition.includes(fieldVal)) {
isShow = false
} else if (!Array.isArray(condition) && fieldVal !== condition) {
isShow = false
}
}
}
})
Expand Down
100 changes: 99 additions & 1 deletion ui/src/views/infra/zone/ZoneWizardAddResources.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,6 +499,81 @@ export default {
primaryStorageProtocol: 'Linstor'
}
},
{
title: 'label.provider',
key: 'provider',
placeHolder: 'message.error.select',
value: 'DefaultPrimary',
select: true,
required: true,
options: this.primaryStorageProviders
},
{
title: 'label.ismanaged',
key: 'managed',
checkbox: true,
hidden: {
provider: ['DefaultPrimary', 'PowerFlex', 'Linstor']
}
},
{
title: 'label.capacitybytes',
key: 'capacityBytes',
hidden: {
provider: ['DefaultPrimary', 'PowerFlex', 'Linstor']
}
},
{
title: 'label.capacityiops',
key: 'capacityIops',
hidden: {
provider: ['DefaultPrimary', 'PowerFlex', 'Linstor']
}
},
{
title: 'label.url',
key: 'url',
hidden: {
provider: ['DefaultPrimary', 'PowerFlex', 'Linstor']
}
},
{
title: 'label.powerflex.gateway',
key: 'powerflexGateway',
required: true,
placeHolder: 'message.error.input.value',
display: {
provider: 'PowerFlex'
}
},
{
title: 'label.powerflex.gateway.username',
key: 'powerflexGatewayUsername',
required: true,
placeHolder: 'message.error.input.value',
display: {
provider: 'PowerFlex'
}
},
{
title: 'label.powerflex.gateway.password',
key: 'powerflexGatewayPassword',
required: true,
placeHolder: 'message.error.input.value',
password: true,
display: {
provider: 'PowerFlex'
}
},
{
title: 'label.powerflex.storage.pool',
key: 'powerflexStoragePool',
required: true,
placeHolder: 'message.error.input.value',
display: {
provider: 'PowerFlex'
}
},
{
title: 'label.storage.tags',
key: 'primaryStorageTags',
Expand Down Expand Up @@ -721,9 +796,10 @@ export default {
currentHypervisor: null,
primaryStorageScopes: [],
primaryStorageProtocols: [],
primaryStorageProviders: [],
storageProviders: [],
currentStep: null,
options: ['primaryStorageScope', 'primaryStorageProtocol', 'provider']
options: ['primaryStorageScope', 'primaryStorageProtocol', 'provider', 'primaryStorageProvider']
}
},
created () {
Expand All @@ -750,6 +826,17 @@ export default {
}
}
},
watch: {
'prefillContent.provider' (newVal, oldVal) {
if (['SolidFire', 'PowerFlex'].includes(newVal) && !['SolidFire', 'PowerFlex'].includes(oldVal)) {
this.$emit('fieldsChanged', { primaryStorageProtocol: undefined })
} else if (!['SolidFire', 'PowerFlex'].includes(newVal) && ['SolidFire', 'PowerFlex'].includes(oldVal)) {
this.$emit('fieldsChanged', { primaryStorageProtocol: undefined })
}

this.fetchProtocol()
}
},
methods: {
nextPressed () {
if (this.currentStep === this.steps.length - 1) {
Expand Down Expand Up @@ -800,6 +887,9 @@ export default {
case 'provider':
this.fetchProvider()
break
case 'primaryStorageProvider':
this.fetchPrimaryStorageProvider()
break
default:
break
}
Expand Down Expand Up @@ -912,6 +1002,7 @@ export default {
})
}

protocols.push({ id: 'custom', description: 'custom' })
this.primaryStorageProtocols = protocols
},
async fetchConfigurationSwitch () {
Expand Down Expand Up @@ -956,6 +1047,13 @@ export default {
this.storageProviders = storageProviders
})
},
fetchPrimaryStorageProvider () {
this.primaryStorageProviders = []
api('listStorageProviders', { type: 'primary' }).then(json => {
this.primaryStorageProviders = json.liststorageprovidersresponse.dataStoreProvider || []
this.primaryStorageProviders.map((item, idx) => { this.primaryStorageProviders[idx].id = item.name })
})
},
submitLaunchZone () {
this.$emit('submitLaunchZone')
},
Expand Down
30 changes: 29 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 @@ -1276,6 +1276,7 @@ export default {
params.clusterid = this.stepData.clusterReturned.id
params.name = this.prefillContent?.primaryStorageName || null
params.scope = this.prefillContent?.primaryStorageScope || null
params.provider = this.prefillContent.provider

if (params.scope === 'zone') {
const hypervisor = this.prefillContent.hypervisor
Expand Down Expand Up @@ -1324,6 +1325,7 @@ export default {
}
url = this.ocfs2URL(server, path)
} else if (protocol === 'SharedMountPoint') {
server = 'localhost'
let path = this.prefillContent?.primaryStoragePath || ''
if (path.substring(0, 1) !== '/') {
path = '/' + path
Expand Down Expand Up @@ -1356,7 +1358,7 @@ export default {
if (protocol === 'datastorecluster') {
url = this.datastoreclusterURL('dummy', path)
}
} else {
} else if (protocol === 'iscsi') {
let iqn = this.prefillContent?.primaryStorageTargetIQN || ''
if (iqn.substring(0, 1) !== '/') {
iqn = '/' + iqn
Expand All @@ -1366,6 +1368,27 @@ export default {
}

params.url = url
if (this.prefillContent.provider !== 'DefaultPrimary' && this.prefillContent.provider !== 'PowerFlex') {
if (this.prefillContent.managed) {
params.managed = true
} else {
params.managed = false
}
if (this.prefillContent.capacityBytes && this.prefillContent.capacityBytes.length > 0) {
params.capacityBytes = this.prefillContent.capacityBytes.split(',').join('')
}
if (this.prefillContent.capacityIops && this.prefillContent.capacityIops.length > 0) {
params.capacityIops = this.prefillContent.capacityIops.split(',').join('')
}
if (this.prefillContent.url && this.prefillContent.url.length > 0) {
params.url = this.prefillContent.url
}
}
if (this.prefillContent.provider === 'PowerFlex') {
params.url = this.powerflexURL(this.prefillContent.powerflexGateway, this.prefillContent.powerflexGatewayUsername,
this.prefillContent.powerflexGatewayPassword, this.prefillContent.powerflexStoragePool)
}

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

try {
Expand Down Expand Up @@ -2168,6 +2191,11 @@ export default {
url = server + iqn + '/' + lun
}
return url
},
powerflexURL (gateway, username, password, pool) {
var url = 'powerflex://' + encodeURIComponent(username) + ':' + encodeURIComponent(password) + '@' +
gateway + '/' + encodeURIComponent(pool)
return url
}
}
}
Expand Down