commit ca47cd7e23b7bc4b887b2566ffb45eab202a3eb9
author Jonathan Hart <jono@onlab.us> Sun Dec 13 12:31:09 2015 -0800
committer Gerrit Code Review <gerrit@onlab.us> Fri Jan 08 23:02:39 2016 +0000
tree 1a4cc15b4f698b9f7717e16b898989535c170d86
parent 18d4bc847518c420e2198eb082396b049acce23b

Allow SingleSwitchFibInstaller to support untagged interfaces.

Added support in OVSCorsaPipeline and SoftRouter.

Change-Id: I7242f0f26cbdf7d6d2205fc6f48458d604de5326

drivers/src/main/java/org/onosproject/driver/pipeline/SoftRouterPipeline.java

diff --git a/drivers/src/main/java/org/onosproject/driver/pipeline/SoftRouterPipeline.java b/drivers/src/main/java/org/onosproject/driver/pipeline/SoftRouterPipeline.java
index bd49e68..03f63b1 100644
--- a/drivers/src/main/java/org/onosproject/driver/pipeline/SoftRouterPipeline.java
+++ b/drivers/src/main/java/org/onosproject/driver/pipeline/SoftRouterPipeline.java
@@ -275,7 +275,9 @@
         selector.matchVlanId(v.vlanId());
         selector.matchEthDst(e.mac());
         selector.matchEthType(Ethernet.TYPE_IPV4);
-        treatment.popVlan();
+        if (!v.vlanId().equals(VlanId.NONE)) {
+            treatment.popVlan();
+        }
         treatment.transition(FIB_TABLE); // all other IPs to the FIB table
         FlowRule rule = DefaultFlowRule.builder()
                 .forDevice(deviceId)