X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=transportpce.git;a=blobdiff_plain;f=renderer%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Frenderer%2FNetworkModelWaveLengthServiceUseTest.java;h=4d4cb3a280908e1eb83a2d3dc9cae837adb142d5;hp=7270eeb2c605ef905e88cbd85d6636910974810e;hb=66ccddbe00692f230350a19e1a222f09d6abd9a7;hpb=e64164ece5c0b8b283bc80dad34fc5f664082ca5 diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/NetworkModelWaveLengthServiceUseTest.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/NetworkModelWaveLengthServiceUseTest.java index 7270eeb2c..4d4cb3a28 100644 --- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/NetworkModelWaveLengthServiceUseTest.java +++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/NetworkModelWaveLengthServiceUseTest.java @@ -18,34 +18,32 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.opendaylight.controller.md.sal.binding.api.MountPointService; import org.opendaylight.transportpce.common.StringConstants; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; import org.opendaylight.transportpce.common.device.DeviceTransactionManagerImpl; -import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl; import org.opendaylight.transportpce.renderer.stub.MountPointServiceStub; import org.opendaylight.transportpce.renderer.stub.MountPointStub; import org.opendaylight.transportpce.renderer.utils.ServiceDeleteDataUtils; import org.opendaylight.transportpce.renderer.utils.WaveLengthServiceUtils; import org.opendaylight.transportpce.test.AbstractTest; -import org.opendaylight.yang.gen.v1.http.org.openroadm.degree.rev170929.degree.node.attributes.AvailableWavelengthsBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.Node1; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.Node1Builder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.TerminationPoint1; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.TerminationPoint1Builder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.DegreeAttributesBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.SrgAttributesBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.termination.point.CpAttributesBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.termination.point.CtpAttributesBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.termination.point.PpAttributesBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.termination.point.RxTtpAttributesBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.termination.point.TxTtpAttributesBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.termination.point.XpdrClientAttributesBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.termination.point.XpdrNetworkAttributesBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.termination.point.XpdrPortAttributesBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev170929.OpenroadmNodeType; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev170929.OpenroadmTpType; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev171016.service.path.PathDescription; +import org.opendaylight.yang.gen.v1.http.org.openroadm.degree.rev181130.degree.node.attributes.AvailableWavelengthsBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.Node1; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.Node1Builder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.TerminationPoint1; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.TerminationPoint1Builder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.networks.network.node.DegreeAttributesBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.networks.network.node.SrgAttributesBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.networks.network.node.termination.point.CpAttributesBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.networks.network.node.termination.point.CtpAttributesBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.networks.network.node.termination.point.PpAttributesBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.networks.network.node.termination.point.RxTtpAttributesBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.networks.network.node.termination.point.TxTtpAttributesBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.networks.network.node.termination.point.XpdrClientAttributesBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.networks.network.node.termination.point.XpdrNetworkAttributesBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.networks.network.node.termination.point.XpdrPortAttributesBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.OpenroadmNodeType; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.OpenroadmTpType; +import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev191009.service.path.PathDescription; @RunWith(Parameterized.class) public class NetworkModelWaveLengthServiceUseTest extends AbstractTest { @@ -54,21 +52,27 @@ public class NetworkModelWaveLengthServiceUseTest extends AbstractTest { private DeviceTransactionManager deviceTransactionManager; private TerminationPoint1 terminationPoint1; + private org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1 terminatPoint2; private PathDescription pathDescription; private Node1 node1; + private org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1 node2; @Before public void setMountPoint() { - MountPointService mountPointService = new MountPointServiceStub(new MountPointStub(this.getDataBroker())); + MountPointServiceStub mountPointService = new MountPointServiceStub(new MountPointStub(this.getDataBroker())); this.deviceTransactionManager = new DeviceTransactionManagerImpl(mountPointService, 3000); networkModelWavelengthService = new NetworkModelWavelengthServiceImpl(this.getDataBroker()); } public NetworkModelWaveLengthServiceUseTest(PathDescription pathDescription, TerminationPoint1 terminationPoint1, - Node1 node1) { + Node1 node1, + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1 terminationPoint2, + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1 node2) { this.pathDescription = pathDescription; this.terminationPoint1 = terminationPoint1; + this.terminatPoint2 = terminationPoint2; this.node1 = node1; + this.node2 = node2; } @Parameterized.Parameters @@ -78,40 +82,48 @@ public class NetworkModelWaveLengthServiceUseTest extends AbstractTest { PathDescription pathDescription = ServiceDeleteDataUtils.createTransactionPathDescription(StringConstants.TTP_TOKEN); - TerminationPoint1Builder terminationPoint1Builder = new TerminationPoint1Builder(); - terminationPoint1Builder - .setCtpAttributes((new CtpAttributesBuilder()).setUsedWavelengths(new ArrayList<>()).build()); - terminationPoint1Builder - .setCpAttributes((new CpAttributesBuilder()).setUsedWavelengths(new ArrayList<>()).build()); - terminationPoint1Builder - .setTxTtpAttributes((new TxTtpAttributesBuilder()).setUsedWavelengths(new ArrayList<>()).build()); - terminationPoint1Builder - .setRxTtpAttributes((new RxTtpAttributesBuilder()).setUsedWavelengths(new ArrayList<>()).build()); - terminationPoint1Builder.setPpAttributes((new PpAttributesBuilder()).setUsedWavelength(new ArrayList<>()) - .build()); - terminationPoint1Builder.setXpdrClientAttributes((new XpdrClientAttributesBuilder()).build()); - terminationPoint1Builder.setXpdrNetworkAttributes((new XpdrNetworkAttributesBuilder()).build()); - terminationPoint1Builder.setXpdrPortAttributes((new XpdrPortAttributesBuilder()).build()); - - Node1Builder node1Builder = new Node1Builder(); - node1Builder.setDegreeAttributes((new DegreeAttributesBuilder()) - .setAvailableWavelengths(Collections.singletonList(new AvailableWavelengthsBuilder().setIndex(20L).build())) - .build()); - node1Builder.setSrgAttributes((new SrgAttributesBuilder()).setAvailableWavelengths(Collections.singletonList( - new org.opendaylight.yang.gen.v1.http.org.openroadm.srg.rev170929.srg.node.attributes - .AvailableWavelengthsBuilder().setIndex(20L).build())).build()); + TerminationPoint1Builder terminationPoint1Builder = new TerminationPoint1Builder() + .setCtpAttributes((new CtpAttributesBuilder()).setUsedWavelengths(new ArrayList<>()).build()) + .setCpAttributes((new CpAttributesBuilder()).setUsedWavelengths(new ArrayList<>()).build()) + .setTxTtpAttributes((new TxTtpAttributesBuilder()).setUsedWavelengths(new ArrayList<>()).build()) + .setRxTtpAttributes((new RxTtpAttributesBuilder()).setUsedWavelengths(new ArrayList<>()).build()) + .setPpAttributes((new PpAttributesBuilder()).setUsedWavelength(new ArrayList<>()).build()) + .setXpdrClientAttributes((new XpdrClientAttributesBuilder()).build()) + .setXpdrNetworkAttributes((new XpdrNetworkAttributesBuilder()).build()) + .setXpdrPortAttributes((new XpdrPortAttributesBuilder()).build()); + + Node1Builder node1Builder = new Node1Builder() + .setDegreeAttributes((new DegreeAttributesBuilder()) + .setAvailableWavelengths( + Collections.singletonList(new AvailableWavelengthsBuilder().setIndex(20L).build())) + .build()) + .setSrgAttributes((new SrgAttributesBuilder()) + .setAvailableWavelengths( + Collections.singletonList( + new org.opendaylight.yang.gen.v1.http.org.openroadm.srg.rev181130.srg.node.attributes + .AvailableWavelengthsBuilder().setIndex(20L).build())) + .build()); + + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1Builder + terminationPoint2Builder = + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1Builder(); + + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1Builder node2Builder = + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1Builder(); for (OpenroadmNodeType nodeType : Arrays .asList(OpenroadmNodeType.XPONDER, OpenroadmNodeType.DEGREE, OpenroadmNodeType.SRG)) { - node1Builder.setNodeType(nodeType); - terminationPoint1Builder.setTpType(OpenroadmTpType.DEGREETXTTP); - parameters.add(new Object[] { pathDescription, terminationPoint1Builder.build(), node1Builder.build() }); + node2Builder.setNodeType(nodeType); + terminationPoint2Builder.setTpType(OpenroadmTpType.DEGREETXTTP); + parameters.add(new Object[] { pathDescription, terminationPoint1Builder.build(), node1Builder.build(), + terminationPoint2Builder.build(), node2Builder.build() }); } for (OpenroadmTpType tpType : OpenroadmTpType.values()) { - node1Builder.setNodeType(OpenroadmNodeType.DEGREE); - terminationPoint1Builder.setTpType(tpType); - parameters.add(new Object[] { pathDescription, terminationPoint1Builder.build(), node1Builder.build() }); + node2Builder.setNodeType(OpenroadmNodeType.DEGREE); + terminationPoint2Builder.setTpType(tpType); + parameters.add(new Object[] { pathDescription, terminationPoint1Builder.build(), node1Builder.build(), + terminationPoint2Builder.build(), node2Builder.build() }); } return parameters; @@ -119,21 +131,31 @@ public class NetworkModelWaveLengthServiceUseTest extends AbstractTest { @Test public void freeWavelengthsTest() throws ExecutionException, InterruptedException { - WaveLengthServiceUtils - .putTerminationPoint1ToDatastore("node1" + StringConstants.TTP_TOKEN, - StringConstants.TTP_TOKEN, - this.terminationPoint1, this.deviceTransactionManager); + WaveLengthServiceUtils.putTerminationPoint1ToDatastore("node1" + StringConstants.TTP_TOKEN, + StringConstants.TTP_TOKEN, this.terminationPoint1, this.deviceTransactionManager); + WaveLengthServiceUtils.putTerminationPoint2ToDatastore("node1" + StringConstants.TTP_TOKEN, + StringConstants.TTP_TOKEN, this.terminatPoint2, this.deviceTransactionManager); WaveLengthServiceUtils.putNode1ToDatastore("node1" + StringConstants.TTP_TOKEN, this.node1, this.deviceTransactionManager); + WaveLengthServiceUtils.putNode2ToDatastore("node1" + StringConstants.TTP_TOKEN, this.node2, + this.deviceTransactionManager); this.networkModelWavelengthService.useWavelengths(this.pathDescription); Node1 updatedNode1 = WaveLengthServiceUtils.getNode1FromDatastore("node1" + StringConstants.TTP_TOKEN, this.deviceTransactionManager); + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1 updatedNode2 = + WaveLengthServiceUtils.getNode2FromDatastore("node1" + StringConstants.TTP_TOKEN, + this.deviceTransactionManager); TerminationPoint1 updatedTerminationPoint1 = WaveLengthServiceUtils - .getTerminationPoint1FromDatastore("node1" + StringConstants.TTP_TOKEN, - StringConstants.TTP_TOKEN, + .getTerminationPoint1FromDatastore("node1" + StringConstants.TTP_TOKEN, StringConstants.TTP_TOKEN, this.deviceTransactionManager); + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130 + .TerminationPoint1 updatedTerminationPoint2 = WaveLengthServiceUtils + .getTerminationPoint2FromDatastore("node1" + StringConstants.TTP_TOKEN, StringConstants.TTP_TOKEN, + this.deviceTransactionManager); - switch (updatedTerminationPoint1.getTpType()) { + switch (updatedTerminationPoint2.getTpType()) { + //switch (((org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1) + // updatedTerminationPoint1).getTpType()) { case DEGREETXRXCTP: case DEGREETXCTP: case DEGREERXCTP: @@ -232,7 +254,9 @@ public class NetworkModelWaveLengthServiceUseTest extends AbstractTest { Assert.assertNull(updatedTerminationPoint1.getXpdrPortAttributes().getWavelength()); break; } - switch (updatedNode1.getNodeType()) { + switch (updatedNode2.getNodeType()) { + //switch (((org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1) updatedNode1) + // .getNodeType()) { case DEGREE: Assert.assertNull(updatedNode1.getDegreeAttributes()); Assert.assertFalse(updatedNode1.getSrgAttributes().getAvailableWavelengths().isEmpty());