SDNC Context Builder: network

Issue-ID: LOG-768
Change-Id: I2835f7122cc7e59e2e31bd4180f923675618b455
Signed-off-by: Tait,Trevor(rt0435) <rtait@amdocs.com>

1 files changed, 47 insertions, 33 deletions

diff --git a/config/sdncgenericresource.spec b/config/sdncgenericresource.spec
index c8a8ffc..7a1ffc1 100644
--- a/config/sdncgenericresource.spec
+++ b/config/sdncgenericresource.spec
@@ -25,12 +25,22 @@
                   "vnf-data": {
                     "vnf-topology": {
                       "onap-model-information": {
-                        "model-uuid": "vfList[&4].uuid",
-                        "model-invariant-uuid": "vfList[&4].invariantUUID"
+                        "model-uuid": "vnfList[&4].uuid",
+                        "model-invariant-uuid": "vnfList[&4].invariantUUID"
                       },
                       "vnf-topology-identifier-structure": {
-                        "vnf-type": "vfList[&4].type",
-                        "vnf-name": "vfList[&4].name"
+                        "vnf-type": "vnfList[&4].type",
+                        "vnf-name": "vnfList[&4].name"
+                      },
+                      "vnf-resource-assignments": {
+                        "vnf-networks": {
+                          "*": {
+                            "network-name": "vnfList[&6].networkList[&1].name",
+                            "network-id": "vnfList[&6].networkList[&1].uuid",
+                            "#networkRole": "vnfList[&6].networkList[&1].attributeList[0].name",
+                            "network-role": "vnfList[&6].networkList[&1].attributeList[0].value"
+                          }
+                        }
                       }
                     },
                     "vf-modules": {
@@ -39,11 +49,11 @@
                           "vf-module-data": {
                             "vf-module-topology": {
                               "vf-module-topology-identifier": {
-                                "vf-module-name": "vfList[&8].vfModuleList[&4].name"
+                                "vf-module-name": "vnfList[&8].vfModuleList[&4].name"
                               },
                               "onap-model-information": {
-                                "model-uuid": "vfList[&8].vfModuleList[&4].uuid",
-                                "model-invariant-uuid": "vfList[&8].vfModuleList[&4].invariantUUID"
+                                "model-uuid": "vnfList[&8].vfModuleList[&4].uuid",
+                                "model-invariant-uuid": "vnfList[&8].vfModuleList[&4].invariantUUID"
                               },
                               "vf-module-assignments": {
                                 "vms": {
@@ -52,33 +62,41 @@
                                       "vm-names": {
                                         "vm-name": {
                                           "*": {
-                                            "@": "vfList[&14].vfModuleList[&10].vmList[&1].name",
-                                            "@(3,vm-type)": "vfList[&14].vfModuleList[&10].vmList[&1].nfNamingCode",
+                                            "@": "vnfList[&14].vfModuleList[&10].vmList[&1].name",
+                                            "@(3,vm-type)": "vnfList[&14].vfModuleList[&10].vmList[&1].nfNamingCode",
                                             "@(3,inMaint)": {
-                                              "#lockedBoolean": "vfList[&15].vfModuleList[&11].vmList[&2].attributeList[0].name",
+                                              "#lockedBoolean": "vnfList[&15].vfModuleList[&11].vmList[&2].attributeList[0].name",
                                               "yes": {
-                                                "#true": "vfList[&16].vfModuleList[&12].vmList[&3].attributeList[0].value"
+                                                "#true": "vnfList[&16].vfModuleList[&12].vmList[&3].attributeList[0].value"
                                               },
                                               "no": {
-                                                "#false": "vfList[&16].vfModuleList[&12].vmList[&3].attributeList[0].value"
+                                                "#false": "vnfList[&16].vfModuleList[&12].vmList[&3].attributeList[0].value"
                                               }
                                             },
                                             "@(3,prov-status)": {
-                                              "#provStatus": "vfList[&15].vfModuleList[&11].vmList[&2].attributeList[1].name",
-                                              "@(4,prov-status)": "vfList[&15].vfModuleList[&11].vmList[&2].attributeList[1].value"
+                                              "#provStatus": "vnfList[&15].vfModuleList[&11].vmList[&2].attributeList[1].name",
+                                              "@(4,prov-status)": "vnfList[&15].vfModuleList[&11].vmList[&2].attributeList[1].value"
                                             },
                                             "@(3,pserver)": {
-                                              "#hostName": "vfList[&15].vfModuleList[&11].vmList[&2].attributeList[2].name",
-                                              "hostname": "vfList[&15].vfModuleList[&11].vmList[&2].attributeList[2].value"
+                                              "#hostName": "vnfList[&15].vfModuleList[&11].vmList[&2].attributeList[2].name",
+                                              "hostname": "vnfList[&15].vfModuleList[&11].vmList[&2].attributeList[2].value"
                                             },
                                             "@(3,image)": {
-                                              "#imageId": "vfList[&15].vfModuleList[&11].vmList[&2].attributeList[3].name",
-                                              "image-name": "vfList[&15].vfModuleList[&11].vmList[&2].attributeList[3].value"
+                                              "#imageId": "vnfList[&15].vfModuleList[&11].vmList[&2].attributeList[3].name",
+                                              "image-name": "vnfList[&15].vfModuleList[&11].vmList[&2].attributeList[3].value"
                                             }
                                           }
                                         }
                                       }
                                     }
+                                  },
+                                  "vm-networks": {
+                                    "*": {
+                                      "network-id": "vnfList[&11].vfModuleList[&7].networkList[&1].uuid",
+                                      "network-name": "vnfList[&11].vfModuleList[&7].networkList[&1].name",
+                                      "#networkRole": "vnfList[&11].vfModuleList[&7].networkList[&1].attributeList[0].name",
+                                      "network-role": "vnfList[&11].vfModuleList[&7].networkList[&1].attributeList[0].value"
+                                    }
                                   }
                                 }
                               }
@@ -96,22 +114,18 @@
                 "*": {
                   "network-data": {
                     "network-topology": {
-                      "onap-model-information": {
-                        "model-uuid": "vfList[0].vfModuleList[0].networkList[&4].uuid",
-                        "model-invariant-uuid": "vfList[0].vfModuleList[0].networkList[&4].invariantUUID"
-                      },
                       "network-topology-identifier-structure": {
-                        "network-type": "vfList[0].vfModuleList[0].networkList[&4].type",
-                        "network-name": "vfList[0].vfModuleList[0].networkList[&4].name",
-                        "isShared": {
-                          "#sharedNetworkBoolean": "vfList[0].vfModuleList[0].networkList[&5].attributeList[0].name",
-                          "yes": {
-                            "#true": "vfList[0].vfModuleList[0].networkList[&6].attributeList[0].value"
-                          },
-                          "no": {
-                            "#false": "vfList[0].vfModuleList[0].networkList[&6].attributeList[0].value"
-                          }
-                        }
+                        "network-name": "networkList[&4].name",
+                        "network-id": "networkList[&4].uuid",
+                        "#networkRole": "networkList[&4].attributeList[0].name",
+                        "network-role": "networkList[&4].attributeList[0].value",
+                        "#networkType": "networkList[&4].attributeList[1].name",
+                        "network-type": "networkList[&4].attributeList[1].value",
+                        "#networkTechnology": "networkList[&4].attributeList[2].name",
+                        "network-technology": "networkList[&4].attributeList[2].value"
+                      },
+                      "onap-model-information": {
+                        "model-invariant-uuid": "networkList[&4].invariantUUID"
                       }
                     }
                   }