From 5e8bb0dfa8a4bc38ba231affe95bca5cc3051f29 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Mon, 10 Feb 2020 17:49:00 +0530 Subject: [PATCH] changes for system service offering handling Signed-off-by: Abhishek Kumar Signed-off-by: Rohit Yadav --- ui/src/views/offering/AddComputeOffering.vue | 82 ++++++++++++++++---- 1 file changed, 66 insertions(+), 16 deletions(-) diff --git a/ui/src/views/offering/AddComputeOffering.vue b/ui/src/views/offering/AddComputeOffering.vue index 5a8a1b9235f..bc2ca3e95fe 100644 --- a/ui/src/views/offering/AddComputeOffering.vue +++ b/ui/src/views/offering/AddComputeOffering.vue @@ -36,6 +36,22 @@ }]" :placeholder="this.$t('displaytext ')"/> + + + {{ $t('domain.router') }} + {{ $t('console.proxy') }} + {{ $t('secondary.storage.vm') }} + + + + + + - + @@ -304,7 +336,7 @@ }]" :placeholder="this.$t('diskiopsmax')"/> - + - + - + + + 0) { + params.networkrate = values.networkrate + } + if (values.qostype === 'storage') { var customIops = values.iscustomizeddiskiops === true params.customizediops = customIops @@ -692,7 +731,8 @@ export default { if (values.diskiopsmax != null && values.diskiopsmax.length > 0) { params.maxiops = values.diskiopsmax } - if (values.hypervisorsnapshotreserve != null && values.hypervisorsnapshotreserve.length > 0) { + if (values.hypervisorsnapshotreserve !== undefined && + values.hypervisorsnapshotreserve != null && values.hypervisorsnapshotreserve.length > 0) { params.hypervisorsnapshotreserve = values.hypervisorsnapshotreserve } } @@ -717,14 +757,21 @@ export default { if (values.hosttags != null && values.hosttags.length > 0) { params.hosttags = values.hosttags } - if (values.deploymentplanner != null && values.deploymentplanner.length > 0) { + if ('deploymentplanner' in values && + values.deploymentplanner !== undefined && + values.deploymentplanner != null && values.deploymentplanner.length > 0) { params.deploymentplanner = values.deploymentplanner } - if (values.deploymentplanner === 'ImplicitDedicationPlanner' && values.plannermode !== '') { + if ('deploymentplanner' in values && + values.deploymentplanner !== undefined && + values.deploymentplanner === 'ImplicitDedicationPlanner' && + values.plannermode !== undefined && + values.plannermode !== '') { params['serviceofferingdetails[0].key'] = 'ImplicitDedicationMode' params['serviceofferingdetails[0].value'] = values.plannermode } - if (values.pcidevice !== '') { + if ('pcidevice' in values && + values.pcidevice !== undefined && values.pcidevice !== '') { params['serviceofferingdetails[1].key'] = 'pciDevice' params['serviceofferingdetails[1].value'] = values.pcidevice } @@ -734,6 +781,9 @@ export default { params['serviceofferingdetails[2].key'] = 'vgpuType' params['serviceofferingdetails[2].value'] = this.vGpuTypes[values.vgputype] } + if ('isvolatile' in values && values.isvolatile !== undefined) { + params.isvolatile = values.isvolatile === true + } if (values.ispublic !== true) { var domainIndexes = values.domainid var domainId = null @@ -762,8 +812,8 @@ export default { } api('createServiceOffering', params).then(json => { this.$notification.success({ - message: this.$t('message.add.service.offering'), - description: this.$t('message.add.service.offering') + message: this.isSystem ? this.$t('message.add.system.service.offering') : this.$t('message.add.service.offering'), + description: this.isSystem ? this.$t('message.add.system.service.offering') : this.$t('message.add.service.offering') }) }).catch(error => { this.$notification.error({