Skip to content

Commit 034a5c8

Browse files
authored
linstor: ui show Server and resource-group fields with custom protocol (#9138)
1 parent 19e9020 commit 034a5c8

1 file changed

Lines changed: 12 additions & 8 deletions

File tree

ui/src/views/infra/AddPrimaryStorage.vue

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
</a-form-item>
163163
<div
164164
v-if="form.protocol === 'nfs' || form.protocol === 'SMB' || form.protocol === 'iscsi' || form.protocol === 'vmfs'|| form.protocol === 'Gluster' || form.protocol === 'Linstor' ||
165-
(form.protocol === 'PreSetup' && hypervisorType === 'VMware') || form.protocol === 'datastorecluster'">
165+
(form.protocol === 'PreSetup' && hypervisorType === 'VMware') || form.protocol === 'datastorecluster' || form.provider === 'Linstor'">
166166
<a-form-item name="server" ref="server">
167167
<template #label>
168168
<tooltip-label :title="$t('label.server')" :tooltip="$t('message.server.description')"/>
@@ -376,7 +376,7 @@
376376
<a-input v-model:value="form.volume" :placeholder="$t('label.volume')"/>
377377
</a-form-item>
378378
</div>
379-
<div v-if="form.protocol === 'Linstor'">
379+
<div v-if="form.protocol === 'Linstor' || form.provider === 'Linstor'">
380380
<a-form-item name="capacityIops" ref="capacityIops">
381381
<template #label>
382382
<tooltip-label :title="$t('label.capacityiops')" :tooltip="apiParams.capacityiops.description"/>
@@ -852,13 +852,7 @@ export default {
852852
var lun = values.lun
853853
url = this.iscsiURL(server, iqn, lun)
854854
} else if (values.protocol === 'Linstor') {
855-
url = this.linstorURL(server)
856855
params.provider = 'Linstor'
857-
values.managed = false
858-
params['details[0].resourceGroup'] = values.resourcegroup
859-
if (values.capacityIops && values.capacityIops.length > 0) {
860-
params.capacityIops = values.capacityIops.split(',').join('')
861-
}
862856
} else if (values.protocol === 'Filesystem') {
863857
url = this.filesystemURL(values.host, path)
864858
} else if (values.provider === 'Primera') {
@@ -870,6 +864,16 @@ export default {
870864
params['details[0].api_password'] = values.flashArrayPassword
871865
url = values.flashArrayURL
872866
}
867+
868+
if (values.provider === 'Linstor') {
869+
url = this.linstorURL(server)
870+
values.managed = false
871+
params['details[0].resourceGroup'] = values.resourcegroup
872+
if (values.capacityIops && values.capacityIops.length > 0) {
873+
params.capacityIops = values.capacityIops.split(',').join('')
874+
}
875+
}
876+
873877
params.url = url
874878
if (values.provider !== 'DefaultPrimary' && values.provider !== 'PowerFlex') {
875879
if (values.managed) {

0 commit comments

Comments
 (0)