Add latest bug fixes to master
Change-Id: Ieddc2330ad4e093984f14a69b52f2ca5cb465a10
Issue-ID: SDC-293
Signed-off-by: avigaffa <avi.gaffa@amdocs.com>
diff --git a/openecomp-be/tools/install/database/schemaTemplates/composition/deployment.ftl b/openecomp-be/tools/install/database/schemaTemplates/composition/deployment.ftl
index 67271c7..2bd0b40 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