[SDC-29] Amdocs OnBoard 1707 initial commit.

Change-Id: Ie4d12a3f574008b792899b368a0902a8b46b5370
Signed-off-by: AviZi <avi.ziv@amdocs.com>

3 files changed, 26 insertions, 13 deletions

diff --git a/openecomp-be/tools/install/database/schemaTemplates/composition/component.ftl b/openecomp-be/tools/install/database/schemaTemplates/composition/component.ftl
index 1c0cb4eb8a..e70deffc89 100644
--- a/openecomp-be/tools/install/database/schemaTemplates/composition/component.ftl
+++ b/openecomp-be/tools/install/database/schemaTemplates/composition/component.ftl
@@ -16,6 +16,9 @@
       ],
       "default": "${component.displayName}"</#if>
     },
+    "vfcCode": {
+      "type": "string"
+    },
     "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 540afca430..6e588eb22a 100644
--- a/openecomp-be/tools/install/database/schemaTemplates/questionnaire/component.ftl
+++ b/openecomp-be/tools/install/database/schemaTemplates/questionnaire/component.ftl
@@ -93,7 +93,7 @@
         },
         "vmCloneUsage": {
           "type": "string",
-          "maximum": 300
+          "maxLength": 300
         }
       },
       "additionalProperties": false
@@ -198,6 +198,16 @@
     "highAvailabilityAndLoadBalancing": {
       "type": "object",
       "properties": {
+        "isComponentMandatory": {
+          "type": "string",
+          "enum": ["","YES", "NO"],
+          "default": ""
+        },
+        "highAvailabilityMode": {
+          "type": "string",
+          "enum": ["","geo-activeactive", "geo-activestandby", "local-activeactive", "local-activestandby"],
+          "default": ""
+        },
         "failureLoadDistribution": {
           "type": "string",
           "maxLength": 1000
@@ -274,8 +284,8 @@
             "backupNIC": {
               "type": "string",
               "enum": [
-                "", <#if nicNames??><#list nicNames as nicName>
-                "${nicName}"<#sep>,</#list></#if>
+                ""<#if nicNames??><#list nicNames as nicName>
+                , "${nicName}"</#list></#if>
               ],
               "default": ""
             }
@@ -324,4 +334,4 @@
     }
   },
   "additionalProperties": false
-}
\ No newline at end of file
+}
diff --git a/openecomp-be/tools/install/database/schemaTemplates/questionnaire/vsp.ftl b/openecomp-be/tools/install/database/schemaTemplates/questionnaire/vsp.ftl
index 6b1502c4a2..96f77b7f23 100644
--- a/openecomp-be/tools/install/database/schemaTemplates/questionnaire/vsp.ftl
+++ b/openecomp-be/tools/install/database/schemaTemplates/questionnaire/vsp.ftl
@@ -38,15 +38,15 @@
                 "type": "string",
                 "enum": [
                   "",
-                  "1",
-                  "2",
-                  "3",
-                  "4",
-                  "5",
-                  "6",
-                  "7",
-                  "8",
-                  "9"
+                  "Alphareta",
+                  "Birmingham",
+                  "Dallas",
+                  "Fairfield CA",
+                  "Hayward CA",
+                  "Lisle",
+                  "Mission",
+                  "San Diego",
+                  "Secaucus"
                 ],
                 "default": ""
               }