Removed obsoleted Graph-based Network Storage and associated interfaces:
DeviceStorageImpl, LinkStorageImpl, SwitchStorageImpl
TopoLinkServiceImpl, TopoSwitchServiceImpl
Change-Id: I09c9fcb9e268bed975b85d110a50f1806b070599
diff --git a/src/main/java/net/onrc/onos/ofcontroller/forwarding/Forwarding.java b/src/main/java/net/onrc/onos/ofcontroller/forwarding/Forwarding.java
index 884c717..97b3e28 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/forwarding/Forwarding.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/forwarding/Forwarding.java
@@ -20,11 +20,9 @@
import net.floodlightcontroller.packet.Ethernet;
import net.floodlightcontroller.util.MACAddress;
import net.onrc.onos.datagrid.IDatagridService;
-import net.onrc.onos.ofcontroller.core.IDeviceStorage;
import net.onrc.onos.ofcontroller.core.INetMapTopologyObjects.IDeviceObject;
import net.onrc.onos.ofcontroller.core.INetMapTopologyObjects.IPortObject;
import net.onrc.onos.ofcontroller.core.INetMapTopologyObjects.ISwitchObject;
-import net.onrc.onos.ofcontroller.core.internal.DeviceStorageImpl;
import net.onrc.onos.ofcontroller.devicemanager.IOnosDeviceService;
import net.onrc.onos.ofcontroller.flowprogrammer.IFlowPusherService;
import net.onrc.onos.ofcontroller.proxyarp.BroadcastPacketOutNotification;
@@ -74,8 +72,6 @@
private IDatagridService datagrid;
private IControllerRegistryService controllerRegistryService;
- private IDeviceStorage deviceStorage;
-
// TODO it seems there is a Guava collection that will time out entries.
// We should see if this will work here.
private Map<Path, PushedFlow> pendingFlows;
@@ -179,9 +175,6 @@
pendingFlows = new HashMap<Path, PushedFlow>();
waitingPackets = LinkedListMultimap.create();
-
- deviceStorage = new DeviceStorageImpl();
- deviceStorage.init("","");
}
@Override
@@ -252,6 +245,8 @@
HexString.toHexString(eth.getDestinationMACAddress());
//FIXME getDeviceByMac() is a blocking call, so it may be better way to handle it to avoid the condition.
+ // TODO: Fix the code below after deviceStorage was removed
+ /*
try{
IDeviceObject deviceObject = deviceStorage.getDeviceByMac(
destinationMac);
@@ -268,6 +263,7 @@
} finally {
deviceStorage.rollback();
}
+ */
}
private class WaitDeviceArp implements Runnable {
@@ -284,6 +280,8 @@
@Override
public void run() {
+ // TODO: Fix the code below after deviceStorage was removed
+ /*
try {
IDeviceObject deviceObject = deviceStorage.getDeviceByMac(HexString.toHexString(eth.getDestinationMACAddress()));
if(deviceObject == null){
@@ -296,6 +294,7 @@
} finally {
deviceStorage.rollback();
}
+ */
}
}