From b5b03acbf009372de264e9a7d06f6283a1e9f2ac Mon Sep 17 00:00:00 2001 From: "Tait,Trevor(rt0435)" Date: Wed, 27 Mar 2019 13:46:23 -0400 Subject: SDNCctxbld unable to populate all networks Issue-ID: LOG-987 Change-Id: I0d929b22dbe99ce96c5c4e70f1d6f1629a952c88 Signed-off-by: Tait,Trevor(rt0435) --- config/sdncgenericresource.spec | 22 ++++++++++------------ src/test/resources/junit/sdncGenericResponse.json | 10 +++++++++- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/config/sdncgenericresource.spec b/config/sdncgenericresource.spec index 81542a2..9ee94d6 100644 --- a/config/sdncgenericresource.spec +++ b/config/sdncgenericresource.spec @@ -97,22 +97,20 @@ "vm-networks": { "vm-network": { "*": { - "network-id": "vnfList[&14].vfModuleList[&10].networkList[&1].uuid", - "network-name": "vnfList[&14].vfModuleList[&10].networkList[&1].name", - "#networkRole": "vnfList[&14].vfModuleList[&10].networkList[&1].attributeList[0].name", - "network-role": "vnfList[&14].vfModuleList[&10].networkList[&1].attributeList[0].value" + "related-networks": { + "related-network": { + "*": { + "network-id": "vnfList[&17].vfModuleList[&13].networkList[&1].uuid", + "network-name": "vnfList[&17].vfModuleList[&13].networkList[&1].name", + "#networkRole": "vnfList[&17].vfModuleList[&13].networkList[&1].attributeList[0].name", + "network-role": "vnfList[&17].vfModuleList[&13].networkList[&1].attributeList[0].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" - } } } } diff --git a/src/test/resources/junit/sdncGenericResponse.json b/src/test/resources/junit/sdncGenericResponse.json index 9f556e5..2b32f13 100644 --- a/src/test/resources/junit/sdncGenericResponse.json +++ b/src/test/resources/junit/sdncGenericResponse.json @@ -246,7 +246,15 @@ "vm-networks": { "vm-network": [ { - "network-role": "vf-module-network-test" + "network-role": "vf-module-network-test", + "related-networks": { + "related-network": [ + { + "network-id": "2ea02809-7279-4b5e-931a-62b231615497", + "network-role": "network-role-sdnc-1" + } + ] + } } ] }, -- cgit 1.2.3-korg