Index ports for faster search
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 f65eb4f..d2a6712 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
@@ -447,7 +447,7 @@
mockOpe.commit();
expect(mockOpe.searchSwitch(dpid)).andReturn(mockISw);
expect(mockOpe.searchPort(dpid, portNumber)).andReturn(null);
- expect(mockOpe.newPort(portNumber)).andReturn(mockIPort);
+ expect(mockOpe.newPort(dpid, portNumber)).andReturn(mockIPort);
mockOpe.commit();
mockOpe.close();
replay(mockOpe);
@@ -588,7 +588,7 @@
mockOpe.commit();
expect(mockOpe.searchSwitch(dpid)).andReturn(mockISw);
expect(mockOpe.searchPort(dpid, portNumber)).andReturn(null);
- expect(mockOpe.newPort(portNumber)).andReturn(null);
+ expect(mockOpe.newPort(dpid, portNumber)).andReturn(null);
mockOpe.rollback();
mockOpe.close();
replay(mockOpe);
@@ -639,7 +639,7 @@
mockOpe.commit();
expect(mockOpe.searchSwitch(dpid)).andReturn(mockISw);
expect(mockOpe.searchPort(dpid, portNumber)).andReturn(null);
- expect(mockOpe.newPort(portNumber)).andReturn(mockIPort);
+ expect(mockOpe.newPort(dpid, portNumber)).andReturn(mockIPort);
mockOpe.commit();
expectLastCall().andThrow(new RuntimeException());
mockOpe.rollback();
@@ -693,7 +693,7 @@
mockOpe.commit();
expect(mockOpe.searchSwitch(dpid)).andReturn(mockISw);
expect(mockOpe.searchPort(dpid, portNumber)).andReturn(null);
- expect(mockOpe.newPort(portNumber)).andReturn(mockIPort);
+ expect(mockOpe.newPort(dpid, portNumber)).andReturn(mockIPort);
mockOpe.commit();
expect(mockOpe.searchSwitch(dpid)).andReturn(mockISw);
expect(mockOpe.searchPort(dpid, portNumber)).andReturn(mockIPort);
@@ -750,7 +750,7 @@
mockOpe.commit();
expect(mockOpe.searchSwitch(dpid)).andReturn(mockISw);
expect(mockOpe.searchPort(dpid, portNumber)).andReturn(null);
- expect(mockOpe.newPort(portNumber)).andReturn(mockIPort);
+ expect(mockOpe.newPort(dpid, portNumber)).andReturn(mockIPort);
mockOpe.commit();
expect(mockOpe.searchSwitch(dpid)).andReturn(mockISw);
expect(mockOpe.searchPort(dpid, portNumber)).andReturn(mockIPort);
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 aaca07d..658aaaf 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
@@ -3,12 +3,14 @@
import java.util.ArrayList;
import java.util.List;
+import org.codehaus.jackson.annotate.JsonIgnore;
import org.easymock.EasyMock;
import org.openflow.util.HexString;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.tinkerpop.blueprints.Vertex;
+import com.tinkerpop.frames.Property;
import com.tinkerpop.frames.annotations.gremlin.GremlinParam;
import net.onrc.onos.graph.GraphDBConnection;
@@ -291,6 +293,22 @@
@Override
public void setLinkPort(IPortObject dest_port) { linkedPortsToAdd.add(dest_port); }
+
+ @Override
+ @JsonIgnore
+ @Property("port_id")
+ public void setPortId(String id) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ @JsonIgnore
+ @Property("port_id")
+ public String getPortId() {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
public static class TestDeviceObject implements IDeviceObject {
@@ -1127,7 +1145,7 @@
}
@Override
- public IPortObject searchPort(String dpid_str, short number) {
+ public IPortObject searchPort(String dpid_str, Short number) {
long dpid = HexString.toLong(dpid_str);
for(TestSwitchObject sw : switches) {