From 6b8e4f12fc66a64fa5c5498d06891f1f5f1189ac Mon Sep 17 00:00:00 2001 From: Ravi Pendurty Date: Thu, 2 Mar 2023 12:06:07 +0530 Subject: Upgrade parents to 2.5.4-SNAPSHOT Code changes as a result of changes induced by ODL Chlorine SR1 Issue-ID: CCSDK-3856 Signed-off-by: Ravi Pendurty Change-Id: Ic08786f050e58bdb8371c8f8c25fb0db9f258cd4 Signed-off-by: Ravi Pendurty --- .../openroadm71/test/TestOpenRoadmNetworkElement.java | 7 ++----- .../devicemanager/openroadm71/test/TestOpenRoadmPMDataBuilder.java | 3 ++- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'sdnr/wt/devicemanager-onap/openroadm71/provider/src/test') diff --git a/sdnr/wt/devicemanager-onap/openroadm71/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm71/test/TestOpenRoadmNetworkElement.java b/sdnr/wt/devicemanager-onap/openroadm71/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm71/test/TestOpenRoadmNetworkElement.java index a018df739..7ebb3af2e 100644 --- a/sdnr/wt/devicemanager-onap/openroadm71/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm71/test/TestOpenRoadmNetworkElement.java +++ b/sdnr/wt/devicemanager-onap/openroadm71/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm71/test/TestOpenRoadmNetworkElement.java @@ -85,10 +85,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types. import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.common.Uint16; -import org.opendaylight.yangtools.yang.common.Uint32; -import org.opendaylight.yangtools.yang.common.Uint64; -import org.opendaylight.yangtools.yang.common.Uint8; +import org.opendaylight.yangtools.yang.common.*; public class TestOpenRoadmNetworkElement { @@ -268,7 +265,7 @@ public class TestOpenRoadmNetworkElement { Measurement measurement = mock(Measurement.class); PmDataType pmDataType = mock(PmDataType.class); - when(pmDataType.getUint64()).thenReturn(Uint64.valueOf(2425425)); + when(pmDataType.getDecimal64()).thenReturn(Decimal64.valueOf(1,2425425)); when(measurement.getBinNumber()).thenReturn(Uint16.valueOf(1452)); when(measurement.getCompletionTime()).thenReturn(new DateAndTime("2018-10-22T15:23:43Z")); when(measurement.getGranularity()).thenReturn(PmGranularity._24Hour); diff --git a/sdnr/wt/devicemanager-onap/openroadm71/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm71/test/TestOpenRoadmPMDataBuilder.java b/sdnr/wt/devicemanager-onap/openroadm71/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm71/test/TestOpenRoadmPMDataBuilder.java index 49585acb2..cfeca1342 100644 --- a/sdnr/wt/devicemanager-onap/openroadm71/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm71/test/TestOpenRoadmPMDataBuilder.java +++ b/sdnr/wt/devicemanager-onap/openroadm71/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm71/test/TestOpenRoadmPMDataBuilder.java @@ -64,6 +64,7 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology. import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.PathArgument; +import org.opendaylight.yangtools.yang.common.Decimal64; import org.opendaylight.yangtools.yang.common.Uint16; import org.opendaylight.yangtools.yang.common.Uint64; @@ -79,7 +80,7 @@ public class TestOpenRoadmPMDataBuilder { private NodeId nodeId = new NodeId("RoadmA"); private HistoricalPmList historicalPmDatalist = mock(HistoricalPmList.class); private HistoricalPm historicalPm = mock(HistoricalPm.class); - private PmDataType pmDataType = new PmDataType(Uint64.valueOf(67508)); + private PmDataType pmDataType = new PmDataType(Decimal64.valueOf(1,67508)); private MeasurementBuilder measurementBuilder = new MeasurementBuilder(); private HistoricalPmBuilder historicalPmBuilder = new HistoricalPmBuilder(); private HistoricalPmEntryBuilder historicalPmEntryBuiler = new HistoricalPmEntryBuilder(); -- cgit 1.2.3-korg