[SDC-29] Amdocs OnBoard 1707 initial commit.

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

6 files changed, 335 insertions, 80 deletions

diff --git a/openecomp-be/tools/install/database/monitoring/component/ceilometer.ftl b/openecomp-be/tools/install/database/monitoring/component/ceilometer.ftl
deleted file mode 100644
index 6cf3dfdb66..0000000000
--- a/openecomp-be/tools/install/database/monitoring/component/ceilometer.ftl
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-    "ceilometerInfoList": [
-        {
-            "name": "instance",
-            "type": "Gauge",
-            "unit": "instance",
-            "category": "compute",
-            "description": "Existence of instance"
-        },
-        {
-            "name": "instance:type",
-            "type": "Gauge",
-            "unit": "instance",
-            "category": "compute",
-            "description": "Existence of instance <type> (OpenStack types)"
-        },
-        {
-            "name": "memory",
-            "type": "Gauge",
-            "unit": "MB",
-            "category": "compute",
-            "description": "Volume of RAM allocated to the instance"
-        },
-        {
-            "name": "memory.usage",
-            "type": "Gauge",
-            "unit": "MB",
-            "category": "compute",
-            "description": "Volume of RAM used by the instance from the amount of its allocated memory"
-        },
-        {
-            "name": "memory.resident",
-            "type": "Gauge",
-            "unit": "MB",
-            "category": "compute",
-            "description": "Volume of RAM used by the instance on the physical machine"
-        },
-        {
-            "name": "cpu",
-            "type": "Cumulative",
-            "unit": "ns",
-            "category": "compute",
-            "description": "CPU time used"
-        },
-        {
-            "name": "cpu_util",
-            "type": "Gauge",
-            "unit": "%",
-            "category": "compute",
-            "description": "Average CPU utilization"
-        },
-        {
-            "name": "cpu.delta",
-            "type": "Delta",
-            "unit": "ns",
-            "category": "compute",
-            "description": "CPU time used since previous datapoint"
-        },
-        {
-            "name": "vcpus",
-            "type": "Gauge",
-            "unit": "ms",
-            "category": "compute",
-            "description": "Average disk latency"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/openecomp-be/tools/install/database/monitoring/compute/ceilometer.ftl b/openecomp-be/tools/install/database/monitoring/compute/ceilometer.ftl
new file mode 100644
index 0000000000..8168f745de
--- /dev/null
+++ b/openecomp-be/tools/install/database/monitoring/compute/ceilometer.ftl
@@ -0,0 +1,249 @@
+{
+    "ceilometerMetricList": [
+        {
+            "name": "instance",
+            "type": "Gauge",
+            "unit": "instance",
+            "category": "compute",
+            "description": "Existence of instance"
+        },
+        {
+            "name": "memory",
+            "type": "Gauge",
+            "unit": "MB",
+            "category": "compute",
+            "description": "Volume of RAM allocated to the instance"
+        },
+        {
+            "name": "memory.usage",
+            "type": "Gauge",
+            "unit": "MB",
+            "category": "compute",
+            "description": "Volume of RAM used by the instance from the amount of its allocated memory"
+        },
+        {
+            "name": "memory.resident",
+            "type": "Gauge",
+            "unit": "MB",
+            "category": "compute",
+            "description": "Volume of RAM used by the instance on the physical machine"
+        },
+        {
+            "name": "cpu",
+            "type": "Cumulative",
+            "unit": "ns",
+            "category": "compute",
+            "description": "CPU time used"
+        },
+        {
+            "name": "cpu_util",
+            "type": "Gauge",
+            "unit": "%",
+            "category": "compute",
+            "description": "Average CPU utilization"
+        },
+        {
+            "name": "cpu.delta",
+            "type": "Delta",
+            "unit": "ns",
+            "category": "compute",
+            "description": "CPU time used since previous datapoint"
+        },
+        {
+            "name": "vcpus",
+            "type": "Gauge",
+            "unit": "vcpu",
+            "category": "compute",
+            "description": "Number of virtual CPUs allocated to the instance"
+        },
+        {
+            "name": "disk.latency",
+            "type": "Gauge",
+            "unit": "ms",
+            "category": "disk",
+            "description": "Average disk latency"
+        },
+        {
+            "name": "disk.iops",
+            "type": "Gauge",
+            "unit": "count/s",
+            "category": "disk",
+            "description": "Average disk iops"
+        },
+        {
+            "name": "disk.device.latency",
+            "type": "Gauge",
+            "unit": "ms",
+            "category": "disk",
+            "description": "Average disk latency per device"
+        },
+        {
+            "name": "disk.device.iops",
+            "type": "Gauge",
+            "unit": "count/s",
+            "category": "disk",
+            "description": "Average disk iops per device"
+        },
+        {
+            "name": "disk.capacity",
+            "type": "Gauge",
+            "unit": "B",
+            "category": "disk",
+            "description": "The amount of disk that the instance can see"
+        },
+        {
+            "name": "disk.allocation",
+            "type": "Gauge",
+            "unit": "B",
+            "category": "disk",
+            "description": "The amount of disk occupied by the instance on the host machine"
+        },
+        {
+            "name": "disk.usage",
+            "type": "Gauge",
+            "unit": "B",
+            "category": "disk",
+            "description": "The physical size in bytes of the image container on the host"
+        },
+        {
+            "name": "disk.device.capacity",
+            "type": "Gauge",
+            "unit": "B",
+            "category": "disk",
+            "description": "The amount of disk per device that the instance can see"
+        },
+        {
+            "name": "disk.device.allocation",
+            "type": "Gauge",
+            "unit": "B",
+            "category": "disk",
+            "description": "The amount of disk per device occupied by the instance on the host machine"
+        },
+        {
+            "name": "disk.device.usage",
+            "type": "Gauge",
+            "unit": "B",
+            "category": "disk",
+            "description": "The physical size in bytes of the image container on the host per device"
+        },
+        {
+            "name": "disk.device.read.requests",
+            "type": "Cumulative",
+            "unit": "request",
+            "category": "disk",
+            "description": "Number of read requests"
+        },
+        {
+            "name": "disk.device.read.requests.rate",
+            "type": "Gauge",
+            "unit": "request/s",
+            "category": "disk",
+            "description": "Average rate of read requests"
+        },
+        {
+            "name": "disk.device.write.requests",
+            "type": "Cumulative",
+            "unit": "request",
+            "category": "disk",
+            "description": "Number of write requests"
+        },
+        {
+            "name": "disk.device.write.requests.rate",
+            "type": "Gauge",
+            "unit": "request/s",
+            "category": "disk",
+            "description": "Average rate of write requests"
+        },
+        {
+            "name": "disk.device.read.bytes",
+            "type": "Cumulative",
+            "unit": "B",
+            "category": "disk",
+            "description": "Volume of reads"
+        },
+        {
+            "name": "disk.device.read.bytes.rate",
+            "type": "Gauge",
+            "unit": "B/s",
+            "category": "disk",
+            "description": "Average rate of reads"
+        },
+        {
+            "name": "disk.device.write.bytes",
+            "type": "Cumulative",
+            "unit": "B",
+            "category": "disk",
+            "description": "Volume of writes"
+        },
+        {
+            "name": "disk.device.write.bytes.rate",
+            "type": "Gauge",
+            "unit": "B/s",
+            "category": "disk",
+            "description": "Average rate of writes"
+        },
+        {
+            "name": "disk.write.requests",
+            "type": "Cumulative",
+            "unit": "request",
+            "category": "compute",
+            "description": "Number of write requests"
+        },
+        {
+            "name": "disk.write.requests.rate",
+            "type": "Gauge",
+            "unit": "request/s",
+            "category": "compute",
+            "description": "Average rate of write requests"
+        },
+        {
+            "name": "disk.read.bytes",
+            "type": "Cumulative",
+            "unit": "B",
+            "category": "compute",
+            "description": "Volume of reads"
+        },
+        {
+            "name": "disk.read.bytes.rate",
+            "type": "Gauge",
+            "unit": "B/s",
+            "category": "compute",
+            "description": "Average rate of reads"
+        },
+        {
+            "name": "disk.write.bytes",
+            "type": "Cumulative",
+            "unit": "B",
+            "category": "compute",
+            "description": "Volume of writes"
+        },
+        {
+            "name": "disk.write.bytes.rate",
+            "type": "Gauge",
+            "unit": "B/s",
+            "category": "compute",
+            "description": "Average rate of writes"
+        },
+        {
+            "name": "disk.read.requests",
+            "type": "Cumulative",
+            "unit": "request",
+            "category": "compute",
+            "description": "Number of read requests"
+        },
+        {
+            "name": "disk.root.size",
+            "type": "Gauge",
+            "unit": "GB",
+            "category": "compute",
+            "description": "Size of root disk"
+        },
+        {
+            "name": "disk.ephemeral.size",
+            "type": "Gauge",
+            "unit": "GB",
+            "category": "compute",
+            "description": "Size of ephemeral disk"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/openecomp-be/tools/install/database/monitoring/port/ceilometer.ftl b/openecomp-be/tools/install/database/monitoring/port/ceilometer.ftl
new file mode 100644
index 0000000000..b741354144
--- /dev/null
+++ b/openecomp-be/tools/install/database/monitoring/port/ceilometer.ftl
@@ -0,0 +1,60 @@
+{
+    "ceilometerMetricList": [
+        {
+            "name": "network.incoming.bytes",
+            "type": "Cumulative",
+            "unit": "B",
+            "category": "network",
+            "description": "Number of incoming bytes"
+        },
+        {
+            "name": "network.incoming.bytes.rate",
+            "type": "Gauge",
+            "unit": "B/s",
+            "category": "network",
+            "description": "Average rate of incoming bytes"
+        },
+        {
+            "name": "network.outgoing.bytes",
+            "type": "Cumulative",
+            "unit": "B",
+            "category": "network",
+            "description": "Number of outgoing bytes"
+        },
+        {
+            "name": "network.outgoing.bytes.rate",
+            "type": "Gauge",
+            "unit": "B/s",
+            "category": "network",
+            "description": "Average rate of outgoing bytes"
+        },
+        {
+            "name": "network.incoming.packets",
+            "type": "Cumulative",
+            "unit": "packet",
+            "category": "network",
+            "description": "Number of incoming packets"
+        },
+        {
+            "name": "network.incoming.packets.rate",
+            "type": "Gauge",
+            "unit": "packet/s",
+            "category": "network",
+            "description": "Average rate of incoming packets"
+        },
+        {
+            "name": "network.outpoing.packets",
+            "type": "Cumulative",
+            "unit": "packet",
+            "category": "network",
+            "description": "Number of outgoing packets"
+        },
+        {
+            "name": "network.outgoing.packets.rate",
+            "type": "Gauge",
+            "unit": "packet/s",
+            "category": "network",
+            "description": "Average rate of outgoing packets"
+        }
+    ]
+}
\ No newline at end of file
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": ""
               }