commit b3c1434414b1580c3c2a7454c3d09dc398572b54
author alshabib <alshabibi.ali@gmail.com> Fri Mar 04 17:05:01 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Mon Mar 07 22:34:06 2016 +0000
tree e280ce0ec22d9929bd2538ddbc155abe09ff6eb6
parent 47b2623316e825d655fdb1104c758fb91eb65f65

adding a discriminant to OF rules for q-in-q tags.

Change-Id: Ic192f950b07fb18673659867631fea87ae7d6172

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

diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/OltPipeline.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/OltPipeline.java
index 767decf..8c1307a 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/OltPipeline.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/OltPipeline.java
@@ -383,7 +383,7 @@
             return;
         }
 
-        Instruction output = fetchOutput(fwd, "downstream");
+        Instructions.OutputInstruction output = (Instructions.OutputInstruction) fetchOutput(fwd, "downstream");
 
         if (output == null) {
             return;
@@ -396,6 +396,7 @@
         Criterion outerVlan = selector.getCriterion(Criterion.Type.VLAN_VID);
         Criterion innerVlan = selector.getCriterion(Criterion.Type.INNER_VLAN_VID);
         Criterion inport = selector.getCriterion(Criterion.Type.IN_PORT);
+        Criterion bullshit = Criteria.matchMetadata(output.port().toLong());
 
         if (outerVlan == null || innerVlan == null || inport == null) {
             log.error("Forwarding objective is underspecified: {}", fwd);
@@ -410,7 +411,7 @@
                 .forDevice(deviceId)
                 .makePermanent()
                 .withPriority(fwd.priority())
-                .withSelector(buildSelector(inport, outerVlan))
+                .withSelector(buildSelector(inport, outerVlan, bullshit))
                 .withTreatment(buildTreatment(popAndRewrite.getLeft(),
                                               Instructions.transition(QQ_TABLE)));