Power Control for Flex-grid

[transportpce.git] / olm / src / main / java / org / opendaylight / transportpce / olm / util / OlmUtils22.java

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
old mode 100755 (executable)
new mode 100644 (file)
index 69f8bbc..9bb42e6
--- a/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils22.java
+++ b/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils22.java
@@ -13,9 +13,8 @@ import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+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;
@@ -47,10 +46,10 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.pm.rev181019.current.pm.l
 import org.opendaylight.yang.gen.v1.http.org.openroadm.pm.rev181019.current.pm.list.CurrentPmEntryKey;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.pm.rev181019.current.pm.val.group.Measurement;
 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.Direction;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.Location;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.PmNamesEnum;
-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.rev200615.Direction;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.Location;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.PmNamesEnum;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.olm.get.pm.input.ResourceIdentifier;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -75,6 +74,8 @@ final class OlmUtils22 {
      *
      * @return Result of the request list of PM readings
      */
+    //LOG.info message length is >120 char and can be difficultly shortened
+    @SuppressWarnings("checkstyle:linelength")
     public static GetPmOutputBuilder pmFetch(GetPmInput input, DeviceTransactionManager deviceTransactionManager) {
         LOG.info("Getting PM Data for 2.2.1 NodeId: {} ResourceType: {} ResourceName: {}", input.getNodeId(),
             input.getResourceType(), input.getResourceIdentifier());
@@ -113,19 +114,18 @@ final class OlmUtils22 {
                             .equals(input.getPmExtension()));
                     }
                     if (input.getLocation() != null) {
-                        currentPMStream = currentPMStream.filter(pm -> pm.getLocation()
+                        currentPMStream = currentPMStream.filter(pm -> Location.forValue(pm.getLocation().getIntValue())
                             .equals(Location.forValue(input.getLocation().getIntValue())));
                     }
                     if (input.getDirection() != null) {
-                        currentPMStream = currentPMStream.filter(pm -> pm.getDirection()
+                        currentPMStream = currentPMStream.filter(pm -> Direction.forValue(pm.getDirection().getIntValue())
                             .equals(Direction.forValue((input.getDirection().getIntValue()))));
                     }
                     List<CurrentPm> filteredPMs = currentPMStream.collect(Collectors.toList());
                     List<Measurements> measurements = extractWantedMeasurements(filteredPMs,input.getGranularity());
                     if (measurements.isEmpty()) {
-                        LOG.error("No Matching PM data found for node: {}, " + "resource type: {},"
-                                + " resource name: {}, pm type: {}, extention: {}"
-                                + ", location: {} and direction: {}",
+                        LOG.error(
+                            "No Matching PM data found for node: {}, resource type: {}, resource name: {}, pm type: {}, extention: {}, location: {} and direction: {}",
                             input.getNodeId(), input.getResourceType(),
                             getResourceIdentifierAsString(input.getResourceIdentifier()),
                             input.getPmNameType(),input.getPmExtension(),input.getLocation(),
@@ -134,9 +134,8 @@ final class OlmUtils22 {
                         pmOutputBuilder.setNodeId(input.getNodeId()).setResourceType(input.getResourceType())
                             .setResourceIdentifier(input.getResourceIdentifier()).setGranularity(input.getGranularity())
                             .setMeasurements(measurements);
-                        LOG.info("PM data found successfully for node: {}, " + "resource type: {},"
-                                + " resource name: {}, pm type: {}, extention: {}"
-                                + ", location: {} and direction: {}",
+                        LOG.info(
+                            "PM data found successfully for node: {}, resource type: {}, resource name: {}, pm type: {}, extention: {}, location: {} and direction: {}",
                             input.getNodeId(), input.getResourceType(),
                             getResourceIdentifierAsString(input.getResourceIdentifier()),
                             input.getPmNameType(),input.getPmExtension(),input.getLocation(),
@@ -167,7 +166,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());
                 }