X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pce%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fpce%2Fnetworkanalyzer%2FPceOpticalNodeTest.java;h=a1341acd06a8308ce1b5bf44767bb449cb2df158;hb=refs%2Fchanges%2F48%2F99948%2F1;hp=06f7565d4d4bd937d1d20d160e1bd61896b4b7a9;hpb=e4411e83f9c4cfba18a9000616fd37149dc3c302;p=transportpce.git diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNodeTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNodeTest.java index 06f7565d4..a1341acd0 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNodeTest.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNodeTest.java @@ -16,14 +16,20 @@ import java.util.Map; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; import org.opendaylight.transportpce.common.NetworkUtils; import org.opendaylight.transportpce.common.StringConstants; import org.opendaylight.transportpce.common.fixedflex.GridConstant; import org.opendaylight.transportpce.common.fixedflex.GridUtils; +import org.opendaylight.transportpce.common.mapping.PortMapping; import org.opendaylight.transportpce.test.AbstractTest; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.TerminationPoint1Builder; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.optical.channel.types.rev200529.FrequencyGHz; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.optical.channel.types.rev200529.FrequencyTHz; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev191129.State; +import org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev191129.AdminStates; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529.networks.network.node.DegreeAttributes; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529.networks.network.node.DegreeAttributesBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529.networks.network.node.SrgAttributes; @@ -62,27 +68,33 @@ public class PceOpticalNodeTest extends AbstractTest { private Node node; private BitSet usedBitSet = new BitSet(8); private BitSet availableBitSet = new BitSet(8); + private String deviceNodeId = "device node"; + private String serviceType = "100GE"; + @Mock + private PortMapping portMapping; @Before public void setUp() { NodeBuilder node1Builder = getNodeBuilder(geSupportingNodes(), OpenroadmTpType.SRGTXRXPP); node = node1Builder.setNodeId(new NodeId("test")).build(); availableBitSet.set(0,8); + MockitoAnnotations.openMocks(this); } @Test public void isValidTest() { OpenroadmNodeType nodeType = OpenroadmNodeType.ROADM; - pceOpticalNode = new PceOpticalNode(node, nodeType, StringConstants.OPENROADM_DEVICE_VERSION_2_2_1, - GridConstant.SLOT_WIDTH_50); + pceOpticalNode = new PceOpticalNode(deviceNodeId, serviceType, portMapping, node, nodeType, + StringConstants.OPENROADM_DEVICE_VERSION_2_2_1, GridConstant.SLOT_WIDTH_50, GridConstant.SLOT_WIDTH_50); Assert.assertTrue(pceOpticalNode.isValid()); } @Test public void testInitSrgTps() { - pceOpticalNode = new PceOpticalNode(node, - OpenroadmNodeType.ROADM, StringConstants.OPENROADM_DEVICE_VERSION_2_2_1, GridConstant.SLOT_WIDTH_50); + pceOpticalNode = new PceOpticalNode(deviceNodeId, serviceType, portMapping, node, + OpenroadmNodeType.ROADM, StringConstants.OPENROADM_DEVICE_VERSION_2_2_1, + GridConstant.SLOT_WIDTH_50, GridConstant.SLOT_WIDTH_50); pceOpticalNode.initSrgTps(); pceOpticalNode.initXndrTps(ServiceFormat.OMS); pceOpticalNode.initFrequenciesBitSet(); @@ -98,8 +110,9 @@ public class PceOpticalNodeTest extends AbstractTest { public void testInitXndrTpSrgTypes() { NodeBuilder node1Builder = getNodeBuilder(geSupportingNodes(), OpenroadmTpType.XPONDERNETWORK); Node specificNode = node1Builder.build(); - pceOpticalNode = new PceOpticalNode(specificNode, - OpenroadmNodeType.SRG, StringConstants.OPENROADM_DEVICE_VERSION_2_2_1, GridConstant.SLOT_WIDTH_50); + pceOpticalNode = new PceOpticalNode(deviceNodeId, serviceType, portMapping, specificNode, + OpenroadmNodeType.SRG, StringConstants.OPENROADM_DEVICE_VERSION_2_2_1, + GridConstant.SLOT_WIDTH_50, GridConstant.SLOT_WIDTH_50); pceOpticalNode.initFrequenciesBitSet(); Assert.assertTrue(pceOpticalNode.isValid()); Assert.assertEquals(availableBitSet, pceOpticalNode.getBitSetData().get(88,96)); @@ -108,8 +121,9 @@ public class PceOpticalNodeTest extends AbstractTest { @Test public void testInitXndrTpDegTypes() { - pceOpticalNode = new PceOpticalNode(node, - OpenroadmNodeType.DEGREE, StringConstants.OPENROADM_DEVICE_VERSION_2_2_1, GridConstant.SLOT_WIDTH_50); + pceOpticalNode = new PceOpticalNode(deviceNodeId, serviceType, portMapping, node, + OpenroadmNodeType.DEGREE, StringConstants.OPENROADM_DEVICE_VERSION_2_2_1, + GridConstant.SLOT_WIDTH_50, GridConstant.SLOT_WIDTH_50); pceOpticalNode.initFrequenciesBitSet(); Assert.assertTrue(pceOpticalNode.isValid()); Assert.assertEquals(usedBitSet,pceOpticalNode.getBitSetData().get(88,96)); @@ -118,8 +132,9 @@ public class PceOpticalNodeTest extends AbstractTest { @Test public void testInitXndrTpXpondrTypes() { - pceOpticalNode = new PceOpticalNode(node, - OpenroadmNodeType.XPONDER, StringConstants.OPENROADM_DEVICE_VERSION_2_2_1, GridConstant.SLOT_WIDTH_50); + pceOpticalNode = new PceOpticalNode(deviceNodeId, serviceType, portMapping, node, + OpenroadmNodeType.XPONDER, StringConstants.OPENROADM_DEVICE_VERSION_2_2_1, + GridConstant.SLOT_WIDTH_50, GridConstant.SLOT_WIDTH_50); pceOpticalNode.initFrequenciesBitSet(); Assert.assertTrue(pceOpticalNode.isValid()); Assert.assertEquals(availableBitSet, pceOpticalNode.getBitSetData().get(88,96)); @@ -128,8 +143,9 @@ public class PceOpticalNodeTest extends AbstractTest { @Test public void testinitFrequenciesBitSet() { - pceOpticalNode = new PceOpticalNode(node, - OpenroadmNodeType.ROADM, StringConstants.OPENROADM_DEVICE_VERSION_2_2_1, GridConstant.SLOT_WIDTH_50); + pceOpticalNode = new PceOpticalNode(null, null, null, node, + OpenroadmNodeType.ROADM, StringConstants.OPENROADM_DEVICE_VERSION_2_2_1, + GridConstant.SLOT_WIDTH_50, GridConstant.SLOT_WIDTH_50); pceOpticalNode.initXndrTps(ServiceFormat.OMS); pceOpticalNode.initFrequenciesBitSet(); Assert.assertFalse(pceOpticalNode.isValid()); @@ -139,10 +155,11 @@ public class PceOpticalNodeTest extends AbstractTest { @Test public void testGetRdmSrgClient() { - pceOpticalNode = new PceOpticalNode(node, - OpenroadmNodeType.ROADM, StringConstants.OPENROADM_DEVICE_VERSION_2_2_1, GridConstant.SLOT_WIDTH_50); + pceOpticalNode = new PceOpticalNode(null, null, null, node, + OpenroadmNodeType.ROADM, StringConstants.OPENROADM_DEVICE_VERSION_2_2_1, + GridConstant.SLOT_WIDTH_50, GridConstant.SLOT_WIDTH_50); pceOpticalNode.initSrgTps(); - Assert.assertNull(pceOpticalNode.getRdmSrgClient("7")); + Assert.assertNull(pceOpticalNode.getRdmSrgClient("7", StringConstants.SERVICE_DIRECTION_AZ)); Assert.assertFalse(pceOpticalNode.isValid()); Assert.assertNull(pceOpticalNode.getBitSetData()); Assert.assertTrue(pceOpticalNode.checkTP("testTP")); @@ -152,12 +169,13 @@ public class PceOpticalNodeTest extends AbstractTest { public void testGetRdmSrgClientEmpty() { NodeBuilder node1Builder = getNodeBuilderEmpty(geSupportingNodes(), OpenroadmTpType.SRGTXRXPP); Node specificNode = node1Builder.setNodeId(new NodeId("test")).build(); - pceOpticalNode = new PceOpticalNode(specificNode, - OpenroadmNodeType.ROADM, StringConstants.OPENROADM_DEVICE_VERSION_2_2_1, GridConstant.SLOT_WIDTH_50); + pceOpticalNode = new PceOpticalNode(null, null, null, specificNode, + OpenroadmNodeType.ROADM, StringConstants.OPENROADM_DEVICE_VERSION_2_2_1, + GridConstant.SLOT_WIDTH_50, GridConstant.SLOT_WIDTH_50); pceOpticalNode.initSrgTps(); pceOpticalNode.initFrequenciesBitSet(); pceOpticalNode.initXndrTps(ServiceFormat.OMS); - Assert.assertNull(pceOpticalNode.getRdmSrgClient("7")); + Assert.assertNull(pceOpticalNode.getRdmSrgClient("7" ,StringConstants.SERVICE_DIRECTION_AZ)); Assert.assertFalse(pceOpticalNode.isValid()); Assert.assertNull(pceOpticalNode.getBitSetData()); Assert.assertTrue(pceOpticalNode.checkTP("testTP")); @@ -165,10 +183,11 @@ public class PceOpticalNodeTest extends AbstractTest { @Test public void testGetRdmSrgClientDeg() { - pceOpticalNode = new PceOpticalNode(node, - OpenroadmNodeType.DEGREE, StringConstants.OPENROADM_DEVICE_VERSION_2_2_1, GridConstant.SLOT_WIDTH_50); + pceOpticalNode = new PceOpticalNode(null, null, null, node, + OpenroadmNodeType.DEGREE, StringConstants.OPENROADM_DEVICE_VERSION_2_2_1, + GridConstant.SLOT_WIDTH_50, GridConstant.SLOT_WIDTH_50); pceOpticalNode.initSrgTps(); - Assert.assertNull(pceOpticalNode.getRdmSrgClient("7")); + Assert.assertNull(pceOpticalNode.getRdmSrgClient("7" ,StringConstants.SERVICE_DIRECTION_AZ)); Assert.assertFalse(pceOpticalNode.isValid()); Assert.assertNull(pceOpticalNode.getBitSetData()); Assert.assertTrue(pceOpticalNode.checkTP("testTP")); @@ -178,23 +197,25 @@ public class PceOpticalNodeTest extends AbstractTest { public void testGetRdmSrgClientsrgtxcp() { NodeBuilder node1Builder = getNodeBuilder(geSupportingNodes(), OpenroadmTpType.SRGTXCP); Node specificNode = node1Builder.build(); - pceOpticalNode = new PceOpticalNode(specificNode, - OpenroadmNodeType.ROADM, StringConstants.OPENROADM_DEVICE_VERSION_2_2_1, GridConstant.SLOT_WIDTH_50); + pceOpticalNode = new PceOpticalNode(null, null, null, specificNode, + OpenroadmNodeType.ROADM, StringConstants.OPENROADM_DEVICE_VERSION_2_2_1, + GridConstant.SLOT_WIDTH_50, GridConstant.SLOT_WIDTH_50); pceOpticalNode.initSrgTps(); Assert.assertFalse(pceOpticalNode.isValid()); Assert.assertNull(pceOpticalNode.getBitSetData()); Assert.assertTrue(pceOpticalNode.checkTP("testTP")); - Assert.assertNull(pceOpticalNode.getRdmSrgClient("5")); + Assert.assertNull(pceOpticalNode.getRdmSrgClient("5", StringConstants.SERVICE_DIRECTION_AZ)); } @Test public void testGetRdmSrgClientDegreerxtpp() { NodeBuilder node1Builder = getNodeBuilder(geSupportingNodes(), OpenroadmTpType.DEGREERXTTP); node = node1Builder.build(); - pceOpticalNode = new PceOpticalNode(node, - OpenroadmNodeType.ROADM, StringConstants.OPENROADM_DEVICE_VERSION_2_2_1, GridConstant.SLOT_WIDTH_50); + pceOpticalNode = new PceOpticalNode(null, null, null, node, + OpenroadmNodeType.ROADM, StringConstants.OPENROADM_DEVICE_VERSION_2_2_1, + GridConstant.SLOT_WIDTH_50, GridConstant.SLOT_WIDTH_50); pceOpticalNode.initSrgTps(); - Assert.assertNull(pceOpticalNode.getRdmSrgClient("2")); + Assert.assertNull(pceOpticalNode.getRdmSrgClient("2" ,StringConstants.SERVICE_DIRECTION_AZ)); Assert.assertFalse(pceOpticalNode.isValid()); Assert.assertNull(pceOpticalNode.getBitSetData()); Assert.assertTrue(pceOpticalNode.checkTP("testTP")); @@ -231,6 +252,8 @@ public class PceOpticalNodeTest extends AbstractTest { new Node1Builder() .setTerminationPoint(Map.of(xpdr.key(),xpdr)) .build(); + Node1 node11 = new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1Builder() + .setAdministrativeState(AdminStates.InService).setOperationalState(State.InService).build(); return new NodeBuilder() @@ -238,6 +261,7 @@ public class PceOpticalNodeTest extends AbstractTest { .withKey(new NodeKey(new NodeId("node 1"))) .addAugmentation(node1Rev180226) .addAugmentation(node1) + .addAugmentation(node11) .setSupportingNode(supportingNodes1); } @@ -255,6 +279,8 @@ public class PceOpticalNodeTest extends AbstractTest { new Node1Builder() .setTerminationPoint(Map.of(xpdr.key(),xpdr)) .build(); + Node1 node11 = new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1Builder() + .setAdministrativeState(AdminStates.InService).setOperationalState(State.InService).build(); return new NodeBuilder() @@ -262,6 +288,7 @@ public class PceOpticalNodeTest extends AbstractTest { .withKey(new NodeKey(new NodeId("node 1"))) .addAugmentation(node1Rev180226) .addAugmentation(node1) + .addAugmentation(node11) .setSupportingNode(supportingNodes1); } @@ -318,7 +345,8 @@ public class PceOpticalNodeTest extends AbstractTest { private TerminationPoint1Builder getTerminationPoint1Builder(OpenroadmTpType openroadmTpType) { - return new TerminationPoint1Builder().setTpType(openroadmTpType); + return new TerminationPoint1Builder().setTpType(openroadmTpType).setOperationalState(State.InService) + .setAdministrativeState(AdminStates.InService); }