Merge branch 'master' into unittest_bugfix
diff --git a/pom.xml b/pom.xml
index 871ca57..71e8192 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
</repositories>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <powermock.version>1.5</powermock.version>
+ <powermock.version>1.5.1</powermock.version>
<restlet.version>2.1-RC1</restlet.version>
<github.global.server>github</github.global.server>
</properties>
@@ -349,7 +349,7 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>3.1</version>
+ <version>3.2</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/src/main/java/net/onrc/onos/flow/FlowManagerImpl.java b/src/main/java/net/onrc/onos/flow/FlowManagerImpl.java
index 2e2706c..a7cd02a 100644
--- a/src/main/java/net/onrc/onos/flow/FlowManagerImpl.java
+++ b/src/main/java/net/onrc/onos/flow/FlowManagerImpl.java
@@ -210,7 +210,7 @@
String type = v.getProperty("type").toString();
// System.out.println("type: " + type);
if (type.equals("port")) {
- String number = v.getProperty("number").toString();
+ //String number = v.getProperty("number").toString();
// System.out.println("number: " + number);
Object obj = v.getProperty("number");
diff --git a/src/main/java/net/onrc/onos/ofcontroller/core/internal/LinkStorageImpl.java b/src/main/java/net/onrc/onos/ofcontroller/core/internal/LinkStorageImpl.java
index e5f2f58..8ee346b 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/core/internal/LinkStorageImpl.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/core/internal/LinkStorageImpl.java
@@ -144,7 +144,6 @@
@Override
public void deleteLink(Link lt) {
IPortObject vportSrc = null, vportDst = null;
- int count = 0;
log.debug("deleteLink(): {}", lt);
@@ -161,15 +160,17 @@
// FIXME: This needs to remove all edges
if (vportSrc != null && vportDst != null) {
-
- /* for (Edge e : vportSrc.asVertex().getEdges(Direction.OUT)) {
+/*
+ int count = 0;
+ for (Edge e : vportSrc.asVertex().getEdges(Direction.OUT)) {
log.debug("deleteLink(): {} in {} out {}",
new Object[]{e.getLabel(), e.getVertex(Direction.IN), e.getVertex(Direction.OUT)});
if (e.getLabel().equals("link") && e.getVertex(Direction.IN).equals(vportDst)) {
graph.removeEdge(e);
count++;
}
- }*/
+ }
+*/
vportSrc.removeLink(vportDst);
dbop.commit();
log.debug("deleteLink(): deleted edges src {} dst {}", new Object[]{
@@ -303,6 +304,7 @@
static class ExtractLink implements PipeFunction<PathPipe<Vertex>, Link> {
+ @SuppressWarnings("unchecked")
@Override
public Link compute(PathPipe<Vertex> pipe ) {
// TODO Auto-generated method stub
@@ -311,7 +313,7 @@
short s_port = 0;
short d_port = 0;
List<Vertex> V = new ArrayList<Vertex>();
- V = pipe.next();
+ V = (List<Vertex>)pipe.next();
Vertex src_sw = V.get(0);
Vertex dest_sw = V.get(3);
Vertex src_port = V.get(1);
diff --git a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
index 8df28ca..4130da6 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
@@ -878,7 +878,6 @@
*/
@Override
public boolean deleteAllFlows() {
- List<Thread> threads = new LinkedList<Thread>();
final ConcurrentLinkedQueue<FlowId> concurrentAllFlowIds =
new ConcurrentLinkedQueue<FlowId>();
@@ -906,6 +905,7 @@
//
// Create the threads to delete the Flow Paths
//
+ List<Thread> threads = new LinkedList<Thread>();
for (int i = 0; i < 10; i++) {
Thread thread = new Thread(new Runnable() {
@Override
@@ -1333,7 +1333,6 @@
public ArrayList<IFlowPath> getAllFlowsWithoutFlowEntries() {
Iterable<IFlowPath> flowPathsObj = null;
ArrayList<IFlowPath> flowPathsObjArray = new ArrayList<IFlowPath>();
- ArrayList<FlowPath> flowPaths = new ArrayList<FlowPath>();
op.commit();
@@ -1356,6 +1355,7 @@
flowPathsObjArray.add(flowObj);
}
/*
+ ArrayList<FlowPath> flowPaths = new ArrayList<FlowPath>();
for (IFlowPath flowObj : flowPathsObj) {
//
// Extract the Flow state
@@ -1606,7 +1606,6 @@
* @return true on success, otherwise false.
*/
public boolean reconcileFlow(IFlowPath flowObj, DataPath newDataPath) {
- Map<Long, IOFSwitch> mySwitches = floodlightProvider.getSwitches();
//
// Set the incoming port matching and the outgoing port output
@@ -1647,7 +1646,6 @@
// Remove the old Flow Entries, and add the new Flow Entries
//
Iterable<IFlowEntry> flowEntries = flowObj.getFlowEntries();
- LinkedList<IFlowEntry> deleteFlowEntries = new LinkedList<IFlowEntry>();
for (IFlowEntry flowEntryObj : flowEntries) {
flowEntryObj.setUserState("FE_USER_DELETE");
flowEntryObj.setSwitchState("FE_SWITCH_NOT_UPDATED");
diff --git a/src/main/java/net/onrc/onos/ofcontroller/topology/TopologyManager.java b/src/main/java/net/onrc/onos/ofcontroller/topology/TopologyManager.java
index 545128d..618ae39 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/topology/TopologyManager.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/topology/TopologyManager.java
@@ -282,7 +282,7 @@
public DataPath getTopoShortestPath(Map<Long, ?> shortestPathTopoHandler,
SwitchPort src, SwitchPort dest) {
@SuppressWarnings("unchecked")
- Map<Long, Node> shortestPathTopo = (Map)shortestPathTopoHandler;
+ Map<Long, Node> shortestPathTopo = (Map<Long, Node>)shortestPathTopoHandler;
DataPath result_data_path = new DataPath();
// Initialize the source and destination in the data path to return
@@ -503,7 +503,7 @@
String type = v.getProperty("type").toString();
// System.out.println("type: " + type);
if (type.equals("port")) {
- String number = v.getProperty("number").toString();
+ //String number = v.getProperty("number").toString();
// System.out.println("number: " + number);
Object obj = v.getProperty("number");
diff --git a/src/test/java/net/floodlightcontroller/core/internal/TestDatabaseManager.java b/src/test/java/net/floodlightcontroller/core/internal/TestDatabaseManager.java
index f811c9d..4e6477b 100644
--- a/src/test/java/net/floodlightcontroller/core/internal/TestDatabaseManager.java
+++ b/src/test/java/net/floodlightcontroller/core/internal/TestDatabaseManager.java
@@ -8,9 +8,8 @@
import java.util.Iterator;
import java.util.Set;
-import junit.framework.Assert;
-
import org.apache.commons.io.FileUtils;
+import org.junit.Assert;
import com.thinkaurelius.titan.core.TitanFactory;
import com.thinkaurelius.titan.core.TitanGraph;
@@ -18,6 +17,7 @@
import com.tinkerpop.blueprints.Vertex;
import com.tinkerpop.blueprints.util.io.graphml.GraphMLReader;
+@SuppressWarnings("deprecation")
public class TestDatabaseManager {
private static final String testDbLocation = "/tmp/onos-testdb";
diff --git a/src/test/java/net/onrc/onos/graph/GraphDBConnectionTest.java b/src/test/java/net/onrc/onos/graph/GraphDBConnectionTest.java
index bee936d..397ed88 100644
--- a/src/test/java/net/onrc/onos/graph/GraphDBConnectionTest.java
+++ b/src/test/java/net/onrc/onos/graph/GraphDBConnectionTest.java
@@ -55,6 +55,7 @@
}
+ @SuppressWarnings("unchecked")
private void expectDBConnectionAvailable() throws Exception {
isGraphOpen = false;
@@ -62,7 +63,7 @@
mockStatic(TitanFactory.class);
mockStatic(EventTransactionalGraph.class);
graph = createMock(TitanGraph.class);
- eg = createMock(EventTransactionalGraph.class);
+ eg = (EventTransactionalGraph<TitanGraph>)createMock(EventTransactionalGraph.class);
// setup expectations
expect(graph.isOpen()).andAnswer(new IAnswer<Boolean>() {
diff --git a/src/test/java/net/onrc/onos/ofcontroller/core/INetMapTopologyObjectsIDeviceObjectTest.java b/src/test/java/net/onrc/onos/ofcontroller/core/INetMapTopologyObjectsIDeviceObjectTest.java
index 323a0eb..880335b 100644
--- a/src/test/java/net/onrc/onos/ofcontroller/core/INetMapTopologyObjectsIDeviceObjectTest.java
+++ b/src/test/java/net/onrc/onos/ofcontroller/core/INetMapTopologyObjectsIDeviceObjectTest.java
@@ -111,7 +111,6 @@
IPortObject portObj = ope.newPort(dpid, number);
IPortObject portObj2 = ope.newPort(dpid, number2);
- String ipaddr = "192.168.0.1";
IDeviceObject devObj = ope.newDevice();
portObj.setDevice(devObj);
@@ -141,11 +140,8 @@
public void testSetRemoveHostPort() {
String dpid = "00:00:00:00:00:00:0a:07";
Short number = 1;
- Short number2 = 2;
IPortObject portObj = ope.newPort(dpid, number);
- IPortObject portObj2 = ope.newPort(dpid, number2);
- String ipaddr = "192.168.0.1";
IDeviceObject devObj = ope.newDevice();
devObj.setHostPort(portObj);
diff --git a/src/test/java/net/onrc/onos/ofcontroller/core/INetMapTopologyObjectsISwitchObjectTest.java b/src/test/java/net/onrc/onos/ofcontroller/core/INetMapTopologyObjectsISwitchObjectTest.java
index c4dca4b..dacfdb5 100644
--- a/src/test/java/net/onrc/onos/ofcontroller/core/INetMapTopologyObjectsISwitchObjectTest.java
+++ b/src/test/java/net/onrc/onos/ofcontroller/core/INetMapTopologyObjectsISwitchObjectTest.java
@@ -13,6 +13,7 @@
import net.onrc.onos.ofcontroller.core.INetMapTopologyObjects.ISwitchObject;
import net.onrc.onos.ofcontroller.core.internal.SwitchStorageImpl;
import net.onrc.onos.ofcontroller.core.internal.TestDatabaseManager;
+
import org.easymock.EasyMock;
import org.junit.After;
import org.junit.Before;
@@ -146,16 +147,16 @@
public void testGetPorts() {
String dpid = "00:00:00:00:00:00:0a:07";
Short portNumber = 1;
- int testSwitchPortNumber = 1;
+ final int testSwitchPortNumber = 1;
ISwitchObject swObj = ope.newSwitch(dpid);
IPortObject portObj = ope.newPort(dpid, portNumber);
swObj.addPort(portObj);
int i = 0;
- for(IPortObject port : swObj.getPorts()){
+ for(@SuppressWarnings("unused") IPortObject port : swObj.getPorts()){
i++;
}
- assertEquals(testSwitchPortNumber, 1);
+ assertEquals(testSwitchPortNumber, i);
}
/**
@@ -225,7 +226,7 @@
portObj.setDevice(devObj);
int i = 0;
- for(IDeviceObject dev : swObj.getDevices()){
+ for(@SuppressWarnings("unused") IDeviceObject dev : swObj.getDevices()){
i++;
}
assertEquals(i, numOfDev);
diff --git a/src/test/java/net/onrc/onos/ofcontroller/core/internal/SwitchStorageImplTest.java b/src/test/java/net/onrc/onos/ofcontroller/core/internal/SwitchStorageImplTest.java
index f276680..24c17f4 100644
--- a/src/test/java/net/onrc/onos/ofcontroller/core/internal/SwitchStorageImplTest.java
+++ b/src/test/java/net/onrc/onos/ofcontroller/core/internal/SwitchStorageImplTest.java
@@ -23,7 +23,6 @@
import org.slf4j.LoggerFactory;
import com.thinkaurelius.titan.core.TitanFactory;
-import com.thinkaurelius.titan.core.TitanGraph;
//Add Powermock preparation
@RunWith(PowerMockRunner.class)
@@ -35,8 +34,6 @@
String conf;
private GraphDBConnection mockConn = null;
private GraphDBOperation mockOpe = null;
- private GraphDBOperation realOpe = null;
- private TitanGraph titanGraph = null;
ISwitchStorage swSt = null;
@Before
@@ -375,12 +372,10 @@
* Expect:
* Should call rollback.
*/
- //@Ignore
@Test
public void testDeleteSwitchException() {
String dpid = "00:00:00:00:00:00:0a:07";
String state = "ACTIVE";
- String type = "";
//Mock Switch
ISwitchObject mockISw = createMock(ISwitchObject.class);
@@ -392,8 +387,8 @@
expect(mockOpe.newSwitch(dpid)).andReturn(mockISw);
mockOpe.commit();
expect(mockOpe.searchSwitch(dpid)).andReturn(mockISw);
- mockOpe.removeSwitch(mockISw);
- mockOpe.commit();
+ mockOpe.removeSwitch(mockISw);
+ mockOpe.commit();
expectLastCall().andThrow(new RuntimeException());
mockOpe.rollback();
mockOpe.close();
@@ -515,12 +510,10 @@
* Expect:
* Nothing happens.
*/
- //@Ignore
@Test
public void testAddPortAbnormalNoSwitch() {
String dpid = "00:00:00:00:00:00:0a:01";
short portNumber = 5;
- String state = "ACTIVE";
String name = "port 5 at SEA switch";
OFPhysicalPort portToAdd = new OFPhysicalPort();
diff --git a/src/test/java/net/onrc/onos/ofcontroller/core/internal/TestDatabaseManager.java b/src/test/java/net/onrc/onos/ofcontroller/core/internal/TestDatabaseManager.java
index 5b0a5b1..2fe5951 100644
--- a/src/test/java/net/onrc/onos/ofcontroller/core/internal/TestDatabaseManager.java
+++ b/src/test/java/net/onrc/onos/ofcontroller/core/internal/TestDatabaseManager.java
@@ -8,9 +8,8 @@
import java.util.Iterator;
import java.util.Set;
-import junit.framework.Assert;
-
import org.apache.commons.io.FileUtils;
+import org.junit.Assert;
import com.thinkaurelius.titan.core.TitanFactory;
import com.thinkaurelius.titan.core.TitanGraph;
@@ -18,6 +17,7 @@
import com.tinkerpop.blueprints.Vertex;
import com.tinkerpop.blueprints.util.io.graphml.GraphMLReader;
+@SuppressWarnings("deprecation")
public class TestDatabaseManager {
private static final String testDbLocation = "/tmp/onos-testdb";
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 bcff36a..c695f8d 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
@@ -918,13 +918,13 @@
public Short getMatchVlanId() {return matchVlanId; }
@Override
- public void setMatchVlanId(Short matchVlanId) { matchVlanId = matchVlanId; }
+ public void setMatchVlanId(Short matchVlanId) { matchVlanIdToUpdate = matchVlanId; }
@Override
public Byte getMatchVlanPriority() {return matchVlanPriority; }
@Override
- public void setMatchVlanPriority(Byte matchVlanPriority) { matchVlanPriority = matchVlanPriority; }
+ public void setMatchVlanPriority(Byte matchVlanPriority) { matchVlanPriorityToUpdate = matchVlanPriority; }
@Override
public String getMatchSrcIPv4Net() { return matchSrcIpaddr; }
@@ -942,13 +942,13 @@
public Byte getMatchIpProto() {return matchIpProto; }
@Override
- public void setMatchIpProto(Byte matchIpProto) { matchIpProto = matchIpProto; }
+ public void setMatchIpProto(Byte matchIpProto) { matchIpProtoToUpdate = matchIpProto; }
@Override
public Byte getMatchIpToS() {return matchIpToS; }
@Override
- public void setMatchIpToS(Byte matchIpToS) { matchIpToS = matchIpToS; }
+ public void setMatchIpToS(Byte matchIpToS) { matchIpToSToUpdate = matchIpToS; }
@Override
public Short getMatchSrcTcpUdpPort() {return matchSrcTcpUdpPort; }
diff --git a/src/test/java/net/onrc/onos/ofcontroller/core/internal/TestableLinkStorageImpl.java b/src/test/java/net/onrc/onos/ofcontroller/core/internal/TestableLinkStorageImpl.java
index 2f90d48..ecba546 100644
--- a/src/test/java/net/onrc/onos/ofcontroller/core/internal/TestableLinkStorageImpl.java
+++ b/src/test/java/net/onrc/onos/ofcontroller/core/internal/TestableLinkStorageImpl.java
@@ -18,6 +18,7 @@
*
*/
+@SuppressWarnings("deprecation")
public class TestableLinkStorageImpl extends LinkStorageImpl {
protected TitanGraph graph;
diff --git a/src/test/java/net/onrc/onos/ofcontroller/devicemanager/internal/DeviceStorageImplTestBB.java b/src/test/java/net/onrc/onos/ofcontroller/devicemanager/internal/DeviceStorageImplTestBB.java
index e4053f4..552cb9c 100644
--- a/src/test/java/net/onrc/onos/ofcontroller/devicemanager/internal/DeviceStorageImplTestBB.java
+++ b/src/test/java/net/onrc/onos/ofcontroller/devicemanager/internal/DeviceStorageImplTestBB.java
@@ -214,11 +214,8 @@
{
String portNumFromDB = port.getNumber().toString();
- assertEquals(String.valueOf(portNum), portNumFromDB);
+ assertEquals(String.valueOf(portNum), portNumFromDB);
- ISwitchObject sw = port.getSwitch();
- String str = sw.getDPID();
- log.debug("");
}
}