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=5adc54bf9e48ff0fce6eed1f0ca0723cd7158c01;hb=d609ca3b1012e9d52ff6cd1ed9376425d22e6246;hp=25e141597c15644e24e2834ed1845a9f24471cf6;hpb=810038f95e82b0564c11ad5ba0f3f2813bc04a48;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 25e141597..5adc54bf9 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
@@ -10,28 +10,17 @@ 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.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.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.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;
@@ -47,11 +36,11 @@ public final class MountPointUtils {
     public static MountPointStub getMountPoint(List<Ports> ports, DataBroker dataBroker) {
         RpcConsumerRegistry rpcConsumerRegistry = Mockito.spy(RpcConsumerRegistry.class);
         OrgOpenroadmDeviceService orgOpenroadmDeviceService = Mockito.spy(OrgOpenroadmDeviceService.class);
-        GetConnectionPortTrailOutputBuilder getConnectionPortTrailOutputBuilder =
-                new GetConnectionPortTrailOutputBuilder();
-        getConnectionPortTrailOutputBuilder.setPorts(ports);
+        GetConnectionPortTrailOutputBuilder getConnectionPortTrailOutputBldr
+                = new GetConnectionPortTrailOutputBuilder();
+        getConnectionPortTrailOutputBldr.setPorts(ports);
         ListenableFuture<RpcResult<GetConnectionPortTrailOutput>> rpcResultFuture =
-                RpcResultBuilder.success(getConnectionPortTrailOutputBuilder.build()).buildFuture();
+                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);
@@ -61,56 +50,21 @@ 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.setSupportingOms("OMS");
+        mappingBuilder.setSupportingPort("8080");
+        mappingBuilder.setSupportingCircuitPackName("circuit1");
+        InstanceIdentifier<Mapping> 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<Optional<DeviceTransaction>> deviceTxFuture =
-                    deviceTransactionManager.getDeviceTransaction(nodeId);
-            if (!deviceTxFuture.get().isPresent()) {
-                return false;
-            }
-            InstanceIdentifier<Mapping> 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();
+            return TransactionUtils.writeTransaction(deviceTransactionManager,
+                    nodeId, LogicalDatastoreType.CONFIGURATION, portMappingIID, mappingBuilder.build());
         } 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<Optional<DeviceTransaction>> deviceTxFuture =
-                    deviceTransactionManager.getDeviceTransaction(nodeId);
-            if (!deviceTxFuture.get().isPresent()) {
-                return false;
-            }
-            DeviceTransaction deviceTx = deviceTxFuture.get().get();
-            InstanceIdentifier<RoadmConnections> 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();
-        } catch (ExecutionException | InterruptedException e) {
-            return false;
-        }
-        return true;
     }
 
     private MountPointUtils() {