From d0156f1d09e6c58dd1268e2b99d24b945dd12485 Mon Sep 17 00:00:00 2001 From: Nishchya Gupta Date: Thu, 23 Jul 2020 14:20:36 +0530 Subject: [PATCH] Unblock the Aluminium Jenkins Verified Build Pass Issue ===== Post Openflowplugin https://git.opendaylight.org/gerrit/c/openflowplugin/+/90390 merge, genius build is starting to get, failed with below key related issues. /w/workspace/genius-distribution-check-aluminium/genius/interfacemanager/ interfacemanager-impl/src/main/java/org/opendaylterfacemanager/pmcounters/NodeConnectorStatsImpl.java:cannot find symbol 13:24:17 symbol: class FlowAndStatisticsMapListKey 13:24:17 location: package org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.flow.and.statistics.map.list Signed-off-by: Nishchya Gupta Change-Id: I0b31725a3871f178ae2f1256670442a601ecf8bf --- .../interfacemanager/pmcounters/NodeConnectorStatsImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/pmcounters/NodeConnectorStatsImpl.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/pmcounters/NodeConnectorStatsImpl.java index 97e740c56..a1ef419b1 100644 --- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/pmcounters/NodeConnectorStatsImpl.java +++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/pmcounters/NodeConnectorStatsImpl.java @@ -14,6 +14,7 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; @@ -48,7 +49,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.direct.statistics.rev160511 import org.opendaylight.yang.gen.v1.urn.opendaylight.direct.statistics.rev160511.GetNodeConnectorStatisticsOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.direct.statistics.rev160511.OpendaylightDirectStatisticsService; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.flow.and.statistics.map.list.FlowAndStatisticsMapList; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.flow.and.statistics.map.list.FlowAndStatisticsMapListKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.config.rev160406.IfmConfig; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.meta.rev160406._interface.child.info._interface.parent.entry.InterfaceChildEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.meta.rev160406._interface.child.info._interface.parent.entry.InterfaceChildEntryKey; @@ -329,9 +329,9 @@ public class NodeConnectorStatsImpl extends AbstractClusteredAsyncDataTreeChange private void processFlowStatistics(GetFlowStatisticsOutput flowStatsOutput, String dpid) { Map flowTableMap = new HashMap<>(); // Get all flows for node from RPC result - @NonNull Map flowTableAndStatisticsMapList = + @NonNull List flowTableAndStatisticsMapList = flowStatsOutput.nonnullFlowAndStatisticsMapList(); - for (FlowAndStatisticsMapList flowAndStatisticsMap : flowTableAndStatisticsMapList.values()) { + for (FlowAndStatisticsMapList flowAndStatisticsMap : flowTableAndStatisticsMapList) { short tableId = flowAndStatisticsMap.getTableId().toJava(); // populate map to maintain flow count per table flowTableMap.computeIfAbsent(tableId, key -> new AtomicInteger(0)).incrementAndGet(); -- 2.36.6