aboutsummaryrefslogtreecommitdiffstats
path: root/src/test
diff options
context:
space:
mode:
authorTait,Trevor(rt0435) <rtait@amdocs.com>2019-02-27 15:31:44 -0500
committerTait,Trevor(rt0435) <rtait@amdocs.com>2019-02-27 15:34:07 -0500
commita4d18fc699d6cf4173d0af54dae4e093908f391a (patch)
tree7c7904270d048a1c863ccb82d55ba645dde12061 /src/test
parent60a97cb7282a4974df86454c29914f82f6601b39 (diff)
POMBA: X-ONAP-RequestID and X-FromAppId support
Also fixes JUNIT issue with new pomba-audit-common. Issue-ID: LOG-551 Change-Id: I7774a6ce83881d1ee37c36b860d456244a6c96cf Signed-off-by: Tait,Trevor(rt0435) <rtait@amdocs.com>
Diffstat (limited to 'src/test')
-rw-r--r--src/test/resources/jolt/serviceDecompToModelContext-expected.json230
-rw-r--r--src/test/resources/jolt/serviceDecompToModelContext2-expected.json324
2 files changed, 301 insertions, 253 deletions
diff --git a/src/test/resources/jolt/serviceDecompToModelContext-expected.json b/src/test/resources/jolt/serviceDecompToModelContext-expected.json
index ea15bf4..0c461c1 100644
--- a/src/test/resources/jolt/serviceDecompToModelContext-expected.json
+++ b/src/test/resources/jolt/serviceDecompToModelContext-expected.json
@@ -1,106 +1,126 @@
-{
- "service" : {
- "uuid" : "PombaDemoCust_001-SerivceInst-001",
- "dataQuality" : {
- "status" : "ok"
- },
- "attributeList" : [ ]
- },
- "dataQuality" : {
- "status" : "ok"
- },
- "attributeList" : [ ],
- "vnfList" : [ {
- "dataQuality" : {
- "status" : "ok"
- },
- "attributeList" : [ ],
- "vfModuleList" : [ {
- "maxInstances" : 0,
- "minInstances" : 0,
- "dataQuality" : {
- "status" : "ok"
- },
- "attributeList" : [ ],
- "vmList" : [ {
- "uuid" : "a6a609e3-967a-48bd-8ce5-41c7ff5c19b9",
- "dataQuality" : {
- "status" : "ok"
- },
- "attributeList" : [ ],
- "pServer" : {
- "dataQuality" : {
- "status" : "ok"
- },
- "attributeList" : [ ],
- "pInterfaceList" : [ ]
- },
- "lInterfaceList" : [ ]
- } ],
- "networkList" : [ ]
- } ],
- "vnfcList" : [ ],
- "networkList" : [ {
- "uuid" : "2ea02809-7279-4b5e-931a-62b231615497",
- "dataQuality" : {
- "status" : "ok"
- },
- "attributeList" : [ ],
- "networkPolicyList" : [ ]
- }, {
- "uuid" : "01e8d84a-17a6-47b5-a167-6a45d1d56603",
- "dataQuality" : {
- "status" : "ok"
- },
- "attributeList" : [ ],
- "networkPolicyList" : [ ]
- } ]
- }, {
- "dataQuality" : {
- "status" : "ok"
- },
- "attributeList" : [ ],
- "vfModuleList" : [ {
- "maxInstances" : 0,
- "minInstances" : 0,
- "dataQuality" : {
- "status" : "ok"
- },
- "attributeList" : [ ],
- "vmList" : [ {
- "uuid" : "a6a609e3-967a-48bd-8ce5-41c7ff5c19b9-2",
- "dataQuality" : {
- "status" : "ok"
- },
- "attributeList" : [ ],
- "pServer" : {
- "dataQuality" : {
- "status" : "ok"
- },
- "attributeList" : [ ],
- "pInterfaceList" : [ ]
- },
- "lInterfaceList" : [ ]
- } ],
- "networkList" : [ ]
- } ],
- "vnfcList" : [ ],
- "networkList" : [ {
- "uuid" : "2ea02809-7279-4b5e-931a-62b231615497-1",
- "dataQuality" : {
- "status" : "ok"
- },
- "attributeList" : [ ],
- "networkPolicyList" : [ ]
- }, {
- "uuid" : "01e8d84a-17a6-47b5-a167-6a45d1d56603-1",
- "dataQuality" : {
- "status" : "ok"
- },
- "attributeList" : [ ],
- "networkPolicyList" : [ ]
- } ]
- } ],
- "pnfList" : [ ],
- "networkList" : [ ]
+{
+ "service": {
+ "uuid": "PombaDemoCust_001-SerivceInst-001",
+ "dataQuality": {
+ "status": "ok"
+ },
+ "attributeList": []
+ },
+ "dataQuality": {
+ "status": "ok"
+ },
+ "attributeList": [],
+ "vnfList": [
+ {
+ "dataQuality": {
+ "status": "ok"
+ },
+ "attributeList": [],
+ "vfModuleList": [
+ {
+ "maxInstances": 0,
+ "minInstances": 0,
+ "dataQuality": {
+ "status": "ok"
+ },
+ "attributeList": [],
+ "vmList": [
+ {
+ "uuid": "a6a609e3-967a-48bd-8ce5-41c7ff5c19b9",
+ "dataQuality": {
+ "status": "ok"
+ },
+ "attributeList": [],
+ "pServer": {
+ "dataQuality": {
+ "status": "ok"
+ },
+ "attributeList": [],
+ "pInterfaceList": []
+ },
+ "lInterfaceList": []
+ }
+ ],
+ "networkList": []
+ }
+ ],
+ "vnfcList": [],
+ "networkList": [
+ {
+ "uuid": "2ea02809-7279-4b5e-931a-62b231615497",
+ "dataQuality": {
+ "status": "ok"
+ },
+ "attributeList": [],
+ "networkPolicyList": []
+ },
+ {
+ "uuid": "01e8d84a-17a6-47b5-a167-6a45d1d56603",
+ "dataQuality": {
+ "status": "ok"
+ },
+ "attributeList": [],
+ "networkPolicyList": []
+ }
+ ],
+ "lInterfaceList": []
+ },
+ {
+ "dataQuality": {
+ "status": "ok"
+ },
+ "attributeList": [],
+ "vfModuleList": [
+ {
+ "maxInstances": 0,
+ "minInstances": 0,
+ "dataQuality": {
+ "status": "ok"
+ },
+ "attributeList": [],
+ "vmList": [
+ {
+ "uuid": "a6a609e3-967a-48bd-8ce5-41c7ff5c19b9-2",
+ "dataQuality": {
+ "status": "ok"
+ },
+ "attributeList": [],
+ "pServer": {
+ "dataQuality": {
+ "status": "ok"
+ },
+ "attributeList": [],
+ "pInterfaceList": []
+ },
+ "lInterfaceList": []
+ }
+ ],
+ "networkList": []
+ }
+ ],
+ "vnfcList": [],
+ "networkList": [
+ {
+ "uuid": "2ea02809-7279-4b5e-931a-62b231615497-1",
+ "dataQuality": {
+ "status": "ok"
+ },
+ "attributeList": [],
+ "networkPolicyList": []
+ },
+ {
+ "uuid": "01e8d84a-17a6-47b5-a167-6a45d1d56603-1",
+ "dataQuality": {
+ "status": "ok"
+ },
+ "attributeList": [],
+ "networkPolicyList": []
+ }
+ ],
+ "lInterfaceList": []
+ }
+ ],
+ "pnfList": [],
+ "networkList": [],
+ "logicalLinkList": []
} \ No newline at end of file
diff --git a/src/test/resources/jolt/serviceDecompToModelContext2-expected.json b/src/test/resources/jolt/serviceDecompToModelContext2-expected.json
index bf8589d..1387d3a 100644
--- a/src/test/resources/jolt/serviceDecompToModelContext2-expected.json
+++ b/src/test/resources/jolt/serviceDecompToModelContext2-expected.json
@@ -1,149 +1,177 @@
-{
- "service" : {
- "uuid" : "PombaDemoCust_002-ServiceInst-002",
- "dataQuality" : {
- "status" : "ok"
- },
- "attributeList" : [ ]
- },
- "dataQuality" : {
- "status" : "ok"
- },
- "attributeList" : [ ],
- "vnfList" : [ {
- "dataQuality" : {
- "status" : "ok"
- },
- "attributeList" : [ ],
- "vfModuleList" : [ {
- "maxInstances" : 0,
- "minInstances" : 0,
- "dataQuality" : {
- "status" : "ok"
- },
- "attributeList" : [ ],
- "vmList" : [ {
- "uuid" : "a6a609e3-967a-48bd-8ce5-41c7ff5c19b9",
- "dataQuality" : {
- "status" : "ok"
- },
- "attributeList" : [ ],
- "pServer" : {
- "dataQuality" : {
- "status" : "ok"
- },
- "attributeList" : [ ],
- "pInterfaceList" : [ ]
- },
- "lInterfaceList" : [ ]
- } ],
- "networkList" : [ {
- "uuid" : "network-id-vnf1-vfmodule1-001",
- "dataQuality" : {
- "status" : "ok"
- },
- "attributeList" : [ ],
- "networkPolicyList" : [ ]
- }, {
- "uuid" : "network-id-vnf1-vfmodule1-002",
- "dataQuality" : {
- "status" : "ok"
- },
- "attributeList" : [ ],
- "networkPolicyList" : [ ]
- } ]
- } ],
- "vnfcList" : [ ],
- "networkList" : [ {
- "uuid" : "network-id-vnf1-001",
- "dataQuality" : {
- "status" : "ok"
- },
- "attributeList" : [ ],
- "networkPolicyList" : [ ]
- }, {
- "uuid" : "network-id-vnf1-002",
- "dataQuality" : {
- "status" : "ok"
- },
- "attributeList" : [ ],
- "networkPolicyList" : [ ]
- } ]
- }, {
- "dataQuality" : {
- "status" : "ok"
- },
- "attributeList" : [ ],
- "vfModuleList" : [ {
- "maxInstances" : 0,
- "minInstances" : 0,
- "dataQuality" : {
- "status" : "ok"
- },
- "attributeList" : [ ],
- "vmList" : [ {
- "uuid" : "a6a609e3-967a-48bd-8ce5-41c7ff5c19b9-2",
- "dataQuality" : {
- "status" : "ok"
- },
- "attributeList" : [ ],
- "pServer" : {
- "dataQuality" : {
- "status" : "ok"
- },
- "attributeList" : [ ],
- "pInterfaceList" : [ ]
- },
- "lInterfaceList" : [ ]
- } ],
- "networkList" : [ {
- "uuid" : "network-id-vnf2-vfmodule1-001",
- "dataQuality" : {
- "status" : "ok"
- },
- "attributeList" : [ ],
- "networkPolicyList" : [ ]
- }, {
- "uuid" : "network-id-vnf2-vfmodule1-002",
- "dataQuality" : {
- "status" : "ok"
- },
- "attributeList" : [ ],
- "networkPolicyList" : [ ]
- } ]
- }],
- "vnfcList" : [ ],
- "networkList" : [ {
- "uuid" : "network-id-vnf2-001",
- "dataQuality" : {
- "status" : "ok"
- },
- "attributeList" : [ ],
- "networkPolicyList" : [ ]
- }, {
- "uuid" : "network-id-vnf2-002",
- "dataQuality" : {
- "status" : "ok"
- },
- "attributeList" : [ ],
- "networkPolicyList" : [ ]
- } ]
- } ],
- "pnfList" : [ ],
- "networkList" : [ {
- "uuid" : "network-id-service-001",
- "dataQuality" : {
- "status" : "ok"
- },
- "attributeList" : [ ],
- "networkPolicyList" : [ ]
- }, {
- "uuid" : "network-id-service-002",
- "dataQuality" : {
- "status" : "ok"
- },
- "attributeList" : [ ],
- "networkPolicyList" : [ ]
- } ]
-
+{
+ "service": {
+ "uuid": "PombaDemoCust_002-ServiceInst-002",
+ "dataQuality": {
+ "status": "ok"
+ },
+ "attributeList": []
+ },
+ "dataQuality": {
+ "status": "ok"
+ },
+ "attributeList": [],
+ "vnfList": [
+ {
+ "dataQuality": {
+ "status": "ok"
+ },
+ "attributeList": [],
+ "vfModuleList": [
+ {
+ "maxInstances": 0,
+ "minInstances": 0,
+ "dataQuality": {
+ "status": "ok"
+ },
+ "attributeList": [],
+ "vmList": [
+ {
+ "uuid": "a6a609e3-967a-48bd-8ce5-41c7ff5c19b9",
+ "dataQuality": {
+ "status": "ok"
+ },
+ "attributeList": [],
+ "pServer": {
+ "dataQuality": {
+ "status": "ok"
+ },
+ "attributeList": [],
+ "pInterfaceList": []
+ },
+ "lInterfaceList": []
+ }
+ ],
+ "networkList": [
+ {
+ "uuid": "network-id-vnf1-vfmodule1-001",
+ "dataQuality": {
+ "status": "ok"
+ },
+ "attributeList": [],
+ "networkPolicyList": []
+ },
+ {
+ "uuid": "network-id-vnf1-vfmodule1-002",
+ "dataQuality": {
+ "status": "ok"
+ },
+ "attributeList": [],
+ "networkPolicyList": []
+ }
+ ]
+ }
+ ],
+ "vnfcList": [],
+ "networkList": [
+ {
+ "uuid": "network-id-vnf1-001",
+ "dataQuality": {
+ "status": "ok"
+ },
+ "attributeList": [],
+ "networkPolicyList": []
+ },
+ {
+ "uuid": "network-id-vnf1-002",
+ "dataQuality": {
+ "status": "ok"
+ },
+ "attributeList": [],
+ "networkPolicyList": []
+ }
+ ],
+ "lInterfaceList": []
+ },
+ {
+ "dataQuality": {
+ "status": "ok"
+ },
+ "attributeList": [],
+ "vfModuleList": [
+ {
+ "maxInstances": 0,
+ "minInstances": 0,
+ "dataQuality": {
+ "status": "ok"
+ },
+ "attributeList": [],
+ "vmList": [
+ {
+ "uuid": "a6a609e3-967a-48bd-8ce5-41c7ff5c19b9-2",
+ "dataQuality": {
+ "status": "ok"
+ },
+ "attributeList": [],
+ "pServer": {
+ "dataQuality": {
+ "status": "ok"
+ },
+ "attributeList": [],
+ "pInterfaceList": []
+ },
+ "lInterfaceList": []
+ }
+ ],
+ "networkList": [
+ {
+ "uuid": "network-id-vnf2-vfmodule1-001",
+ "dataQuality": {
+ "status": "ok"
+ },
+ "attributeList": [],
+ "networkPolicyList": []
+ },
+ {
+ "uuid": "network-id-vnf2-vfmodule1-002",
+ "dataQuality": {
+ "status": "ok"
+ },
+ "attributeList": [],
+ "networkPolicyList": []
+ }
+ ]
+ }
+ ],
+ "vnfcList": [],
+ "networkList": [
+ {
+ "uuid": "network-id-vnf2-001",
+ "dataQuality": {
+ "status": "ok"
+ },
+ "attributeList": [],
+ "networkPolicyList": []
+ },
+ {
+ "uuid": "network-id-vnf2-002",
+ "dataQuality": {
+ "status": "ok"
+ },
+ "attributeList": [],
+ "networkPolicyList": []
+ }
+ ],
+ "lInterfaceList": []
+ }
+ ],
+ "pnfList": [],
+ "networkList": [
+ {
+ "uuid": "network-id-service-001",
+ "dataQuality": {
+ "status": "ok"
+ },
+ "attributeList": [],
+ "networkPolicyList": []
+ },
+ {
+ "uuid": "network-id-service-002",
+ "dataQuality": {
+ "status": "ok"
+ },
+ "attributeList": [],
+ "networkPolicyList": []
+ }
+ ],
+ "logicalLinkList": []
} \ No newline at end of file