Rename Port to PortNumber
Current util.Port actually only represent a port number.
Renaming it to PortNumber, so that it matches what it actually reprsent.
- Updated javadoc
- Removed unnecessary hashCode calculation
- Hide default constructor from public
Change-Id: Ib26c746eaa27464356c4ca0abff6af5e321afc35
diff --git a/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java b/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java
index 43d19be..830998c 100644
--- a/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java
+++ b/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java
@@ -39,6 +39,7 @@
import net.onrc.onos.core.topology.Topology;
import net.onrc.onos.core.util.Dpid;
import net.onrc.onos.core.util.FlowPath;
+import net.onrc.onos.core.util.PortNumber;
import net.onrc.onos.core.util.SwitchPort;
import org.openflow.util.HexString;
@@ -340,10 +341,10 @@
// TODO eliminate cast
SwitchPort srcSwitchPort = new SwitchPort(
new Dpid(sw.getDpid()),
- new net.onrc.onos.core.util.Port((short) inPort.getNumber().longValue()));
+ new PortNumber((short) inPort.getNumber().longValue()));
SwitchPort dstSwitchPort = new SwitchPort(
new Dpid(destinationDpid),
- new net.onrc.onos.core.util.Port(destinationPort));
+ new PortNumber(destinationPort));
MACAddress srcMacAddress = MACAddress.valueOf(eth.getSourceMACAddress());
MACAddress dstMacAddress = MACAddress.valueOf(eth.getDestinationMACAddress());
diff --git a/src/main/java/net/onrc/onos/apps/sdnip/Interface.java b/src/main/java/net/onrc/onos/apps/sdnip/Interface.java
index b906ba6..de3b48c 100644
--- a/src/main/java/net/onrc/onos/apps/sdnip/Interface.java
+++ b/src/main/java/net/onrc/onos/apps/sdnip/Interface.java
@@ -3,7 +3,7 @@
import java.net.InetAddress;
import net.onrc.onos.core.util.Dpid;
-import net.onrc.onos.core.util.Port;
+import net.onrc.onos.core.util.PortNumber;
import net.onrc.onos.core.util.SwitchPort;
import org.codehaus.jackson.annotate.JsonCreator;
@@ -73,7 +73,7 @@
public SwitchPort getSwitchPort() {
//TODO SwitchPort, Dpid and Port are mutable, but they could probably
//be made immutable which would prevent the need to copy
- return new SwitchPort(new Dpid(dpid), new Port(port));
+ return new SwitchPort(new Dpid(dpid), new PortNumber(port));
}
/**
diff --git a/src/main/java/net/onrc/onos/apps/sdnip/SdnIp.java b/src/main/java/net/onrc/onos/apps/sdnip/SdnIp.java
index 4dff135..3b56468 100644
--- a/src/main/java/net/onrc/onos/apps/sdnip/SdnIp.java
+++ b/src/main/java/net/onrc/onos/apps/sdnip/SdnIp.java
@@ -52,7 +52,7 @@
import net.onrc.onos.core.util.FlowPathType;
import net.onrc.onos.core.util.FlowPathUserState;
import net.onrc.onos.core.util.IPv4Net;
-import net.onrc.onos.core.util.Port;
+import net.onrc.onos.core.util.PortNumber;
import net.onrc.onos.core.util.SwitchPort;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -219,7 +219,7 @@
bgpdAttachmentPoint = new SwitchPort(
new Dpid(config.getBgpdAttachmentDpid()),
- new Port(config.getBgpdAttachmentPort()));
+ new PortNumber(config.getBgpdAttachmentPort()));
bgpdMacAddress = config.getBgpdMacAddress();
vlan = config.getVlan();
@@ -542,7 +542,7 @@
// Create the DataPath object: dstSwitchPort
SwitchPort dstPort =
new SwitchPort(new Dpid(egressInterface.getDpid()),
- new Port(egressInterface.getPort()));
+ new PortNumber(egressInterface.getPort()));
// We only need one flow mod per switch, so pick one interface on each switch
Map<Long, Interface> srcInterfaces = new HashMap<Long, Interface>();
@@ -564,7 +564,7 @@
// Create DataPath object: srcSwitchPort
SwitchPort srcPort =
new SwitchPort(new Dpid(srcInterface.getDpid()),
- new Port(srcInterface.getPort()));
+ new PortNumber(srcInterface.getPort()));
DataPath dataPath = new DataPath();
dataPath.setSrcPort(srcPort);
@@ -774,7 +774,7 @@
// Create the DataPath object: dstSwitchPort
SwitchPort dstPort =
new SwitchPort(new Dpid(dstInterface.getDpid()),
- new Port(dstInterface.getPort()));
+ new PortNumber(dstInterface.getPort()));
for (Interface srcInterface : interfaces.values()) {
@@ -788,7 +788,7 @@
// Create the DataPath object: srcSwitchPort
SwitchPort srcPort =
new SwitchPort(new Dpid(srcInterface.getDpid()),
- new Port(srcInterface.getPort()));
+ new PortNumber(srcInterface.getPort()));
DataPath dataPath = new DataPath();
dataPath.setSrcPort(srcPort);
@@ -863,7 +863,7 @@
bgpdAttachmentPoint.port());
SwitchPort dstPort =
new SwitchPort(new Dpid(peerInterface.getDpid()),
- new Port(peerInterface.getSwitchPort().port()));
+ new PortNumber(peerInterface.getSwitchPort().port()));
ShortestPathIntent fwdIntent = new ShortestPathIntent(fwdIntentId,
srcPort.dpid().value(), srcPort.port().value(), ShortestPathIntent.EMPTYMACADDRESS, srcIP,
dstPort.dpid().value(), dstPort.port().value(), ShortestPathIntent.EMPTYMACADDRESS, dstIP);
@@ -929,7 +929,7 @@
SwitchPort dstPort =
new SwitchPort(new Dpid(peerInterface.getDpid()),
- new Port(peerInterface.getSwitchPort().port()));
+ new PortNumber(peerInterface.getSwitchPort().port()));
dataPath.setDstPort(dstPort);
flowPath.setDataPath(dataPath);
@@ -981,7 +981,7 @@
SwitchPort reverseSrcPort =
new SwitchPort(new Dpid(peerInterface.getDpid()),
- new Port(peerInterface.getSwitchPort().port()));
+ new PortNumber(peerInterface.getSwitchPort().port()));
reverseDataPath.setSrcPort(reverseSrcPort);
flowPath.setDataPath(reverseDataPath);