Reflects the change of TrafficTreatment.Builder.setMpls() input paramter (int to MplsLabel)
Change-Id: Icc4345e60008c8d4f8c50cd8edab0622f7e0b6fc
diff --git a/apps/grouphandler/src/main/java/org/onosproject/grouphandler/DefaultEdgeGroupHandler.java b/apps/grouphandler/src/main/java/org/onosproject/grouphandler/DefaultEdgeGroupHandler.java
index d5d489c..8da4acd 100644
--- a/apps/grouphandler/src/main/java/org/onosproject/grouphandler/DefaultEdgeGroupHandler.java
+++ b/apps/grouphandler/src/main/java/org/onosproject/grouphandler/DefaultEdgeGroupHandler.java
@@ -20,6 +20,7 @@
import java.util.List;
import java.util.Set;
+import org.onlab.packet.MplsLabel;
import org.onosproject.core.ApplicationId;
import org.onosproject.net.DeviceId;
import org.onosproject.net.Link;
@@ -125,7 +126,7 @@
newNeighborLink.dst().deviceId()))
.setEthSrc(nodeMacAddr)
.pushMpls()
- .setMpls(ns.getEdgeLabel());
+ .setMpls(MplsLabel.mplsLabel(ns.getEdgeLabel()));
GroupBucket updatedBucket = DefaultGroupBucket.
createSelectGroupBucket(tBuilder.build());
GroupBuckets updatedBuckets = new GroupBuckets(
diff --git a/apps/grouphandler/src/main/java/org/onosproject/grouphandler/DefaultGroupHandler.java b/apps/grouphandler/src/main/java/org/onosproject/grouphandler/DefaultGroupHandler.java
index 1421f85..755fac2 100644
--- a/apps/grouphandler/src/main/java/org/onosproject/grouphandler/DefaultGroupHandler.java
+++ b/apps/grouphandler/src/main/java/org/onosproject/grouphandler/DefaultGroupHandler.java
@@ -26,6 +26,7 @@
import java.util.Set;
import org.onlab.packet.MacAddress;
+import org.onlab.packet.MplsLabel;
import org.onosproject.core.ApplicationId;
import org.onosproject.net.DeviceId;
import org.onosproject.net.Link;
@@ -186,7 +187,7 @@
portDeviceMap.get(port)))
.setEthSrc(nodeMacAddr)
.pushMpls()
- .setMpls(ns.getEdgeLabel());
+ .setMpls(MplsLabel.mplsLabel(ns.getEdgeLabel()));
GroupBucket removeBucket = DefaultGroupBucket.
createSelectGroupBucket(tBuilder.build());
GroupBuckets removeBuckets = new GroupBuckets(
@@ -332,7 +333,7 @@
.setEthDst(deviceConfig.getDeviceMac(d))
.setEthSrc(nodeMacAddr)
.pushMpls()
- .setMpls(ns.getEdgeLabel());
+ .setMpls(MplsLabel.mplsLabel(ns.getEdgeLabel()));
buckets.add(DefaultGroupBucket.createSelectGroupBucket(
tBuilder.build()));
}
diff --git a/apps/grouphandler/src/main/java/org/onosproject/grouphandler/DefaultTransitGroupHandler.java b/apps/grouphandler/src/main/java/org/onosproject/grouphandler/DefaultTransitGroupHandler.java
index 9704539..a6129c2 100644
--- a/apps/grouphandler/src/main/java/org/onosproject/grouphandler/DefaultTransitGroupHandler.java
+++ b/apps/grouphandler/src/main/java/org/onosproject/grouphandler/DefaultTransitGroupHandler.java
@@ -19,6 +19,7 @@
import java.util.HashSet;
import java.util.Set;
+import org.onlab.packet.MplsLabel;
import org.onosproject.core.ApplicationId;
import org.onosproject.net.DeviceId;
import org.onosproject.net.Link;
@@ -113,7 +114,7 @@
newNeighborLink.dst().deviceId()))
.setEthSrc(nodeMacAddr)
.pushMpls()
- .setMpls(ns.getEdgeLabel());
+ .setMpls(MplsLabel.mplsLabel(ns.getEdgeLabel()));
GroupBucket updatedBucket = DefaultGroupBucket.
createSelectGroupBucket(tBuilder.build());
GroupBuckets updatedBuckets = new GroupBuckets(
diff --git a/apps/grouphandler/src/main/java/org/onosproject/grouphandler/PolicyGroupHandler.java b/apps/grouphandler/src/main/java/org/onosproject/grouphandler/PolicyGroupHandler.java
index 4f57bd3..d2b43b3 100644
--- a/apps/grouphandler/src/main/java/org/onosproject/grouphandler/PolicyGroupHandler.java
+++ b/apps/grouphandler/src/main/java/org/onosproject/grouphandler/PolicyGroupHandler.java
@@ -23,6 +23,7 @@
import java.util.Iterator;
import java.util.List;
+import org.onlab.packet.MplsLabel;
import org.onosproject.core.ApplicationId;
import org.onosproject.core.GroupId;
import org.onosproject.grouphandler.GroupBucketIdentifier.BucketOutputType;
@@ -111,7 +112,7 @@
getDeviceMac(neighbor))
.setEthSrc(nodeMacAddr)
.pushMpls()
- .setMpls(label);
+ .setMpls(MplsLabel.mplsLabel(label));
outBuckets.add(DefaultGroupBucket.
createSelectGroupBucket(tBuilder.build()));
GroupDescription desc = new
@@ -176,7 +177,7 @@
getDeviceMac(neighbor))
.setEthSrc(nodeMacAddr)
.pushMpls()
- .setMpls(bucketId.label());
+ .setMpls(MplsLabel.mplsLabel(bucketId.label()));
//TODO: BoS
outBuckets.add(DefaultGroupBucket.
createSelectGroupBucket(tBuilder.build()));
@@ -217,7 +218,7 @@
TrafficTreatment.Builder tBuilder =
DefaultTrafficTreatment.builder();
tBuilder.pushMpls()
- .setMpls(bucketId.label());
+ .setMpls(MplsLabel.mplsLabel(bucketId.label()));
//TODO: BoS
if (bucketId.type() == BucketOutputType.PORT) {
DeviceId neighbor = portDeviceMap.