commit 2bc10aed5b728a78d6659abe5e44541e4fca53cb
author Gamze Abaka <gamze.abaka@netsia.com> Wed Feb 27 12:07:43 2019 +0000
committer Saurav Das <sauravdas@alumni.stanford.edu> Mon Apr 22 17:35:29 2019 -0700
tree ac34546d9642bdc83614ae7755fbd9022262461d
parent 7c070c8fda806378b37907c625b1d81e79a8ea15

This patch solves the following issue:

* When flow stats reply is received, a new FlowEntry object is created. However, although flow stats entry includes meter instruction, ONOS does not assign this value (meterId) to the FlowEntry object.

Change-Id: I73ad5dd75b3b77117360844fea66adb3b132cc87

providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/util/FlowEntryBuilder.java

diff --git a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/util/FlowEntryBuilder.java b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/util/FlowEntryBuilder.java
index a32466f..b63dfe7 100644
--- a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/util/FlowEntryBuilder.java
+++ b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/util/FlowEntryBuilder.java
@@ -82,6 +82,7 @@
 import org.projectfloodlight.openflow.protocol.instruction.OFInstruction;
 import org.projectfloodlight.openflow.protocol.instruction.OFInstructionApplyActions;
 import org.projectfloodlight.openflow.protocol.instruction.OFInstructionGotoTable;
+import org.projectfloodlight.openflow.protocol.instruction.OFInstructionMeter;
 import org.projectfloodlight.openflow.protocol.instruction.OFInstructionStatTrigger;
 import org.projectfloodlight.openflow.protocol.instruction.OFInstructionWriteActions;
 import org.projectfloodlight.openflow.protocol.instruction.OFInstructionWriteMetadata;
@@ -445,6 +446,7 @@
                 case EXPERIMENTER:
                     break;
                 case METER:
+                    builder.meter(MeterId.meterId(((OFInstructionMeter) in).getMeterId()));
                     break;
                 default:
                     log.warn("Unknown instructions type {}", in.getType());