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/test/java/net/onrc/onos/core/flowprogrammer/FlowPusherTest.java b/src/test/java/net/onrc/onos/core/flowprogrammer/FlowPusherTest.java
index 81938f7..cf86358 100644
--- a/src/test/java/net/onrc/onos/core/flowprogrammer/FlowPusherTest.java
+++ b/src/test/java/net/onrc/onos/core/flowprogrammer/FlowPusherTest.java
@@ -15,7 +15,7 @@
import net.onrc.onos.core.util.FlowEntryUserState;
import net.onrc.onos.core.util.FlowId;
import net.onrc.onos.core.util.IntegrationTest;
-import net.onrc.onos.core.util.Port;
+import net.onrc.onos.core.util.PortNumber;
import org.easymock.EasyMock;
import org.easymock.IAnswer;
import org.junit.Test;
@@ -429,8 +429,8 @@
FlowEntry flowEntry1 = new FlowEntry();
flowEntry1.setDpid(new Dpid(DPID_TO_VERIFY));
flowEntry1.setFlowId(new FlowId(1));
- flowEntry1.setInPort(new Port((short) 1));
- flowEntry1.setOutPort(new Port((short) 11));
+ flowEntry1.setInPort(new PortNumber((short) 1));
+ flowEntry1.setOutPort(new PortNumber((short) 11));
flowEntry1.setFlowEntryId(new FlowEntryId(1));
flowEntry1.setFlowEntryMatch(new FlowEntryMatch());
flowEntry1.setFlowEntryActions(new FlowEntryActions());
diff --git a/src/test/java/net/onrc/onos/core/util/FlowEntryActionTest.java b/src/test/java/net/onrc/onos/core/util/FlowEntryActionTest.java
index c93f132..6aed473 100644
--- a/src/test/java/net/onrc/onos/core/util/FlowEntryActionTest.java
+++ b/src/test/java/net/onrc/onos/core/util/FlowEntryActionTest.java
@@ -20,7 +20,7 @@
@Test
public void testSetActionOutputActionOutput() {
FlowEntryAction act = new FlowEntryAction();
- ActionOutput actout = new FlowEntryAction.ActionOutput(new Port((short) 42));
+ ActionOutput actout = new FlowEntryAction.ActionOutput(new PortNumber((short) 42));
act.setActionOutput(actout);
assertEquals("action output", FlowEntryAction.ActionValues.ACTION_OUTPUT, act.actionType());
@@ -39,7 +39,7 @@
@Test
public void testSetActionOutputPort() {
FlowEntryAction act = new FlowEntryAction();
- act.setActionOutput(new Port((short) 42));
+ act.setActionOutput(new PortNumber((short) 42));
FlowEntryAction actCopy = new FlowEntryAction(act);
FlowEntryAction actCopy2 = new FlowEntryAction(act.toString());
@@ -56,7 +56,7 @@
act.setActionOutputToController((short) 0);
FlowEntryAction actCopy = new FlowEntryAction();
- actCopy.setActionOutput(new Port(Port.PortValues.PORT_CONTROLLER));
+ actCopy.setActionOutput(new PortNumber(PortNumber.PortValues.PORT_CONTROLLER));
FlowEntryAction actCopy2 = new FlowEntryAction(act.toString());
@@ -396,7 +396,7 @@
@Test
public void testSetActionEnqueueActionEnqueue() {
FlowEntryAction act = new FlowEntryAction();
- ActionEnqueue enq = new FlowEntryAction.ActionEnqueue(new Port((short) 42), 1);
+ ActionEnqueue enq = new FlowEntryAction.ActionEnqueue(new PortNumber((short) 42), 1);
act.setActionEnqueue(enq);
assertEquals("action type", FlowEntryAction.ActionValues.ACTION_ENQUEUE, act.actionType());
@@ -415,7 +415,7 @@
@Test
public void testSetActionEnqueuePortInt() {
FlowEntryAction act = new FlowEntryAction();
- act.setActionEnqueue(new Port((short) 42), 1);
+ act.setActionEnqueue(new PortNumber((short) 42), 1);
FlowEntryAction actCopy = new FlowEntryAction(act);
FlowEntryAction actCopy2 = new FlowEntryAction(act.toString());
diff --git a/src/test/java/net/onrc/onos/core/util/FlowEntryMatchTest.java b/src/test/java/net/onrc/onos/core/util/FlowEntryMatchTest.java
index 1528433..3f84c09 100644
--- a/src/test/java/net/onrc/onos/core/util/FlowEntryMatchTest.java
+++ b/src/test/java/net/onrc/onos/core/util/FlowEntryMatchTest.java
@@ -13,7 +13,7 @@
FlowEntryMatch match;
- Port inport = new Port((short) 1);
+ PortNumber inport = new PortNumber((short) 1);
byte[] byte1 = {1, 2, 3, 4, 5, 6};
byte[] byte2 = {6, 5, 4, 3, 2, 1};
MACAddress mac1 = new MACAddress(byte1);
diff --git a/src/test/java/net/onrc/onos/core/util/FlowEntryTest.java b/src/test/java/net/onrc/onos/core/util/FlowEntryTest.java
index 4be4bdb..cca5d02 100644
--- a/src/test/java/net/onrc/onos/core/util/FlowEntryTest.java
+++ b/src/test/java/net/onrc/onos/core/util/FlowEntryTest.java
@@ -22,7 +22,7 @@
Dpid dpid = new Dpid(0xCAFE);
- Port inport = new Port((short) 1);
+ PortNumber inport = new PortNumber((short) 1);
byte[] byte1 = {1, 2, 3, 4, 5, 6};
byte[] byte2 = {6, 5, 4, 3, 2, 1};
MACAddress mac1 = new MACAddress(byte1);
@@ -38,8 +38,8 @@
Byte ipToS = Byte.valueOf((byte) 6);
Short tport1 = Short.valueOf((short) 7);
Short tport2 = Short.valueOf((short) 8);
- Port outport = new Port((short) 9);
- Port queueport = new Port((short) 10);
+ PortNumber outport = new PortNumber((short) 9);
+ PortNumber queueport = new PortNumber((short) 10);
int queueId = 11;
FlowEntryErrorState errorState = new FlowEntryErrorState((short) 12, (short) 13);