commit be8aea439ddde93dba850f3cc60e2476efec2e20
author Charles Chan <rascov@gmail.com> Wed Feb 24 12:04:47 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Wed Mar 02 03:31:08 2016 +0000
tree eebd7c4513da568078f6b345db2eb479a56828cc
parent c04e876216a2dd77bcbf78967369b992ab8cdc22

Change untagged representation in OfdpaMatchVlanVid from 0 to NONE

Note: Match vlan 0 is still not supported in this commit

Change-Id: Iecfcde151261e9df53b1cc8fbe9c1a397686a3d9

drivers/default/src/main/java/org/onosproject/driver/pipeline/OFDPA2Pipeline.java

diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/OFDPA2Pipeline.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/OFDPA2Pipeline.java
index 382d978..2b27f0e 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/OFDPA2Pipeline.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/OFDPA2Pipeline.java
@@ -369,7 +369,7 @@
                 ExtensionCriterion extCriterion =
                         (ExtensionCriterion) flowRule.selector().getCriterion(Criterion.Type.EXTENSION);
                 VlanId vlanId = ((OfdpaMatchVlanVid) extCriterion.extensionSelector()).vlanId();
-                if (vlanId.toShort() != (short) 0) {
+                if (!vlanId.equals(VlanId.NONE)) {
                     filteringRules.add(flowRule);
                 } else {
                     assignmentRules.add(flowRule);
@@ -461,7 +461,7 @@
         VlanId storeVlan = null;
         if (vidCriterion.vlanId() == VlanId.NONE) {
             // untagged packets are assigned vlans
-            OfdpaMatchVlanVid ofdpaMatchVlanVid = new OfdpaMatchVlanVid(VlanId.vlanId((short) 0));
+            OfdpaMatchVlanVid ofdpaMatchVlanVid = new OfdpaMatchVlanVid(VlanId.NONE);
             selector.extension(ofdpaMatchVlanVid, deviceId);
             OfdpaSetVlanVid ofdpaSetVlanVid = new OfdpaSetVlanVid(assignedVlan);
             treatment.extension(ofdpaSetVlanVid, deviceId);