From d20e0ddf4b8953ce539f1dc7bf7cb4dca30fd189 Mon Sep 17 00:00:00 2001 From: "Leigh, Phillip (pl876u)" Date: Wed, 27 Feb 2019 13:31:33 -0500 Subject: AaiCtxBuilder:Handle L-Interface & Logical-Link Also remove resourceVersion and handle empty valude of any attribute (LOG-988) Issue-ID: LOG-988 Issue-ID: LOG-766 Issue-ID: LOG-767 Change-Id: I8b3eef61cebf93690aaa0291f8d0a7c1e3575088 Signed-off-by: Leigh, Phillip (pl876u) --- .../resources/junit/aai-service-instance_set4.json | 44 ++++++ src/test/resources/junit/aai-vserver-set3.json | 96 ++++++++---- src/test/resources/junit/genericVnfInput_set6.json | 148 ++++++++++++++++++ src/test/resources/junit/l-interface-input.json | 10 -- src/test/resources/junit/l-interface-input2.json | 10 -- src/test/resources/junit/logical-link-input1.json | 17 +++ src/test/resources/junit/logical-link-input2.json | 17 +++ src/test/resources/junit/logical-link-input3.json | 17 +++ src/test/resources/junit/logical-link-input4.json | 17 +++ .../resources/junit/pnfInput_w_pInterface.json | 86 ----------- .../junit/pnfInput_w_pInterface_LInterface.json | 110 ++++++++++++++ .../pnfInput_w_pInterface_LInterface_set2.json | 146 ++++++++++++++++++ .../junit/pserverInput_with_pInterface.json | 65 -------- .../pserverInput_with_pInterface_LInterface.json | 89 +++++++++++ ...erverInput_with_pInterface_LInterface_set2.json | 165 +++++++++++++++++++++ 15 files changed, 834 insertions(+), 203 deletions(-) create mode 100644 src/test/resources/junit/aai-service-instance_set4.json create mode 100644 src/test/resources/junit/genericVnfInput_set6.json delete mode 100644 src/test/resources/junit/l-interface-input.json delete mode 100644 src/test/resources/junit/l-interface-input2.json create mode 100644 src/test/resources/junit/logical-link-input1.json create mode 100644 src/test/resources/junit/logical-link-input2.json create mode 100644 src/test/resources/junit/logical-link-input3.json create mode 100644 src/test/resources/junit/logical-link-input4.json delete mode 100644 src/test/resources/junit/pnfInput_w_pInterface.json create mode 100644 src/test/resources/junit/pnfInput_w_pInterface_LInterface.json create mode 100644 src/test/resources/junit/pnfInput_w_pInterface_LInterface_set2.json delete mode 100644 src/test/resources/junit/pserverInput_with_pInterface.json create mode 100644 src/test/resources/junit/pserverInput_with_pInterface_LInterface.json create mode 100644 src/test/resources/junit/pserverInput_with_pInterface_LInterface_set2.json (limited to 'src/test/resources') diff --git a/src/test/resources/junit/aai-service-instance_set4.json b/src/test/resources/junit/aai-service-instance_set4.json new file mode 100644 index 0000000..f7e6f1a --- /dev/null +++ b/src/test/resources/junit/aai-service-instance_set4.json @@ -0,0 +1,44 @@ +{ + "service-instance-id": "adc3cc2a-c73e-414f-8ddb-367de81300cb", + "service-instance-name": "Firewall1", + "model-invariant-id": "0c5a20de-87ad-442c-9190-f38ab0a6bb7f", + "model-version-id": "d3d6cf83-d03a-43cc-99ff-206d40bb9a72", + "resource-version": "1527637758480", + "relationship-list": { + "relationship": [ + { + "related-to": "logical-link", + "related-link": "/aai/v13/network/logical-links/logical-link/01e8d84a-logical-link-1", + "relationship-data": [ + { + "relationship-key": "logical-link.link-name", + "relationship-value": "01e8d84a-logical-link-1" + } + ], + "related-to-property": [ + { + "property-key": "logical-link.circuit-id", + "property-value": "NET_8802" + } + ] + }, + { + "related-to": "logical-link", + "related-link": "/aai/v13/network/logical-links/logical-link/01e8d84a-logical-link-2", + "relationship-data": [ + { + "relationship-key": "logical-link.link-name", + "relationship-value": "01e8d84a-logical-link-2" + } + ], + "related-to-property": [ + { + "property-key": "logical-link.circuit-id", + "property-value": "NET_8802" + } + ] + } + + ] + } +} diff --git a/src/test/resources/junit/aai-vserver-set3.json b/src/test/resources/junit/aai-vserver-set3.json index f50d65a..9804786 100644 --- a/src/test/resources/junit/aai-vserver-set3.json +++ b/src/test/resources/junit/aai-vserver-set3.json @@ -7,40 +7,72 @@ "in-maint": false, "is-closed-loop-disabled": false, "resource-version": "1528481820321", + "l-interfaces" : { + "l-interface" : [ + { + "interface-id": "junit-l-interface-1", + "interface-name": "junit-l-interface-name1", + "interface-role": "interface-role1", + "is-port-mirrored": "true", + "admin-status": "admin-status1", + "network-name": "network-name-amdocs", + "macaddr": "macaddr-1", + "in-maint": "true", + "relationship-list": { + "relationship": [ + { + "related-to": "logical-link", + "related-link": "/aai/v13/network/logical-links/logical-link/01e8d84a-logical-link-1", + "relationship-data": [ + { + "relationship-key": "logical-link.link-name", + "relationship-value": "01e8d84a-logical-link-1" + } + ], + "related-to-property": [ + { + "property-key": "logical-link.circuit-id", + "property-value": "NET_8802" + } + ] + } + ] + } + }, + { + "interface-id": "junit-l-interface-2", + "interface-name": "junit-l-interface-name2", + "interface-role": "interface-role2", + "is-port-mirrored": "true", + "admin-status": "admin-status2", + "network-name": "network-name-amdocs", + "macaddr": "macaddr-2", + "in-maint": "true", + "relationship-list": { + "relationship": [ + { + "related-to": "logical-link", + "related-link": "/aai/v13/network/logical-links/logical-link/01e8d84a-logical-link-2", + "relationship-data": [ + { + "relationship-key": "logical-link.link-name", + "relationship-value": "01e8d84a-logical-link-2" + } + ], + "related-to-property": [ + { + "property-key": "logical-link.circuit-id", + "property-value": "NET_8802" + } + ] + } + ] + } + } + ] + }, "relationship-list": { "relationship": [ - { - "related-to": "l-interface", - "relationship-label": "tosca.relationships.HostedOn", - "related-link": "/aai/v13/l-interfaces/l-interface/junit-l-interface-name1", - "relationship-data": [ - { - "relationship-key": "l-interface.interface-name", - "relationship-value": "junit-l-interface-name1" - } - ], - "related-to-property": [ - { "property-key": "l-interface.interface-id", - "property-value": "junit-l-interface-1" - } - ] - }, - { - "related-to": "l-interface", - "relationship-label": "tosca.relationships.HostedOn", - "related-link": "/aai/v13/l-interfaces/l-interface/junit-l-interface-name2", - "relationship-data": [ - { - "relationship-key": "l-interface.interface-name", - "relationship-value": "junit-l-interface-name2" - } - ], - "related-to-property": [ - { "property-key": "l-interface.interface-id", - "property-value": "junit-l-interface-2" - } - ] - }, { "related-to": "generic-vnf", "related-link": "/aai/v13/network/generic-vnfs/generic-vnf/8a9ddb25-2e79-449c-a40d-5011bac0da39", diff --git a/src/test/resources/junit/genericVnfInput_set6.json b/src/test/resources/junit/genericVnfInput_set6.json new file mode 100644 index 0000000..e5f7ea4 --- /dev/null +++ b/src/test/resources/junit/genericVnfInput_set6.json @@ -0,0 +1,148 @@ +{ + "vnf-id": "8a9ddb25-2e79-449c-a40d-5011bac0da39", + "vnf-name": "Firewall-1", + "vnf-type": "vFW-vSINK-service/vFWvSINK 0", + "service-id": "8ea56b0d-459d-4668-b363-c9567432d8b7", + "prov-status": "PREPROV", + "orchestration-status": "Created", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "1527637940029", + "model-invariant-id": "59dd4d63-8f21-406c-98c0-3b057bb86820", + "model-version-id": "e2d52f32-a952-46f5-800c-c250903625d6", + "model-customization-id": "3b822416-475d-4e1c-aac3-2544b0a0fdfc", + "nf-type": "", + "nf-function": "", + "nf-role": "", + "nf-naming-code": "", + "l-interfaces" : { + "l-interface" : [ + { + "interface-id": "junit-l-interface-3", + "interface-name": "junit-l-interface-name3", + "interface-role": "interface-role3", + "is-port-mirrored": "true", + "admin-status": "admin-status3", + "network-name": "network-name-amdocs", + "macaddr": "macaddr-3", + "in-maint": "true", + "relationship-list": { + "relationship": [ + { + "related-to": "logical-link", + "related-link": "/aai/v13/network/logical-links/logical-link/01e8d84a-logical-link-3", + "relationship-data": [ + { + "relationship-key": "logical-link.link-name", + "relationship-value": "01e8d84a-logical-link-3" + } + ], + "related-to-property": [ + { + "property-key": "logical-link.circuit-id", + "property-value": "NET_8802" + } + ] + } + ] + } + }, + { + "interface-id": "junit-l-interface-4", + "interface-name": "junit-l-interface-name4", + "interface-role": "interface-role4", + "is-port-mirrored": "true", + "admin-status": "admin-status4", + "network-name": "network-name-amdocs", + "macaddr": "macaddr-4", + "in-maint": "true", + "relationship-list": { + "relationship": [ + { + "related-to": "logical-link", + "related-link": "/aai/v13/network/logical-links/logical-link/01e8d84a-logical-link-4", + "relationship-data": [ + { + "relationship-key": "logical-link.link-name", + "relationship-value": "01e8d84a-logical-link-4" + } + ], + "related-to-property": [ + { + "property-key": "logical-link.circuit-id", + "property-value": "NET_8802" + } + ] + } + ] + } + } + ] + }, + "relationship-list": { + "relationship": [ + { + "related-to": "vserver", + "related-link": "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/b49b830686654191bb1e952a74b014ad/vservers/vserver/b494cd6e-b9f3-45e0-afe7-e1d1a5f5d74a", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "CloudOwner" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "RegionOne" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "b49b830686654191bb1e952a74b014ad" + }, + { + "relationship-key": "vserver.vserver-id", + "relationship-value": "b494cd6e-b9f3-45e0-afe7-e1d1a5f5d74a" + } + ] + }, + { + "related-to": "service-instance", + "related-link": "/aai/v13/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vFWCL/service-instances/service-instance/adc3cc2a-c73e-414f-8ddb-367de81300cb", + "relationship-data": [ + { + "relationship-key": "customer.global-customer-id", + "relationship-value": "Demonstration" + }, + { + "relationship-key": "service-subscription.service-type", + "relationship-value": "vFWCL" + }, + { + "relationship-key": "service-instance.service-instance-id", + "relationship-value": "adc3cc2a-c73e-414f-8ddb-367de81300cb" + } + ], + "related-to-property": [ + { + "property-key": "service-instance.service-instance-name", + "property-value": "Firewall1" + } + ] + } + ] + }, + "vf-modules": { + "vf-module": [ + { + "vf-module-id": "1563b649-9e05-4288-b7d9-e3639a54ace6", + "vf-module-name": "vFW_SINC_Module-2", + "heat-stack-id": "vFW_SINC_Module-2/41c4533a-748d-4cf4-a8d3-eccdd0aeb0d4", + "orchestration-status": "active", + "is-base-vf-module": true, + "resource-version": "1527638439198", + "model-invariant-id": "74bc1518-282d-4148-860f-8892b6369456", + "model-version-id": "4e3d28cf-d654-41af-a47b-04b4bd0ac58e", + "model-customization-id": "cc51ab7d-9b03-4bd6-9104-09df0c7c7907", + "module-index": 0 + } + ] + } +} diff --git a/src/test/resources/junit/l-interface-input.json b/src/test/resources/junit/l-interface-input.json deleted file mode 100644 index 0f80367..0000000 --- a/src/test/resources/junit/l-interface-input.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "interface-id": "junit-l-interface-1", - "interface-name": "junit-l-interface-name1", - "interface-role": "interface-role1", - "is-port-mirrored": "true", - "admin-status": "admin-status1", - "network-name": "network-name-amdocs", - "macaddr": "macaddr-1", - "in-maint": "true" -} \ No newline at end of file diff --git a/src/test/resources/junit/l-interface-input2.json b/src/test/resources/junit/l-interface-input2.json deleted file mode 100644 index 3bcbbda..0000000 --- a/src/test/resources/junit/l-interface-input2.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "interface-id": "junit-l-interface-2", - "interface-name": "junit-l-interface-name2", - "interface-role": "interface-role2", - "is-port-mirrored": "true", - "admin-status": "admin-status2", - "network-name": "network-name-amdocs", - "macaddr": "macaddr-2", - "in-maint": "true" -} \ No newline at end of file diff --git a/src/test/resources/junit/logical-link-input1.json b/src/test/resources/junit/logical-link-input1.json new file mode 100644 index 0000000..40fc85d --- /dev/null +++ b/src/test/resources/junit/logical-link-input1.json @@ -0,0 +1,17 @@ +{ + "link-name" : "01e8d84a-logical-link-1", + "link-id" : "link-id-1", + "model-version-id" : "model-version-id_1", + "model-invariant-id" : "model-invariant-id_1", + "link-type" : "link-type_1", + "routing-protocol" : "routing-protocol-1", + "speed-value" : "speed-value-1", + "speed-units" : "speed-units-001", + "ip-version" : "ip-version-001", + "prov-status" : "prov-status-1", + "link-role" : "link-role-1", + "link-name2" : "link-name2-1", + "circuit-id" : "circuit-id-001", + "purpose" : "purpose-1", + "in-maint" : false +} \ No newline at end of file diff --git a/src/test/resources/junit/logical-link-input2.json b/src/test/resources/junit/logical-link-input2.json new file mode 100644 index 0000000..e606764 --- /dev/null +++ b/src/test/resources/junit/logical-link-input2.json @@ -0,0 +1,17 @@ +{ + "link-name" : "01e8d84a-logical-link-2", + "link-id" : "link-id-2", + "model-version-id" : "model-version-id_2", + "model-invariant-id" : "model-invariant-id_2", + "link-type" : "link-type_2", + "routing-protocol" : "routing-protocol-2", + "speed-value" : "speed-value-2", + "speed-units" : "speed-units-002", + "ip-version" : "ip-version-002", + "prov-status" : "prov-status-2", + "link-role" : "link-role-2", + "link-name2" : "link-name2-2", + "circuit-id" : "circuit-id-002", + "purpose" : "purpose-2", + "in-maint" : true +} \ No newline at end of file diff --git a/src/test/resources/junit/logical-link-input3.json b/src/test/resources/junit/logical-link-input3.json new file mode 100644 index 0000000..bc25f61 --- /dev/null +++ b/src/test/resources/junit/logical-link-input3.json @@ -0,0 +1,17 @@ +{ + "link-name" : "01e8d84a-logical-link-3", + "link-id" : "link-id-3", + "model-version-id" : "model-version-id_3", + "model-invariant-id" : "model-invariant-id_3", + "link-type" : "link-type_3", + "routing-protocol" : "routing-protocol-3", + "speed-value" : "speed-value-3", + "speed-units" : "speed-units-003", + "ip-version" : "ip-version-003", + "prov-status" : "prov-status-3", + "link-role" : "link-role-3", + "link-name2" : "link-name2-3", + "circuit-id" : "circuit-id-003", + "purpose" : "purpose-3", + "in-maint" : false +} \ No newline at end of file diff --git a/src/test/resources/junit/logical-link-input4.json b/src/test/resources/junit/logical-link-input4.json new file mode 100644 index 0000000..d44f075 --- /dev/null +++ b/src/test/resources/junit/logical-link-input4.json @@ -0,0 +1,17 @@ +{ + "link-name" : "01e8d84a-logical-link-4", + "link-id" : "link-id-4", + "model-version-id" : "model-version-id_4", + "model-invariant-id" : "model-invariant-id_4", + "link-type" : "link-type_4", + "routing-protocol" : "routing-protocol-4", + "speed-value" : "speed-value-4", + "speed-units" : "speed-units-004", + "ip-version" : "ip-version-004", + "prov-status" : "prov-status-4", + "link-role" : "link-role-4", + "link-name2" : "link-name2-4", + "circuit-id" : "circuit-id-004", + "purpose" : "purpose-4", + "in-maint" : false +} \ No newline at end of file diff --git a/src/test/resources/junit/pnfInput_w_pInterface.json b/src/test/resources/junit/pnfInput_w_pInterface.json deleted file mode 100644 index c534dfc..0000000 --- a/src/test/resources/junit/pnfInput_w_pInterface.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "pnf-name": "amdocsPnfName", - "pnf-name2": "amdocsPnfName2", - "pnf-name2-source": "pombaName2Source", - "pnf-id": "11112222pnf88889999", - "equip-type": "software", - "equip-vendor": "8df84f0a-737a-4628-be9c-c3c78454f9d9", - "equip-model": "123134236", - "management-option": "TBD", - "sw-version": "2", - "in-maint": "true", - "frame-id": "99888", - "serial-number": "c44b872f6830498b88c4989d67b2a6b7", - "status": "ACTIVE", - "nf-function": "nf-Function-123", - "nf-role": "22222", - "model-invariant-id": "12345", - "model-version-id": "2123", - "admin_state_up": true, - "resource-version": "28", - "tenant_id": "c44b872f6830498b88c4989d67b2a6b7", - "created_at": "2018-03-20T16:49:01Z", - "provider:network_type": "vlan", - "p-interfaces":{ - "p-interface": [ - { - "interface-name": "bdc3cc2a-c73e-414f-7ddb-367de92801cb", - "speed-value": "1225", - "speed-units": "mbs", - "port-description": "port-used-for-junit", - "equipment-identifier": "8df84f0a-737a-4628-be9c-c3c78454f9d9", - "interface-role": "123134236", - "interface-type": "Software", - "prov-status": "2", - "in-maint": "true", - "resource-version": "99888", - "serial-number": "c44b872f6830498b88c4989d67b2a6b7", - "status": "ACTIVE", - "inv-status": "TBD" - } - ] - }, - "relationship-list": { - "relationship": [ - { - "related-to": "vserver", - "related-link": "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/b49b830686654191bb1e952a74b014ad/vservers/vserver/b494cd6e-b9f3-45e0-afe7-e1d1a5f5d74a", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "CloudOwner" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "RegionOne" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "b49b830686654191bb1e952a74b014ad" - }, - { - "relationship-key": "vserver.vserver-id", - "relationship-value": "b494cd6e-b9f3-45e0-afe7-e1d1a5f5d74a" - } - ] - }, - { - "related-to": "l3-network", - "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v13/network/l3-networks/l3-network/HNP1d77c-1094-41ec-b7f3-94bb30951870", - "relationship-data": [ - { - "relationship-key": "l3-network.network-id", - "relationship-value": "HNP1d77c-1094-41ec-b7f3-94bb30951870" - } - ], - "related-to-property": [ - { - "property-key": "l3-network.network-name", - "property-value": "HNPORTALOAM.OAM" - } - ] - } - ] - } -} \ No newline at end of file diff --git a/src/test/resources/junit/pnfInput_w_pInterface_LInterface.json b/src/test/resources/junit/pnfInput_w_pInterface_LInterface.json new file mode 100644 index 0000000..d7a9fd7 --- /dev/null +++ b/src/test/resources/junit/pnfInput_w_pInterface_LInterface.json @@ -0,0 +1,110 @@ +{ + "pnf-name": "amdocsPnfName", + "pnf-name2": "amdocsPnfName2", + "pnf-name2-source": "pombaName2Source", + "pnf-id": "11112222pnf88889999", + "equip-type": "software", + "equip-vendor": "8df84f0a-737a-4628-be9c-c3c78454f9d9", + "equip-model": "123134236", + "management-option": "TBD", + "sw-version": "2", + "in-maint": "true", + "frame-id": "99888", + "serial-number": "c44b872f6830498b88c4989d67b2a6b7", + "status": "ACTIVE", + "nf-function": "nf-Function-123", + "nf-role": "22222", + "model-invariant-id": "12345", + "model-version-id": "2123", + "admin_state_up": true, + "resource-version": "28", + "tenant_id": "c44b872f6830498b88c4989d67b2a6b7", + "created_at": "2018-03-20T16:49:01Z", + "provider:network_type": "vlan", + "p-interfaces":{ + "p-interface": [ + { + "interface-name": "bdc3cc2a-c73e-414f-7ddb-367de92801cb", + "speed-value": "1225", + "speed-units": "mbs", + "port-description": "port-used-for-junit", + "equipment-identifier": "8df84f0a-737a-4628-be9c-c3c78454f9d9", + "interface-role": "123134236", + "interface-type": "Software", + "prov-status": "2", + "in-maint": "true", + "resource-version": "99888", + "serial-number": "c44b872f6830498b88c4989d67b2a6b7", + "status": "ACTIVE", + "inv-status": "TBD", + "l-interfaces" : { + "l-interface" : [ + { + "interface-id": "junit-l-interface-5", + "interface-name": "junit-l-interface-name5", + "interface-role": "interface-role5", + "is-port-mirrored": "true", + "admin-status": "admin-status5", + "network-name": "network-name-amdocs", + "macaddr": "macaddr-5", + "in-maint": "true" + }, + { + "interface-id": "junit-l-interface-6", + "interface-name": "junit-l-interface-name6", + "interface-role": "interface-role6", + "is-port-mirrored": "true", + "admin-status": "admin-status6", + "network-name": "network-name-amdocs", + "macaddr": "macaddr-6", + "in-maint": "true" + } + ] + } + } + ] + }, + "relationship-list": { + "relationship": [ + { + "related-to": "vserver", + "related-link": "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/b49b830686654191bb1e952a74b014ad/vservers/vserver/b494cd6e-b9f3-45e0-afe7-e1d1a5f5d74a", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "CloudOwner" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "RegionOne" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "b49b830686654191bb1e952a74b014ad" + }, + { + "relationship-key": "vserver.vserver-id", + "relationship-value": "b494cd6e-b9f3-45e0-afe7-e1d1a5f5d74a" + } + ] + }, + { + "related-to": "l3-network", + "relationship-label": "org.onap.relationships.inventory.Uses", + "related-link": "/aai/v13/network/l3-networks/l3-network/HNP1d77c-1094-41ec-b7f3-94bb30951870", + "relationship-data": [ + { + "relationship-key": "l3-network.network-id", + "relationship-value": "HNP1d77c-1094-41ec-b7f3-94bb30951870" + } + ], + "related-to-property": [ + { + "property-key": "l3-network.network-name", + "property-value": "HNPORTALOAM.OAM" + } + ] + } + ] + } +} \ No newline at end of file diff --git a/src/test/resources/junit/pnfInput_w_pInterface_LInterface_set2.json b/src/test/resources/junit/pnfInput_w_pInterface_LInterface_set2.json new file mode 100644 index 0000000..acd995e --- /dev/null +++ b/src/test/resources/junit/pnfInput_w_pInterface_LInterface_set2.json @@ -0,0 +1,146 @@ +{ + "pnf-name": "amdocsPnfName", + "pnf-name2": "amdocsPnfName2", + "pnf-name2-source": "pombaName2Source", + "pnf-id": "11112222pnf88889999", + "equip-type": "software", + "equip-vendor": "8df84f0a-737a-4628-be9c-c3c78454f9d9", + "equip-model": "123134236", + "management-option": "TBD", + "sw-version": "2", + "in-maint": "true", + "frame-id": "99888", + "serial-number": "c44b872f6830498b88c4989d67b2a6b7", + "status": "ACTIVE", + "nf-function": "nf-Function-123", + "nf-role": "22222", + "model-invariant-id": "12345", + "model-version-id": "2123", + "admin_state_up": true, + "resource-version": "28", + "tenant_id": "c44b872f6830498b88c4989d67b2a6b7", + "created_at": "2018-03-20T16:49:01Z", + "provider:network_type": "vlan", + "p-interfaces":{ + "p-interface": [ + { + "interface-name": "bdc3cc2a-c73e-414f-7ddb-367de92801cb", + "speed-value": "1225", + "speed-units": "mbs", + "port-description": "port-used-for-junit", + "equipment-identifier": "8df84f0a-737a-4628-be9c-c3c78454f9d9", + "interface-role": "123134236", + "interface-type": "Software", + "prov-status": "2", + "in-maint": "true", + "resource-version": "99888", + "serial-number": "c44b872f6830498b88c4989d67b2a6b7", + "status": "ACTIVE", + "inv-status": "TBD", + "l-interfaces" : { + "l-interface" : [ + { + "interface-id": "junit-l-interface-5", + "interface-name": "junit-l-interface-name5", + "interface-role": "interface-role5", + "is-port-mirrored": "true", + "admin-status": "admin-status5", + "network-name": "network-name-amdocs", + "macaddr": "macaddr-5", + "in-maint": "true" + }, + { + "interface-id": "junit-l-interface-6", + "interface-name": "junit-l-interface-name6", + "interface-role": "interface-role6", + "is-port-mirrored": "true", + "admin-status": "admin-status6", + "network-name": "network-name-amdocs", + "macaddr": "macaddr-6", + "in-maint": "true" + } + ] + }, + "relationship-list": { + "relationship": [ + { + "related-to": "logical-link", + "related-link": "/aai/v13/network/logical-links/logical-link/01e8d84a-logical-link-1", + "relationship-data": [ + { + "relationship-key": "logical-link.link-name", + "relationship-value": "01e8d84a-logical-link-1" + } + ], + "related-to-property": [ + { + "property-key": "logical-link.circuit-id", + "property-value": "NET_8802" + } + ] + }, + { + "related-to": "logical-link", + "related-link": "/aai/v13/network/logical-links/logical-link/01e8d84a-logical-link-2", + "relationship-data": [ + { + "relationship-key": "logical-link.link-name", + "relationship-value": "01e8d84a-logical-link-2" + } + ], + "related-to-property": [ + { + "property-key": "logical-link.circuit-id", + "property-value": "NET_8802" + } + ] + } + ] + } + } + ] + }, + "relationship-list": { + "relationship": [ + { + "related-to": "vserver", + "related-link": "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/b49b830686654191bb1e952a74b014ad/vservers/vserver/b494cd6e-b9f3-45e0-afe7-e1d1a5f5d74a", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "CloudOwner" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "RegionOne" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "b49b830686654191bb1e952a74b014ad" + }, + { + "relationship-key": "vserver.vserver-id", + "relationship-value": "b494cd6e-b9f3-45e0-afe7-e1d1a5f5d74a" + } + ] + }, + { + "related-to": "l3-network", + "relationship-label": "org.onap.relationships.inventory.Uses", + "related-link": "/aai/v13/network/l3-networks/l3-network/HNP1d77c-1094-41ec-b7f3-94bb30951870", + "relationship-data": [ + { + "relationship-key": "l3-network.network-id", + "relationship-value": "HNP1d77c-1094-41ec-b7f3-94bb30951870" + } + ], + "related-to-property": [ + { + "property-key": "l3-network.network-name", + "property-value": "HNPORTALOAM.OAM" + } + ] + } + ] + } +} \ No newline at end of file diff --git a/src/test/resources/junit/pserverInput_with_pInterface.json b/src/test/resources/junit/pserverInput_with_pInterface.json deleted file mode 100644 index e33026b..0000000 --- a/src/test/resources/junit/pserverInput_with_pInterface.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "hostname": "mtn96compute.cci.att.com", - "fqdn": "mtn96compute.cci.att.com", - "pserver-id": "auto-generated-skeleton", - "pserver-name2": "pserverName2-hello", - "ptnii-equip-name": "ptnii-equip-name-hello", - "equip-type": "Firewall", - "equip-vendor": "equip-vendor-hello", - "equip-model": "equip-model-hello", - "internet-topology": "internet-topology-hello", - "purpose": "purpose-something-for-fun", - "serial-number": "1223128888", - "in-maint": false, - "resource-version": "1544034123458", - "p-interfaces":{ - "p-interface": [ - { - "interface-name": "bdc3cc2a-c73e-414f-7ddb-367de92801cb", - "speed-value": "1225", - "speed-units": "mbs", - "port-description": "port-used-for-junit", - "equipment-identifier": "8df84f0a-737a-4628-be9c-c3c78454f9d9", - "interface-role": "123134236", - "interface-type": "Software", - "prov-status": "2", - "in-maint": "true", - "resource-version": "99888", - "serial-number": "c44b872f6830498b88c4989d67b2a6b7", - "status": "ACTIVE", - "inv-status": "TBD" - } - ] - }, - "relationship-list": { - "relationship": [ - { - "related-to": "vserver", - "relationship-label": "tosca.relationships.HostedOn", - "related-link": "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/b49b830686654191bb1e952a74b014ad/vservers/vserver/b494cd6e-b9f3-45e0-afe7-e1d1a5f5d74a", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "CloudOwner" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "RegionOne" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "b49b830686654191bb1e952a74b014ad" - }, - { - "relationship-key": "vserver.vserver-id", - "relationship-value": "b494cd6e-b9f3-45e0-afe7-e1d1a5f5d74a" - } - ], - "related-to-property": [ { - "property-key": "vserver.vserver-name", - "property-value": "Firewall-0" - }] - } - ] - } -} \ No newline at end of file diff --git a/src/test/resources/junit/pserverInput_with_pInterface_LInterface.json b/src/test/resources/junit/pserverInput_with_pInterface_LInterface.json new file mode 100644 index 0000000..f0ce496 --- /dev/null +++ b/src/test/resources/junit/pserverInput_with_pInterface_LInterface.json @@ -0,0 +1,89 @@ +{ + "hostname": "mtn96compute.cci.att.com", + "fqdn": "mtn96compute.cci.att.com", + "pserver-id": "auto-generated-skeleton", + "pserver-name2": "pserverName2-hello", + "ptnii-equip-name": "ptnii-equip-name-hello", + "equip-type": "Firewall", + "equip-vendor": "equip-vendor-hello", + "equip-model": "equip-model-hello", + "internet-topology": "internet-topology-hello", + "purpose": "purpose-something-for-fun", + "serial-number": "1223128888", + "in-maint": false, + "resource-version": "1544034123458", + "p-interfaces":{ + "p-interface": [ + { + "interface-name": "bdc3cc2a-c73e-414f-7ddb-367de92801cb", + "speed-value": "1225", + "speed-units": "mbs", + "port-description": "port-used-for-junit", + "equipment-identifier": "8df84f0a-737a-4628-be9c-c3c78454f9d9", + "interface-role": "123134236", + "interface-type": "Software", + "prov-status": "2", + "in-maint": "true", + "resource-version": "99888", + "serial-number": "c44b872f6830498b88c4989d67b2a6b7", + "status": "ACTIVE", + "inv-status": "TBD", + "l-interfaces" : { + "l-interface" : [ + { + "interface-id": "junit-l-interface-7", + "interface-name": "junit-l-interface-name7", + "interface-role": "interface-role7", + "is-port-mirrored": "true", + "admin-status": "admin-status7", + "network-name": "network-name-amdocs", + "macaddr": "macaddr-7", + "in-maint": "true" + }, + { + "interface-id": "junit-l-interface-8", + "interface-name": "junit-l-interface-name8", + "interface-role": "interface-role8", + "is-port-mirrored": "true", + "admin-status": "admin-status8", + "network-name": "network-name-amdocs", + "macaddr": "macaddr-8", + "in-maint": "true" + } + ] + } + } + ] + }, + "relationship-list": { + "relationship": [ + { + "related-to": "vserver", + "relationship-label": "tosca.relationships.HostedOn", + "related-link": "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/b49b830686654191bb1e952a74b014ad/vservers/vserver/b494cd6e-b9f3-45e0-afe7-e1d1a5f5d74a", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "CloudOwner" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "RegionOne" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "b49b830686654191bb1e952a74b014ad" + }, + { + "relationship-key": "vserver.vserver-id", + "relationship-value": "b494cd6e-b9f3-45e0-afe7-e1d1a5f5d74a" + } + ], + "related-to-property": [ { + "property-key": "vserver.vserver-name", + "property-value": "Firewall-0" + }] + } + ] + } +} \ No newline at end of file diff --git a/src/test/resources/junit/pserverInput_with_pInterface_LInterface_set2.json b/src/test/resources/junit/pserverInput_with_pInterface_LInterface_set2.json new file mode 100644 index 0000000..7b87fa7 --- /dev/null +++ b/src/test/resources/junit/pserverInput_with_pInterface_LInterface_set2.json @@ -0,0 +1,165 @@ +{ + "hostname": "mtn96compute.cci.att.com", + "fqdn": "mtn96compute.cci.att.com", + "pserver-id": "auto-generated-skeleton", + "pserver-name2": "pserverName2-hello", + "ptnii-equip-name": "ptnii-equip-name-hello", + "equip-type": "Firewall", + "equip-vendor": "equip-vendor-hello", + "equip-model": "equip-model-hello", + "internet-topology": "internet-topology-hello", + "purpose": "purpose-something-for-fun", + "serial-number": "1223128888", + "in-maint": false, + "resource-version": "1544034123458", + "p-interfaces":{ + "p-interface": [ + { + "interface-name": "bdc3cc2a-c73e-414f-7ddb-367de92801cb", + "speed-value": "1225", + "speed-units": "mbs", + "port-description": "port-used-for-junit", + "equipment-identifier": "8df84f0a-737a-4628-be9c-c3c78454f9d9", + "interface-role": "123134236", + "interface-type": "Software", + "prov-status": "2", + "in-maint": "true", + "resource-version": "99888", + "serial-number": "c44b872f6830498b88c4989d67b2a6b7", + "status": "ACTIVE", + "inv-status": "TBD", + "l-interfaces" : { + "l-interface" : [ + { + "interface-id": "junit-l-interface-7", + "interface-name": "junit-l-interface-name7", + "interface-role": "interface-role7", + "is-port-mirrored": "true", + "admin-status": "admin-status7", + "network-name": "network-name-amdocs", + "macaddr": "macaddr-7", + "in-maint": "true", + "relationship-list": { + "relationship": [ + { + "related-to": "logical-link", + "related-link": "/aai/v13/network/logical-links/logical-link/01e8d84a-logical-link-3", + "relationship-data": [ + { + "relationship-key": "logical-link.link-name", + "relationship-value": "01e8d84a-logical-link-3" + } + ], + "related-to-property": [ + { + "property-key": "logical-link.circuit-id", + "property-value": "NET_8802" + } + ] + } + ] + } + }, + { + "interface-id": "junit-l-interface-8", + "interface-name": "junit-l-interface-name8", + "interface-role": "interface-role8", + "is-port-mirrored": "true", + "admin-status": "admin-status8", + "network-name": "network-name-amdocs", + "macaddr": "macaddr-8", + "in-maint": "true", + "relationship-list": { + "relationship": [ + { + "related-to": "logical-link", + "related-link": "/aai/v13/network/logical-links/logical-link/01e8d84a-logical-link-4", + "relationship-data": [ + { + "relationship-key": "logical-link.link-name", + "relationship-value": "01e8d84a-logical-link-4" + } + ], + "related-to-property": [ + { + "property-key": "logical-link.circuit-id", + "property-value": "NET_8802" + } + ] + } + ] + } + } + ] + }, + "relationship-list": { + "relationship": [ + { + "related-to": "logical-link", + "related-link": "/aai/v13/network/logical-links/logical-link/01e8d84a-logical-link-1", + "relationship-data": [ + { + "relationship-key": "logical-link.link-name", + "relationship-value": "01e8d84a-logical-link-1" + } + ], + "related-to-property": [ + { + "property-key": "logical-link.circuit-id", + "property-value": "NET_8802" + } + ] + }, + { + "related-to": "logical-link", + "related-link": "/aai/v13/network/logical-links/logical-link/01e8d84a-logical-link-2", + "relationship-data": [ + { + "relationship-key": "logical-link.link-name", + "relationship-value": "01e8d84a-logical-link-2" + } + ], + "related-to-property": [ + { + "property-key": "logical-link.circuit-id", + "property-value": "NET_8802" + } + ] + } + ] + } + } + ] + }, + "relationship-list": { + "relationship": [ + { + "related-to": "vserver", + "relationship-label": "tosca.relationships.HostedOn", + "related-link": "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/b49b830686654191bb1e952a74b014ad/vservers/vserver/b494cd6e-b9f3-45e0-afe7-e1d1a5f5d74a", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "CloudOwner" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "RegionOne" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "b49b830686654191bb1e952a74b014ad" + }, + { + "relationship-key": "vserver.vserver-id", + "relationship-value": "b494cd6e-b9f3-45e0-afe7-e1d1a5f5d74a" + } + ], + "related-to-property": [ { + "property-key": "vserver.vserver-name", + "property-value": "Firewall-0" + }] + } + ] + } +} \ No newline at end of file -- cgit 1.2.3-korg