Update testtool version in tests folder

[transportpce.git] / olm / src / main / java / org / opendaylight / transportpce / olm / spanloss / SpanLoss.java

diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/spanloss/SpanLoss.java b/olm/src/main/java/org/opendaylight/transportpce/olm/spanloss/SpanLoss.java
index c4d25f0558f4db964b5ad52c3c27b1403b994973..026c041fe93135e3c34efe525a096b6d2f82c6c0 100644 (file)
--- a/olm/src/main/java/org/opendaylight/transportpce/olm/spanloss/SpanLoss.java
+++ b/olm/src/main/java/org/opendaylight/transportpce/olm/spanloss/SpanLoss.java
@@ -23,7 +23,6 @@ import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
 import org.opendaylight.transportpce.olm.OlmPowerSetupImpl;
 import org.opendaylight.transportpce.renderer.mapping.PortMapping;
-import org.opendaylight.transportpce.renderer.provisiondevice.OpenRoadmInterfaces;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.RatioDB;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.interfaces.grp.Interface;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.interfaces.grp.InterfaceBuilder;
@@ -74,11 +73,14 @@ public class SpanLoss {
      *            Node-id of the NE.
      * @param tpID
      *            Termination point Name.
+     * @param pmName
+     *            PM name which need to be retrieved
      * @return reference to OtsPmHolder
      */
     public OtsPmHolder getPmMeasurements(String nodeId, String tpID, String pmName) {
         GetPmInputBuilder otsPmInputBuilder = new GetPmInputBuilder();
-        Mapping portMapping = new OpenRoadmInterfaces(db, mps, nodeId, tpID).getMapping(nodeId, tpID);
+        new PortMapping(db, mps, nodeId);
+        Mapping portMapping = PortMapping.getMapping(nodeId, tpID, db);
         if (portMapping != null) {
             otsPmInputBuilder.setNodeId(nodeId).setResourceType("Interface").setGranularity("15min")
             .setResourceName(portMapping.getSupportingOts());