commit cefcf776de7d910808913f332ce3881d14397f59
author Charles Chan <rascov@gmail.com> Sun Jan 22 13:53:13 2017 -0800
committer Charles Chan <charles@onlab.us> Mon Jan 23 07:28:12 2017 +0000
tree 1cf4c04608e1fdae25022531651b7972144cd5c0
parent 57a5af0b6837b270f8c3e3c674c7e1ed65d7a59c

Cosmetic fix for VLAN_POP instruction

Change-Id: I224916db270d080df5c86da095e7b85f2b2948be

core/api/src/main/java/org/onosproject/net/flow/instructions/L2ModificationInstruction.java

diff --git a/core/api/src/main/java/org/onosproject/net/flow/instructions/L2ModificationInstruction.java b/core/api/src/main/java/org/onosproject/net/flow/instructions/L2ModificationInstruction.java
index bfcc588..31bd2c0 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/instructions/L2ModificationInstruction.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/instructions/L2ModificationInstruction.java
@@ -309,7 +309,10 @@
 
         @Override
         public String toString() {
-            return subtype().toString() + SEPARATOR + ethernetType;
+            // etherType is not specified in VLAN_POP case. Ignore it.
+            return subtype().equals(L2SubType.VLAN_POP) ?
+                    subtype().toString() :
+                    subtype().toString() + SEPARATOR + ethernetType;
         }
 
         @Override