commit a7592bc6842a3a910e98a7e318e3cbe32ee76121
author Konstantinos Kanonakis <kanonakisk@gmail.com> Wed Apr 13 10:24:15 2016 -0500
committer Konstantinos Kanonakis <kanonakisk@gmail.com> Wed Apr 13 10:25:24 2016 -0500
tree 4acb0dbaa37d741ee5af25c876157f49e632bf2c
parent 637c807aaed09777c09e857047c2ee3c17f2965f

Show meter and/or table transition in GUI even if flow entry has no other treatment instructions.

Change-Id: Ia1ae053b7fd8264a9a33735717328eea89e177f6

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 0f945e4..900a3af 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
@@ -156,7 +156,9 @@
                 FlowEntry flow = (FlowEntry) value;
                 List<Instruction> instructions = flow.treatment().allInstructions();
 
-                if (instructions.isEmpty()) {
+                if (instructions.isEmpty()
+                        && flow.treatment().metered() == null
+                        && flow.treatment().tableTransition() == null) {
                     return "(No traffic treatment instructions for this flow)";
                 }
                 StringBuilder sb = new StringBuilder("Treatment Instructions: ");