ONOS-2711 Replaced short to TpPort for tcp/udp ports
Change-Id: Ibf0474b5369d11d377fd33cf5ab48083cbca3308
diff --git a/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficTreatment.java b/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficTreatment.java
index f0937a7..8d787c4 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficTreatment.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficTreatment.java
@@ -22,6 +22,7 @@
import org.onlab.packet.IpAddress;
import org.onlab.packet.MacAddress;
import org.onlab.packet.MplsLabel;
+import org.onlab.packet.TpPort;
import org.onlab.packet.VlanId;
import org.onosproject.core.GroupId;
import org.onosproject.net.IndexedLambda;
@@ -416,27 +417,51 @@
return add(Instructions.modTunnelId(tunnelId));
}
+ @Deprecated
@Override
public TrafficTreatment.Builder setTcpSrc(short port) {
return add(Instructions.modTcpSrc(port));
}
@Override
+ public TrafficTreatment.Builder setTcpSrc(TpPort port) {
+ return add(Instructions.modTcpSrc(port));
+ }
+
+ @Deprecated
+ @Override
public TrafficTreatment.Builder setTcpDst(short port) {
return add(Instructions.modTcpDst(port));
}
@Override
+ public TrafficTreatment.Builder setTcpDst(TpPort port) {
+ return add(Instructions.modTcpDst(port));
+ }
+
+ @Deprecated
+ @Override
public TrafficTreatment.Builder setUdpSrc(short port) {
return add(Instructions.modUdpSrc(port));
}
@Override
+ public TrafficTreatment.Builder setUdpSrc(TpPort port) {
+ return add(Instructions.modUdpSrc(port));
+ }
+
+ @Deprecated
+ @Override
public TrafficTreatment.Builder setUdpDst(short port) {
return add(Instructions.modUdpDst(port));
}
@Override
+ public TrafficTreatment.Builder setUdpDst(TpPort port) {
+ return add(Instructions.modUdpDst(port));
+ }
+
+ @Override
public TrafficTreatment build() {
//Don't add DROP instruction by default when instruction
//set is empty. This will be handled in DefaultSingleTablePipeline