Renamed ActionOutput FlowEntry attribute to ActionOutputPort, because
it actually contains the output port value.
NOTE: The corresponding Titan graph property has been renamed from
"actionOutput" to "actionOutputPort".
As a result, ONOS should be restarted with clean database.
diff --git a/src/test/java/net/onrc/onos/ofcontroller/core/INetMapTopologyObjectsIFlowEntryTest.java b/src/test/java/net/onrc/onos/ofcontroller/core/INetMapTopologyObjectsIFlowEntryTest.java
index 717d688..06d8522 100644
--- a/src/test/java/net/onrc/onos/ofcontroller/core/INetMapTopologyObjectsIFlowEntryTest.java
+++ b/src/test/java/net/onrc/onos/ofcontroller/core/INetMapTopologyObjectsIFlowEntryTest.java
@@ -353,18 +353,18 @@
/**
* Desc:
- * Test method for set and get ActionOutput.
+ * Test method for set and get ActionOutputPort.
* Condition:
* N/A
* Expect:
- * 1. Should set ActionOutput.
- * 2. Should get ActionOutput.
+ * 1. Should set ActionOutputPort.
+ * 2. Should get ActionOutputPort.
*/
@Test
- public void testSetGetActionOutput() {
- Short actionOutput = 1;
- flowEntry.setActionOutput(actionOutput);
- assertEquals(flowEntry.getActionOutput(), actionOutput);
+ public void testSetGetActionOutputPort() {
+ Short actionOutputPort = 1;
+ flowEntry.setActionOutputPort(actionOutputPort);
+ assertEquals(flowEntry.getActionOutputPort(), actionOutputPort);
}
/**
diff --git a/src/test/java/net/onrc/onos/ofcontroller/core/internal/TestableGraphDBOperation.java b/src/test/java/net/onrc/onos/ofcontroller/core/internal/TestableGraphDBOperation.java
index f746060..dd21a26 100644
--- a/src/test/java/net/onrc/onos/ofcontroller/core/internal/TestableGraphDBOperation.java
+++ b/src/test/java/net/onrc/onos/ofcontroller/core/internal/TestableGraphDBOperation.java
@@ -712,7 +712,7 @@
private String matchSrcIpaddr,matchDstIpaddr;
private Byte matchIpProto, matchIpToS;
private Short matchSrcTcpUdpPort, matchDstTcpUdpPort;
- private Short actionOutput;
+ private Short actionOutputPort;
private IFlowPath flowPath;
private ISwitchObject sw;
@@ -728,7 +728,7 @@
private String matchSrcIpaddrToUpdate,matchDstIpaddrToUpdate;
private Byte matchIpProtoToUpdate, matchIpToSToUpdate;
private Short matchSrcTcpUdpPortToUpdate, matchDstTcpUdpPortToUpdate;
- private Short actionOutputToUpdate;
+ private Short actionOutputPortToUpdate;
private IFlowPath flowPathToUpdate;
private ISwitchObject swToUpdate;
@@ -761,7 +761,7 @@
if(matchIpToSToUpdate != null) { matchIpToS = matchIpToSToUpdate; }
if(matchSrcTcpUdpPortToUpdate != null) { matchSrcTcpUdpPort = matchSrcTcpUdpPortToUpdate; }
if(matchDstTcpUdpPortToUpdate != null) { matchDstTcpUdpPort = matchDstTcpUdpPortToUpdate; }
- if(actionOutputToUpdate != null) { actionOutput = actionOutputToUpdate; }
+ if(actionOutputPortToUpdate != null) { actionOutputPort = actionOutputPortToUpdate; }
if(flowPathToUpdate != null) { flowPath = flowPathToUpdate; }
if(swToUpdate != null) { sw = swToUpdate; }
@@ -786,7 +786,7 @@
matchSrcIpaddrToUpdate = matchDstIpaddrToUpdate = null;
matchIpProtoToUpdate = matchIpToSToUpdate = null;
matchSrcTcpUdpPortToUpdate = matchDstTcpUdpPortToUpdate = null;
- actionOutputToUpdate = null;
+ actionOutputPortToUpdate = null;
flowPathToUpdate = null;
swToUpdate = null;
inportToUpdate = outportToUpdate = null;
@@ -813,7 +813,7 @@
public void setMatchIpToSForTest(Byte matchIpToS) { this.matchIpToS = matchIpToS; }
public void setMatchSrcTcpUdpPortForTest(Short matchSrcTcpUdpPort) { this.matchSrcTcpUdpPort = matchSrcTcpUdpPort; }
public void setMatchDstTcpUdpPortForTest(Short matchDstTcpUdpPort) { this.matchDstTcpUdpPort = matchDstTcpUdpPort; }
- public void setActionOutputForTest(Short actionOutput) { this.actionOutput = actionOutput; }
+ public void setActionOutputPortForTest(Short actionOutputPort) { this.actionOutputPort = actionOutputPort; }
public void setFlowPathForTest(IFlowPath flowPath) { this.flowPath = flowPath; }
public void setSwitchForTest(ISwitchObject sw) { this.sw = sw; }
public void setInportForTest(IPortObject inport) { this.inport = inport; }
@@ -946,10 +946,10 @@
public void setMatchDstTcpUdpPort(Short matchDstTcpUdpPort) { matchDstTcpUdpPortToUpdate = matchDstTcpUdpPort; }
@Override
- public Short getActionOutput() { return actionOutput; }
+ public Short getActionOutputPort() { return actionOutputPort; }
@Override
- public void setActionOutput(Short actionOutput) { actionOutputToUpdate = actionOutput; }
+ public void setActionOutputPort(Short actionOutputPort) { actionOutputPortToUpdate = actionOutputPort; }
@Override
public IFlowPath getFlow() { return flowPath; }
diff --git a/src/test/java/net/onrc/onos/ofcontroller/flowmanager/FlowManagerTest.java b/src/test/java/net/onrc/onos/ofcontroller/flowmanager/FlowManagerTest.java
index cacedd2..9f197a7 100644
--- a/src/test/java/net/onrc/onos/ofcontroller/flowmanager/FlowManagerTest.java
+++ b/src/test/java/net/onrc/onos/ofcontroller/flowmanager/FlowManagerTest.java
@@ -1164,7 +1164,7 @@
expect(iFlowEntry.getMatchIpToS()).andReturn(new Byte((byte)0x3));
expect(iFlowEntry.getMatchSrcTcpUdpPort()).andReturn(new Short((short)40000));
expect(iFlowEntry.getMatchDstTcpUdpPort()).andReturn(new Short((short)80));
- expect(iFlowEntry.getActionOutput()).andReturn(new Short((short) 2));
+ expect(iFlowEntry.getActionOutputPort()).andReturn(new Short((short) 2));
expect(floodlightProvider.getOFMessageFactory()).andReturn(basicFactory);
expect(basicFactory.getMessage(OFType.FLOW_MOD)).andReturn(new OFFlowMod());
expect(iofSwitch.getStringId()).andReturn(new Dpid(100).toString());