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=e82e0f72a56a273af3c3b9ac5dfdbef63b94a2c9;hb=26c22f3f96ad697ddcc3bcce508922b10d7ac9ff;hp=9cccf3c1679d4ca2acf7bfd30907cf69415806e0;hpb=45de2604acea011072a5478eaead6ffb96e1e6ea;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 9cccf3c16..e82e0f72a 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,24 +10,17 @@ 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.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.opendaylight.transportpce.portmapping.rev190702.Network;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.Nodes;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.NodesKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.nodes.Mapping;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.nodes.MappingBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.nodes.MappingKey;
+import org.opendaylight.transportpce.test.stub.MountPointStub;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210927.mapping.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210927.mapping.MappingBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210927.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.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
 
@@ -49,25 +42,16 @@ 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.setSupportingOts("OTS");
-        mappingBuilder.setSupportingCircuitPackName("2/0");
-        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() {