X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=olm%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Folm%2Futil%2FOlmUtils121.java;h=ca20d6cdd3ef64c506e4ac48b7824c0b00ea048c;hb=HEAD;hp=31ed0423dedf5361a22c9d1fa96f0ce0b60bbde9;hpb=95e82b90f4afbbfc75b126236d0d011d0d015fb4;p=transportpce.git

diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils121.java b/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils121.java
index 31ed0423d..ca20d6cdd 100644
--- a/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils121.java
+++ b/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils121.java
@@ -36,7 +36,7 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.resource.rev161014.resour
 import org.opendaylight.yang.gen.v1.http.org.openroadm.resource.rev161014.resource.resource.resource.Shelf;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.resource.rev161014.resource.resource.resource.Srg;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.resource.types.rev161014.ResourceTypeEnum;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210930.olm.get.pm.input.ResourceIdentifier;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev220926.olm.get.pm.input.ResourceIdentifier;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -72,8 +72,8 @@ final class OlmUtils121 {
                         Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
         if (currentPmList.isPresent()) {
             String pmExtension = null;
-            org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210930.Location location = null;
-            org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210930.Direction direction = null;
+            org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev220926.Location location = null;
+            org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev220926.Direction direction = null;
             if (input.getPmExtension() != null) {
                 pmExtension = input.getPmExtension();
             }
@@ -86,7 +86,7 @@ final class OlmUtils121 {
             //PmNamesEnum pmName = null;
             List<org.opendaylight.yang.gen.v1.http
                     .org.opendaylight.transportpce.olm.rev210618.get.pm.output.Measurements> measurements =
-                extractWantedMeasurements(currentPmList.get(),
+                extractWantedMeasurements(currentPmList.orElseThrow(),
                     ResourceTypeEnum.forValue(input.getResourceType().getIntValue()),
                     input.getResourceIdentifier(),
                     PmGranularity.forValue(input.getGranularity().getIntValue()),
@@ -128,8 +128,8 @@ final class OlmUtils121 {
         List<org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.get.pm.output.Measurements>
             extractWantedMeasurements(CurrentPmlist currentPmList, ResourceTypeEnum resourceTypeEnum,
             ResourceIdentifier wantedResourceIdentifier,PmGranularity pmGranularity, PmNamesEnum pmNamesEnum,
-            String extension, org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210930.Location
-            location, org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210930.Direction direction) {
+            String extension, org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev220926.Location
+            location, org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev220926.Direction direction) {
         List<org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.get.pm.output.Measurements>
             measurements = new ArrayList<>();
         for (CurrentPm pm : currentPmList.nonnullCurrentPm().values()) {
@@ -151,8 +151,8 @@ final class OlmUtils121 {
     private static
          List<org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.get.pm.output.Measurements>
             extractMeasurements(List<Measurements> measurementsFromDevice, PmNamesEnum pmNamesEnum, String extension,
-            org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210930.Location location,
-            org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210930.Direction direction) {
+            org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev220926.Location location,
+            org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev220926.Direction direction) {
         List<org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.get.pm.output.Measurements>
             extractedMeasurements = new ArrayList<>();
         List<Measurements> pmMeasurements = measurementsFromDevice;
@@ -185,7 +185,7 @@ final class OlmUtils121 {
             measurement.setPmparameterName(measure.getMeasurement().getPmParameterName().getType().toString());
             if (measure.getMeasurement().getPmParameterValue().getDecimal64() != null) {
                 measurement.setPmparameterValue(measure.getMeasurement().getPmParameterValue().getDecimal64()
-                    .toPlainString());
+                    .toString());
             } else if (measure.getMeasurement().getPmParameterValue().getUint64() != null) {
                 measurement.setPmparameterValue(measure.getMeasurement().getPmParameterValue().getUint64().toString());
             }