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) <phillip.leigh@amdocs.com>

1 files changed, 1 insertions, 30 deletions

diff --git a/src/test/java/org/onap/logging_analytics/pomba/pomba_aai_context_builder/LInterfaceInstanceTest.java b/src/test/java/org/onap/logging_analytics/pomba/pomba_aai_context_builder/LInterfaceInstanceTest.java
index dbca0d0..1dde19d 100644
--- a/src/test/java/org/onap/logging_analytics/pomba/pomba_aai_context_builder/LInterfaceInstanceTest.java
+++ b/src/test/java/org/onap/logging_analytics/pomba/pomba_aai_context_builder/LInterfaceInstanceTest.java
@@ -21,44 +21,15 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
-import org.onap.pomba.contextbuilder.aai.datatype.L3networkInstance;
 import org.onap.pomba.contextbuilder.aai.datatype.LInterfaceInstance;
 
 public class LInterfaceInstanceTest {
-	@Test
-	public void testL3networkInstanceEquals() {
-	    L3networkInstance  l3networkInstance1 = new L3networkInstance
-	            ( "networkId1",  "networkName1",  "networkType1",
-	             "networkRole1",  "networkTechnology1", "resourceVersion1",
-	             "modelInvariantId1",  "modelVersionId1",  "physicalNetworkName1", "true",
-	             null);
-
-	    L3networkInstance  l3networkInstance2 = new L3networkInstance ();
-	    l3networkInstance2.setNetworkId("networkId1");
-        l3networkInstance2.setNetworkName("networkName1");
-        l3networkInstance2.setNetworkType("networkType1");
-        l3networkInstance2.setNetworkRole("networkRole1");
-        l3networkInstance2.setNetworkTechnology("networkTechnology1");
-        l3networkInstance2.setResourceVersion("resourceVersion1");
-        l3networkInstance2.setModelInvariantId("modelInvariantId1");
-        l3networkInstance2.setModelVersionId("modelVersionId1");
-        l3networkInstance2.setPhysicalNetworkName("physicalNetworkName1");
-        l3networkInstance2.setSharedNetworkBoolean("true");
-        l3networkInstance2.setRelationshipList(null);
-
-        l3networkInstance1.toJson();
-        l3networkInstance1.toString();
-        assertEquals("physicalNetworkName1", l3networkInstance2.getPhysicalNetworkName());
-		assertTrue(l3networkInstance1.equals(l3networkInstance1));
-		assertTrue(l3networkInstance1.equals(l3networkInstance2));
-	}
-
 	   @Test
 	    public void testLInterfaceInstanceEquals() {
 	       LInterfaceInstance  lInterfaceInstance1 = new LInterfaceInstance
 	               ( "interfaceId1",  "interfaceName1",  "interfaceRole1",
                     "isPortMirrored1",  "adminStatus1",  "networkName1",
-                    "macAddr1", "inMaint1");
+                    "macAddr1", "inMaint1", null);
 
 	       LInterfaceInstance  lInterfaceInstance2 = new LInterfaceInstance ();
 	        lInterfaceInstance2.setInterfaceId("interfaceId1");