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;
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.rev200128.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;
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.rev200128.Location location = null;
- org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200128.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();
}
if (input.getDirection() != null) {
direction = input.getDirection();
}
- PmNamesEnum pmName = null;
- List<org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm
- .rev170418.get.pm.output.Measurements>
- measurements = extractWantedMeasurements(currentPmList.get(),
- ResourceTypeEnum.forValue(input.getResourceType().getIntValue()),
- input.getResourceIdentifier(),
- PmGranularity.forValue(input.getGranularity().getIntValue()),
- pmName, pmExtension, location, direction);
+ //PmNamesEnum pmName = null;
+ List<org.opendaylight.yang.gen.v1.http
+ .org.opendaylight.transportpce.olm.rev210618.get.pm.output.Measurements> 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(),
}
private static
- List<org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.get.pm.output.Measurements>
+ 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.rev200128.Location
- location, org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200128.Direction direction) {
- List<org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.get.pm.output.Measurements>
+ 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.getCurrentPm()) {
+ for (CurrentPm pm : currentPmList.nonnullCurrentPm().values()) {
ResourceTypeEnum currentResourceType = pm.getResource().getResourceType().getType();
if (currentResourceType.equals(resourceTypeEnum)) {
Resource currentResource = pm.getResource().getResource().getResource();
}
private static
- List<org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.get.pm.output.Measurements>
+ 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.rev200128.Location location,
- org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200128.Direction direction) {
- List<org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.get.pm.output.Measurements>
+ 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;
Stream<Measurements> measurementStream = pmMeasurements.stream();
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) {
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());
}