홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
sangho
Committed by Jonathan Hart
32a59323 1 parent f2fda81f

Reflects the change of TrafficTreatment.Builder.setMpls() input paramter (int to MplsLabel) 

Change-Id: Icc4345e60008c8d4f8c50cd8edab0622f7e0b6fc
Inline Side-by-side
Showing 4 changed files with 11 additions and 7 deletions
......@@ -20,6 +20,7 @@ import java.util.HashSet;
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 @@ public class DefaultEdgeGroupHandler extends DefaultGroupHandler {
newNeighborLink.dst().deviceId()))
.setEthSrc(nodeMacAddr)
.pushMpls()
.setMpls(ns.getEdgeLabel());
.setMpls(MplsLabel.mplsLabel(ns.getEdgeLabel()));
GroupBucket updatedBucket = DefaultGroupBucket.
createSelectGroupBucket(tBuilder.build());
GroupBuckets updatedBuckets = new GroupBuckets(
......
......@@ -26,6 +26,7 @@ import java.util.List;
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 @@ public class DefaultGroupHandler {
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 @@ public class DefaultGroupHandler {
.setEthDst(deviceConfig.getDeviceMac(d))
.setEthSrc(nodeMacAddr)
.pushMpls()
.setMpls(ns.getEdgeLabel());
.setMpls(MplsLabel.mplsLabel(ns.getEdgeLabel()));
buckets.add(DefaultGroupBucket.createSelectGroupBucket(
tBuilder.build()));
}
......
......@@ -19,6 +19,7 @@ import java.util.Arrays;
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 @@ public class DefaultTransitGroupHandler extends DefaultGroupHandler {
newNeighborLink.dst().deviceId()))
.setEthSrc(nodeMacAddr)
.pushMpls()
.setMpls(ns.getEdgeLabel());
.setMpls(MplsLabel.mplsLabel(ns.getEdgeLabel()));
GroupBucket updatedBucket = DefaultGroupBucket.
createSelectGroupBucket(tBuilder.build());
GroupBuckets updatedBuckets = new GroupBuckets(
......
......@@ -23,6 +23,7 @@ import java.util.HashMap;
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 @@ public class PolicyGroupHandler extends DefaultGroupHandler {
getDeviceMac(neighbor))
.setEthSrc(nodeMacAddr)
.pushMpls()
.setMpls(label);
.setMpls(MplsLabel.mplsLabel(label));
outBuckets.add(DefaultGroupBucket.
createSelectGroupBucket(tBuilder.build()));
GroupDescription desc = new
......@@ -176,7 +177,7 @@ public class PolicyGroupHandler extends DefaultGroupHandler {
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 @@ public class PolicyGroupHandler extends DefaultGroupHandler {
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.
......