From f1f19db0b23d8d470c270cddcd2a6c4eace5f837 Mon Sep 17 00:00:00 2001 From: Alessandro Boch Date: Tue, 17 Sep 2013 08:34:53 -0700 Subject: [PATCH] Cookie value is ignored while converting OF Flow statistics to SAL statistics Change-Id: Ia47d4e673fee0e247b49b45ae5ce55bdb387f7fe Signed-off-by: Alessandro Boch --- .../openflow/internal/FlowStatisticsConverter.java | 2 ++ .../sal/implementation/internal/FlowProgrammerService.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowStatisticsConverter.java b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowStatisticsConverter.java index 82dbf670a9..6873b528a2 100644 --- a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowStatisticsConverter.java +++ b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowStatisticsConverter.java @@ -59,6 +59,7 @@ public class FlowStatisticsConverter { flow.setPriority(ofFlowStat.getPriority()); flow.setIdleTimeout(ofFlowStat.getIdleTimeout()); flow.setHardTimeout(ofFlowStat.getHardTimeout()); + flow.setId(ofFlowStat.getCookie()); flowOnNode = new FlowOnNode(flow); flowOnNode.setByteCount(ofFlowStat.getByteCount()); flowOnNode.setPacketCount(ofFlowStat.getPacketCount()); @@ -74,6 +75,7 @@ public class FlowStatisticsConverter { flow.setPriority(v6StatsReply.getPriority()); flow.setIdleTimeout(v6StatsReply.getIdleTimeout()); flow.setHardTimeout(v6StatsReply.getHardTimeout()); + flow.setId(v6StatsReply.getCookie()); flowOnNode = new FlowOnNode(flow); flowOnNode.setByteCount(v6StatsReply.getByteCount()); flowOnNode.setPacketCount(v6StatsReply.getPacketCount()); diff --git a/opendaylight/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/FlowProgrammerService.java b/opendaylight/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/FlowProgrammerService.java index a7bdb9da8b..854125b356 100644 --- a/opendaylight/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/FlowProgrammerService.java +++ b/opendaylight/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/FlowProgrammerService.java @@ -432,6 +432,7 @@ public class FlowProgrammerService implements IFlowProgrammerService, Flow flow = new Flow(match, actions); flow.setPriority((short) 100); flow.setHardTimeout((short) 360); + flow.setId(1234L); return flow; } @@ -489,6 +490,7 @@ public class FlowProgrammerService implements IFlowProgrammerService, Flow flow = new Flow(match, actions); flow.setPriority((short) 300); flow.setHardTimeout((short) 240); + flow.setId(65536L); return flow; } -- 2.36.6