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) --- src/test/resources/junit/aai-vserver-set3.json | 96 +++++++++++++++++--------- 1 file changed, 64 insertions(+), 32 deletions(-) (limited to 'src/test/resources/junit/aai-vserver-set3.json') 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", -- cgit 1.2.3-korg