commit 1468fee953acf8e4f77c846d2b2524dfb50a9df2
author Jonathan Hart <jono@onlab.us> Thu Jul 16 18:50:34 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Thu Jul 23 17:43:49 2015 +0000
tree adb7f25aed4434d478f498b8923ddd99522fa92d
parent 111b42b7a33b3751cc771db0835ec8177a2638cf

Set VLAN ID at the OLT.

Change-Id: I399d8f10da88687fd44328c4dd2c4ad8f17d7bf2

providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilder.java

diff --git a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilder.java b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilder.java
index d9d02ff..e443aac 100644
--- a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilder.java
+++ b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilder.java
@@ -208,6 +208,8 @@
                 if (vid.vlanId().equals(VlanId.ANY)) {
                     mBuilder.setMasked(MatchField.VLAN_VID, OFVlanVidMatch.PRESENT,
                                        OFVlanVidMatch.PRESENT);
+                } else if (vid.vlanId().equals(VlanId.NONE)) {
+                    mBuilder.setExact(MatchField.VLAN_VID, OFVlanVidMatch.NONE);
                 } else {
                     mBuilder.setExact(MatchField.VLAN_VID,
                                       OFVlanVidMatch.ofVlanVid(VlanVid.ofVlan(vid.vlanId().toShort())));