Adding ACL flow for Table 60 for Ipv6

Change-Id: Iab5a510ab77e2f50a9d8f28fe22edf053efc1884

Author: hchaundkar

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

@@ -57,4 +57,9 @@ public boolean requireMplsBosMatch() {
     public boolean requireMplsTtlModification() {
         return false;
     }
+
+    @Override
+    protected boolean requireEthType() {
+        return false;
+    }
 }

drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa2Pipeline.java

@@ -101,6 +101,7 @@
 import java.util.Timer;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import static java.util.concurrent.Executors.newScheduledThreadPool;
 import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
@@ -209,6 +210,15 @@ public boolean requireMplsPop() {
         return true;
     }
 
+    /**
+     * Determines whether this pipeline requires one additional flow matching on ethType 0x86dd in ACL table.
+     *
+     * @return true to create one additional flow matching on ethType 0x86dd in ACL table
+     */
+    protected boolean requireEthType() {
+        return true;
+    }
+
     /**
      * Determines whether this pipeline requires MPLS BOS match.
      *
@@ -1173,6 +1183,8 @@ protected Collection<FlowRule> processEgress(ForwardingObjective fwd) {
     protected Collection<FlowRule> processVersatile(ForwardingObjective fwd) {
         log.debug("Processing versatile forwarding objective:{} in dev:{}",
                  fwd.id(), deviceId);
+        List<FlowRule> flowRules = new ArrayList<>();
+        final AtomicBoolean ethTypeUsed  = new AtomicBoolean(false);
 
         if (fwd.nextId() == null && fwd.treatment() == null) {
             log.error("Forwarding objective {} from {} must contain "
@@ -1181,30 +1193,6 @@ protected Collection<FlowRule> processVersatile(ForwardingObjective fwd) {
             return Collections.emptySet();
         }
 
-        TrafficSelector.Builder sbuilder = versatileSelectorBuilder(fwd);
-        TrafficTreatment.Builder ttBuilder = versatileTreatmentBuilder(fwd);
-        if (ttBuilder == null) {
-            return Collections.emptySet();
-        }
-
-        FlowRule.Builder ruleBuilder = DefaultFlowRule.builder()
-                .fromApp(fwd.appId())
-                .withPriority(fwd.priority())
-                .forDevice(deviceId)
-                .withSelector(sbuilder.build())
-                .withTreatment(ttBuilder.build())
-                .makePermanent()
-                .forTable(ACL_TABLE);
-        return Collections.singletonList(ruleBuilder.build());
-    }
-
-    /**
-     * Helper function to create traffic selector builder for versatile forwarding objectives.
-     *
-     * @param fwd original forwarding objective
-     * @return selector builder for the flow rule
-     */
-    protected TrafficSelector.Builder versatileSelectorBuilder(ForwardingObjective fwd) {
         TrafficSelector.Builder sbuilder = DefaultTrafficSelector.builder();
         fwd.selector().criteria().forEach(criterion -> {
             if (criterion instanceof VlanIdCriterion) {
@@ -1244,11 +1232,45 @@ protected TrafficSelector.Builder versatileSelectorBuilder(ForwardingObjective f
                 } else {
                     sbuilder.add(criterion);
                 }
+            } else if (criterion instanceof EthTypeCriterion) {
+                sbuilder.add(criterion);
+                ethTypeUsed.set(true);
             } else {
                 sbuilder.add(criterion);
             }
         });
-        return sbuilder;
+
+        TrafficTreatment.Builder ttBuilder = versatileTreatmentBuilder(fwd);
+        if (ttBuilder == null) {
+            return Collections.emptySet();
+        }
+
+        FlowRule.Builder ruleBuilder = DefaultFlowRule.builder()
+                .fromApp(fwd.appId())
+                .withPriority(fwd.priority())
+                .forDevice(deviceId)
+                .withSelector(sbuilder.build())
+                .withTreatment(ttBuilder.build())
+                .makePermanent()
+                .forTable(ACL_TABLE);
+
+        flowRules.add(ruleBuilder.build());
+
+        if (!ethTypeUsed.get() && requireEthType()) {
+            log.debug("{} doesn't match on ethType but requireEthType is true, adding complementary ACL flow.",
+                      sbuilder.toString());
+            sbuilder.matchEthType(Ethernet.TYPE_IPV6);
+            FlowRule.Builder ethTypeRuleBuilder = DefaultFlowRule.builder()
+                    .fromApp(fwd.appId())
+                    .withPriority(fwd.priority())
+                    .forDevice(deviceId)
+                    .withSelector(sbuilder.build())
+                    .withTreatment(ttBuilder.build())
+                    .makePermanent()
+                    .forTable(ACL_TABLE);
+            flowRules.add(ethTypeRuleBuilder.build());
+        }
+        return flowRules;
     }
 
     /**

drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/OvsOfdpaPipeline.java

@@ -139,6 +139,11 @@ protected boolean requireVlanExtensions() {
         return false;
     }
 
+    @Override
+    protected boolean requireEthType() {
+        return false;
+    }
+
     @Override
     protected void initDriverId() {
         driverId = coreService.registerApplication(