Changes to call the network map Link Storage apis.
diff --git a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
index bcb8b35..4e19013 100644
--- a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
@@ -42,6 +42,7 @@
import net.floodlightcontroller.core.FloodlightContext;
import net.floodlightcontroller.core.IFloodlightProviderService;
import net.floodlightcontroller.core.IFloodlightProviderService.Role;
+import net.floodlightcontroller.core.INetMapStorage.DM_OPERATION;
import net.floodlightcontroller.core.IHAListener;
import net.floodlightcontroller.core.IInfoProvider;
import net.floodlightcontroller.core.IOFMessageListener;
@@ -189,6 +190,9 @@
protected ReentrantReadWriteLock lock;
int lldpTimeCount = 0;
+ // Storage
+ protected LinkStorageImplStubs linkStore;
+
/**
* Flag to indicate if automatic port fast is enabled or not.
* Default is set to false -- Initialized in the init method as well.
@@ -1007,6 +1011,10 @@
addLinkToBroadcastDomain(lt);
writeLinkToStorage(lt, newInfo);
+
+ // Write link to network map
+ linkStore.update(lt, newInfo, DM_OPERATION.INSERT);
+
updateOperation = UpdateOperation.LINK_UPDATED;
linkChanged = true;
@@ -1063,6 +1071,9 @@
// they weren't set to null in the previous block of code.
writeLinkToStorage(lt, newInfo);
+ // Write link to network map
+ linkStore.update(lt, newInfo, DM_OPERATION.UPDATE);
+
if (linkChanged) {
updateOperation = getUpdateOperation(newInfo.getSrcPortState(),
newInfo.getDstPortState());
@@ -1150,6 +1161,9 @@
// remove link from storage.
removeLinkFromStorage(lt);
+ // Write link to network map
+ linkStore.update(lt, DM_OPERATION.DELETE);
+
// TODO Whenever link is removed, it has to checked if
// the switchports must be added to quarantine.
@@ -1239,6 +1253,10 @@
getLinkType(lt, linkInfo),
operation));
writeLinkToStorage(lt, linkInfo);
+
+ // Write the changed link to the network map
+ linkStore.update(lt, linkInfo, DM_OPERATION.UPDATE);
+
linkInfoChanged = true;
}
}
@@ -1849,6 +1867,9 @@
"switch table {}", SWITCH_CONFIG_TABLE_NAME);
}
+ // Initialize the link storage connector to the network map
+ this.linkStore.init("");
+
ScheduledExecutorService ses = threadPool.getScheduledExecutor();
// To be started by the first switch connection
diff --git a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImplStubs.java b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImplStubs.java
index 9d61981..9d0cc6d 100644
--- a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImplStubs.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImplStubs.java
@@ -5,6 +5,9 @@
import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import net.floodlightcontroller.linkdiscovery.ILinkStorage;
import net.floodlightcontroller.linkdiscovery.LinkInfo;
import net.floodlightcontroller.routing.Link;
@@ -15,22 +18,24 @@
*/
public class LinkStorageImplStubs implements ILinkStorage {
+ protected static Logger log = LoggerFactory.getLogger(LinkStorageImplStubs.class);
+
/* (non-Javadoc)
* @see net.floodlightcontroller.linkdiscovery.ILinkStorage#update(net.floodlightcontroller.routing.Link, net.floodlightcontroller.core.INetMapStorage.DM_OPERATION)
*/
@Override
public void update(Link link, DM_OPERATION op) {
// TODO Auto-generated method stub
-
+ log.trace("LinkStorage:update(): op {} link {}", op, link);
}
/* (non-Javadoc)
* @see net.floodlightcontroller.linkdiscovery.ILinkStorage#update(java.util.List, net.floodlightcontroller.core.INetMapStorage.DM_OPERATION)
*/
@Override
- public void update(List<Link> List, DM_OPERATION op) {
+ public void update(List<Link> list, DM_OPERATION op) {
// TODO Auto-generated method stub
-
+ log.trace("LinkStorage:update(): op {} link {}", op, list);
}
/* (non-Javadoc)
@@ -39,7 +44,7 @@
@Override
public void update(Link link, LinkInfo linkinfo, DM_OPERATION op) {
// TODO Auto-generated method stub
-
+ log.trace("LinkStorage:update(): op {} link {}", op, link);
}
/* (non-Javadoc)
@@ -48,6 +53,8 @@
@Override
public List<Link> getLinks(Long dpid, int port) {
// TODO Auto-generated method stub
+ log.trace("LinkStorage:getLinks(): dpid {} port {}", dpid, port);
+
return null;
}
@@ -57,7 +64,7 @@
@Override
public void deleteLinks(Long dpid, int port) {
// TODO Auto-generated method stub
-
+ log.trace("LinkStorage:deleteLinks(): dpid {} port {}", dpid, port);
}
/* (non-Javadoc)