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=9c6b749e6e38ef2520fc7fa3b6c0e1c7720cf3e0;hb=268165cb2822b6ce4c55f00cac63eed2bb222ec7;hp=aa20447d0ab24c091095a04ca70e5c39bc655ecd;hpb=e6e13c5ba1221d74154c089ec95cd631950f1ef4;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 aa20447d0..9c6b749e6 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,27 +10,21 @@ package org.opendaylight.transportpce.renderer.utils;
 
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.List;
-import java.util.concurrent.ExecutionException;
 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.device.DeviceTransactionManager;
-import org.opendaylight.transportpce.renderer.stub.MountPointStub;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry;
+import org.opendaylight.transportpce.test.stub.MountPointStub;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mapping.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mapping.MappingBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mapping.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.get.connection.port.trail.output.Ports;
-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> ports, DataBroker dataBroker) {
@@ -48,27 +42,19 @@ public final class MountPointUtils {
         return mountPoint;
     }
 
-    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 {
-            return TransactionUtils.writeTransaction(deviceTransactionManager,
-                    nodeId, LogicalDatastoreType.CONFIGURATION, portMappingIID, mappingBuilder.build());
-        } catch (ExecutionException | InterruptedException e) {
-            return false;
-        }
+    public static Mapping createMapping(String nodeId, String logicalConnPoint) {
+        return new MappingBuilder()
+            .withKey(new MappingKey(logicalConnPoint))
+            .setLogicalConnectionPoint(logicalConnPoint)
+            .setSupportingOts("supporting-OTS")
+            .setSupportingCircuitPackName("2/0")
+            .setSupportingOms("supporting-OMS")
+            .setSupportingPort("port")
+            .setSupportingCircuitPackName("circuit-pack")
+            .build();
     }
 
     private MountPointUtils() {
-
     }
 
 }