From e9966c94065f6a74d07578b8cee055c37594a0f7 Mon Sep 17 00:00:00 2001
From: shrikantawachar <shrikant.awachar@amdocs.com>
Date: Tue, 15 May 2018 15:32:18 +0530
Subject: Refactoring validation

Refactoring validation from Code to FTL

Change-Id: Ic33a3719a021bb4c82565653fd8d95de38b7929e
Issue-ID: SDC-1334
Signed-off-by: shrikantawachar <shrikant.awachar@amdocs.com>
---
 .../database/schemaTemplates/composition/image.ftl       |  4 +++-
 .../install/database/schemaTemplates/composition/nic.ftl | 16 ++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'openecomp-be/tools')

diff --git a/openecomp-be/tools/install/database/schemaTemplates/composition/image.ftl b/openecomp-be/tools/install/database/schemaTemplates/composition/image.ftl
index 8391390506..6d0fb3c890 100644
--- a/openecomp-be/tools/install/database/schemaTemplates/composition/image.ftl
+++ b/openecomp-be/tools/install/database/schemaTemplates/composition/image.ftl
@@ -3,7 +3,9 @@
 "type": "object",
 "properties": {
     "fileName": {
-         "type": "string"
+         "type": "string" <#if !manual>,
+            "enum":["${image.fileName}"]
+         </#if>
     },
     "description": {
          "type": "string"
diff --git a/openecomp-be/tools/install/database/schemaTemplates/composition/nic.ftl b/openecomp-be/tools/install/database/schemaTemplates/composition/nic.ftl
index fec5b9cd64..15d34f2489 100644
--- a/openecomp-be/tools/install/database/schemaTemplates/composition/nic.ftl
+++ b/openecomp-be/tools/install/database/schemaTemplates/composition/nic.ftl
@@ -3,12 +3,16 @@
   "type": "object",
   "properties": {
     "name": {
-      "type": "string",
-      "enum": [
-        "${nic.name}"
-      ],
-      "default": "${nic.name}"
-    },
+        "type": "string",
+         <#if manual>
+            {"pattern":"^[a-zA-Z0-9_]*$"}
+         <#else>
+            "enum": [
+             "${nic.name}"
+            ],
+           "default": "${nic.name}"
+         </#if>
+},
     "description": {
       "type": "string"
     }<#if !manual><#if nic.networkId??>,
-- 
cgit 1.2.3-korg