Moved pure ONOS code in net.floodlightcontroller.linkdiscovery to onos package namespace
diff --git a/src/main/java/net/floodlightcontroller/linkdiscovery/ILinkStorage.java b/src/main/java/net/floodlightcontroller/linkdiscovery/ILinkStorage.java
deleted file mode 100644
index 9a70708..0000000
--- a/src/main/java/net/floodlightcontroller/linkdiscovery/ILinkStorage.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package net.floodlightcontroller.linkdiscovery;
-
-import java.util.List;
-
-import net.floodlightcontroller.routing.Link;
-import net.onrc.onos.ofcontroller.core.INetMapStorage;
-
-public interface ILinkStorage extends INetMapStorage {
-
- /*
- * Link creation
- */
- public void update(Link link, DM_OPERATION op);
- public void update(Link link, LinkInfo linkinfo, DM_OPERATION op);
- public void update(List<Link> List, DM_OPERATION op);
-
- /*
- * Add Linkinfo
- */
- public void updateLink (Link link, LinkInfo linkinfo, DM_OPERATION op);
-
- /*
- * Delete a single link
- */
- public void deleteLink(Link link);
-
- /*
- * Delete links associated with dpid and port
- * If only dpid is used, All links associated for switch are removed
- * Useful for port up/down and also switch join/remove events
- */
- public void deleteLinksOnPort(Long dpid, short port);
-
- /*
- * Delete a list of links
- */
- public void deleteLinks(List<Link> links);
-
- /*
- * Get Links from Storage
- * If dpid and port both are specified specific link is retrieved
- * If only dpid is set all links associated with Switch are retrieved
- */
- public List<Link> getLinks(Long dpid, short port);
- public List<Link> getLinks(String dpid);
- public List<Link> getActiveLinks();
-
- /*
- * Init with Storage conf
- */
- public void init(String conf);
-
-}
diff --git a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImpl.java b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImpl.java
index fb85636..156150d 100644
--- a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImpl.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImpl.java
@@ -3,11 +3,11 @@
import java.util.ArrayList;
import java.util.List;
-import net.floodlightcontroller.linkdiscovery.ILinkStorage;
import net.floodlightcontroller.linkdiscovery.LinkInfo;
import net.floodlightcontroller.routing.Link;
import net.onrc.onos.ofcontroller.core.INetMapTopologyObjects.IPortObject;
import net.onrc.onos.ofcontroller.core.INetMapTopologyObjects.ISwitchObject;
+import net.onrc.onos.ofcontroller.linkdiscovery.ILinkStorage;
import net.onrc.onos.util.GraphDBConnection;
import net.onrc.onos.util.GraphDBConnection.Transaction;