commit 797692374e6b01fadb00c6328c46910c7017dbc0
author Charles Chan <rascov@gmail.com> Tue Jul 05 16:34:39 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Thu Jul 07 17:24:19 2016 +0000
tree c2d9d11b7ab7077bb6572ef1fa5c3eedfd46c199
parent 8db7d092ba404f19cf71fde71da0775e3f3131c4

Only pop internally assigned VLANs before sending ARP to controller

This is a fix for gerrit 10292 (commit ec8e06) which was not implemented correctly

Change-Id: If227860120c1e10a3ffbd0f8fb630490734ab751

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

diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/CpqdOfdpa2Pipeline.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/CpqdOfdpa2Pipeline.java
index effa88f..b111e87 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/CpqdOfdpa2Pipeline.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/CpqdOfdpa2Pipeline.java
@@ -249,7 +249,7 @@
                                                  VlanIdCriterion vidCriterion,
                                                  VlanId assignedVlan,
                                                  ApplicationId applicationId) {
-        List<FlowRule> rules = new ArrayList<FlowRule>();
+        List<FlowRule> rules = new ArrayList<>();
         TrafficSelector.Builder selector = DefaultTrafficSelector.builder();
         TrafficTreatment.Builder treatment = DefaultTrafficTreatment.builder();
         selector.matchVlanId(vidCriterion.vlanId());
@@ -258,6 +258,24 @@
         if (vidCriterion.vlanId() == VlanId.NONE) {
             // untagged packets are assigned vlans
             treatment.pushVlan().setVlanId(assignedVlan);
+
+            // Emulating OFDPA behavior by popping off internal assigned VLAN
+            // before sending to controller
+            TrafficSelector.Builder sbuilder = DefaultTrafficSelector.builder()
+                    .matchEthType(Ethernet.TYPE_ARP)
+                    .matchVlanId(assignedVlan);
+            TrafficTreatment.Builder tbuilder = DefaultTrafficTreatment.builder()
+                    .popVlan()
+                    .punt();
+            FlowRule internalVlan = DefaultFlowRule.builder()
+                    .forDevice(deviceId)
+                    .withSelector(sbuilder.build())
+                    .withTreatment(tbuilder.build())
+                    .withPriority(PacketPriority.CONTROL.priorityValue() + 1)
+                    .fromApp(applicationId)
+                    .makePermanent()
+                    .forTable(ACL_TABLE).build();
+            rules.add(internalVlan);
         }
 
         // ofdpa cannot match on ALL portnumber, so we need to use separate
@@ -287,24 +305,6 @@
             rules.add(rule);
         }
 
-        // Emulating OFDPA behavior by popping off internal assigned VLAN
-        // before sending to controller
-        TrafficSelector.Builder sbuilder = DefaultTrafficSelector.builder()
-                .matchEthType(Ethernet.TYPE_ARP)
-                .matchVlanId(assignedVlan);
-        TrafficTreatment.Builder tbuilder = DefaultTrafficTreatment.builder()
-                .popVlan()
-                .punt();
-        FlowRule internalVlan = DefaultFlowRule.builder()
-                .forDevice(deviceId)
-                .withSelector(sbuilder.build())
-                .withTreatment(tbuilder.build())
-                .withPriority(PacketPriority.CONTROL.priorityValue() + 1)
-                .fromApp(applicationId)
-                .makePermanent()
-                .forTable(ACL_TABLE).build();
-        rules.add(internalVlan);
-
         return rules;
     }