commit 409289de0650c9bb2bdef9d98a0be96d46ce6966
author cansu.toprak <cansu.toprak@argela.com.tr> Fri Oct 27 10:04:05 2017 +0300
committer Ray Milkey <ray@opennetworking.org> Mon Nov 06 18:22:59 2017 +0000
tree fbe674b418865cb111650cc8396be01ebf6865da
parent 279d5821e8f7f44433457a2fe25537d613f8258e

Multiple meter support added and meter action added for OF1.5
MeterFeaturesFlag added for OF1.5

Change-Id: I84d2785f37ea51b08244de9c54effe5224af9531

web/gui/src/main/java/org/onosproject/ui/impl/FlowViewMessageHandler.java

diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/FlowViewMessageHandler.java b/web/gui/src/main/java/org/onosproject/ui/impl/FlowViewMessageHandler.java
index 8f2a0a5..3160ec7 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/FlowViewMessageHandler.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/FlowViewMessageHandler.java
@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
 import org.onosproject.app.ApplicationService;
 import org.onosproject.core.Application;
 import org.onosproject.core.ApplicationId;
@@ -325,7 +326,9 @@
                 formatInstructs(sb, imm, IMM);
                 formatInstructs(sb, def, DEF);
 
-                addLabVal(sb, METERED, treatment.metered());
+                treatment.meters().forEach(meterInstruction ->
+                        addLabVal(sb, METERED, meterInstruction)
+                );
                 addLabVal(sb, TRANSITION, treatment.tableTransition());
                 addLabVal(sb, METADATA, treatment.writeMetadata());
 
@@ -445,9 +448,9 @@
         private ObjectNode jsonTreatment(FlowEntry flow) {
             ObjectNode treat = objectNode();
             TrafficTreatment treatment = flow.treatment();
-            List<Instruction> imm = treatment.immediate();
+            List<Instruction> imm = Lists.newArrayList(treatment.immediate());
             List<Instruction> def = treatment.deferred();
-            Instructions.MeterInstruction meter = treatment.metered();
+            Set<Instructions.MeterInstruction> meter = treatment.meters();
             Instructions.TableTypeTransition table = treatment.tableTransition();
             Instructions.MetadataInstruction meta = treatment.writeMetadata();
 
@@ -457,8 +460,8 @@
             if (!def.isEmpty()) {
                 treat.set(DEFER, jsonInstrList(def));
             }
-            if (meter != null) {
-                treat.put(METER, meter.toString());
+            if (!meter.isEmpty()) {
+                treat.set(METER, jsonInstrList(Lists.newArrayList(meter)));
             }
             if (table != null) {
                 treat.put(TABLE, table.toString());