From 27c71d2147b65e5f174f0be81a25c09e45645df0 Mon Sep 17 00:00:00 2001 From: Gilles Thouenon Date: Mon, 3 Jun 2019 16:50:59 +0200 Subject: [PATCH] Fix OLM bugs to make olm functional tests running JIRA: TRNSPRTPCE-106 Change-Id: I028c6caa98207c0ebfb3743e201ecdb31d3e4a75 Signed-off-by: Gilles Thouenon Co-authored-by: Christophe Betoule --- .../common/openroadminterfaces/OpenRoadmInterfacesImpl221.java | 2 +- .../transportpce/olm/service/OlmPowerServiceImpl.java | 2 +- .../java/org/opendaylight/transportpce/olm/util/OlmUtils22.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 b1e2a3387..1148f1799 100755 --- 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 getInterface(String nodeId, String interfaceName) throws OpenRoadmInterfaceException { InstanceIdentifier 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 8f8ba76eb..3d3889318 100644 --- 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 interfaceObject = - openRoadmInterfaces.getInterface(nodeId, interfaceName); + openRoadmInterfaces.getInterface(realNodeId, interfaceName); if (interfaceObject.isPresent()) { InstanceIdentifier 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 69f8bbcdb..914d6eb9d 100755 --- 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()); } -- 2.36.6