From 67e400cc929314f1d66accb2f2f47d489f6b0c4f Mon Sep 17 00:00:00 2001
From: sheetalm <sheetal.mudholkar@amdocs.com>
Date: Tue, 12 Jun 2018 17:32:56 +0530
Subject: Fix for nfcparameters in component questionnaire

issue - nfc naming code and nfc function fields' values are wiped out
with a VSP update
Moved the above fields from composition to questionnaire
Add BDD test. Add license to java files

Change-Id: I2b746fedc17c19b716df35bf0dad2c212f15df30
Issue-ID: SDC-1419
Signed-off-by: sheetalm <sheetal.mudholkar@amdocs.com>
---
 .../database/schemaTemplates/composition/component.ftl        | 11 +----------
 .../database/schemaTemplates/questionnaire/component.ftl      |  9 +++++++++
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'openecomp-be/tools/install')

diff --git a/openecomp-be/tools/install/database/schemaTemplates/composition/component.ftl b/openecomp-be/tools/install/database/schemaTemplates/composition/component.ftl
index e2953b83d0..1c0cb4eb8a 100644
--- a/openecomp-be/tools/install/database/schemaTemplates/composition/component.ftl
+++ b/openecomp-be/tools/install/database/schemaTemplates/composition/component.ftl
@@ -16,16 +16,7 @@
       ],
       "default": "${component.displayName}"</#if>
     },
-    "vfcCode": {
-      "type": "string"
-    },
-"nfcCode": {
-"type": "string"
-},
-"nfcFunction": {
-"type": "string"
-},
-"description": {
+    "description": {
       "type": "string"
     }
   },
diff --git a/openecomp-be/tools/install/database/schemaTemplates/questionnaire/component.ftl b/openecomp-be/tools/install/database/schemaTemplates/questionnaire/component.ftl
index 6b00c37061..f99d7fa9e0 100644
--- a/openecomp-be/tools/install/database/schemaTemplates/questionnaire/component.ftl
+++ b/openecomp-be/tools/install/database/schemaTemplates/questionnaire/component.ftl
@@ -5,6 +5,15 @@
     "general": {
       "type": "object",
       "properties": {
+        <#if !manual>
+        "nfcNamingCode": {
+          "type": "string",
+          "maxLength": 1000<#if componentDisplayName??>,
+          "default": "${componentDisplayName}"</#if>
+        },</#if>
+        "nfcFunction": {
+          "type": "string"
+        },
         "hypervisor": {
           "type": "object",
           "properties": {
-- 
cgit 1.2.3-korg