diff options
author | avigaffa <avi.gaffa@amdocs.com> | 2017-09-10 08:58:51 +0300 |
---|---|---|
committer | avigaffa <avi.gaffa@amdocs.com> | 2017-09-10 10:07:00 +0300 |
commit | 00e935fc6b8baae4d9b9ffef2c748202a60b66b4 (patch) | |
tree | 56d7b608dbb5a53022db0350f04977da8cd960f5 /openecomp-be/tools/install/database/schemaTemplates | |
parent | 75c572279398dc2be7652263843c8802a9406c4f (diff) |
Add latest bug fixes to master
Change-Id: Ieddc2330ad4e093984f14a69b52f2ca5cb465a10
Issue-ID: SDC-293
Signed-off-by: avigaffa <avi.gaffa@amdocs.com>
Diffstat (limited to 'openecomp-be/tools/install/database/schemaTemplates')
-rw-r--r-- | openecomp-be/tools/install/database/schemaTemplates/composition/deployment.ftl | 69 |
1 files changed, 34 insertions, 35 deletions
diff --git a/openecomp-be/tools/install/database/schemaTemplates/composition/deployment.ftl b/openecomp-be/tools/install/database/schemaTemplates/composition/deployment.ftl index 67271c79e2..2bd0b40705 100644 --- a/openecomp-be/tools/install/database/schemaTemplates/composition/deployment.ftl +++ b/openecomp-be/tools/install/database/schemaTemplates/composition/deployment.ftl @@ -1,39 +1,38 @@ { - "$schema": "http://json-schema.org/draft-04/schema#", - "type": "object", - "properties": { - "model": { - "type": "string", - "maxLength": 30, - "pattern": "^[A-Za-z0-9_,-]*$" - }, - "description": { - "type": "string", +"$schema": "http://json-schema.org/draft-04/schema#", +"type": "object", +"properties": { +"model": { +"type": "string", +"maxLength": 30 +}, +"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 - } +"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" - ] +}, +"additionalProperties": false, +"required": [ +"model" +] }
\ No newline at end of file |