commit 27b9bc070fcadb0689e2f5c6fffec321319e3f6a
author Yi Tseng <yi@opennetworking.org> Thu Apr 12 14:52:40 2018 +0800
committer Yi Tseng <yi@opennetworking.org> Thu Apr 12 16:29:48 2018 +0800
tree e8aadce8bb96278d2f314f3a12bf78904e12a5b4
parent bb4f541bb2cdbdec37df3a31395086b0839ab3fc

[ONOS-7607] Update fabric.p4 bmv2 json w/ new p4c compiler

Change-Id: I0ba33a0773bd32b2108a0e7d163ad1e2c758078b

pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricFilteringPipeliner.java

diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricFilteringPipeliner.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricFilteringPipeliner.java
index 36cfcaf..d46d354 100644
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricFilteringPipeliner.java
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricFilteringPipeliner.java
@@ -16,7 +16,7 @@
 
 package org.onosproject.pipelines.fabric.pipeliner;
 
-import com.google.common.collect.Sets;
+import com.google.common.collect.Lists;
 import org.onlab.packet.Ethernet;
 import org.onlab.packet.MacAddress;
 import org.onlab.packet.VlanId;
@@ -156,7 +156,7 @@
     private Collection<FlowRule> createFwdClassifierRules(PortCriterion inPortCriterion,
                                                           EthCriterion ethDstCriterion,
                                                           FilteringObjective filterObjective) {
-        Collection<FlowRule> flowRules = Sets.newHashSet();
+        Collection<FlowRule> flowRules = Lists.newArrayList();
         if (ethDstCriterion == null) {
             // Bridging table, do nothing
             return flowRules;
@@ -192,7 +192,7 @@
     private Collection<FlowRule> createIpFwdClassifierRules(PortNumber inPort,
                                                             MacAddress dstMac,
                                                             FilteringObjective filterObjective) {
-        Collection<FlowRule> flowRules = Sets.newHashSet();
+        Collection<FlowRule> flowRules = Lists.newArrayList();
         TrafficTreatment treatment;
         treatment = createFwdClassifierTreatment(FWD_IPV4_UNICAST);
         flowRules.add(createFwdClassifierRule(inPort, Ethernet.TYPE_IPV4, dstMac, treatment, filterObjective));
@@ -233,7 +233,7 @@
         PiActionParam param = new PiActionParam(FabricConstants.ACT_PRM_FWD_TYPE_ID,
                                                 ImmutableByteSequence.copyFrom(fwdType));
         PiAction action = PiAction.builder()
-                .withId(FabricConstants.ACT_FILTERING_SET_FORWARDING_TYPE_ID)
+                .withId(FabricConstants.ACT_FABRICINGRESS_FILTERING_SET_FORWARDING_TYPE_ID)
                 .withParameter(param)
                 .build();
         return DefaultTrafficTreatment.builder()