diff options
| -rw-r--r-- | config/sdncgenericresource.spec | 22 | ||||
| -rw-r--r-- | src/test/resources/junit/sdncGenericResponse.json | 18 |
2 files changed, 34 insertions, 6 deletions
diff --git a/config/sdncgenericresource.spec b/config/sdncgenericresource.spec index 7a1ffc1..518b557 100644 --- a/config/sdncgenericresource.spec +++ b/config/sdncgenericresource.spec @@ -34,11 +34,13 @@ }, "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" + "vnf-network": { + "*": { + "network-name": "vnfList[&7].networkList[&1].name", + "network-id": "vnfList[&7].networkList[&1].uuid", + "#networkRole": "vnfList[&7].networkList[&1].attributeList[0].name", + "network-role": "vnfList[&7].networkList[&1].attributeList[0].value" + } } } } @@ -87,6 +89,16 @@ } } } + }, + "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" + } + } } } }, diff --git a/src/test/resources/junit/sdncGenericResponse.json b/src/test/resources/junit/sdncGenericResponse.json index 096c71e..9f556e5 100644 --- a/src/test/resources/junit/sdncGenericResponse.json +++ b/src/test/resources/junit/sdncGenericResponse.json @@ -1,7 +1,7 @@ { "service": [ { - "service-instance-id": "PombaDemoCust_001-SerivceInst-001", + "service-instance-id": "PombaDemoCust_001-ServiceInst-001", "service-status": { "final-indicator": "Y", "rpc-action": "assign", @@ -243,6 +243,13 @@ "vm": [ { "vm-type": "vgw", + "vm-networks": { + "vm-network": [ + { + "network-role": "vf-module-network-test" + } + ] + }, "vm-count": 1, "vm-type-tag": "vgw", "vm-names": { @@ -360,6 +367,15 @@ "vnf-name": "zRegionOne06" }, "vnf-resource-assignments": { + "vnf-networks": { + "vnf-network": [ + { + "network-role": "trusted", + "network-name": "vnf-network-test", + "network-id": "bf2a200d-744f-4900-afc4-d5ef44638853" + } + ] + }, "availability-zones": { "availability-zone": [ "nova" |