From 4d0dbee1a1ac7c58c665cdd0e8576bfa9edd1e0e Mon Sep 17 00:00:00 2001
From: talig <talig@amdocs.com>
Date: Wed, 30 May 2018 16:15:50 +0300
Subject: Add minimum to number questionnaire fields

In case of compute validation error - display its name (same as other entities)

Change-Id: Ie3f0190a3b30d1ed6210f50958f61d8a883d5bef
Issue-ID: SDC-1387
Signed-off-by: talig <talig@amdocs.com>
---
 .../schemaTemplates/questionnaire/component.ftl    | 25 ++++++++++++++--------
 1 file changed, 16 insertions(+), 9 deletions(-)

(limited to 'openecomp-be/tools')

diff --git a/openecomp-be/tools/install/database/schemaTemplates/questionnaire/component.ftl b/openecomp-be/tools/install/database/schemaTemplates/questionnaire/component.ftl
index c023f1c88c..6b00c37061 100644
--- a/openecomp-be/tools/install/database/schemaTemplates/questionnaire/component.ftl
+++ b/openecomp-be/tools/install/database/schemaTemplates/questionnaire/component.ftl
@@ -48,10 +48,12 @@
           "properties": {
               "bootDiskSizePerVM": {
                 "type": "number",
+                "minimum": 0,
                 "maximum": 100
               },
              "ephemeralDiskSizePerVM": {
                "type": "number",
+               "minimum": 0,
                "maximum": 400
               }
            },
@@ -104,10 +106,10 @@
             "maximum": {
               "type": "number",
             "minimum": <#if (componentQuestionnaireData.compute.numOfVMs.minimum)??
-            && (componentQuestionnaireData.compute.numOfVMs.minimum)?is_number
-            && ((componentQuestionnaireData.compute.numOfVMs.minimum) > 0
-            && (componentQuestionnaireData.compute.numOfVMs.minimum) <= 100)>
-            ${componentQuestionnaireData.compute.numOfVMs.minimum}<#else>
+&& (componentQuestionnaireData.compute.numOfVMs.minimum)?is_number
+&& ((componentQuestionnaireData.compute.numOfVMs.minimum) > 0
+&& (componentQuestionnaireData.compute.numOfVMs.minimum) <= 100)>
+    ${componentQuestionnaireData.compute.numOfVMs.minimum}<#else>
             0</#if> ,
               "exclusiveMinimum": true,
               "maximum": 100
@@ -198,7 +200,8 @@
               "default": ""
             },
             "networkTransactionsPerSecond": {
-              "type": "number"
+              "type": "number",
+              "minimum": 0
             }
           },
           "additionalProperties": false
@@ -221,7 +224,8 @@
               "default": "On Site"
             },
             "backupStorageSize": {
-              "type": "number"
+              "type": "number",
+              "minimum": 0
             },
             "backupSolution": {
               "type": "string"
@@ -253,17 +257,20 @@
           "type": "object",
           "properties": {
             "sizeOfLogFiles": {
-              "type": "number",
+              "type": "integer",
+              "minimum": 0,
               "maximum": 5,
               "exclusiveMaximum": true
             },
             "logBackupFrequency": {
-              "type": "number",
+              "type": "integer",
+              "minimum": 0,
               "maximum": 4,
               "exclusiveMaximum": true
             },
             "logRetentionPeriod": {
-              "type": "number",
+              "type": "integer",
+              "minimum": 0,
               "maximum": 15,
               "exclusiveMaximum": true
             },
-- 
cgit 1.2.3-korg