X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=renderer%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Frenderer%2Futils%2FMountPointUtils.java;h=98c4f14b56258424fea40d49a333065ec1009a7d;hb=34cbca4ad81fbd29e833197f0e4b09128daa8b95;hp=4a9dc7d42b8b4887f05930b3a4e97e0e5b8d5fd5;hpb=4ef19c0a7cddd25efa5c74c402b5f6b46bb73739;p=transportpce.git diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/MountPointUtils.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/MountPointUtils.java index 4a9dc7d42..98c4f14b5 100644 --- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/MountPointUtils.java +++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/MountPointUtils.java @@ -8,52 +8,40 @@ package org.opendaylight.transportpce.renderer.utils; +import com.google.common.util.concurrent.ListenableFuture; import java.util.List; -import java.util.Optional; -import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; import org.mockito.Mockito; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.controller.sal.binding.api.RpcConsumerRegistry; -import org.opendaylight.transportpce.common.Timeouts; -import org.opendaylight.transportpce.common.device.DeviceTransaction; +import org.opendaylight.mdsal.binding.api.DataBroker; +import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; +import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; import org.opendaylight.transportpce.renderer.stub.MountPointStub; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.OpticalControlMode; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.Network; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.NodesKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.MappingBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.MappingKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.GetConnectionPortTrailOutput; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.GetConnectionPortTrailOutputBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.OrgOpenroadmDeviceService; -import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.connection.DestinationBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.connection.SourceBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.get.connection.port.trail.output.Ports; -import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.OrgOpenroadmDevice; -import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.org.openroadm.device.RoadmConnections; -import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.org.openroadm.device.RoadmConnectionsBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.org.openroadm.device.RoadmConnectionsKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.Network; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.network.Nodes; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.network.NodesKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.network.nodes.Mapping; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.network.nodes.MappingBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.network.nodes.MappingKey; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; + public final class MountPointUtils { public static MountPointStub getMountPoint(List ports, DataBroker dataBroker) { RpcConsumerRegistry rpcConsumerRegistry = Mockito.spy(RpcConsumerRegistry.class); OrgOpenroadmDeviceService orgOpenroadmDeviceService = Mockito.spy(OrgOpenroadmDeviceService.class); - GetConnectionPortTrailOutputBuilder getConnectionPortTrailOutputBuilder = - new GetConnectionPortTrailOutputBuilder(); - getConnectionPortTrailOutputBuilder.setPorts(ports); - RpcResultBuilder rpcResultBuilder = - RpcResultBuilder.success(getConnectionPortTrailOutputBuilder.build()); - Future> rpcResultFuture = - CompletableFuture.completedFuture(rpcResultBuilder.build()); + GetConnectionPortTrailOutputBuilder getConnectionPortTrailOutputBldr + = new GetConnectionPortTrailOutputBuilder(); + getConnectionPortTrailOutputBldr.setPorts(ports); + ListenableFuture> rpcResultFuture = + RpcResultBuilder.success(getConnectionPortTrailOutputBldr.build()).buildFuture(); Mockito.doReturn(rpcResultFuture).when(orgOpenroadmDeviceService).getConnectionPortTrail(Mockito.any()); Mockito.doReturn(orgOpenroadmDeviceService).when(rpcConsumerRegistry).getRpcService(Mockito.any()); MountPointStub mountPoint = new MountPointStub(dataBroker); @@ -63,59 +51,27 @@ public final class MountPointUtils { public static boolean writeMapping(String nodeId, String logicalConnPoint, DeviceTransactionManager deviceTransactionManager) { + MappingBuilder mappingBuilder = new MappingBuilder(); + mappingBuilder.withKey(new MappingKey(logicalConnPoint)); + mappingBuilder.setLogicalConnectionPoint(logicalConnPoint); + mappingBuilder.setSupportingOts("OTS"); + mappingBuilder.setSupportingCircuitPackName("2/0"); + mappingBuilder.setSupportingOms("OMS"); + mappingBuilder.setSupportingPort("8080"); + mappingBuilder.setSupportingCircuitPackName("circuit1"); + InstanceIdentifier portMappingIID = + InstanceIdentifier.builder(Network.class).child(Nodes.class, new NodesKey(nodeId)) + .child(Mapping.class, new MappingKey(logicalConnPoint)).build(); try { - MappingBuilder mappingBuilder = new MappingBuilder(); - mappingBuilder.withKey(new MappingKey(logicalConnPoint)); - mappingBuilder.setLogicalConnectionPoint(logicalConnPoint); - mappingBuilder.setSupportingOms("OMS"); - mappingBuilder.setSupportingPort("8080"); - mappingBuilder.setSupportingCircuitPackName("circuit1"); - Future> deviceTxFuture = - deviceTransactionManager.getDeviceTransaction(nodeId); - if (!deviceTxFuture.get().isPresent()) { - return false; - } - InstanceIdentifier portMappingIID = - InstanceIdentifier.builder(Network.class).child(Nodes.class, new NodesKey(nodeId)) - .child(Mapping.class, new MappingKey(logicalConnPoint)).build(); - DeviceTransaction deviceTx = deviceTxFuture.get().get(); - deviceTx.put(LogicalDatastoreType.CONFIGURATION, portMappingIID, mappingBuilder.build(), true); - deviceTx.submit(Timeouts.DEVICE_WRITE_TIMEOUT, Timeouts.DEVICE_WRITE_TIMEOUT_UNIT).get(); - } catch (ExecutionException | InterruptedException e) { - return false; - } - return true; - } - - public static boolean writeConnection(String nodeId, String srcTp, String destTp, Long waveNumber, - DeviceTransactionManager deviceTransactionManager) { - try { - RoadmConnectionsBuilder rdmConnBldr = new RoadmConnectionsBuilder(); - String connectionNumber = srcTp + "-" + destTp + "-" + waveNumber; - rdmConnBldr.setConnectionNumber(connectionNumber); - rdmConnBldr.setWavelengthNumber(waveNumber); - rdmConnBldr.setOpticalControlMode(OpticalControlMode.Off); - rdmConnBldr.setSource(new SourceBuilder().setSrcIf(srcTp + "-" + waveNumber.toString()).build()); - rdmConnBldr.setDestination(new DestinationBuilder().setDstIf(destTp + "-" + waveNumber.toString()).build()); - - Future> deviceTxFuture = - deviceTransactionManager.getDeviceTransaction(nodeId); - if (!deviceTxFuture.get().isPresent()) { - return false; - } - DeviceTransaction deviceTx = deviceTxFuture.get().get(); - InstanceIdentifier connectionID = - InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(RoadmConnections.class, new RoadmConnectionsKey(connectionNumber)); - deviceTx.put(LogicalDatastoreType.CONFIGURATION, connectionID, rdmConnBldr.build(), true); - deviceTx.submit(Timeouts.DEVICE_WRITE_TIMEOUT, Timeouts.DEVICE_WRITE_TIMEOUT_UNIT).get(); + return TransactionUtils.writeTransaction(deviceTransactionManager, + nodeId, LogicalDatastoreType.CONFIGURATION, portMappingIID, mappingBuilder.build()); } catch (ExecutionException | InterruptedException e) { return false; } - return true; } private MountPointUtils() { + } }