Skip to content
This repository has been archived by the owner on Jan 20, 2021. It is now read-only.

[UI] UI Changes to support new storage plugin for PowerFlex/ScaleIO storage pool #863

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions public/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1592,6 +1592,10 @@
"label.portable.ip.ranges": "Portable IP Ranges",
"label.portableipaddress": "Portable IPs",
"label.portforwarding": "Port Forwarding",
"label.powerflex.gateway": "Gateway",
"label.powerflex.gateway.username": "Gateway Username",
"label.powerflex.gateway.password": "Gateway Password",
"label.powerflex.storage.pool": "Storage Pool",
"label.powerstate": "Power State",
"label.preferred": "Prefered",
"label.presetup": "PreSetup",
Expand Down
3 changes: 2 additions & 1 deletion src/config/section/compute.js
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,8 @@ export default {
args: ['virtualmachineid', 'name', 'description', 'snapshotmemory', 'quiescevm'],
show: (record) => {
return ((['Running'].includes(record.state) && record.hypervisor !== 'LXC') ||
(['Stopped'].includes(record.state) && record.hypervisor !== 'KVM' && record.hypervisor !== 'LXC'))
(['Stopped'].includes(record.state) && ((record.hypervisor !== 'KVM' && record.hypervisor !== 'LXC') ||
(record.hypervisor === 'KVM' && record.pooltype === 'PowerFlex'))))
},
mapping: {
virtualmachineid: {
Expand Down
67 changes: 64 additions & 3 deletions src/views/infra/AddPrimaryStorage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -202,13 +202,13 @@
</span>
<a-select
v-decorator="['provider', { initialValue: providerSelected, rules: [{ required: true, message: `${$t('label.required')}`}] }]"
@change="val => this.providerSelected = val">
@change="updateProviderAndProtocol">
<a-select-option :value="provider" v-for="(provider,idx) in providers" :key="idx">
{{ provider }}
</a-select-option>
</a-select>
</a-form-item>
<div v-if="this.providerSelected !== 'DefaultPrimary'">
<div v-if="this.providerSelected !== 'DefaultPrimary' && this.providerSelected !== 'PowerFlex'">
<a-form-item>
<span slot="label">
{{ $t('label.ismanaged') }}
Expand Down Expand Up @@ -248,6 +248,44 @@
<a-input v-decorator="['url']" />
</a-form-item>
</div>
<div v-if="this.providerSelected === 'PowerFlex'">
<a-form-item>
<span slot="label">
{{ $t('label.powerflex.gateway') }}
<a-tooltip :title="$t('label.powerflex.gateway')">
<a-icon type="info-circle" style="color: rgba(0,0,0,.45)" />
</a-tooltip>
</span>
<a-input v-decorator="['powerflexGateway', { rules: [{ required: true, message: `${$t('label.required')}` }] }]"/>
</a-form-item>
<a-form-item>
<span slot="label">
{{ $t('label.powerflex.gateway.username') }}
<a-tooltip :title="$t('label.powerflex.gateway.username')">
<a-icon type="info-circle" style="color: rgba(0,0,0,.45)" />
</a-tooltip>
</span>
<a-input v-decorator="['powerflexGatewayUsername', { rules: [{ required: true, message: `${$t('label.required')}` }] }]"/>
</a-form-item>
<a-form-item>
<span slot="label">
{{ $t('label.powerflex.gateway.password') }}
<a-tooltip :title="$t('label.powerflex.gateway.password')">
<a-icon type="info-circle" style="color: rgba(0,0,0,.45)" />
</a-tooltip>
</span>
<a-input-password v-decorator="['powerflexGatewayPassword', { rules: [{ required: true, message: `${$t('label.required')}` }] }]"/>
</a-form-item>
<a-form-item>
<span slot="label">
{{ $t('label.powerflex.storage.pool') }}
<a-tooltip :title="$t('label.powerflex.storage.pool')">
<a-icon type="info-circle" style="color: rgba(0,0,0,.45)" />
</a-tooltip>
</span>
<a-input v-decorator="['powerflexStoragePool', { rules: [{ required: true, message: `${$t('label.required')}` }] }]"/>
</a-form-item>
</div>
<div v-if="this.protocolSelected === 'RBD'">
<a-form-item :label="$t('label.rados.monitor')">
<a-input v-decorator="['radosmonitor']" />
Expand Down Expand Up @@ -557,6 +595,23 @@ export default {
}
return url
},
powerflexURL (gateway, username, password, pool) {
var url = 'powerflex://' + encodeURIComponent(username) + ':' + encodeURIComponent(password) + '@' +
gateway + '/' + encodeURIComponent(pool)
return url
},
updateProviderAndProtocol (value) {
if (value === 'PowerFlex') {
this.protocols = ['custom']
this.protocolSelected = 'custom'
this.form.setFieldsValue({
protocol: 'custom'
})
} else {
this.fetchHypervisor(null)
}
this.providerSelected = value
},
closeModal () {
this.$parent.$parent.close()
},
Expand Down Expand Up @@ -649,7 +704,7 @@ export default {
url = this.iscsiURL(server, iqn, lun)
}
params.url = url
if (values.provider !== 'DefaultPrimary') {
if (values.provider !== 'DefaultPrimary' && values.provider !== 'PowerFlex') {
if (values.managed) {
params.managed = true
} else {
Expand All @@ -665,6 +720,12 @@ export default {
params.url = values.url
}
}

if (values.provider === 'PowerFlex') {
params.url = this.powerflexURL(values.powerflexGateway, values.powerflexGatewayUsername,
values.powerflexGatewayPassword, values.powerflexStoragePool)
}

if (this.selectedTags.length > 0) {
params.tags = this.selectedTags.join()
}
Expand Down