Removed the OF1.0 special port enum from PortNumber
Change-Id: I3514b38dde0b37fd890509c7f79c17eca954df12
diff --git a/src/main/java/net/onrc/onos/core/util/FlowEntryAction.java b/src/main/java/net/onrc/onos/core/util/FlowEntryAction.java
index dd7bdbd..02a969c 100644
--- a/src/main/java/net/onrc/onos/core/util/FlowEntryAction.java
+++ b/src/main/java/net/onrc/onos/core/util/FlowEntryAction.java
@@ -3,6 +3,7 @@
import net.floodlightcontroller.util.MACAddress;
import org.codehaus.jackson.annotate.JsonProperty;
+import org.openflow.protocol.OFPort;
/**
* The class representing a single Flow Entry action.
@@ -1212,7 +1213,7 @@
* @param maxLen the maximum length (in bytes) to send to controller.
*/
public void setActionOutputToController(short maxLen) {
- PortNumber port = new PortNumber(PortNumber.PortValues.PORT_CONTROLLER);
+ PortNumber port = new PortNumber(OFPort.OFPP_CONTROLLER.getValue());
actionOutput = new ActionOutput(port, maxLen);
actionType = ActionValues.ACTION_OUTPUT;
}
diff --git a/src/main/java/net/onrc/onos/core/util/PortNumber.java b/src/main/java/net/onrc/onos/core/util/PortNumber.java
index f9f27bd..7273dea 100644
--- a/src/main/java/net/onrc/onos/core/util/PortNumber.java
+++ b/src/main/java/net/onrc/onos/core/util/PortNumber.java
@@ -8,68 +8,6 @@
* Current implementation supports only OpenFlow 1.0 (16 bit unsigned) port number.
*/
public final class PortNumber {
- /**
- * Special port values.
- * <p/>
- * Those values are taken as-is from the OpenFlow-v1.0.0 specification
- * (pp 18-19).
- */
- public enum PortValues {
- /** Maximum number of physical switch ports. */
- PORT_MAX((short) 0xff00),
-
- /* Fake output "ports". */
-
- /** Send the packet out the input port. This
- virtual port must be explicitly used
- in order to send back out of the input
- port. */
- PORT_IN_PORT((short) 0xfff8),
-
- /** Perform actions in flow table.
- NB: This can only be the destination
- port for packet-out messages. */
- PORT_TABLE((short) 0xfff9),
-
- /** Process with normal L2/L3 switching. */
- PORT_NORMAL((short) 0xfffa),
-
- /** All physical ports except input port and
- those disabled by STP. */
- PORT_FLOOD((short) 0xfffb),
-
- /** All physical ports except input port. */
- PORT_ALL((short) 0xfffc),
-
- /** Send to controller. */
- PORT_CONTROLLER((short) 0xfffd),
-
- /** Local openflow "port". */
- PORT_LOCAL((short) 0xfffe),
-
- /** Not associated with a physical port. */
- PORT_NONE((short) 0xffff);
-
- private final short value; // The value
-
- /**
- * Constructor for a given value.
- *
- * @param value the value to use for the initialization.
- */
- private PortValues(short value) {
- this.value = value;
- }
-
- /**
- * Get the value as a short integer.
- *
- * @return the value as a short integer.
- */
- private short value() {
- return this.value;
- }
- }
private final short value;
@@ -99,15 +37,6 @@
}
/**
- * Constructor from a PortValues enum value.
- *
- * @param value the value to use.
- */
- public PortNumber(PortValues value) {
- this.value = value.value();
- }
-
- /**
* Get the value of the port.
*
* @return the value of the port.
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 6aed473..7048697 100644
--- a/src/test/java/net/onrc/onos/core/util/FlowEntryActionTest.java
+++ b/src/test/java/net/onrc/onos/core/util/FlowEntryActionTest.java
@@ -1,7 +1,6 @@
package net.onrc.onos.core.util;
import static org.junit.Assert.assertEquals;
-
import net.floodlightcontroller.util.MACAddress;
import net.onrc.onos.core.util.FlowEntryAction.ActionEnqueue;
import net.onrc.onos.core.util.FlowEntryAction.ActionOutput;
@@ -14,6 +13,7 @@
import net.onrc.onos.core.util.FlowEntryAction.ActionStripVlan;
import org.junit.Test;
+import org.openflow.protocol.OFPort;
public class FlowEntryActionTest {
@@ -56,7 +56,7 @@
act.setActionOutputToController((short) 0);
FlowEntryAction actCopy = new FlowEntryAction();
- actCopy.setActionOutput(new PortNumber(PortNumber.PortValues.PORT_CONTROLLER));
+ actCopy.setActionOutput(new PortNumber(OFPort.OFPP_CONTROLLER.getValue()));
FlowEntryAction actCopy2 = new FlowEntryAction(act.toString());