diff options
Diffstat (limited to 'openecomp-be/tools/install')
8 files changed, 191 insertions, 75 deletions
diff --git a/openecomp-be/tools/install/database/schemaTemplates/composition/component.ftl b/openecomp-be/tools/install/database/schemaTemplates/composition/component.ftl index e70deffc89..e2953b83d0 100644 --- a/openecomp-be/tools/install/database/schemaTemplates/composition/component.ftl +++ b/openecomp-be/tools/install/database/schemaTemplates/composition/component.ftl @@ -19,7 +19,13 @@ "vfcCode": { "type": "string" }, - "description": { +"nfcCode": { +"type": "string" +}, +"nfcFunction": { +"type": "string" +}, +"description": { "type": "string" } }, diff --git a/openecomp-be/tools/install/database/schemaTemplates/composition/compute.ftl b/openecomp-be/tools/install/database/schemaTemplates/composition/compute.ftl new file mode 100644 index 0000000000..02b46633a6 --- /dev/null +++ b/openecomp-be/tools/install/database/schemaTemplates/composition/compute.ftl @@ -0,0 +1,17 @@ +{ + "$schema": "http://json-schema.org/draft-04/schema#", + "type": "object", + "properties": { + "name": { + "type": "string" <#if !manual>, + "enum": [ + "${compute.name}" + ], + "default": "${compute.name}"</#if> + }, + "description": { + "type": "string", + "maxLength": 300 + } + } +}
\ No newline at end of file diff --git a/openecomp-be/tools/install/database/schemaTemplates/composition/deployment.ftl b/openecomp-be/tools/install/database/schemaTemplates/composition/deployment.ftl new file mode 100644 index 0000000000..67271c79e2 --- /dev/null +++ b/openecomp-be/tools/install/database/schemaTemplates/composition/deployment.ftl @@ -0,0 +1,39 @@ +{ + "$schema": "http://json-schema.org/draft-04/schema#", + "type": "object", + "properties": { + "model": { + "type": "string", + "maxLength": 30, + "pattern": "^[A-Za-z0-9_,-]*$" + }, + "description": { + "type": "string", + + "maxLength": 300 + }, + "featureGroupId":{ + "type": "string", + "enum": [<#if featureGroupIds??> <#list featureGroupIds as featureGroupId> + "${featureGroupId}"<#sep>,</#list> </#if> + ] + }, + "componentComputeAssociations": { + "type": "array", + "properties": { + "vfcid": { + "type": "string" + }, + "computeFlavorid": { + "type": "string" + } + }, + "additionalProperties": false + } + + }, + "additionalProperties": false, + "required": [ + "model" + ] +}
\ No newline at end of file diff --git a/openecomp-be/tools/install/database/schemaTemplates/composition/image.ftl b/openecomp-be/tools/install/database/schemaTemplates/composition/image.ftl new file mode 100644 index 0000000000..8391390506 --- /dev/null +++ b/openecomp-be/tools/install/database/schemaTemplates/composition/image.ftl @@ -0,0 +1,13 @@ +{ +"$schema": "http://json-schema.org/draft-04/schema#", +"type": "object", +"properties": { + "fileName": { + "type": "string" + }, + "description": { + "type": "string" + } + }, + "additionalProperties": false +} diff --git a/openecomp-be/tools/install/database/schemaTemplates/composition/nic.ftl b/openecomp-be/tools/install/database/schemaTemplates/composition/nic.ftl index 6111348f88..fec5b9cd64 100644 --- a/openecomp-be/tools/install/database/schemaTemplates/composition/nic.ftl +++ b/openecomp-be/tools/install/database/schemaTemplates/composition/nic.ftl @@ -3,12 +3,11 @@ "type": "object", "properties": { "name": { - "type": "string"<#if !manual>, + "type": "string", "enum": [ "${nic.name}" ], "default": "${nic.name}" - </#if> }, "description": { "type": "string" @@ -20,15 +19,36 @@ ], "default": "${nic.networkId}" } - </#if><#else>, + </#if> + <#elseif manual><#if nic.networkId??>, + "networkId": { + "type": "string", + "enum": [ + "${nic.networkId}" + ], + "default": "${nic.networkId}" + } + </#if> +<#else>, "networkId": { "type": "string", "enum": [<#list networkIds as networkId> "${networkId}"<#sep>,</#list> ] } - </#if> + </#if>, + "networkDescription": { + "type": "string" + }, + "networkType": { + "type": "string", + "enum": [ + "${nic.networkType}" + ], + "default": "${nic.networkType}" + } }, + "additionalProperties": false, "required": [ "name" 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 |