Fix OLM bugs to make olm functional tests running

JIRA: TRNSPRTPCE-106
Change-Id: I028c6caa98207c0ebfb3743e201ecdb31d3e4a75
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl221.java b/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl221.java
index b1e2a3387c4c9cba8236a89d52084cfceb0bee48..1148f179997a79df4196c57c2d51acf417e24c95 100755 (executable)
--- a/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl221.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl221.java
@@ -84,7 +84,7 @@ public class OpenRoadmInterfacesImpl221 {
     public Optional<Interface> getInterface(String nodeId, String interfaceName) throws OpenRoadmInterfaceException {
         InstanceIdentifier<Interface> interfacesIID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
             .child(Interface.class, new InterfaceKey(interfaceName));
-        return deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL,
+        return deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.CONFIGURATION,
             interfacesIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
     }
 

diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java b/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java
index 8f8ba76eb7e1d63e11e9e5ce72c577359649d90b..3d3889318e79bf2fde6181e93f5fcaeda2fd17fa 100644 (file)
--- a/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java
+++ b/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java
@@ -444,7 +444,7 @@ public class OlmPowerServiceImpl implements OlmPowerService {
                     .rev181019.RatioDB spanLossTx;
                 Optional<org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019
                     .interfaces.grp.Interface> interfaceObject =
-                        openRoadmInterfaces.getInterface(nodeId, interfaceName);
+                        openRoadmInterfaces.getInterface(realNodeId, interfaceName);
                 if (interfaceObject.isPresent()) {
                     InstanceIdentifier<org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019
                         .interfaces.grp.Interface> interfacesIID =

diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils22.java b/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils22.java
index 69f8bbcdbe73df96e3dcf0cb526568afbccbaad6..914d6eb9dd0c24cd483efb7a81669320f3bfa467 100755 (executable)
--- a/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils22.java
+++ b/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils22.java
@@ -167,7 +167,7 @@ final class OlmUtils22 {
                 if (measurements.getGranularity().getIntValue() == org.opendaylight.yang.gen.v1.http.org.openroadm.pm
                     .types.rev171215.PmGranularity.forValue(wantedGranularity.getIntValue()).getIntValue()) {
                     MeasurementsBuilder pmMeasureBuilder = new MeasurementsBuilder();
-                    pmMeasureBuilder.setPmparameterName(pm.getType().getName());
+                    pmMeasureBuilder.setPmparameterName(pm.getType().name());
                     pmMeasureBuilder.setPmparameterValue(measurements.getPmParameterValue().stringValue());
                     olmMeasurements.add(pmMeasureBuilder.build());
                 }