aboutsummaryrefslogtreecommitdiffstats
path: root/platform-logic/restapi-templates/src
diff options
context:
space:
mode:
authorCheung, Pat <kc1472@att.com>2018-11-01 18:30:58 +0000
committerTimoney, Dan (dt5972) <dtimoney@att.com>2018-11-01 14:47:50 -0400
commitbc265458adb8189cff56662fca6b543ffde8b750 (patch)
treeabfaad4a1514212a81aa8a8295f6219bab3394f6 /platform-logic/restapi-templates/src
parent5f2deedd4d0d1c0b8b1c97cf9e7e3e5f9f1138cf (diff)
self-serve DG bug fixes
Fixing various bug fixes for self serve logics Change-Id: I9127900df427483ac9bc93c51774d7b1f97ba1c5 Issue-ID: SDNC-509 Signed-off-by: Cheung, Pat <kc1472@att.com> Former-commit-id: 8eb03908d9de95073ec6484a95009a033f324b8a
Diffstat (limited to 'platform-logic/restapi-templates/src')
-rw-r--r--platform-logic/restapi-templates/src/main/json/self-serve-vfmodule-assignments.json60
1 files changed, 54 insertions, 6 deletions
diff --git a/platform-logic/restapi-templates/src/main/json/self-serve-vfmodule-assignments.json b/platform-logic/restapi-templates/src/main/json/self-serve-vfmodule-assignments.json
index c62d0a3e..ee239656 100644
--- a/platform-logic/restapi-templates/src/main/json/self-serve-vfmodule-assignments.json
+++ b/platform-logic/restapi-templates/src/main/json/self-serve-vfmodule-assignments.json
@@ -60,12 +60,12 @@
"aic-clli": ${vf.vf-module-data.vf-module-request-input.aic-clli},
"vf-module-input-parameters": {
"param": [
- ${repeat:vf.vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length:
+${repeat:vf.vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length:
{
"name": ${vf.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[${1}].name},
"value": ${vf.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[${1}].value}
},
- }
+}
]
}
},
@@ -82,26 +82,74 @@
"model-version": ${vf.vf-module-data.vf-module-topology.onap-model-information.model-version},
"model-name": ${vf.vf-module-data.vf-module-topology.onap-model-information.model-name}
},
+ "vf-module-assignments": {
+ "vms": {
+ "vm": [
+${repeat:vf.vf-module-data.vf-module-topology.vf-module-assignments.vms.vm_length:
+ {
+ "vm-type": ${vf.vf-module-data.vf-module-topology.vf-module-assignments.vms.vm[${1}].vm-type},
+ "onap-model-information": {
+ "model-invariant-uuid": ${vf.vf-module-data.vf-module-topology.vf-module-assignments.vms.vm[${1}].onap-model-information.model-invariant-uuid},
+ "model-customization-uuid": ${vf.vf-module-data.vf-module-topology.vf-module-assignments.vms.vm[${1}].onap-model-information.model-customization-uuid},
+ "model-version": ${vf.vf-module-data.vf-module-topology.vf-module-assignments.vms.vm[${1}].onap-model-information.model-version}
+ },
+ "vm-names": {
+ "vnfc-names": [
+${repeat:vf.vf-module-data.vf-module-topology.vf-module-assignments.vms.vm[${1}].vm-names.vnfc-names_length:
+ {
+ "vnfc-name": ${vf.vf-module-data.vf-module-topology.vf-module-assignments.vms.vm[${1}].vm-names.vnfc-names[${2}].vnfc-name},
+ "vnfc-networks": {
+ "vnfc-network-data": [
+${repeat:vf.vf-module-data.vf-module-topology.vf-module-assignments.vms.vm[${1}].vm-names.vnfc-names[${2}].vnfc-networks.vnfc-network-data_length:
+ {
+ "vnfc-network-role": ${vf.vf-module-data.vf-module-topology.vf-module-assignments.vms.vm[${1}].vm-names.vnfc-names[${2}].vnfc-networks.vnfc-network-data[${3}].vnfc-network-role},
+ "vnfc-type": ${vf.vf-module-data.vf-module-topology.vf-module-assignments.vms.vm[${1}].vm-names.vnfc-names[${2}].vnfc-networks.vnfc-network-data[${3}].vnfc-type},
+ "connection-point": {
+ "connection-point-id": ${vf.vf-module-data.vf-module-topology.vf-module-assignments.vms.vm[${1}].vm-names.vnfc-names[${2}].vnfc-networks.vnfc-network-data[${3}].connection-point.connection-point-id},
+ "vlan-data": [
+${repeat:vf.vf-module-data.vf-module-topology.vf-module-assignments.vms.vm[${1}].vm-names.vnfc-names[${2}].vnfc-networks.vnfc-network-data[${3}].connection-point.vlan-data_length:
+ {
+ "vlan-uuid": ${vf.vf-module-data.vf-module-topology.vf-module-assignments.vms.vm[${1}].vm-names.vnfc-names[${2}].vnfc-networks.vnfc-network-data[${3}].connection-point.vlan-data[${4}].vlan-uuid},
+ "vlan-tag-id": ${vf.vf-module-data.vf-module-topology.vf-module-assignments.vms.vm[${1}].vm-names.vnfc-names[${2}].vnfc-networks.vnfc-network-data[${3}].connection-point.vlan-data[${4}].vlan-tag-id},
+ "vlan-tag-description": ${vf.vf-module-data.vf-module-topology.vf-module-assignments.vms.vm[${1}].vm-names.vnfc-names[${2}].vnfc-networks.vnfc-network-data[${3}].connection-point.vlan-data[${4}].vlan-tag-description},
+ "vlan-role": ${vf.vf-module-data.vf-module-topology.vf-module-assignments.vms.vm[${1}].vm-names.vnfc-names[${2}].vnfc-networks.vnfc-network-data[${3}].connection-point.vlan-data[${4}].vlan-role}
+ },
+}
+ ]
+ }
+ },
+}
+ ]
+ }
+ },
+}
+ ]
+ }
+ },
+}
+ ]
+ }
+ },
"vf-module-parameters": {
"param": [
- ${repeat:vf.vf-module-data.vf-module-topology.vf-module-parameters.param_length:
+${repeat:vf.vf-module-data.vf-module-topology.vf-module-parameters.param_length:
{
"name": ${vf.vf-module-data.vf-module-topology.vf-module-parameters.param[${1}].name},
"value": ${vf.vf-module-data.vf-module-topology.vf-module-parameters.param[${1}].value},
"resource-resolution-data": {
"resource-key": [
- ${repeat:vf.vf-module-data.vf-module-topology.vf-module-parameters.param[${1}].resource-resolution-data.resource-key_length:
+${repeat:vf.vf-module-data.vf-module-topology.vf-module-parameters.param[${1}].resource-resolution-data.resource-key_length:
{
"name": ${vf.vf-module-data.vf-module-topology.vf-module-parameters.param[${1}].resource-resolution-data.resource-key[${2}].name},
"value": ${vf.vf-module-data.vf-module-topology.vf-module-parameters.param[${1}].resource-resolution-data.resource-key[${2}].value}
},
- }
+}
],
"status": ${vf.vf-module-data.vf-module-topology.vf-module-parameters.param[${1}].resource-resolution-data.status},
"capability-name": ${vf.vf-module-data.vf-module-topology.vf-module-parameters.param[${1}].resource-resolution-data.capability-name}
},
},
- }
+}
]
},
"tenant": ${vf.vf-module-data.vf-module-topology.tenant},