aboutsummaryrefslogtreecommitdiffstats
path: root/openecomp-be/tools/install/database/schemaTemplates/questionnaire
diff options
context:
space:
mode:
authorAvi Ziv <avi.ziv@amdocs.com>2017-07-18 19:45:38 +0300
committerAvi Ziv <avi.ziv@amdocs.com>2017-07-18 19:45:38 +0300
commitb8e2faf476202b6ffe61bc3a9a37df1304881d40 (patch)
treef78b8c0517d8e16c5ae610bf8b49f68ea8a312a1 /openecomp-be/tools/install/database/schemaTemplates/questionnaire
parent75aacbbe1acf78fa53378f07f0a8c7769449a17e (diff)
[SDC] Onboarding 1710 rebase.
Change-Id: If3b6b81d221fde13908f1e8160db6f7d9433c535 Signed-off-by: Avi Ziv <avi.ziv@amdocs.com>
Diffstat (limited to 'openecomp-be/tools/install/database/schemaTemplates/questionnaire')
-rw-r--r--openecomp-be/tools/install/database/schemaTemplates/questionnaire/component.ftl85
-rw-r--r--openecomp-be/tools/install/database/schemaTemplates/questionnaire/compute.ftl54
-rw-r--r--openecomp-be/tools/install/database/schemaTemplates/questionnaire/image.ftl22
3 files changed, 91 insertions, 70 deletions
diff --git a/openecomp-be/tools/install/database/schemaTemplates/questionnaire/component.ftl b/openecomp-be/tools/install/database/schemaTemplates/questionnaire/component.ftl
index d525c62474..062bf55928 100644
--- a/openecomp-be/tools/install/database/schemaTemplates/questionnaire/component.ftl
+++ b/openecomp-be/tools/install/database/schemaTemplates/questionnaire/component.ftl
@@ -32,39 +32,30 @@
"image": {
"type": "object",
"properties": {
- "format": {
- "type": "string",
- "enum": [
- "aki",
- "ami",
- "ari",
- "iso",
- "qcow2",
- "raw",
- "vdi",
- "vhd",
- "vmdk"
- ],
- "default": "qcow2"
- },
"providedBy": {
"type": "string",
"enum": [
"Vendor"
],
"default": "Vendor"
- },
- "bootDiskSizePerVM": {
- "type": "number",
- "maximum": 100
- },
- "ephemeralDiskSizePerVM": {
- "type": "number",
- "maximum": 400
}
},
"additionalProperties": false
},
+ "disk": {
+ "type": "object" ,
+ "properties": {
+ "bootDiskSizePerVM": {
+ "type": "number",
+ "maximum": 100
+ },
+ "ephemeralDiskSizePerVM": {
+ "type": "number",
+ "maximum": 400
+ }
+ },
+ "additionalProperties": false
+ },
"recovery": {
"type": "object",
"properties": {
@@ -101,35 +92,6 @@
"compute": {
"type": "object",
"properties": {
- "vmSizing": {
- "type": "object",
- "properties": {
- "numOfCPUs": {
- "type": "number",
- "minimum": 0,
- "exclusiveMinimum": true,
- "maximum": 16,
- "default": 2
- },
- "fileSystemSizeGB": {
- "type": "number",
- "minimum": 0,
- "exclusiveMinimum": true,
- "default": 5
- },
- "persistentStorageVolumeSize": {
- "type": "number",
- "minimum": 0,
- "exclusiveMinimum": true
- },
- "IOOperationsPerSec": {
- "type": "number",
- "minimum": 0,
- "exclusiveMinimum": true
- }
- },
- "additionalProperties": false
- },
"numOfVMs": {
"type": "object",
"properties": {
@@ -148,24 +110,6 @@
0</#if> ,
"exclusiveMinimum": true,
"maximum": 100
- },
- "CpuOverSubscriptionRatio": {
- "type": "string",
- "enum": [
- "1:1",
- "4:1",
- "16:1"
- ],
- "default": "4:1"
- },
- "MemoryRAM": {
- "type": "string",
- "enum": [
- "2 GB",
- "4 GB",
- "8 GB"
- ],
- "default": "2 GB"
}
},
"additionalProperties": false
@@ -184,6 +128,7 @@
32
],
"default": 64
+
},
"tools": {
"type": "string"
diff --git a/openecomp-be/tools/install/database/schemaTemplates/questionnaire/compute.ftl b/openecomp-be/tools/install/database/schemaTemplates/questionnaire/compute.ftl
new file mode 100644
index 0000000000..3dc85cf192
--- /dev/null
+++ b/openecomp-be/tools/install/database/schemaTemplates/questionnaire/compute.ftl
@@ -0,0 +1,54 @@
+{
+ "$schema": "http://json-schema.org/draft-04/schema#",
+ "type": "object",
+ "properties": {
+ "vmSizing": {
+ "type": "object",
+ "properties": {
+ "numOfCPUs": {
+ "type": "number",
+ "minimum": 0,
+ "exclusiveMinimum": true,
+ "maximum": 16,
+ "default": 2
+ },
+ "fileSystemSizeGB": {
+ "type": "number",
+ "minimum": 0,
+ "exclusiveMinimum": true,
+ "default": 5
+ },
+ "persistentStorageVolumeSize": {
+ "type": "number",
+ "minimum": 0,
+ "exclusiveMinimum": true
+ },
+ "ioOperationsPerSec": {
+ "type": "number",
+ "minimum": 0,
+ "exclusiveMinimum": true
+ },
+ "cpuOverSubscriptionRatio": {
+ "type": "string",
+ "enum": [
+ "1:1",
+ "4:1",
+ "16:1"
+ ],
+ "default": "4:1"
+ },
+ "memoryRAM": {
+ "type": "string",
+ "enum": [
+ "1",
+ "2",
+ "4",
+ "8"
+ ],
+ "default": "1"
+ }
+ },
+ "additionalProperties": false
+ }
+ }
+} \ No newline at end of file
diff --git a/openecomp-be/tools/install/database/schemaTemplates/questionnaire/image.ftl b/openecomp-be/tools/install/database/schemaTemplates/questionnaire/image.ftl
new file mode 100644
index 0000000000..4313e65c44
--- /dev/null
+++ b/openecomp-be/tools/install/database/schemaTemplates/questionnaire/image.ftl
@@ -0,0 +1,22 @@
+{
+"$schema": "http://json-schema.org/draft-04/schema#",
+"type": "object",
+"properties": {
+ "format": {
+ "type": "string",
+ "enum": [
+ "aki","ami","ari","iso","qcow2","raw", "vdi","vhd","vmdk"
+ ]
+ },
+ "version": {
+ "type": "string"
+ },
+ "md5": {
+ "type": "string"
+ }
+},
+ "additionalProperties": false,
+ "required": [
+ "version"
+ ]
+} \ No newline at end of file