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=2790c02356468059a168e29426347b7aa5f88657;hpb=738d0daf16440e92fc7b111d3db83b42573c705a;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 2790c0235..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 @@ -8,19 +8,17 @@ package org.opendaylight.transportpce.olm.util; import com.google.common.base.Strings; - import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; import java.util.stream.Stream; - import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.Timeouts; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.GetPmInput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.GetPmOutputBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.get.pm.output.MeasurementsBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.GetPmInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.GetPmOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.get.pm.output.MeasurementsBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.pm.rev161014.CurrentPmlist; import org.opendaylight.yang.gen.v1.http.org.openroadm.pm.rev161014.current.pm.Measurements; import org.opendaylight.yang.gen.v1.http.org.openroadm.pm.rev161014.currentpmlist.CurrentPm; @@ -38,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.rev170907.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; @@ -74,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.rev170907.Location location = null; - org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.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(); } @@ -85,14 +83,18 @@ final class OlmUtils121 { if (input.getDirection() != null) { direction = input.getDirection(); } - PmNamesEnum pmName = null; - List - measurements = extractWantedMeasurements(currentPmList.get(), - ResourceTypeEnum.forValue(input.getResourceType().getIntValue()), - input.getResourceIdentifier(), - PmGranularity.forValue(input.getGranularity().getIntValue()), - pmName, pmExtension, location, direction); + //PmNamesEnum pmName = null; + List measurements = + extractWantedMeasurements(currentPmList.orElseThrow(), + ResourceTypeEnum.forValue(input.getResourceType().getIntValue()), + input.getResourceIdentifier(), + PmGranularity.forValue(input.getGranularity().getIntValue()), + //pmName + null, + pmExtension, + location, + direction); if (measurements.isEmpty()) { LOG.error("No Matching PM data found for node: {}, resource type: {}, resource name: {}", input.getNodeId(), input.getResourceType(), @@ -123,14 +125,14 @@ final class OlmUtils121 { } private static - List + List extractWantedMeasurements(CurrentPmlist currentPmList, ResourceTypeEnum resourceTypeEnum, ResourceIdentifier wantedResourceIdentifier,PmGranularity pmGranularity, PmNamesEnum pmNamesEnum, - String extension, org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.Location - location, org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.Direction direction) { - List + 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 measurements = new ArrayList<>(); - for (CurrentPm pm : currentPmList.getCurrentPm()) { + for (CurrentPm pm : currentPmList.nonnullCurrentPm().values()) { ResourceTypeEnum currentResourceType = pm.getResource().getResourceType().getType(); if (currentResourceType.equals(resourceTypeEnum)) { Resource currentResource = pm.getResource().getResource().getResource(); @@ -147,11 +149,11 @@ final class OlmUtils121 { } private static - List + List extractMeasurements(List measurementsFromDevice, PmNamesEnum pmNamesEnum, String extension, - org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.Location location, - org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.Direction direction) { - List + 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 extractedMeasurements = new ArrayList<>(); List pmMeasurements = measurementsFromDevice; Stream measurementStream = pmMeasurements.stream(); @@ -164,7 +166,7 @@ final class OlmUtils121 { if (extension != null) { LOG.info("extension is not null {}",extension); measurementStream = measurementStream.filter(measure -> measure.getMeasurement() - .getPmParameterName().getType().equals("vendorExtension") + .getPmParameterName().getType().toString().equals("vendorExtension") && measure.getMeasurement().getPmParameterName().getExtension().equals(extension)); } if (location != null) { @@ -183,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()); }