[SDC] Onboarding 1710 rebase.
Change-Id: If3b6b81d221fde13908f1e8160db6f7d9433c535
Signed-off-by: Avi Ziv <avi.ziv@amdocs.com>
diff --git a/openecomp-be/tools/install/database/schemaTemplates/composition/nic.ftl b/openecomp-be/tools/install/database/schemaTemplates/composition/nic.ftl
index 6111348..fec5b9c 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"