From ffb163d752367b42b30ecb1cdcb87b293851f04f Mon Sep 17 00:00:00 2001 From: ShaabanEltanany Date: Sun, 31 May 2020 12:56:32 +0200 Subject: [PATCH] add unit tests for pceOtnNode JIRA: TRNSPRTPCE-209 Signed-off-by: ShaabanEltanany Change-Id: I84db3039341163441d3bf05cf0741e3efb32a9e1 --- .../pce/networkanalyzer/PceOtnNode.java | 10 ++-- .../pce/networkanalyzer/PceOtnNodeTest.java | 50 ++++++++++++++----- 2 files changed, 42 insertions(+), 18 deletions(-) diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNode.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNode.java index a93d38396..93e760e9f 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNode.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNode.java @@ -101,7 +101,7 @@ public class PceOtnNode implements PceNode { = this.node.augmentation(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang .ietf.network.topology.rev180226.Node1.class); List allTps = nodeTp.getTerminationPoint(); + .node.TerminationPoint> allTps = nodeTp.getTerminationPoint(); this.valid = false; if (allTps == null) { LOG.error("PceOtnNode: initXndrTps: XPONDER TerminationPoint list is empty for node {}", this); @@ -109,7 +109,7 @@ public class PceOtnNode implements PceNode { } for (org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network - .node.TerminationPoint tp : allTps) { + .node.TerminationPoint tp : allTps) { org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.@Nullable TerminationPoint1 ocnTp1 = tp.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130 .TerminationPoint1.class); @@ -291,16 +291,16 @@ public class PceOtnNode implements PceNode { public boolean validateSwitchingPoolBandwidth( org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang - .ietf.network.topology.rev180226.networks.network.node.TerminationPoint tp1, + .ietf.network.topology.rev180226.networks.network.node.TerminationPoint tp1, org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang - .ietf.network.topology.rev180226.networks.network.node.TerminationPoint tp2, + .ietf.network.topology.rev180226.networks.network.node.TerminationPoint tp2, Long neededBW) { if (this.nodeType != OpenroadmNodeType.TPDR) { return true; } org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.Node1 node1 = node.augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.Node1.class); + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.Node1.class); SwitchingPools sp = node1.getSwitchingPools(); List osp = sp.getOduSwitchingPools(); for (OduSwitchingPools ospx : osp) { diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNodeTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNodeTest.java index b0276c816..561c1a9a5 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNodeTest.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNodeTest.java @@ -15,6 +15,7 @@ import java.util.List; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.mockito.Mockito; import org.opendaylight.transportpce.common.NetworkUtils; import org.opendaylight.transportpce.test.AbstractTest; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1; @@ -76,9 +77,9 @@ public class PceOtnNodeTest extends AbstractTest { pceOtnNode.initXndrTps("AZ"); pceOtnNode.checkAvailableTribPort(); pceOtnNode.checkAvailableTribSlot(); - Assert.assertTrue(pceOtnNode.isValid()); - Assert.assertFalse(pceOtnNode.checkWL(5L)); - Assert.assertNotNull(pceOtnNode.getAvailableTribPorts()); + Assert.assertTrue("valid otn service type " , pceOtnNode.isValid()); + Assert.assertFalse("checkWl returns by default false" , pceOtnNode.checkWL(5L)); + Assert.assertNotNull("tpAvailableTribPort isn't null !" , pceOtnNode.getAvailableTribPorts()); } @Test @@ -88,7 +89,7 @@ public class PceOtnNodeTest extends AbstractTest { pceOtnNode.initXndrTps("mode"); pceOtnNode.checkAvailableTribPort(); pceOtnNode.checkAvailableTribSlot(); - Assert.assertFalse(pceOtnNode.isValid()); + Assert.assertFalse("not valid otn service type" , pceOtnNode.isValid()); } @Test @@ -99,7 +100,10 @@ public class PceOtnNodeTest extends AbstractTest { pceOtnNode.initXndrTps("mode"); pceOtnNode.checkAvailableTribPort(); pceOtnNode.checkAvailableTribSlot(); - Assert.assertFalse(pceOtnNode.isValid()); + Assert.assertFalse("not valid otn service type", pceOtnNode.isValid()); + Assert.assertTrue("this.nodeType isn'tOpenroadmNodeType.TPDR" , + pceOtnNode.validateSwitchingPoolBandwidth(null,null,1L)); + } @Test @@ -110,7 +114,7 @@ public class PceOtnNodeTest extends AbstractTest { pceOtnNode.initXndrTps("mode"); pceOtnNode.checkAvailableTribPort(); pceOtnNode.checkAvailableTribSlot(); - Assert.assertFalse(pceOtnNode.isValid()); + Assert.assertFalse("not valid otn service type" , pceOtnNode.isValid()); } @Test @@ -122,8 +126,8 @@ public class PceOtnNodeTest extends AbstractTest { pceOtnNode.initXndrTps("AZ"); pceOtnNode.checkAvailableTribPort(); pceOtnNode.checkAvailableTribSlot(); - Assert.assertFalse(pceOtnNode.isValid()); - Assert.assertFalse(pceOtnNode.checkTP("tp")); + Assert.assertFalse("not valid otn service type" , pceOtnNode.isValid()); + Assert.assertFalse("checkTp returns false by default " , pceOtnNode.checkTP("tp")); } @@ -132,7 +136,22 @@ public class PceOtnNodeTest extends AbstractTest { pceOtnNode = new PceOtnNode(node, OpenroadmNodeType.MUXPDR, new NodeId("optical"), ServiceFormat.OMS.getName(), "10GE"); pceOtnNode.initXndrTps("AZ"); - Assert.assertFalse(pceOtnNode.isPceOtnNodeValid(pceOtnNode)); + pceOtnNode.checkAvailableTribPort(); + pceOtnNode.checkAvailableTribSlot(); + Assert.assertFalse("not valid otn service Type" , pceOtnNode.isPceOtnNodeValid(pceOtnNode)); + } + + @Test + public void testIsPceOtnNodeValidNode() { + pceOtnNode = new PceOtnNode(node, OpenroadmNodeType.DEGREE, + new NodeId("optical"), ServiceFormat.OMS.getName(), "100GE"); + pceOtnNode.initXndrTps("AZ"); + pceOtnNode.checkAvailableTribPort(); + pceOtnNode.checkAvailableTribSlot(); + pceOtnNode = Mockito.spy(pceOtnNode); + Mockito.when(pceOtnNode.getNodeId()).thenReturn(null); + Assert.assertFalse("not valid node , nodeId is null" , pceOtnNode.isPceOtnNodeValid(pceOtnNode)); + } @Test @@ -140,7 +159,9 @@ public class PceOtnNodeTest extends AbstractTest { pceOtnNode = new PceOtnNode(node, null, new NodeId("optical"), ServiceFormat.OMS.getName(), "100GE"); pceOtnNode.initXndrTps("AZ"); - Assert.assertFalse(pceOtnNode.isPceOtnNodeValid(pceOtnNode)); + pceOtnNode.checkAvailableTribPort(); + pceOtnNode.checkAvailableTribSlot(); + Assert.assertFalse("not valid type, nodeType is null " , pceOtnNode.isPceOtnNodeValid(pceOtnNode)); } @Test @@ -148,7 +169,8 @@ public class PceOtnNodeTest extends AbstractTest { pceOtnNode = new PceOtnNode(node, OpenroadmNodeType.DEGREE, new NodeId("optical"), ServiceFormat.OMS.getName(), "100GE"); pceOtnNode.initXndrTps("AZ"); - Assert.assertFalse(pceOtnNode.isPceOtnNodeValid(pceOtnNode)); + Assert.assertFalse("not valid node , its type isn't one of MUXPDR or SWITCH or TPDR" , + pceOtnNode.isPceOtnNodeValid(pceOtnNode)); } @Test @@ -156,7 +178,9 @@ public class PceOtnNodeTest extends AbstractTest { pceOtnNode = new PceOtnNode(node, OpenroadmNodeType.MUXPDR, new NodeId("optical"), ServiceFormat.OMS.getName(), "ODU4"); pceOtnNode.initXndrTps("AZ"); - Assert.assertTrue(pceOtnNode.isPceOtnNodeValid(pceOtnNode)); + pceOtnNode.checkAvailableTribPort(); + pceOtnNode.checkAvailableTribSlot(); + Assert.assertTrue("valid otn service type ", pceOtnNode.isPceOtnNodeValid(pceOtnNode)); } @Test @@ -165,7 +189,7 @@ public class PceOtnNodeTest extends AbstractTest { pceOtnNode = new PceOtnNode(node, OpenroadmNodeType.MUXPDR, new NodeId("optical"), ServiceFormat.OMS.getName(), "1GE"); pceOtnNode.initXndrTps("mode"); - pceOtnNode.isPceOtnNodeValid(pceOtnNode); + Assert.assertFalse("not valid otn service Type" , pceOtnNode.isPceOtnNodeValid(pceOtnNode)); } private List geSupportingNodes() { -- 2.36.6