commit | 2102bfb72076dccffd91371b8f151c16a09d7491 | [log] [tgz] |
---|---|---|
author | Carmelo Cascone <carmelo@opennetworking.org> | Fri Dec 04 16:54:24 2020 -0800 |
committer | Carmelo Cascone <carmelo@opennetworking.org> | Sat Dec 05 01:03:39 2020 +0000 |
tree | 5b50dfa097d1c1f05b366504f85b0ed715b27e97 | |
parent | 7981d09ab6a380df7798f0e96d2985a88c0da370 [diff] |
Fabric.p4 cherry-picks from onos-2.2 Publish fabric.p4 constants with fabric-api artifact For consumption by third-party apps who wish to operate directly on fabric.p4 tables and other entities. (cherry picked from commit 8f6b5cdabf7828f6f7c017f288aad87c7bd0911a) Backport fabric-tna dbuf support to v1model (cherry picked from commit 4d1d67fa3abb4d7517e5836fbb82c899acffa951) Update SPGW p4 namespace to match fabric-tna (cherry picked from commit 35e4d196eb61104e7f96c62361a100bb454ee1cf) Change-Id: I3230a508a601180060e1041d4369a54f519658e1
diff --git a/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricInterpreterTest.java b/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricInterpreterTest.java index a0e6194..7ee9c88 100644 --- a/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricInterpreterTest.java +++ b/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricInterpreterTest.java
@@ -28,6 +28,7 @@ import org.onosproject.net.flow.TrafficTreatment; import org.onosproject.net.pi.runtime.PiAction; import org.onosproject.net.pi.runtime.PiActionParam; +import org.onosproject.pipelines.fabric.FabricConstants; import static org.easymock.EasyMock.createNiceMock; import static org.easymock.EasyMock.expect;
diff --git a/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricFilteringPipelinerTest.java b/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricFilteringPipelinerTest.java index 18cd132..1372a25 100644 --- a/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricFilteringPipelinerTest.java +++ b/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricFilteringPipelinerTest.java
@@ -38,7 +38,7 @@ import org.onosproject.net.flowobjective.ObjectiveError; import org.onosproject.net.pi.runtime.PiAction; import org.onosproject.net.pi.runtime.PiActionParam; -import org.onosproject.pipelines.fabric.impl.behaviour.FabricConstants; +import org.onosproject.pipelines.fabric.FabricConstants; import java.util.Collection; import java.util.List;
diff --git a/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricForwardingPipelineTest.java b/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricForwardingPipelineTest.java index 3d2942f..4c554a9 100644 --- a/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricForwardingPipelineTest.java +++ b/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricForwardingPipelineTest.java
@@ -46,7 +46,7 @@ import org.onosproject.net.pi.model.PiTableId; import org.onosproject.net.pi.runtime.PiAction; import org.onosproject.net.pi.runtime.PiActionParam; -import org.onosproject.pipelines.fabric.impl.behaviour.FabricConstants; +import org.onosproject.pipelines.fabric.FabricConstants; import java.util.List;
diff --git a/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricNextPipelinerTest.java b/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricNextPipelinerTest.java index a7d03c2..ffe6221 100644 --- a/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricNextPipelinerTest.java +++ b/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricNextPipelinerTest.java
@@ -39,7 +39,7 @@ import org.onosproject.net.pi.runtime.PiActionParam; import org.onosproject.net.pi.runtime.PiActionProfileGroupId; import org.onosproject.net.pi.runtime.PiGroupKey; -import org.onosproject.pipelines.fabric.impl.behaviour.FabricConstants; +import org.onosproject.pipelines.fabric.FabricConstants; import java.util.List; import java.util.stream.Collectors;