self-serve DG bug fixes

[sdnc/oam.git] / platform-logic / restapi-templates / src / main / json / self-serve-vfmodule-assignments.json

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 c62d0a3..ee23965 100644 (file)
--- 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},