aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/main/java/org/onap/pomba/contextbuilder/aai/datatype/PInterfaceInstance.java2
-rw-r--r--src/main/java/org/onap/pomba/contextbuilder/aai/datatype/PserverInstance.java2
-rw-r--r--src/test/java/org/onap/logging_analytics/pomba/pomba_aai_context_builder/L3networkInstanceTest.java54
-rw-r--r--src/test/java/org/onap/logging_analytics/pomba/pomba_aai_context_builder/PInterfaceInstanceTest.java54
-rw-r--r--src/test/java/org/onap/logging_analytics/pomba/pomba_aai_context_builder/PnfInstanceTest.java59
-rw-r--r--src/test/java/org/onap/logging_analytics/pomba/pomba_aai_context_builder/PserverInstanceTest.java58
6 files changed, 228 insertions, 1 deletions
diff --git a/src/main/java/org/onap/pomba/contextbuilder/aai/datatype/PInterfaceInstance.java b/src/main/java/org/onap/pomba/contextbuilder/aai/datatype/PInterfaceInstance.java
index a8c5004..c343df6 100644
--- a/src/main/java/org/onap/pomba/contextbuilder/aai/datatype/PInterfaceInstance.java
+++ b/src/main/java/org/onap/pomba/contextbuilder/aai/datatype/PInterfaceInstance.java
@@ -181,6 +181,8 @@ public class PInterfaceInstance {
this.speedUnits = speedUnits;
this.portDescription = portDescription;
this.equipmentIdentifier = equipmentIdentifier;
+ this.interfaceRole = interfaceRole;
+ this.interfaceType = interfaceType;
this.provStatus = provStatus;
this.resourceVersion = resourceVersion;
this.inMaint = inMaint;
diff --git a/src/main/java/org/onap/pomba/contextbuilder/aai/datatype/PserverInstance.java b/src/main/java/org/onap/pomba/contextbuilder/aai/datatype/PserverInstance.java
index 63b3f70..d8d6d39 100644
--- a/src/main/java/org/onap/pomba/contextbuilder/aai/datatype/PserverInstance.java
+++ b/src/main/java/org/onap/pomba/contextbuilder/aai/datatype/PserverInstance.java
@@ -260,7 +260,7 @@ public class PserverInstance {
String ptniiEquipName, String equipType,String equipVendor,
String equipModel,String fqdn,String internetTopology,
String inMaint, String resourceVersion, String serialNumber,
- String purpose, String relationshipList, PInterfaceInstanceList pInterfaceInstanceList) {
+ String purpose, PInterfaceInstanceList pInterfaceInstanceList) {
super();
this.pserverId = pserverId;
this.hostname = hostname;
diff --git a/src/test/java/org/onap/logging_analytics/pomba/pomba_aai_context_builder/L3networkInstanceTest.java b/src/test/java/org/onap/logging_analytics/pomba/pomba_aai_context_builder/L3networkInstanceTest.java
new file mode 100644
index 0000000..d08d696
--- /dev/null
+++ b/src/test/java/org/onap/logging_analytics/pomba/pomba_aai_context_builder/L3networkInstanceTest.java
@@ -0,0 +1,54 @@
+/*
+ * ============LICENSE_START===================================================
+ * Copyright (c) 2018 Amdocs
+ * ============================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=====================================================
+ */
+package org.onap.logging_analytics.pomba.pomba_aai_context_builder;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+import org.onap.pomba.contextbuilder.aai.datatype.L3networkInstance;
+
+public class L3networkInstanceTest {
+ @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));
+ }
+}
diff --git a/src/test/java/org/onap/logging_analytics/pomba/pomba_aai_context_builder/PInterfaceInstanceTest.java b/src/test/java/org/onap/logging_analytics/pomba/pomba_aai_context_builder/PInterfaceInstanceTest.java
new file mode 100644
index 0000000..2a0bbb2
--- /dev/null
+++ b/src/test/java/org/onap/logging_analytics/pomba/pomba_aai_context_builder/PInterfaceInstanceTest.java
@@ -0,0 +1,54 @@
+/*
+ * ============LICENSE_START===================================================
+ * Copyright (c) 2018 Amdocs
+ * ============================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=====================================================
+ */
+package org.onap.logging_analytics.pomba.pomba_aai_context_builder;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+import org.onap.pomba.contextbuilder.aai.datatype.PInterfaceInstance;
+
+public class PInterfaceInstanceTest {
+
+ @Test
+ public void testPInterfaceInstanceEquals() {
+ PInterfaceInstance pInterfaceInstance1 = new PInterfaceInstance
+ ( "interfaceName1", "speedValue1", "speedUnits1",
+ "portDescription1", "equipmentIdentifier1", "interfaceRole1", "interfaceType1",
+ "provStatus1", "resourceVersion1", "inMaint1", "invStatus1" );
+
+ PInterfaceInstance pInterfaceInstance2 = new PInterfaceInstance ();
+ pInterfaceInstance2.setInterfaceName("interfaceName1");
+ pInterfaceInstance2.setSpeedValue("speedValue1");
+ pInterfaceInstance2.setSpeedUnits("speedUnits1");
+ pInterfaceInstance2.setPortDescription("portDescription1");
+ pInterfaceInstance2.setEquipmentIdentifier("equipmentIdentifier1");
+ pInterfaceInstance2.setInterfaceRole("interfaceRole1");
+ pInterfaceInstance2.setInterfaceType("interfaceType1");
+ pInterfaceInstance2.setProvStatus("provStatus1");
+ pInterfaceInstance2.setResourceVersion("resourceVersion1");
+ pInterfaceInstance2.setInMaint("inMaint1");
+ pInterfaceInstance2.setInvStatus("invStatus1");
+
+ pInterfaceInstance1.toJson();
+ pInterfaceInstance1.toString();
+ assertEquals("interfaceName1", pInterfaceInstance2.getInterfaceName());
+ assertTrue(pInterfaceInstance1.equals(pInterfaceInstance1));
+ assertTrue(pInterfaceInstance1.equals(pInterfaceInstance2));
+ }
+}
diff --git a/src/test/java/org/onap/logging_analytics/pomba/pomba_aai_context_builder/PnfInstanceTest.java b/src/test/java/org/onap/logging_analytics/pomba/pomba_aai_context_builder/PnfInstanceTest.java
new file mode 100644
index 0000000..e7748c5
--- /dev/null
+++ b/src/test/java/org/onap/logging_analytics/pomba/pomba_aai_context_builder/PnfInstanceTest.java
@@ -0,0 +1,59 @@
+/*
+ * ============LICENSE_START===================================================
+ * Copyright (c) 2018 Amdocs
+ * ============================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=====================================================
+ */
+package org.onap.logging_analytics.pomba.pomba_aai_context_builder;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+import org.onap.pomba.contextbuilder.aai.datatype.PnfInstance;
+
+public class PnfInstanceTest {
+ @Test
+ public void testPnfInstanceEquals() {
+ PnfInstance pnfInstance1 = new PnfInstance
+ ( "uuid1", "name1", "networkRole1",
+ "name21", "name2Source1", "equipmentType1",
+ "equipmentVendor1", "equipmentModel1", "managementOptions1",
+ "swVersion1", "frameId1", "serialNumber1",
+ "modelInvariantId1", "modelVersionId1", null);
+
+ PnfInstance pnfInstance2 = new PnfInstance ();
+ pnfInstance2.setPnfId("uuid1");
+ pnfInstance2.setPnfName("name1");
+ pnfInstance2.setNfRole("networkRole1");
+ pnfInstance2.setPnfName2("name21");
+ pnfInstance2.setPnfName2Source("name2Source1");
+ pnfInstance2.setEquipmentType("equipmentType1");
+ pnfInstance2.setEquipmentVendor("equipmentVendor1");
+ pnfInstance2.setEquipmentModel("equipmentModel1");
+ pnfInstance2.setManagementOptions("managementOptions1");
+ pnfInstance2.setSwVersion("swVersion1");
+ pnfInstance2.setFrameId("frameId1");
+ pnfInstance2.setSerialNumber("serialNumber1");
+ pnfInstance2.setModelInvariantId("modelInvariantId1");
+ pnfInstance2.setModelVersionId("modelVersionId1");
+ pnfInstance2.setPInterfaceInstanceList(null);
+
+ pnfInstance1.toJson();
+ pnfInstance1.toString();
+ assertEquals("name1", pnfInstance2.getPnfName());
+ assertTrue(pnfInstance1.equals(pnfInstance1));
+ assertTrue(pnfInstance1.equals(pnfInstance2));
+ }
+}
diff --git a/src/test/java/org/onap/logging_analytics/pomba/pomba_aai_context_builder/PserverInstanceTest.java b/src/test/java/org/onap/logging_analytics/pomba/pomba_aai_context_builder/PserverInstanceTest.java
new file mode 100644
index 0000000..93afb91
--- /dev/null
+++ b/src/test/java/org/onap/logging_analytics/pomba/pomba_aai_context_builder/PserverInstanceTest.java
@@ -0,0 +1,58 @@
+/*
+ * ============LICENSE_START===================================================
+ * Copyright (c) 2018 Amdocs
+ * ============================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=====================================================
+ */
+package org.onap.logging_analytics.pomba.pomba_aai_context_builder;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+import org.onap.pomba.contextbuilder.aai.datatype.PserverInstance;
+
+public class PserverInstanceTest {
+ @Test
+ public void testPserverInstanceEquals() {
+ PserverInstance pserverInstance1 = new PserverInstance
+ ( "pserverId1", "hostname1", "pserverName2a",
+ "ptniiEquipName1", "equipType1", "equipVendor1",
+ "equipModel1", "fqdn1", "internetTopology1",
+ "inMaint1", "resourceVersion1", "serialNumber1",
+ "purpose1",null);
+
+ PserverInstance pserverInstance2 = new PserverInstance ();
+ pserverInstance2.setPserverId("pserverId1");
+ pserverInstance2.setHostname("hostname1");
+ pserverInstance2.setPserverName2("pserverName2a");
+ pserverInstance2.setPtniiEquipName("ptniiEquipName1");
+ pserverInstance2.setEquipType("equipType1");
+ pserverInstance2.setEquipVendor("equipVendor1");
+ pserverInstance2.setEquipModel("equipModel1");
+ pserverInstance2.setFqdn("fqdn1");
+ pserverInstance2.setInternetTopology("internetTopology1");
+ pserverInstance2.setInMaint("inMaint1");
+ pserverInstance2.setResourceVersion("resourceVersion1");
+ pserverInstance2.setSerialNumber("serialNumber1");
+ pserverInstance2.setPurpose("purpose1");
+ pserverInstance2.setPInterfaceInstanceList(null);
+
+ pserverInstance1.toJson();
+ pserverInstance1.toString();
+ assertEquals("hostname1", pserverInstance2.getHostname());
+ assertTrue(pserverInstance1.equals(pserverInstance1));
+ assertTrue(pserverInstance1.equals(pserverInstance2));
+ }
+}