X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=common%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fcommon%2Fcrossconnect%2FCrossConnectImpl221Test.java;h=2299e62b6d30e14b17f5682cee4968144b98c924;hb=c21aabb5b6eeacbe8d5ddf3db269add5e8cc13fa;hp=8068be6012448358f6cad9c9410c9b0491cb9cac;hpb=3cb0866be6bc8b477849b6ad61e152e565254058;p=transportpce.git diff --git a/common/src/test/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl221Test.java b/common/src/test/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl221Test.java index 8068be601..2299e62b6 100644 --- a/common/src/test/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl221Test.java +++ b/common/src/test/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl221Test.java @@ -28,8 +28,9 @@ import org.opendaylight.transportpce.common.Timeouts; import org.opendaylight.transportpce.common.device.DeviceTransaction; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; import org.opendaylight.transportpce.common.device.DeviceTransactionManagerImpl; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.NodesBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.NodesKey; +import org.opendaylight.transportpce.common.fixedflex.SpectrumInformation; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.network.NodesBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.network.NodesKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.OpticalControlMode; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.degree.ConnectionPorts; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.degree.ConnectionPortsBuilder; @@ -39,6 +40,7 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.open import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.otn.renderer.input.Nodes; import org.opendaylight.yangtools.util.concurrent.FluentFutures; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.yang.common.Uint32; public class CrossConnectImpl221Test { private CrossConnectImpl221 crossConnectImpl221 = null; @@ -81,8 +83,12 @@ public class CrossConnectImpl221Test { Mockito.when(rwTransactionMock.commit()).thenReturn(FluentFutures.immediateNullFluentFuture()); deviceTransactionManager = new DeviceTransactionManagerImpl(mountPointServiceMock, 3000); crossConnectImpl221 = new CrossConnectImpl221(deviceTransactionManager); - Optional res = crossConnectImpl221.postCrossConnect("deviceId", "srcTp", "destTp", 1, 8); - Assert.assertEquals(res.get(), "srcTp-destTp-1:8"); + SpectrumInformation spectrumInformation = new SpectrumInformation(); + spectrumInformation.setWaveLength(Uint32.valueOf(1)); + spectrumInformation.setLowerSpectralSlotNumber(761); + spectrumInformation.setHigherSpectralSlotNumber(768); + Optional res = crossConnectImpl221.postCrossConnect("deviceId", "srcTp", "destTp", spectrumInformation); + Assert.assertEquals(res.get(), "srcTp-destTp-761:768"); } @Test(expected = NullPointerException.class)