etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

linstor: ui show Server and resource-group fields with custom protocol (#9138)

This commit is contained in:
Rene Peinthor 2024-06-13 11:49:03 +02:00 committed by GitHub
parent 19e9020c9b
commit 034a5c8466
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ui/src/views/infra/AddPrimaryStorage.vue
View File

@ -162,7 +162,7 @@
</a-form-item>
<div
v-if="form.protocol === 'nfs' || form.protocol === 'SMB' || form.protocol === 'iscsi' || form.protocol === 'vmfs'|| form.protocol === 'Gluster' || form.protocol === 'Linstor' ||
(form.protocol === 'PreSetup' && hypervisorType === 'VMware') || form.protocol === 'datastorecluster'">
(form.protocol === 'PreSetup' && hypervisorType === 'VMware') || form.protocol === 'datastorecluster' || form.provider === 'Linstor'">
<a-form-item name="server" ref="server">
<template #label>
<tooltip-label :title="$t('label.server')" :tooltip="$t('message.server.description')"/>
@ -376,7 +376,7 @@
<a-input v-model:value="form.volume" :placeholder="$t('label.volume')"/>
</a-form-item>
</div>
<div v-if="form.protocol === 'Linstor'">
<div v-if="form.protocol === 'Linstor' || form.provider === 'Linstor'">
<a-form-item name="capacityIops" ref="capacityIops">
<template #label>
<tooltip-label :title="$t('label.capacityiops')" :tooltip="apiParams.capacityiops.description"/>
@ -852,13 +852,7 @@ export default {
var lun = values.lun
url = this.iscsiURL(server, iqn, lun)
} else if (values.protocol === 'Linstor') {
url = this.linstorURL(server)
params.provider = 'Linstor'
values.managed = false
params['details[0].resourceGroup'] = values.resourcegroup
if (values.capacityIops && values.capacityIops.length > 0) {
params.capacityIops = values.capacityIops.split(',').join('')
}
} else if (values.protocol === 'Filesystem') {
url = this.filesystemURL(values.host, path)
} else if (values.provider === 'Primera') {
@ -870,6 +864,16 @@ export default {
params['details[0].api_password'] = values.flashArrayPassword
url = values.flashArrayURL
}
if (values.provider === 'Linstor') {
url = this.linstorURL(server)
values.managed = false
params['details[0].resourceGroup'] = values.resourcegroup
if (values.capacityIops && values.capacityIops.length > 0) {
params.capacityIops = values.capacityIops.split(',').join('')
}
}
params.url = url
if (values.provider !== 'DefaultPrimary' && values.provider !== 'PowerFlex') {
if (values.managed) {