commit 2f74f2cc8ca6512efd5d3bd931374ff972942886
author alshabib <alshabibi.ali@gmail.com> Thu Jan 14 13:29:35 2016 -0800
committer alshabib <alshabibi.ali@gmail.com> Thu Jan 14 13:34:50 2016 -0800
tree 07635235650f4bfb0fbc428dde47ba942adb8b3c
parent e34f1102b18997619e032c689f72db53a2f72fe1

fixed pipeline and onos-drivers for OLT connection

Change-Id: I51bda2d1f937ba9bf0c3b480070e9c4844465500

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

diff --git a/drivers/src/main/java/org/onosproject/driver/pipeline/OltPipeline.java b/drivers/src/main/java/org/onosproject/driver/pipeline/OltPipeline.java
index 28d6071..e4b50a1 100644
--- a/drivers/src/main/java/org/onosproject/driver/pipeline/OltPipeline.java
+++ b/drivers/src/main/java/org/onosproject/driver/pipeline/OltPipeline.java
@@ -51,6 +51,7 @@
 import org.onosproject.net.flow.criteria.EthTypeCriterion;
 import org.onosproject.net.flow.criteria.IPProtocolCriterion;
 import org.onosproject.net.flow.criteria.PortCriterion;
+import org.onosproject.net.flow.criteria.VlanIdCriterion;
 import org.onosproject.net.flow.instructions.Instruction;
 import org.onosproject.net.flow.instructions.Instructions;
 import org.onosproject.net.flow.instructions.L2ModificationInstruction;
@@ -226,6 +227,8 @@
             return;
         }
 
+        Criterion innerVid = Criteria.matchVlanId(((VlanIdCriterion) innerVlan).vlanId());
+
         FlowRule.Builder outer = DefaultFlowRule.builder()
                 .forDevice(deviceId)
                 .fromApp(appId)
@@ -241,7 +244,7 @@
                 .forTable(QQ_TABLE)
                 .makePermanent()
                 .withPriority(fwd.priority())
-                .withSelector(buildSelector(inport, innerVlan))
+                .withSelector(buildSelector(inport, innerVid))
                 .withTreatment(buildTreatment(popAndRewrite.getRight(),
                                               output));