commit 3970e479d68fbdbfcb2f67573017a186cde2db9d
author Andrea Campanella <andrea@opennetworking.org> Thu Jan 25 16:44:04 2018 +0100
committer Andrea Campanella <andrea@opennetworking.org> Mon Jan 29 09:19:46 2018 +0000
tree 65a194298c064ea21974ad891ebd13ed28bb884b
parent 7db72fc561b94a09508208ddd7bc0ba45c5b48f9

T3: removed fixed mpls_bos and proper mpls label removal

Change-Id: Iaa122a84a43fedb5a0814d2a34b00a682ce4f741
(cherry picked from commit d293a5aa25937530da1d297589a2e5d7dfb5aef5)

src/test/java/org/onosproject/t3/impl/T3TestObjects.java

diff --git a/src/test/java/org/onosproject/t3/impl/T3TestObjects.java b/src/test/java/org/onosproject/t3/impl/T3TestObjects.java
index 7d24bbd..15cee5f 100644
--- a/src/test/java/org/onosproject/t3/impl/T3TestObjects.java
+++ b/src/test/java/org/onosproject/t3/impl/T3TestObjects.java
@@ -21,6 +21,7 @@
 import org.onlab.packet.IpAddress;
 import org.onlab.packet.IpPrefix;
 import org.onlab.packet.MacAddress;
+import org.onlab.packet.MplsLabel;
 import org.onlab.packet.VlanId;
 import org.onosproject.core.DefaultApplicationId;
 import org.onosproject.core.GroupId;
@@ -144,6 +145,8 @@
     private static final GroupId GROUP_ID = GroupId.valueOf(1);
 
     private static final TrafficTreatment GROUP_FLOW_TREATMENT = DefaultTrafficTreatment.builder()
+            .pushMpls()
+            .setMpls(MplsLabel.mplsLabel(100))
             .group(GROUP_ID)
             .build();
     private static final FlowRule GROUP_FLOW = DefaultFlowEntry.builder().forDevice(GROUP_FLOW_DEVICE)
@@ -156,7 +159,11 @@
             .build();
     static final FlowEntry GROUP_FLOW_ENTRY = new DefaultFlowEntry(GROUP_FLOW);
 
-    private static final GroupBucket BUCKET = DefaultGroupBucket.createSelectGroupBucket(OUTPUT_FLOW_TREATMENT);
+    private static final TrafficTreatment OUTPUT_GROUP_TREATMENT = DefaultTrafficTreatment.builder()
+            .popMpls(EthType.EtherType.IPV4.ethType())
+            .setOutput(PortNumber.portNumber(2)).build();
+
+    private static final GroupBucket BUCKET = DefaultGroupBucket.createSelectGroupBucket(OUTPUT_GROUP_TREATMENT);
 
     private static final GroupBuckets BUCKETS = new GroupBuckets(ImmutableList.of(BUCKET));