From 4d43e2e84a8792db802c9a0afd597efee6a26773 Mon Sep 17 00:00:00 2001
From: Srinivasan Ramasubramanian <srini@bigswitch.com>
Date: Mon, 5 Mar 2012 20:05:24 -0800
Subject: [PATCH] Renaming old topology.* to linkdiscovery.*; and renaming
topologymanager to topology.
---
.../EventHistoryTopologyClusterResource.java | 8 ++---
.../web/EventHistoryTopologyLinkResource.java | 8 ++---
.../EventHistoryTopologySwitchResource.java | 8 ++---
...tHistoryTopologyClusterJSONSerializer.java | 2 +-
...ventHistoryTopologyLinkJSONSerializer.java | 2 +-
...ntHistoryTopologySwitchJSONSerializer.java | 2 +-
.../web/serializers/LinkTupleSerializer.java | 2 +-
.../devicemanager/Device.java | 2 +-
.../devicemanager/DeviceAttachmentPoint.java | 2 +-
.../internal/DeviceManagerImpl.java | 8 ++---
.../forwarding/Forwarding.java | 2 +-
.../ILinkDiscovery.java | 2 +-
.../ILinkDiscoveryListener.java | 2 +-
.../ILinkDiscoveryService.java | 2 +-
.../{topology => linkdiscovery}/LinkInfo.java | 2 +-
.../LinkTuple.java | 2 +-
.../SwitchPortTuple.java | 2 +-
.../internal/EventHistoryTopologyCluster.java | 2 +-
.../internal/EventHistoryTopologyLink.java | 2 +-
.../internal/EventHistoryTopologySwitch.java | 2 +-
.../internal/LinkDiscoveryManager.java} | 20 +++++------
.../web/LinksResource.java | 6 ++--
.../web/TopologyWebRoutable.java | 2 +-
.../routing/ForwardingBase.java | 2 +-
.../routing/IRoutingDecision.java | 2 +-
.../BroadcastDomain.java | 2 +-
.../Cluster.java | 2 +-
.../NodePair.java | 2 +-
.../NodePortTuple.java | 2 +-
.../OrderedNodePair.java | 2 +-
.../TopologyInstance.java | 2 +-
.../TopologyManager.java | 10 +++---
...htcontroller.core.module.IFloodlightModule | 4 +--
.../internal/DeviceManagerImplTest.java | 2 +-
.../forwarding/ForwardingTest.java | 2 +-
.../internal/TopologyImplTest.java | 33 ++++++++++---------
.../TopologyInstanceTest.java | 7 ++--
.../TopologyManagerTest.java | 5 +--
38 files changed, 87 insertions(+), 84 deletions(-)
rename src/main/java/net/floodlightcontroller/{topology => linkdiscovery}/ILinkDiscovery.java (72%)
rename src/main/java/net/floodlightcontroller/{topology => linkdiscovery}/ILinkDiscoveryListener.java (97%)
rename src/main/java/net/floodlightcontroller/{topology => linkdiscovery}/ILinkDiscoveryService.java (97%)
rename src/main/java/net/floodlightcontroller/{topology => linkdiscovery}/LinkInfo.java (99%)
rename src/main/java/net/floodlightcontroller/{topology => linkdiscovery}/LinkTuple.java (98%)
rename src/main/java/net/floodlightcontroller/{topology => linkdiscovery}/SwitchPortTuple.java (98%)
rename src/main/java/net/floodlightcontroller/{topology => linkdiscovery}/internal/EventHistoryTopologyCluster.java (89%)
rename src/main/java/net/floodlightcontroller/{topology => linkdiscovery}/internal/EventHistoryTopologyLink.java (90%)
rename src/main/java/net/floodlightcontroller/{topology => linkdiscovery}/internal/EventHistoryTopologySwitch.java (88%)
rename src/main/java/net/floodlightcontroller/{topology/internal/TopologyImpl.java => linkdiscovery/internal/LinkDiscoveryManager.java} (99%)
rename src/main/java/net/floodlightcontroller/{topology => linkdiscovery}/web/LinksResource.java (78%)
rename src/main/java/net/floodlightcontroller/{topology => linkdiscovery}/web/TopologyWebRoutable.java (93%)
rename src/main/java/net/floodlightcontroller/{topologymanager => topology}/BroadcastDomain.java (98%)
rename src/main/java/net/floodlightcontroller/{topologymanager => topology}/Cluster.java (97%)
rename src/main/java/net/floodlightcontroller/{topologymanager => topology}/NodePair.java (95%)
rename src/main/java/net/floodlightcontroller/{topologymanager => topology}/NodePortTuple.java (96%)
rename src/main/java/net/floodlightcontroller/{topologymanager => topology}/OrderedNodePair.java (95%)
rename src/main/java/net/floodlightcontroller/{topologymanager => topology}/TopologyInstance.java (99%)
rename src/main/java/net/floodlightcontroller/{topologymanager => topology}/TopologyManager.java (96%)
rename src/test/java/net/floodlightcontroller/{topology => linkdiscovery}/internal/TopologyImplTest.java (93%)
rename src/test/java/net/floodlightcontroller/{topologymanager => topology}/TopologyInstanceTest.java (97%)
rename src/test/java/net/floodlightcontroller/{topologymanager => topology}/TopologyManagerTest.java (97%)
diff --git a/src/main/java/net/floodlightcontroller/core/web/EventHistoryTopologyClusterResource.java b/src/main/java/net/floodlightcontroller/core/web/EventHistoryTopologyClusterResource.java
index 47b5905b1..282d44ef1 100644
--- a/src/main/java/net/floodlightcontroller/core/web/EventHistoryTopologyClusterResource.java
+++ b/src/main/java/net/floodlightcontroller/core/web/EventHistoryTopologyClusterResource.java
@@ -1,7 +1,7 @@
package net.floodlightcontroller.core.web;
-import net.floodlightcontroller.topology.internal.EventHistoryTopologyCluster;
-import net.floodlightcontroller.topology.internal.TopologyImpl;
+import net.floodlightcontroller.linkdiscovery.internal.EventHistoryTopologyCluster;
+import net.floodlightcontroller.linkdiscovery.internal.LinkDiscoveryManager;
import net.floodlightcontroller.util.EventHistory;
import org.restlet.resource.Get;
@@ -26,8 +26,8 @@ public class EventHistoryTopologyClusterResource extends ServerResource {
// Invalid input for event count - use default value
}
- TopologyImpl topoManager =
- (TopologyImpl)getContext().getAttributes().get("topology");
+ LinkDiscoveryManager topoManager =
+ (LinkDiscoveryManager)getContext().getAttributes().get("topology");
return new EventHistory<EventHistoryTopologyCluster>(
topoManager.evHistTopologyCluster, count);
diff --git a/src/main/java/net/floodlightcontroller/core/web/EventHistoryTopologyLinkResource.java b/src/main/java/net/floodlightcontroller/core/web/EventHistoryTopologyLinkResource.java
index 9d92d0a87..5e8949277 100644
--- a/src/main/java/net/floodlightcontroller/core/web/EventHistoryTopologyLinkResource.java
+++ b/src/main/java/net/floodlightcontroller/core/web/EventHistoryTopologyLinkResource.java
@@ -1,7 +1,7 @@
package net.floodlightcontroller.core.web;
-import net.floodlightcontroller.topology.internal.EventHistoryTopologyLink;
-import net.floodlightcontroller.topology.internal.TopologyImpl;
+import net.floodlightcontroller.linkdiscovery.internal.EventHistoryTopologyLink;
+import net.floodlightcontroller.linkdiscovery.internal.LinkDiscoveryManager;
import net.floodlightcontroller.util.EventHistory;
import org.restlet.resource.Get;
@@ -26,8 +26,8 @@ public class EventHistoryTopologyLinkResource extends ServerResource {
// Invalid input for event count - use default value
}
- TopologyImpl topoManager =
- (TopologyImpl)getContext().getAttributes().get("topology");
+ LinkDiscoveryManager topoManager =
+ (LinkDiscoveryManager)getContext().getAttributes().get("topology");
return new EventHistory<EventHistoryTopologyLink>(
topoManager.evHistTopologyLink, count);
diff --git a/src/main/java/net/floodlightcontroller/core/web/EventHistoryTopologySwitchResource.java b/src/main/java/net/floodlightcontroller/core/web/EventHistoryTopologySwitchResource.java
index 645b37772..683b63fff 100644
--- a/src/main/java/net/floodlightcontroller/core/web/EventHistoryTopologySwitchResource.java
+++ b/src/main/java/net/floodlightcontroller/core/web/EventHistoryTopologySwitchResource.java
@@ -1,7 +1,7 @@
package net.floodlightcontroller.core.web;
-import net.floodlightcontroller.topology.internal.EventHistoryTopologySwitch;
-import net.floodlightcontroller.topology.internal.TopologyImpl;
+import net.floodlightcontroller.linkdiscovery.internal.EventHistoryTopologySwitch;
+import net.floodlightcontroller.linkdiscovery.internal.LinkDiscoveryManager;
import net.floodlightcontroller.util.EventHistory;
import org.restlet.resource.Get;
@@ -26,8 +26,8 @@ public class EventHistoryTopologySwitchResource extends ServerResource {
// Invalid input for event count - use default value
}
- TopologyImpl topoManager =
- (TopologyImpl)getContext().getAttributes().get("topology");
+ LinkDiscoveryManager topoManager =
+ (LinkDiscoveryManager)getContext().getAttributes().get("topology");
return new EventHistory<EventHistoryTopologySwitch>(
topoManager.evHistTopologySwitch, count);
diff --git a/src/main/java/net/floodlightcontroller/core/web/serializers/EventHistoryTopologyClusterJSONSerializer.java b/src/main/java/net/floodlightcontroller/core/web/serializers/EventHistoryTopologyClusterJSONSerializer.java
index 2e6f9fa69..c571bef59 100644
--- a/src/main/java/net/floodlightcontroller/core/web/serializers/EventHistoryTopologyClusterJSONSerializer.java
+++ b/src/main/java/net/floodlightcontroller/core/web/serializers/EventHistoryTopologyClusterJSONSerializer.java
@@ -2,7 +2,7 @@ package net.floodlightcontroller.core.web.serializers;
import java.io.IOException;
-import net.floodlightcontroller.topology.internal.EventHistoryTopologyCluster;
+import net.floodlightcontroller.linkdiscovery.internal.EventHistoryTopologyCluster;
import org.codehaus.jackson.JsonGenerator;
import org.codehaus.jackson.JsonProcessingException;
diff --git a/src/main/java/net/floodlightcontroller/core/web/serializers/EventHistoryTopologyLinkJSONSerializer.java b/src/main/java/net/floodlightcontroller/core/web/serializers/EventHistoryTopologyLinkJSONSerializer.java
index 1621cc48b..1117db933 100644
--- a/src/main/java/net/floodlightcontroller/core/web/serializers/EventHistoryTopologyLinkJSONSerializer.java
+++ b/src/main/java/net/floodlightcontroller/core/web/serializers/EventHistoryTopologyLinkJSONSerializer.java
@@ -2,7 +2,7 @@ package net.floodlightcontroller.core.web.serializers;
import java.io.IOException;
-import net.floodlightcontroller.topology.internal.EventHistoryTopologyLink;
+import net.floodlightcontroller.linkdiscovery.internal.EventHistoryTopologyLink;
import org.codehaus.jackson.JsonGenerator;
import org.codehaus.jackson.JsonProcessingException;
diff --git a/src/main/java/net/floodlightcontroller/core/web/serializers/EventHistoryTopologySwitchJSONSerializer.java b/src/main/java/net/floodlightcontroller/core/web/serializers/EventHistoryTopologySwitchJSONSerializer.java
index b4f5e1c5e..fd076bbe9 100644
--- a/src/main/java/net/floodlightcontroller/core/web/serializers/EventHistoryTopologySwitchJSONSerializer.java
+++ b/src/main/java/net/floodlightcontroller/core/web/serializers/EventHistoryTopologySwitchJSONSerializer.java
@@ -2,8 +2,8 @@ package net.floodlightcontroller.core.web.serializers;
import java.io.IOException;
+import net.floodlightcontroller.linkdiscovery.internal.EventHistoryTopologySwitch;
import net.floodlightcontroller.packet.IPv4;
-import net.floodlightcontroller.topology.internal.EventHistoryTopologySwitch;
import org.codehaus.jackson.JsonGenerator;
import org.codehaus.jackson.JsonProcessingException;
diff --git a/src/main/java/net/floodlightcontroller/core/web/serializers/LinkTupleSerializer.java b/src/main/java/net/floodlightcontroller/core/web/serializers/LinkTupleSerializer.java
index 6d4d7e373..7392913db 100644
--- a/src/main/java/net/floodlightcontroller/core/web/serializers/LinkTupleSerializer.java
+++ b/src/main/java/net/floodlightcontroller/core/web/serializers/LinkTupleSerializer.java
@@ -2,7 +2,7 @@ package net.floodlightcontroller.core.web.serializers;
import java.io.IOException;
-import net.floodlightcontroller.topology.LinkTuple;
+import net.floodlightcontroller.linkdiscovery.LinkTuple;
import org.codehaus.jackson.JsonGenerator;
import org.codehaus.jackson.JsonProcessingException;
diff --git a/src/main/java/net/floodlightcontroller/devicemanager/Device.java b/src/main/java/net/floodlightcontroller/devicemanager/Device.java
index 9d761f92a..b3d8ade58 100755
--- a/src/main/java/net/floodlightcontroller/devicemanager/Device.java
+++ b/src/main/java/net/floodlightcontroller/devicemanager/Device.java
@@ -31,9 +31,9 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import net.floodlightcontroller.core.IOFSwitch;
+import net.floodlightcontroller.linkdiscovery.SwitchPortTuple;
import net.floodlightcontroller.packet.Ethernet;
import net.floodlightcontroller.packet.IPv4;
-import net.floodlightcontroller.topology.SwitchPortTuple;
import org.openflow.util.HexString;
diff --git a/src/main/java/net/floodlightcontroller/devicemanager/DeviceAttachmentPoint.java b/src/main/java/net/floodlightcontroller/devicemanager/DeviceAttachmentPoint.java
index b43812194..9571c8f3b 100644
--- a/src/main/java/net/floodlightcontroller/devicemanager/DeviceAttachmentPoint.java
+++ b/src/main/java/net/floodlightcontroller/devicemanager/DeviceAttachmentPoint.java
@@ -18,7 +18,7 @@
package net.floodlightcontroller.devicemanager;
import java.util.Date;
-import net.floodlightcontroller.topology.SwitchPortTuple;
+import net.floodlightcontroller.linkdiscovery.SwitchPortTuple;
public class DeviceAttachmentPoint {
private SwitchPortTuple switchPort;
diff --git a/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java b/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
index 71c419627..f333d5913 100755
--- a/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
+++ b/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
@@ -55,6 +55,10 @@ import net.floodlightcontroller.devicemanager.DeviceAttachmentPoint;
import net.floodlightcontroller.devicemanager.DeviceNetworkAddress;
import net.floodlightcontroller.devicemanager.IDeviceManagerService;
import net.floodlightcontroller.devicemanager.IDeviceManagerAware;
+import net.floodlightcontroller.linkdiscovery.ILinkDiscovery;
+import net.floodlightcontroller.linkdiscovery.ILinkDiscoveryListener;
+import net.floodlightcontroller.linkdiscovery.ILinkDiscoveryService;
+import net.floodlightcontroller.linkdiscovery.SwitchPortTuple;
import net.floodlightcontroller.packet.ARP;
import net.floodlightcontroller.packet.DHCP;
import net.floodlightcontroller.packet.Ethernet;
@@ -66,11 +70,7 @@ import net.floodlightcontroller.storage.IStorageSourceListener;
import net.floodlightcontroller.storage.IStorageSourceService;
import net.floodlightcontroller.storage.OperatorPredicate;
import net.floodlightcontroller.storage.StorageException;
-import net.floodlightcontroller.topology.ILinkDiscovery;
-import net.floodlightcontroller.topology.ILinkDiscoveryService;
-import net.floodlightcontroller.topology.ILinkDiscoveryListener;
import net.floodlightcontroller.topology.ITopologyService;
-import net.floodlightcontroller.topology.SwitchPortTuple;
import net.floodlightcontroller.util.EventHistory;
import net.floodlightcontroller.util.EventHistory.EvAction;
diff --git a/src/main/java/net/floodlightcontroller/forwarding/Forwarding.java b/src/main/java/net/floodlightcontroller/forwarding/Forwarding.java
index 5dfc9e5ff..098b62cc1 100644
--- a/src/main/java/net/floodlightcontroller/forwarding/Forwarding.java
+++ b/src/main/java/net/floodlightcontroller/forwarding/Forwarding.java
@@ -36,13 +36,13 @@ import net.floodlightcontroller.counter.ICounterStoreService;
import net.floodlightcontroller.devicemanager.Device;
import net.floodlightcontroller.devicemanager.DeviceAttachmentPoint;
import net.floodlightcontroller.devicemanager.IDeviceManagerService;
+import net.floodlightcontroller.linkdiscovery.SwitchPortTuple;
import net.floodlightcontroller.packet.Ethernet;
import net.floodlightcontroller.routing.ForwardingBase;
import net.floodlightcontroller.routing.IRoutingDecision;
import net.floodlightcontroller.routing.IRoutingService;
import net.floodlightcontroller.routing.Route;
import net.floodlightcontroller.topology.ITopologyService;
-import net.floodlightcontroller.topology.SwitchPortTuple;
import org.openflow.protocol.OFFlowMod;
import org.openflow.protocol.OFMatch;
diff --git a/src/main/java/net/floodlightcontroller/topology/ILinkDiscovery.java b/src/main/java/net/floodlightcontroller/linkdiscovery/ILinkDiscovery.java
similarity index 72%
rename from src/main/java/net/floodlightcontroller/topology/ILinkDiscovery.java
rename to src/main/java/net/floodlightcontroller/linkdiscovery/ILinkDiscovery.java
index 49220d903..c112cce8a 100644
--- a/src/main/java/net/floodlightcontroller/topology/ILinkDiscovery.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/ILinkDiscovery.java
@@ -1,4 +1,4 @@
-package net.floodlightcontroller.topology;
+package net.floodlightcontroller.linkdiscovery;
public interface ILinkDiscovery {
public enum LinkType {
diff --git a/src/main/java/net/floodlightcontroller/topology/ILinkDiscoveryListener.java b/src/main/java/net/floodlightcontroller/linkdiscovery/ILinkDiscoveryListener.java
similarity index 97%
rename from src/main/java/net/floodlightcontroller/topology/ILinkDiscoveryListener.java
rename to src/main/java/net/floodlightcontroller/linkdiscovery/ILinkDiscoveryListener.java
index bc3bb3664..ad9ea7149 100644
--- a/src/main/java/net/floodlightcontroller/topology/ILinkDiscoveryListener.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/ILinkDiscoveryListener.java
@@ -15,7 +15,7 @@
* under the License.
**/
-package net.floodlightcontroller.topology;
+package net.floodlightcontroller.linkdiscovery;
public interface ILinkDiscoveryListener {
/**
diff --git a/src/main/java/net/floodlightcontroller/topology/ILinkDiscoveryService.java b/src/main/java/net/floodlightcontroller/linkdiscovery/ILinkDiscoveryService.java
similarity index 97%
rename from src/main/java/net/floodlightcontroller/topology/ILinkDiscoveryService.java
rename to src/main/java/net/floodlightcontroller/linkdiscovery/ILinkDiscoveryService.java
index f8e93ca6b..cbd440edc 100644
--- a/src/main/java/net/floodlightcontroller/topology/ILinkDiscoveryService.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/ILinkDiscoveryService.java
@@ -15,7 +15,7 @@
* under the License.
**/
-package net.floodlightcontroller.topology;
+package net.floodlightcontroller.linkdiscovery;
/**
*
diff --git a/src/main/java/net/floodlightcontroller/topology/LinkInfo.java b/src/main/java/net/floodlightcontroller/linkdiscovery/LinkInfo.java
similarity index 99%
rename from src/main/java/net/floodlightcontroller/topology/LinkInfo.java
rename to src/main/java/net/floodlightcontroller/linkdiscovery/LinkInfo.java
index bae8e670a..6421328f4 100644
--- a/src/main/java/net/floodlightcontroller/topology/LinkInfo.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/LinkInfo.java
@@ -13,7 +13,7 @@
* under the License.
**/
-package net.floodlightcontroller.topology;
+package net.floodlightcontroller.linkdiscovery;
import org.openflow.protocol.OFPhysicalPort.OFPortState;
diff --git a/src/main/java/net/floodlightcontroller/topology/LinkTuple.java b/src/main/java/net/floodlightcontroller/linkdiscovery/LinkTuple.java
similarity index 98%
rename from src/main/java/net/floodlightcontroller/topology/LinkTuple.java
rename to src/main/java/net/floodlightcontroller/linkdiscovery/LinkTuple.java
index 682787feb..66c348fd7 100755
--- a/src/main/java/net/floodlightcontroller/topology/LinkTuple.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/LinkTuple.java
@@ -15,7 +15,7 @@
* under the License.
**/
-package net.floodlightcontroller.topology;
+package net.floodlightcontroller.linkdiscovery;
import net.floodlightcontroller.core.IOFSwitch;
diff --git a/src/main/java/net/floodlightcontroller/topology/SwitchPortTuple.java b/src/main/java/net/floodlightcontroller/linkdiscovery/SwitchPortTuple.java
similarity index 98%
rename from src/main/java/net/floodlightcontroller/topology/SwitchPortTuple.java
rename to src/main/java/net/floodlightcontroller/linkdiscovery/SwitchPortTuple.java
index 4b3775674..91c374bfe 100755
--- a/src/main/java/net/floodlightcontroller/topology/SwitchPortTuple.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/SwitchPortTuple.java
@@ -18,7 +18,7 @@
/**
*
*/
-package net.floodlightcontroller.topology;
+package net.floodlightcontroller.linkdiscovery;
import net.floodlightcontroller.core.IOFSwitch;
diff --git a/src/main/java/net/floodlightcontroller/topology/internal/EventHistoryTopologyCluster.java b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/EventHistoryTopologyCluster.java
similarity index 89%
rename from src/main/java/net/floodlightcontroller/topology/internal/EventHistoryTopologyCluster.java
rename to src/main/java/net/floodlightcontroller/linkdiscovery/internal/EventHistoryTopologyCluster.java
index 137af975c..befe82945 100644
--- a/src/main/java/net/floodlightcontroller/topology/internal/EventHistoryTopologyCluster.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/EventHistoryTopologyCluster.java
@@ -1,4 +1,4 @@
-package net.floodlightcontroller.topology.internal;
+package net.floodlightcontroller.linkdiscovery.internal;
/***
* Topology Cluster merge/split event history related classes and members
diff --git a/src/main/java/net/floodlightcontroller/topology/internal/EventHistoryTopologyLink.java b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/EventHistoryTopologyLink.java
similarity index 90%
rename from src/main/java/net/floodlightcontroller/topology/internal/EventHistoryTopologyLink.java
rename to src/main/java/net/floodlightcontroller/linkdiscovery/internal/EventHistoryTopologyLink.java
index ca82247da..8e43b7a52 100644
--- a/src/main/java/net/floodlightcontroller/topology/internal/EventHistoryTopologyLink.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/EventHistoryTopologyLink.java
@@ -1,4 +1,4 @@
-package net.floodlightcontroller.topology.internal;
+package net.floodlightcontroller.linkdiscovery.internal;
/***
* Topology link up/down event history related classes and members
diff --git a/src/main/java/net/floodlightcontroller/topology/internal/EventHistoryTopologySwitch.java b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/EventHistoryTopologySwitch.java
similarity index 88%
rename from src/main/java/net/floodlightcontroller/topology/internal/EventHistoryTopologySwitch.java
rename to src/main/java/net/floodlightcontroller/linkdiscovery/internal/EventHistoryTopologySwitch.java
index b220cc6f3..176687785 100644
--- a/src/main/java/net/floodlightcontroller/topology/internal/EventHistoryTopologySwitch.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/EventHistoryTopologySwitch.java
@@ -1,4 +1,4 @@
-package net.floodlightcontroller.topology.internal;
+package net.floodlightcontroller.linkdiscovery.internal;
/***
* Topology Switch event history related classes and members
diff --git a/src/main/java/net/floodlightcontroller/topology/internal/TopologyImpl.java b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
similarity index 99%
rename from src/main/java/net/floodlightcontroller/topology/internal/TopologyImpl.java
rename to src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
index b3147612f..d337a4e68 100644
--- a/src/main/java/net/floodlightcontroller/topology/internal/TopologyImpl.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
@@ -15,7 +15,7 @@
* under the License.
**/
-package net.floodlightcontroller.topology.internal;
+package net.floodlightcontroller.linkdiscovery.internal;
import java.io.IOException;
import java.net.InetAddress;
@@ -49,6 +49,13 @@ import net.floodlightcontroller.core.module.FloodlightModuleException;
import net.floodlightcontroller.core.module.IFloodlightModule;
import net.floodlightcontroller.core.module.IFloodlightService;
import net.floodlightcontroller.core.util.SingletonTask;
+import net.floodlightcontroller.linkdiscovery.ILinkDiscovery;
+import net.floodlightcontroller.linkdiscovery.ILinkDiscoveryListener;
+import net.floodlightcontroller.linkdiscovery.ILinkDiscoveryService;
+import net.floodlightcontroller.linkdiscovery.LinkInfo;
+import net.floodlightcontroller.linkdiscovery.LinkTuple;
+import net.floodlightcontroller.linkdiscovery.SwitchPortTuple;
+import net.floodlightcontroller.linkdiscovery.web.TopologyWebRoutable;
import net.floodlightcontroller.packet.BPDU;
import net.floodlightcontroller.packet.Ethernet;
import net.floodlightcontroller.packet.IPv4;
@@ -61,14 +68,7 @@ import net.floodlightcontroller.storage.IStorageSourceService;
import net.floodlightcontroller.storage.IStorageSourceListener;
import net.floodlightcontroller.storage.OperatorPredicate;
import net.floodlightcontroller.storage.StorageException;
-import net.floodlightcontroller.topology.ILinkDiscovery;
-import net.floodlightcontroller.topology.ILinkDiscoveryService;
-import net.floodlightcontroller.topology.ILinkDiscoveryListener;
import net.floodlightcontroller.topology.ITopologyListener;
-import net.floodlightcontroller.topology.LinkInfo;
-import net.floodlightcontroller.topology.LinkTuple;
-import net.floodlightcontroller.topology.SwitchPortTuple;
-import net.floodlightcontroller.topology.web.TopologyWebRoutable;
import net.floodlightcontroller.util.EventHistory;
import net.floodlightcontroller.util.EventHistory.EvAction;
@@ -111,11 +111,11 @@ import org.slf4j.LoggerFactory;
*
* @author David Erickson (daviderickson@cs.stanford.edu)
*/
-public class TopologyImpl
+public class LinkDiscoveryManager
implements IOFMessageListener, IOFSwitchListener,
IStorageSourceListener, ILinkDiscoveryService,
IFloodlightModule, IInfoProvider {
- protected static Logger log = LoggerFactory.getLogger(TopologyImpl.class);
+ protected static Logger log = LoggerFactory.getLogger(LinkDiscoveryManager.class);
// Names of table/fields for links in the storage API
private static final String LINK_TABLE_NAME = "controller_link";
diff --git a/src/main/java/net/floodlightcontroller/topology/web/LinksResource.java b/src/main/java/net/floodlightcontroller/linkdiscovery/web/LinksResource.java
similarity index 78%
rename from src/main/java/net/floodlightcontroller/topology/web/LinksResource.java
rename to src/main/java/net/floodlightcontroller/linkdiscovery/web/LinksResource.java
index 1d7c16663..a843db59d 100644
--- a/src/main/java/net/floodlightcontroller/topology/web/LinksResource.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/web/LinksResource.java
@@ -1,10 +1,10 @@
-package net.floodlightcontroller.topology.web;
+package net.floodlightcontroller.linkdiscovery.web;
import java.util.HashSet;
import java.util.Set;
-import net.floodlightcontroller.topology.ILinkDiscoveryService;
-import net.floodlightcontroller.topology.LinkTuple;
+import net.floodlightcontroller.linkdiscovery.ILinkDiscoveryService;
+import net.floodlightcontroller.linkdiscovery.LinkTuple;
import org.restlet.resource.Get;
import org.restlet.resource.ServerResource;
diff --git a/src/main/java/net/floodlightcontroller/topology/web/TopologyWebRoutable.java b/src/main/java/net/floodlightcontroller/linkdiscovery/web/TopologyWebRoutable.java
similarity index 93%
rename from src/main/java/net/floodlightcontroller/topology/web/TopologyWebRoutable.java
rename to src/main/java/net/floodlightcontroller/linkdiscovery/web/TopologyWebRoutable.java
index fa918c450..56adc3c64 100644
--- a/src/main/java/net/floodlightcontroller/topology/web/TopologyWebRoutable.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/web/TopologyWebRoutable.java
@@ -1,4 +1,4 @@
-package net.floodlightcontroller.topology.web;
+package net.floodlightcontroller.linkdiscovery.web;
import org.restlet.Context;
import org.restlet.Restlet;
diff --git a/src/main/java/net/floodlightcontroller/routing/ForwardingBase.java b/src/main/java/net/floodlightcontroller/routing/ForwardingBase.java
index bbb2e40a6..707dcbbd2 100644
--- a/src/main/java/net/floodlightcontroller/routing/ForwardingBase.java
+++ b/src/main/java/net/floodlightcontroller/routing/ForwardingBase.java
@@ -33,13 +33,13 @@ import net.floodlightcontroller.devicemanager.DeviceAttachmentPoint;
import net.floodlightcontroller.devicemanager.DeviceNetworkAddress;
import net.floodlightcontroller.devicemanager.IDeviceManagerService;
import net.floodlightcontroller.devicemanager.IDeviceManagerAware;
+import net.floodlightcontroller.linkdiscovery.SwitchPortTuple;
import net.floodlightcontroller.packet.Ethernet;
import net.floodlightcontroller.routing.IRoutingService;
import net.floodlightcontroller.routing.IRoutingDecision;
import net.floodlightcontroller.routing.Link;
import net.floodlightcontroller.routing.Route;
import net.floodlightcontroller.topology.ITopologyService;
-import net.floodlightcontroller.topology.SwitchPortTuple;
import org.openflow.protocol.OFFlowMod;
import org.openflow.protocol.OFMatch;
diff --git a/src/main/java/net/floodlightcontroller/routing/IRoutingDecision.java b/src/main/java/net/floodlightcontroller/routing/IRoutingDecision.java
index 47c723f39..0fbe2ae34 100644
--- a/src/main/java/net/floodlightcontroller/routing/IRoutingDecision.java
+++ b/src/main/java/net/floodlightcontroller/routing/IRoutingDecision.java
@@ -22,7 +22,7 @@ import java.util.List;
import net.floodlightcontroller.core.FloodlightContext;
import net.floodlightcontroller.core.FloodlightContextStore;
import net.floodlightcontroller.devicemanager.Device;
-import net.floodlightcontroller.topology.SwitchPortTuple;
+import net.floodlightcontroller.linkdiscovery.SwitchPortTuple;
public interface IRoutingDecision {
public enum RoutingAction {
diff --git a/src/main/java/net/floodlightcontroller/topologymanager/BroadcastDomain.java b/src/main/java/net/floodlightcontroller/topology/BroadcastDomain.java
similarity index 98%
rename from src/main/java/net/floodlightcontroller/topologymanager/BroadcastDomain.java
rename to src/main/java/net/floodlightcontroller/topology/BroadcastDomain.java
index 6e3e879b3..f592b5046 100644
--- a/src/main/java/net/floodlightcontroller/topologymanager/BroadcastDomain.java
+++ b/src/main/java/net/floodlightcontroller/topology/BroadcastDomain.java
@@ -1,4 +1,4 @@
-package net.floodlightcontroller.topologymanager;
+package net.floodlightcontroller.topology;
import java.util.HashMap;
import java.util.HashSet;
diff --git a/src/main/java/net/floodlightcontroller/topologymanager/Cluster.java b/src/main/java/net/floodlightcontroller/topology/Cluster.java
similarity index 97%
rename from src/main/java/net/floodlightcontroller/topologymanager/Cluster.java
rename to src/main/java/net/floodlightcontroller/topology/Cluster.java
index 3bc5e6c7c..606b07914 100644
--- a/src/main/java/net/floodlightcontroller/topologymanager/Cluster.java
+++ b/src/main/java/net/floodlightcontroller/topology/Cluster.java
@@ -1,4 +1,4 @@
-package net.floodlightcontroller.topologymanager;
+package net.floodlightcontroller.topology;
import java.util.HashMap;
import java.util.HashSet;
diff --git a/src/main/java/net/floodlightcontroller/topologymanager/NodePair.java b/src/main/java/net/floodlightcontroller/topology/NodePair.java
similarity index 95%
rename from src/main/java/net/floodlightcontroller/topologymanager/NodePair.java
rename to src/main/java/net/floodlightcontroller/topology/NodePair.java
index a93622dbc..ff954a01a 100644
--- a/src/main/java/net/floodlightcontroller/topologymanager/NodePair.java
+++ b/src/main/java/net/floodlightcontroller/topology/NodePair.java
@@ -1,4 +1,4 @@
-package net.floodlightcontroller.topologymanager;
+package net.floodlightcontroller.topology;
public class NodePair {
private long min;
diff --git a/src/main/java/net/floodlightcontroller/topologymanager/NodePortTuple.java b/src/main/java/net/floodlightcontroller/topology/NodePortTuple.java
similarity index 96%
rename from src/main/java/net/floodlightcontroller/topologymanager/NodePortTuple.java
rename to src/main/java/net/floodlightcontroller/topology/NodePortTuple.java
index e55d90a09..67cebeaaf 100644
--- a/src/main/java/net/floodlightcontroller/topologymanager/NodePortTuple.java
+++ b/src/main/java/net/floodlightcontroller/topology/NodePortTuple.java
@@ -1,4 +1,4 @@
-package net.floodlightcontroller.topologymanager;
+package net.floodlightcontroller.topology;
public class NodePortTuple {
protected long nodeId;
diff --git a/src/main/java/net/floodlightcontroller/topologymanager/OrderedNodePair.java b/src/main/java/net/floodlightcontroller/topology/OrderedNodePair.java
similarity index 95%
rename from src/main/java/net/floodlightcontroller/topologymanager/OrderedNodePair.java
rename to src/main/java/net/floodlightcontroller/topology/OrderedNodePair.java
index 6fdb9ffd8..af9e677c4 100644
--- a/src/main/java/net/floodlightcontroller/topologymanager/OrderedNodePair.java
+++ b/src/main/java/net/floodlightcontroller/topology/OrderedNodePair.java
@@ -1,4 +1,4 @@
-package net.floodlightcontroller.topologymanager;
+package net.floodlightcontroller.topology;
public class OrderedNodePair {
private long src;
diff --git a/src/main/java/net/floodlightcontroller/topologymanager/TopologyInstance.java b/src/main/java/net/floodlightcontroller/topology/TopologyInstance.java
similarity index 99%
rename from src/main/java/net/floodlightcontroller/topologymanager/TopologyInstance.java
rename to src/main/java/net/floodlightcontroller/topology/TopologyInstance.java
index cc6edd53c..4b56bc38d 100644
--- a/src/main/java/net/floodlightcontroller/topologymanager/TopologyInstance.java
+++ b/src/main/java/net/floodlightcontroller/topology/TopologyInstance.java
@@ -1,4 +1,4 @@
-package net.floodlightcontroller.topologymanager;
+package net.floodlightcontroller.topology;
import java.util.HashMap;
import java.util.HashSet;
diff --git a/src/main/java/net/floodlightcontroller/topologymanager/TopologyManager.java b/src/main/java/net/floodlightcontroller/topology/TopologyManager.java
similarity index 96%
rename from src/main/java/net/floodlightcontroller/topologymanager/TopologyManager.java
rename to src/main/java/net/floodlightcontroller/topology/TopologyManager.java
index 7a13f32e6..0fdd8b937 100644
--- a/src/main/java/net/floodlightcontroller/topologymanager/TopologyManager.java
+++ b/src/main/java/net/floodlightcontroller/topology/TopologyManager.java
@@ -1,4 +1,4 @@
-package net.floodlightcontroller.topologymanager;
+package net.floodlightcontroller.topology;
import java.util.ArrayList;
import java.util.Collection;
@@ -11,15 +11,13 @@ import net.floodlightcontroller.core.module.FloodlightModuleContext;
import net.floodlightcontroller.core.module.FloodlightModuleException;
import net.floodlightcontroller.core.module.IFloodlightModule;
import net.floodlightcontroller.core.module.IFloodlightService;
+import net.floodlightcontroller.linkdiscovery.ILinkDiscoveryListener;
+import net.floodlightcontroller.linkdiscovery.ILinkDiscoveryService;
+import net.floodlightcontroller.linkdiscovery.ILinkDiscovery.LinkType;
import net.floodlightcontroller.routing.BroadcastTree;
import net.floodlightcontroller.routing.IRoutingService;
import net.floodlightcontroller.routing.Link;
import net.floodlightcontroller.routing.Route;
-import net.floodlightcontroller.topology.ILinkDiscovery.LinkType;
-import net.floodlightcontroller.topology.ILinkDiscoveryListener;
-import net.floodlightcontroller.topology.ILinkDiscoveryService;
-import net.floodlightcontroller.topology.ITopologyListener;
-import net.floodlightcontroller.topology.ITopologyService;
import org.openflow.protocol.OFPhysicalPort.OFPortState;
diff --git a/src/main/resources/META-INF/services/net.floodlightcontroller.core.module.IFloodlightModule b/src/main/resources/META-INF/services/net.floodlightcontroller.core.module.IFloodlightModule
index 044aeafc4..b28500aa1 100644
--- a/src/main/resources/META-INF/services/net.floodlightcontroller.core.module.IFloodlightModule
+++ b/src/main/resources/META-INF/services/net.floodlightcontroller.core.module.IFloodlightModule
@@ -1,8 +1,8 @@
net.floodlightcontroller.core.CoreModule
net.floodlightcontroller.storage.memory.MemoryStorageSource
net.floodlightcontroller.devicemanager.internal.DeviceManagerImpl
-net.floodlightcontroller.topology.internal.TopologyImpl
-net.floodlightcontroller.topologymanager.TopologyManager
+net.floodlightcontroller.linkdiscovery.internal.LinkDiscoveryManager
+net.floodlightcontroller.topology.TopologyManager
net.floodlightcontroller.forwarding.Forwarding
net.floodlightcontroller.core.OFMessageFilterManager
net.floodlightcontroller.staticflowentry.StaticFlowEntryPusher
diff --git a/src/test/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImplTest.java b/src/test/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImplTest.java
index f64faaf74..229e77dc5 100644
--- a/src/test/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImplTest.java
+++ b/src/test/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImplTest.java
@@ -35,6 +35,7 @@ import net.floodlightcontroller.core.test.MockFloodlightProvider;
import net.floodlightcontroller.devicemanager.Device;
import net.floodlightcontroller.devicemanager.DeviceAttachmentPoint;
import net.floodlightcontroller.devicemanager.IDeviceManagerService;
+import net.floodlightcontroller.linkdiscovery.SwitchPortTuple;
import net.floodlightcontroller.packet.ARP;
import net.floodlightcontroller.packet.Ethernet;
import net.floodlightcontroller.packet.IPacket;
@@ -45,7 +46,6 @@ import net.floodlightcontroller.storage.IStorageSourceService;
import net.floodlightcontroller.storage.memory.MemoryStorageSource;
import net.floodlightcontroller.test.FloodlightTestCase;
import net.floodlightcontroller.topology.ITopologyService;
-import net.floodlightcontroller.topology.SwitchPortTuple;
import org.junit.Before;
import org.junit.Test;
diff --git a/src/test/java/net/floodlightcontroller/forwarding/ForwardingTest.java b/src/test/java/net/floodlightcontroller/forwarding/ForwardingTest.java
index b2199fc92..3b7e2f830 100644
--- a/src/test/java/net/floodlightcontroller/forwarding/ForwardingTest.java
+++ b/src/test/java/net/floodlightcontroller/forwarding/ForwardingTest.java
@@ -38,6 +38,7 @@ import net.floodlightcontroller.core.test.MockFloodlightProvider;
import net.floodlightcontroller.counter.CounterStore;
import net.floodlightcontroller.devicemanager.Device;
import net.floodlightcontroller.devicemanager.IDeviceManagerService;
+import net.floodlightcontroller.linkdiscovery.SwitchPortTuple;
import net.floodlightcontroller.packet.Data;
import net.floodlightcontroller.packet.Ethernet;
import net.floodlightcontroller.packet.IPacket;
@@ -48,7 +49,6 @@ import net.floodlightcontroller.routing.Link;
import net.floodlightcontroller.routing.Route;
import net.floodlightcontroller.test.FloodlightTestCase;
import net.floodlightcontroller.topology.ITopologyService;
-import net.floodlightcontroller.topology.SwitchPortTuple;
import net.floodlightcontroller.forwarding.Forwarding;
import org.easymock.Capture;
diff --git a/src/test/java/net/floodlightcontroller/topology/internal/TopologyImplTest.java b/src/test/java/net/floodlightcontroller/linkdiscovery/internal/TopologyImplTest.java
similarity index 93%
rename from src/test/java/net/floodlightcontroller/topology/internal/TopologyImplTest.java
rename to src/test/java/net/floodlightcontroller/linkdiscovery/internal/TopologyImplTest.java
index a31efae89..02e342add 100644
--- a/src/test/java/net/floodlightcontroller/topology/internal/TopologyImplTest.java
+++ b/src/test/java/net/floodlightcontroller/linkdiscovery/internal/TopologyImplTest.java
@@ -15,7 +15,7 @@
* under the License.
**/
-package net.floodlightcontroller.topology.internal;
+package net.floodlightcontroller.linkdiscovery.internal;
import static org.easymock.EasyMock.*;
@@ -31,17 +31,18 @@ import org.slf4j.LoggerFactory;
import net.floodlightcontroller.core.IFloodlightProviderService;
import net.floodlightcontroller.core.IOFSwitch;
import net.floodlightcontroller.core.module.FloodlightModuleContext;
+import net.floodlightcontroller.linkdiscovery.ILinkDiscoveryListener;
+import net.floodlightcontroller.linkdiscovery.ILinkDiscoveryService;
+import net.floodlightcontroller.linkdiscovery.LinkInfo;
+import net.floodlightcontroller.linkdiscovery.LinkTuple;
+import net.floodlightcontroller.linkdiscovery.internal.LinkDiscoveryManager;
import net.floodlightcontroller.routing.IRoutingService;
import net.floodlightcontroller.storage.IStorageSourceService;
import net.floodlightcontroller.storage.memory.MemoryStorageSource;
import net.floodlightcontroller.test.FloodlightTestCase;
-import net.floodlightcontroller.topology.ILinkDiscoveryListener;
-import net.floodlightcontroller.topology.ILinkDiscoveryService;
import net.floodlightcontroller.topology.ITopologyListener;
import net.floodlightcontroller.topology.ITopologyService;
-import net.floodlightcontroller.topology.LinkInfo;
-import net.floodlightcontroller.topology.LinkTuple;
-import net.floodlightcontroller.topologymanager.TopologyManager;
+import net.floodlightcontroller.topology.TopologyManager;
/**
*
@@ -49,10 +50,10 @@ import net.floodlightcontroller.topologymanager.TopologyManager;
*/
public class TopologyImplTest extends FloodlightTestCase {
- private TopologyImpl topology;
+ private LinkDiscoveryManager topology;
protected static Logger log = LoggerFactory.getLogger(TopologyImplTest.class);
- public TopologyImpl getTopology() {
+ public LinkDiscoveryManager getTopology() {
return topology;
}
@@ -66,7 +67,7 @@ public class TopologyImplTest extends FloodlightTestCase {
public void setUp() throws Exception {
super.setUp();
FloodlightModuleContext cntx = new FloodlightModuleContext();
- topology = new TopologyImpl();
+ topology = new LinkDiscoveryManager();
TopologyManager routingEngine = new TopologyManager();
topology.topologyAware = new ArrayList<ITopologyListener>();
topology.linkDiscoveryAware = new ArrayList<ILinkDiscoveryListener>();
@@ -83,7 +84,7 @@ public class TopologyImplTest extends FloodlightTestCase {
@Test
public void testAddOrUpdateLink() throws Exception {
- TopologyImpl topology = getTopology();
+ LinkDiscoveryManager topology = getTopology();
IOFSwitch sw1 = createMockSwitch(1L);
IOFSwitch sw2 = createMockSwitch(2L);
replay(sw1, sw2);
@@ -104,7 +105,7 @@ public class TopologyImplTest extends FloodlightTestCase {
@Test
public void testDeleteLink() throws Exception {
- TopologyImpl topology = getTopology();
+ LinkDiscoveryManager topology = getTopology();
IOFSwitch sw1 = createMockSwitch(1L);
IOFSwitch sw2 = createMockSwitch(2L);
replay(sw1, sw2);
@@ -124,7 +125,7 @@ public class TopologyImplTest extends FloodlightTestCase {
@Test
public void testAddOrUpdateLinkToSelf() throws Exception {
- TopologyImpl topology = getTopology();
+ LinkDiscoveryManager topology = getTopology();
IOFSwitch sw1 = createMockSwitch(1L);
IOFSwitch sw2 = createMockSwitch(2L);
replay(sw1, sw2);
@@ -145,7 +146,7 @@ public class TopologyImplTest extends FloodlightTestCase {
@Test
public void testDeleteLinkToSelf() throws Exception {
- TopologyImpl topology = getTopology();
+ LinkDiscoveryManager topology = getTopology();
IOFSwitch sw1 = createMockSwitch(1L);
replay(sw1);
LinkTuple lt = new LinkTuple(sw1, 2, sw1, 3);
@@ -164,7 +165,7 @@ public class TopologyImplTest extends FloodlightTestCase {
@Test
public void testRemovedSwitch() {
- TopologyImpl topology = getTopology();
+ LinkDiscoveryManager topology = getTopology();
IOFSwitch sw1 = createMockSwitch(1L);
IOFSwitch sw2 = createMockSwitch(2L);
replay(sw1, sw2);
@@ -187,7 +188,7 @@ public class TopologyImplTest extends FloodlightTestCase {
@Test
public void testRemovedSwitchSelf() {
- TopologyImpl topology = getTopology();
+ LinkDiscoveryManager topology = getTopology();
IOFSwitch sw1 = createMockSwitch(1L);
replay(sw1);
LinkTuple lt = new LinkTuple(sw1, 2, sw1, 3);
@@ -208,7 +209,7 @@ public class TopologyImplTest extends FloodlightTestCase {
@Test
public void testAddUpdateLinks() throws Exception {
- TopologyImpl topology = getTopology();
+ LinkDiscoveryManager topology = getTopology();
IOFSwitch sw1 = createMockSwitch(1L);
IOFSwitch sw2 = createMockSwitch(2L);
//expect(topology.getSwitchClusterId(1L)).andReturn(1L).anyTimes();
diff --git a/src/test/java/net/floodlightcontroller/topologymanager/TopologyInstanceTest.java b/src/test/java/net/floodlightcontroller/topology/TopologyInstanceTest.java
similarity index 97%
rename from src/test/java/net/floodlightcontroller/topologymanager/TopologyInstanceTest.java
rename to src/test/java/net/floodlightcontroller/topology/TopologyInstanceTest.java
index 4b20e33b6..36dfb2ec1 100644
--- a/src/test/java/net/floodlightcontroller/topologymanager/TopologyInstanceTest.java
+++ b/src/test/java/net/floodlightcontroller/topology/TopologyInstanceTest.java
@@ -1,4 +1,4 @@
-package net.floodlightcontroller.topologymanager;
+package net.floodlightcontroller.topology;
import static org.junit.Assert.*;
@@ -9,7 +9,10 @@ import java.util.List;
import java.util.Set;
import net.floodlightcontroller.core.module.FloodlightModuleContext;
-import net.floodlightcontroller.topology.ILinkDiscovery;
+import net.floodlightcontroller.linkdiscovery.ILinkDiscovery;
+import net.floodlightcontroller.topology.NodePortTuple;
+import net.floodlightcontroller.topology.TopologyInstance;
+import net.floodlightcontroller.topology.TopologyManager;
import org.junit.Before;
import org.junit.Test;
diff --git a/src/test/java/net/floodlightcontroller/topologymanager/TopologyManagerTest.java b/src/test/java/net/floodlightcontroller/topology/TopologyManagerTest.java
similarity index 97%
rename from src/test/java/net/floodlightcontroller/topologymanager/TopologyManagerTest.java
rename to src/test/java/net/floodlightcontroller/topology/TopologyManagerTest.java
index 40d053296..d354a6d39 100644
--- a/src/test/java/net/floodlightcontroller/topologymanager/TopologyManagerTest.java
+++ b/src/test/java/net/floodlightcontroller/topology/TopologyManagerTest.java
@@ -1,9 +1,10 @@
-package net.floodlightcontroller.topologymanager;
+package net.floodlightcontroller.topology;
import static org.junit.Assert.*;
import net.floodlightcontroller.core.module.FloodlightModuleContext;
-import net.floodlightcontroller.topology.ILinkDiscovery;
+import net.floodlightcontroller.linkdiscovery.ILinkDiscovery;
+import net.floodlightcontroller.topology.TopologyManager;
import org.junit.Before;
import org.junit.Test;
--
GitLab