From 76997577cb51afbaa23e0bb574b2604cadfe2835 Mon Sep 17 00:00:00 2001
From: Rob Adams <rob.adams@bigswitch.com>
Date: Mon, 12 Mar 2012 16:11:12 -0700
Subject: [PATCH] Rename some interfaces
---
.../devicemanager/IDevice.java | 2 +-
...ManagerAware.java => IDeviceListener.java} | 2 +-
...anagerService.java => IDeviceService.java} | 12 +++++------
.../devicemanager/IEntityClass.java | 2 +-
.../devicemanager/IEntityClassifier.java | 2 +-
.../internal/DefaultEntityClassifier.java | 6 +++---
.../devicemanager/internal/Device.java | 2 +-
.../devicemanager/internal/DeviceIndex.java | 2 +-
.../internal/DeviceManagerImpl.java | 18 ++++++++---------
.../internal/DeviceMultiIndex.java | 2 +-
.../internal/DeviceUniqueIndex.java | 2 +-
.../devicemanager/internal/IndexedEntity.java | 6 +++---
.../forwarding/Forwarding.java | 14 ++++++-------
.../routing/ForwardingBase.java | 10 +++++-----
.../internal/DeviceManagerImplTest.java | 20 +++++++++----------
.../devicemanager/test/MockDeviceManager.java | 6 +++---
.../forwarding/ForwardingTest.java | 16 +++++++--------
.../test/FloodlightTestCase.java | 10 +++++-----
18 files changed, 67 insertions(+), 67 deletions(-)
rename src/main/java/net/floodlightcontroller/devicemanager/{IDeviceManagerAware.java => IDeviceListener.java} (98%)
rename src/main/java/net/floodlightcontroller/devicemanager/{IDeviceManagerService.java => IDeviceService.java} (95%)
diff --git a/src/main/java/net/floodlightcontroller/devicemanager/IDevice.java b/src/main/java/net/floodlightcontroller/devicemanager/IDevice.java
index 08ce270b7..aa36839b7 100644
--- a/src/main/java/net/floodlightcontroller/devicemanager/IDevice.java
+++ b/src/main/java/net/floodlightcontroller/devicemanager/IDevice.java
@@ -73,7 +73,7 @@ public interface IDevice {
* Get the entity classes for the device.
* @return the entity classes
* @see IEntityClassifier
- * @see IDeviceManagerService#setEntityClassifier(IEntityClassifier)
+ * @see IDeviceService#setEntityClassifier(IEntityClassifier)
*/
public IEntityClass[] getEntityClasses();
}
diff --git a/src/main/java/net/floodlightcontroller/devicemanager/IDeviceManagerAware.java b/src/main/java/net/floodlightcontroller/devicemanager/IDeviceListener.java
similarity index 98%
rename from src/main/java/net/floodlightcontroller/devicemanager/IDeviceManagerAware.java
rename to src/main/java/net/floodlightcontroller/devicemanager/IDeviceListener.java
index cbd9b4512..3c3d599f5 100644
--- a/src/main/java/net/floodlightcontroller/devicemanager/IDeviceManagerAware.java
+++ b/src/main/java/net/floodlightcontroller/devicemanager/IDeviceListener.java
@@ -23,7 +23,7 @@ package net.floodlightcontroller.devicemanager;
*
* @author David Erickson (daviderickson@cs.stanford.edu)
*/
-public interface IDeviceManagerAware {
+public interface IDeviceListener {
/**
* Called when a new Device is found
* @param device the device that changed
diff --git a/src/main/java/net/floodlightcontroller/devicemanager/IDeviceManagerService.java b/src/main/java/net/floodlightcontroller/devicemanager/IDeviceService.java
similarity index 95%
rename from src/main/java/net/floodlightcontroller/devicemanager/IDeviceManagerService.java
rename to src/main/java/net/floodlightcontroller/devicemanager/IDeviceService.java
index b13ab8ea8..945477526 100755
--- a/src/main/java/net/floodlightcontroller/devicemanager/IDeviceManagerService.java
+++ b/src/main/java/net/floodlightcontroller/devicemanager/IDeviceService.java
@@ -30,10 +30,10 @@ import net.floodlightcontroller.core.module.IFloodlightService;
* that under normal circumstances, {@link Device} objects should be retrieved
* from the {@link FloodlightContext} rather than from {@link IDeviceManager}.
*/
-public interface IDeviceManagerService extends IFloodlightService {
+public interface IDeviceService extends IFloodlightService {
/**
* Fields used in devices for indexes and querying
- * @see IDeviceManagerService#addIndex
+ * @see IDeviceService#addIndex
*/
enum DeviceField {
MAC, IPV4, VLAN, SWITCH, PORT
@@ -96,7 +96,7 @@ public interface IDeviceManagerService extends IFloodlightService {
* @param vlan the VLAN if available
* @param ipv4Address The IP address if available.
* @return an {@link IDevice} or null if no device is found.
- * @see IDeviceManagerService#findDevice(long, Short, Integer, Long,
+ * @see IDeviceService#findDevice(long, Short, Integer, Long,
* Integer)
*/
public IDevice findDestDevice(IDevice source,
@@ -136,7 +136,7 @@ public interface IDeviceManagerService extends IFloodlightService {
* @param switchDPID the switch DPID
* @param switchPort the switch port
* @return an iterator over a set of devices matching the query
- * @see IDeviceManagerService#queryClassDevices(IEntityClass, Long,
+ * @see IDeviceService#queryClassDevices(IEntityClass, Long,
* Short, Integer, Long, Integer)
*/
public Iterator<? extends IDevice> queryDevices(Long macAddress,
@@ -161,7 +161,7 @@ public interface IDeviceManagerService extends IFloodlightService {
* @param switchDPID the switch DPID
* @param switchPort the switch port
* @return an iterator over a set of devices matching the query
- * @see IDeviceManagerService#queryClassDevices(Long,
+ * @see IDeviceService#queryClassDevices(Long,
* Short, Integer, Long, Integer)
*/
public Iterator<? extends IDevice> queryClassDevices(IDevice reference,
@@ -176,7 +176,7 @@ public interface IDeviceManagerService extends IFloodlightService {
*
* @param listener The listener that wants the notifications
*/
- public void addListener(IDeviceManagerAware listener);
+ public void addListener(IDeviceListener listener);
/**
* Set the entity classifier for the device manager to use to
diff --git a/src/main/java/net/floodlightcontroller/devicemanager/IEntityClass.java b/src/main/java/net/floodlightcontroller/devicemanager/IEntityClass.java
index e82f59dd2..1053a79a1 100644
--- a/src/main/java/net/floodlightcontroller/devicemanager/IEntityClass.java
+++ b/src/main/java/net/floodlightcontroller/devicemanager/IEntityClass.java
@@ -19,7 +19,7 @@ package net.floodlightcontroller.devicemanager;
import java.util.EnumSet;
-import net.floodlightcontroller.devicemanager.IDeviceManagerService.DeviceField;
+import net.floodlightcontroller.devicemanager.IDeviceService.DeviceField;
import net.floodlightcontroller.devicemanager.internal.Device;
/**
diff --git a/src/main/java/net/floodlightcontroller/devicemanager/IEntityClassifier.java b/src/main/java/net/floodlightcontroller/devicemanager/IEntityClassifier.java
index 5696a766b..31cf4a70d 100644
--- a/src/main/java/net/floodlightcontroller/devicemanager/IEntityClassifier.java
+++ b/src/main/java/net/floodlightcontroller/devicemanager/IEntityClassifier.java
@@ -19,7 +19,7 @@ package net.floodlightcontroller.devicemanager;
import java.util.Collection;
import java.util.EnumSet;
-import net.floodlightcontroller.devicemanager.IDeviceManagerService.DeviceField;
+import net.floodlightcontroller.devicemanager.IDeviceService.DeviceField;
import net.floodlightcontroller.devicemanager.internal.Entity;
/**
diff --git a/src/main/java/net/floodlightcontroller/devicemanager/internal/DefaultEntityClassifier.java b/src/main/java/net/floodlightcontroller/devicemanager/internal/DefaultEntityClassifier.java
index 5d178bf64..32bbeabb6 100644
--- a/src/main/java/net/floodlightcontroller/devicemanager/internal/DefaultEntityClassifier.java
+++ b/src/main/java/net/floodlightcontroller/devicemanager/internal/DefaultEntityClassifier.java
@@ -22,8 +22,8 @@ import java.util.Collection;
import java.util.EnumSet;
import net.floodlightcontroller.devicemanager.IDevice;
-import net.floodlightcontroller.devicemanager.IDeviceManagerService;
-import net.floodlightcontroller.devicemanager.IDeviceManagerService.DeviceField;
+import net.floodlightcontroller.devicemanager.IDeviceService;
+import net.floodlightcontroller.devicemanager.IDeviceService.DeviceField;
import net.floodlightcontroller.devicemanager.IEntityClass;
import net.floodlightcontroller.devicemanager.IEntityClassifier;
@@ -38,7 +38,7 @@ public class DefaultEntityClassifier implements IEntityClassifier {
*/
protected static class DefaultEntityClass implements IEntityClass {
@Override
- public EnumSet<IDeviceManagerService.DeviceField> getKeyFields() {
+ public EnumSet<IDeviceService.DeviceField> getKeyFields() {
return keyFields;
}
}
diff --git a/src/main/java/net/floodlightcontroller/devicemanager/internal/Device.java b/src/main/java/net/floodlightcontroller/devicemanager/internal/Device.java
index 95765d3c3..0952eeed4 100755
--- a/src/main/java/net/floodlightcontroller/devicemanager/internal/Device.java
+++ b/src/main/java/net/floodlightcontroller/devicemanager/internal/Device.java
@@ -27,7 +27,7 @@ import java.util.TreeSet;
import org.openflow.util.HexString;
-import net.floodlightcontroller.devicemanager.IDeviceManagerService.DeviceField;
+import net.floodlightcontroller.devicemanager.IDeviceService.DeviceField;
import net.floodlightcontroller.devicemanager.IDevice;
import net.floodlightcontroller.devicemanager.IEntityClass;
import net.floodlightcontroller.devicemanager.SwitchPort;
diff --git a/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceIndex.java b/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceIndex.java
index 05b6ba921..f7831662d 100644
--- a/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceIndex.java
+++ b/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceIndex.java
@@ -21,7 +21,7 @@ import java.util.Collection;
import java.util.EnumSet;
import java.util.Iterator;
-import net.floodlightcontroller.devicemanager.IDeviceManagerService.DeviceField;
+import net.floodlightcontroller.devicemanager.IDeviceService.DeviceField;
/**
* An index that maps key fields of an entity to device keys
diff --git a/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java b/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
index 7b2db1c56..05343f780 100755
--- a/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
+++ b/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
@@ -47,10 +47,10 @@ import net.floodlightcontroller.core.module.IFloodlightModule;
import net.floodlightcontroller.core.module.IFloodlightService;
import net.floodlightcontroller.core.util.SingletonTask;
import net.floodlightcontroller.devicemanager.IDevice;
-import net.floodlightcontroller.devicemanager.IDeviceManagerService;
+import net.floodlightcontroller.devicemanager.IDeviceService;
import net.floodlightcontroller.devicemanager.IEntityClass;
import net.floodlightcontroller.devicemanager.IEntityClassifier;
-import net.floodlightcontroller.devicemanager.IDeviceManagerAware;
+import net.floodlightcontroller.devicemanager.IDeviceListener;
import net.floodlightcontroller.packet.ARP;
import net.floodlightcontroller.packet.DHCP;
import net.floodlightcontroller.packet.Ethernet;
@@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory;
* @author readams
*/
public class DeviceManagerImpl implements
- IDeviceManagerService, IOFMessageListener,
+ IDeviceService, IOFMessageListener,
IOFSwitchListener, ITopologyListener,
IStorageSourceListener, IFloodlightModule,
IInfoProvider {
@@ -182,7 +182,7 @@ public class DeviceManagerImpl implements
/**
* Device manager event listeners
*/
- protected Set<IDeviceManagerAware> deviceListeners;
+ protected Set<IDeviceListener> deviceListeners;
/**
* A device update event to be dispatched
@@ -370,7 +370,7 @@ public class DeviceManagerImpl implements
}
@Override
- public void addListener(IDeviceManagerAware listener) {
+ public void addListener(IDeviceListener listener) {
deviceListeners.add(listener);
}
@@ -489,7 +489,7 @@ public class DeviceManagerImpl implements
public Collection<Class<? extends IFloodlightService>> getModuleServices() {
Collection<Class<? extends IFloodlightService>> l =
new ArrayList<Class<? extends IFloodlightService>>();
- l.add(IDeviceManagerService.class);
+ l.add(IDeviceService.class);
return l;
}
@@ -501,7 +501,7 @@ public class DeviceManagerImpl implements
new HashMap<Class<? extends IFloodlightService>,
IFloodlightService>();
// We are the class that implements the service
- m.put(IDeviceManagerService.class, this);
+ m.put(IDeviceService.class, this);
return m;
}
@@ -521,7 +521,7 @@ public class DeviceManagerImpl implements
new HashSet<EnumSet<DeviceField>>();
addIndex(true, EnumSet.of(DeviceField.IPV4));
- this.deviceListeners = new HashSet<IDeviceManagerAware>();
+ this.deviceListeners = new HashSet<IDeviceListener>();
this.floodlightProvider =
fmc.getServiceImpl(IFloodlightProviderService.class);
@@ -1032,7 +1032,7 @@ public class DeviceManagerImpl implements
if (updates == null) return;
DeviceUpdate update = null;
while (null != (update = updates.poll())) {
- for (IDeviceManagerAware listener : deviceListeners) {
+ for (IDeviceListener listener : deviceListeners) {
if (update.added) {
listener.deviceAdded(update.device);
} else {
diff --git a/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceMultiIndex.java b/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceMultiIndex.java
index 7fd7c995d..c6aa9808e 100644
--- a/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceMultiIndex.java
+++ b/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceMultiIndex.java
@@ -24,7 +24,7 @@ import java.util.Iterator;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import net.floodlightcontroller.devicemanager.IDeviceManagerService.DeviceField;
+import net.floodlightcontroller.devicemanager.IDeviceService.DeviceField;
import net.floodlightcontroller.util.IterableIterator;
/**
diff --git a/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceUniqueIndex.java b/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceUniqueIndex.java
index 0e1e049fb..4f2d3f8c4 100644
--- a/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceUniqueIndex.java
+++ b/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceUniqueIndex.java
@@ -22,7 +22,7 @@ import java.util.EnumSet;
import java.util.Iterator;
import java.util.concurrent.ConcurrentHashMap;
-import net.floodlightcontroller.devicemanager.IDeviceManagerService.DeviceField;
+import net.floodlightcontroller.devicemanager.IDeviceService.DeviceField;
/**
* An index that maps key fields of an entity uniquely to a device key
diff --git a/src/main/java/net/floodlightcontroller/devicemanager/internal/IndexedEntity.java b/src/main/java/net/floodlightcontroller/devicemanager/internal/IndexedEntity.java
index 3ca355104..ac1981b1a 100644
--- a/src/main/java/net/floodlightcontroller/devicemanager/internal/IndexedEntity.java
+++ b/src/main/java/net/floodlightcontroller/devicemanager/internal/IndexedEntity.java
@@ -2,8 +2,8 @@ package net.floodlightcontroller.devicemanager.internal;
import java.util.EnumSet;
-import net.floodlightcontroller.devicemanager.IDeviceManagerService;
-import net.floodlightcontroller.devicemanager.IDeviceManagerService.DeviceField;
+import net.floodlightcontroller.devicemanager.IDeviceService;
+import net.floodlightcontroller.devicemanager.IDeviceService.DeviceField;
/**
* This is a thin wrapper around {@link Entity} that allows overriding
@@ -104,7 +104,7 @@ public class IndexedEntity {
if (getClass() != obj.getClass()) return false;
IndexedEntity other = (IndexedEntity) obj;
- for (IDeviceManagerService.DeviceField f : keyFields) {
+ for (IDeviceService.DeviceField f : keyFields) {
switch (f) {
case MAC:
if (entity.macAddress != other.entity.macAddress)
diff --git a/src/main/java/net/floodlightcontroller/forwarding/Forwarding.java b/src/main/java/net/floodlightcontroller/forwarding/Forwarding.java
index 00567f17b..0cfe75d03 100644
--- a/src/main/java/net/floodlightcontroller/forwarding/Forwarding.java
+++ b/src/main/java/net/floodlightcontroller/forwarding/Forwarding.java
@@ -29,7 +29,7 @@ import net.floodlightcontroller.core.FloodlightContext;
import net.floodlightcontroller.core.IFloodlightProviderService;
import net.floodlightcontroller.core.IOFSwitch;
import net.floodlightcontroller.devicemanager.IDevice;
-import net.floodlightcontroller.devicemanager.IDeviceManagerService;
+import net.floodlightcontroller.devicemanager.IDeviceService;
import net.floodlightcontroller.devicemanager.SwitchPort;
import net.floodlightcontroller.core.module.FloodlightModuleContext;
import net.floodlightcontroller.core.module.FloodlightModuleException;
@@ -81,13 +81,13 @@ public class Forwarding extends ForwardingBase implements IFloodlightModule {
// Check if we have the location of the destination
IDevice dstDevice =
- IDeviceManagerService.fcStore.
- get(cntx, IDeviceManagerService.CONTEXT_DST_DEVICE);
+ IDeviceService.fcStore.
+ get(cntx, IDeviceService.CONTEXT_DST_DEVICE);
if (dstDevice != null) {
IDevice srcDevice =
- IDeviceManagerService.fcStore.
- get(cntx, IDeviceManagerService.CONTEXT_SRC_DEVICE);
+ IDeviceService.fcStore.
+ get(cntx, IDeviceService.CONTEXT_SRC_DEVICE);
Long srcIsland = topology.getSwitchClusterId(sw.getId());
if (srcDevice == null) {
@@ -283,7 +283,7 @@ public class Forwarding extends ForwardingBase implements IFloodlightModule {
Collection<Class<? extends IFloodlightService>> l =
new ArrayList<Class<? extends IFloodlightService>>();
l.add(IFloodlightProviderService.class);
- l.add(IDeviceManagerService.class);
+ l.add(IDeviceService.class);
l.add(IRoutingService.class);
l.add(ITopologyService.class);
l.add(ICounterStoreService.class);
@@ -293,7 +293,7 @@ public class Forwarding extends ForwardingBase implements IFloodlightModule {
@Override
public void init(FloodlightModuleContext context) throws FloodlightModuleException {
this.setFloodlightProvider(context.getServiceImpl(IFloodlightProviderService.class));
- this.setDeviceManager(context.getServiceImpl(IDeviceManagerService.class));
+ this.setDeviceManager(context.getServiceImpl(IDeviceService.class));
this.setRoutingEngine(context.getServiceImpl(IRoutingService.class));
this.setTopology(context.getServiceImpl(ITopologyService.class));
this.setCounterStore(context.getServiceImpl(ICounterStoreService.class));
diff --git a/src/main/java/net/floodlightcontroller/routing/ForwardingBase.java b/src/main/java/net/floodlightcontroller/routing/ForwardingBase.java
index 096769149..e7de2d1a8 100644
--- a/src/main/java/net/floodlightcontroller/routing/ForwardingBase.java
+++ b/src/main/java/net/floodlightcontroller/routing/ForwardingBase.java
@@ -30,8 +30,8 @@ import net.floodlightcontroller.core.IOFSwitch;
import net.floodlightcontroller.core.util.AppCookie;
import net.floodlightcontroller.counter.ICounterStoreService;
import net.floodlightcontroller.devicemanager.IDevice;
-import net.floodlightcontroller.devicemanager.IDeviceManagerAware;
-import net.floodlightcontroller.devicemanager.IDeviceManagerService;
+import net.floodlightcontroller.devicemanager.IDeviceListener;
+import net.floodlightcontroller.devicemanager.IDeviceService;
import net.floodlightcontroller.devicemanager.SwitchPort;
import net.floodlightcontroller.packet.Ethernet;
import net.floodlightcontroller.routing.IRoutingService;
@@ -56,14 +56,14 @@ import org.slf4j.LoggerFactory;
public abstract class ForwardingBase implements
IOFMessageListener,
- IDeviceManagerAware {
+ IDeviceListener {
protected static Logger log =
LoggerFactory.getLogger(ForwardingBase.class);
public static final short FLOWMOD_DEFAULT_HARD_TIMEOUT = 5; // in seconds
protected IFloodlightProviderService floodlightProvider;
- protected IDeviceManagerService deviceManager;
+ protected IDeviceService deviceManager;
protected IRoutingService routingEngine;
protected ITopologyService topology;
protected ICounterStoreService counterStore;
@@ -420,7 +420,7 @@ public abstract class ForwardingBase implements
* @param deviceManager
* the deviceManager to set
*/
- public void setDeviceManager(IDeviceManagerService deviceManager) {
+ public void setDeviceManager(IDeviceService deviceManager) {
this.deviceManager = deviceManager;
}
diff --git a/src/test/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImplTest.java b/src/test/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImplTest.java
index 48679cb5c..825ef7838 100644
--- a/src/test/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImplTest.java
+++ b/src/test/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImplTest.java
@@ -43,13 +43,13 @@ import net.floodlightcontroller.core.IOFSwitch;
import net.floodlightcontroller.core.module.FloodlightModuleContext;
import net.floodlightcontroller.core.module.IFloodlightModule;
import net.floodlightcontroller.core.test.MockFloodlightProvider;
-import static net.floodlightcontroller.devicemanager.IDeviceManagerService.DeviceField.*;
-import net.floodlightcontroller.devicemanager.IDeviceManagerAware;
-import net.floodlightcontroller.devicemanager.IDeviceManagerService.DeviceField;
+import static net.floodlightcontroller.devicemanager.IDeviceService.DeviceField.*;
+import net.floodlightcontroller.devicemanager.IDeviceListener;
+import net.floodlightcontroller.devicemanager.IDeviceService.DeviceField;
import net.floodlightcontroller.devicemanager.IDevice;
import net.floodlightcontroller.devicemanager.IEntityClass;
import net.floodlightcontroller.devicemanager.SwitchPort;
-import net.floodlightcontroller.devicemanager.IDeviceManagerService;
+import net.floodlightcontroller.devicemanager.IDeviceService;
import net.floodlightcontroller.packet.ARP;
import net.floodlightcontroller.packet.Ethernet;
import net.floodlightcontroller.packet.IPacket;
@@ -104,7 +104,7 @@ public class DeviceManagerImplTest extends FloodlightTestCase {
modSet.add(mockFloodlightProvider);
deviceManager = new DeviceManagerImpl();
modSet.add(deviceManager);
- fmc.addService(IDeviceManagerService.class, deviceManager);
+ fmc.addService(IDeviceService.class, deviceManager);
storageSource = new MemoryStorageSource();
modSet.add(storageSource);
fmc.addService(IStorageSourceService.class, storageSource);
@@ -183,7 +183,7 @@ public class DeviceManagerImplTest extends FloodlightTestCase {
}
@Override
- public EnumSet<IDeviceManagerService.DeviceField> getKeyFields() {
+ public EnumSet<IDeviceService.DeviceField> getKeyFields() {
return testKeyFields;
}
@@ -191,8 +191,8 @@ public class DeviceManagerImplTest extends FloodlightTestCase {
@Test
public void testEntityLearning() throws Exception {
- IDeviceManagerAware mockListener =
- createStrictMock(IDeviceManagerAware.class);
+ IDeviceListener mockListener =
+ createStrictMock(IDeviceListener.class);
deviceManager.addListener(mockListener);
deviceManager.setEntityClassifier(new TestEntityClassifier());
@@ -298,8 +298,8 @@ public class DeviceManagerImplTest extends FloodlightTestCase {
@Test
public void testAttachmentPointLearning() throws Exception {
- IDeviceManagerAware mockListener =
- createStrictMock(IDeviceManagerAware.class);
+ IDeviceListener mockListener =
+ createStrictMock(IDeviceListener.class);
deviceManager.addListener(mockListener);
diff --git a/src/test/java/net/floodlightcontroller/devicemanager/test/MockDeviceManager.java b/src/test/java/net/floodlightcontroller/devicemanager/test/MockDeviceManager.java
index 4189deefc..4ab44d3ab 100644
--- a/src/test/java/net/floodlightcontroller/devicemanager/test/MockDeviceManager.java
+++ b/src/test/java/net/floodlightcontroller/devicemanager/test/MockDeviceManager.java
@@ -5,7 +5,7 @@ import java.util.Collections;
import java.util.Set;
import net.floodlightcontroller.devicemanager.IDevice;
-import net.floodlightcontroller.devicemanager.IDeviceManagerAware;
+import net.floodlightcontroller.devicemanager.IDeviceListener;
import net.floodlightcontroller.devicemanager.IEntityClass;
import net.floodlightcontroller.devicemanager.internal.Device;
import net.floodlightcontroller.devicemanager.internal.DeviceManagerImpl;
@@ -31,9 +31,9 @@ public class MockDeviceManager extends DeviceManagerImpl {
Integer ipv4Address, Long switchDPID,
Integer switchPort,
boolean processUpdates) {
- Set<IDeviceManagerAware> listeners = deviceListeners;
+ Set<IDeviceListener> listeners = deviceListeners;
if (!processUpdates) {
- deviceListeners = Collections.<IDeviceManagerAware>emptySet();
+ deviceListeners = Collections.<IDeviceListener>emptySet();
}
if (vlan != null && vlan.shortValue() <= 0)
diff --git a/src/test/java/net/floodlightcontroller/forwarding/ForwardingTest.java b/src/test/java/net/floodlightcontroller/forwarding/ForwardingTest.java
index c0bb95caa..74c0b5db1 100644
--- a/src/test/java/net/floodlightcontroller/forwarding/ForwardingTest.java
+++ b/src/test/java/net/floodlightcontroller/forwarding/ForwardingTest.java
@@ -41,7 +41,7 @@ import net.floodlightcontroller.devicemanager.test.MockDeviceManager;
import net.floodlightcontroller.counter.CounterStore;
import net.floodlightcontroller.counter.ICounterStoreService;
import net.floodlightcontroller.devicemanager.IDevice;
-import net.floodlightcontroller.devicemanager.IDeviceManagerService;
+import net.floodlightcontroller.devicemanager.IDeviceService;
import net.floodlightcontroller.packet.Data;
import net.floodlightcontroller.packet.Ethernet;
import net.floodlightcontroller.packet.IPacket;
@@ -102,7 +102,7 @@ public class ForwardingTest extends FloodlightTestCase {
fmc.addService(ITopologyService.class, topology);
fmc.addService(IRoutingService.class, routingEngine);
fmc.addService(ICounterStoreService.class, new CounterStore());
- fmc.addService(IDeviceManagerService.class, deviceManager);
+ fmc.addService(IDeviceService.class, deviceManager);
forwarding.init(fmc);
deviceManager.init(fmc);
@@ -215,9 +215,9 @@ public class ForwardingTest extends FloodlightTestCase {
put(cntx,
IFloodlightProviderService.CONTEXT_PI_PAYLOAD,
(Ethernet)testPacket);
- IDeviceManagerService.fcStore.
+ IDeviceService.fcStore.
put(cntx,
- IDeviceManagerService.CONTEXT_SRC_DEVICE,
+ IDeviceService.CONTEXT_SRC_DEVICE,
srcDevice);
}
@@ -236,9 +236,9 @@ public class ForwardingTest extends FloodlightTestCase {
new Capture<FloodlightContext>(CaptureType.ALL);
// Set destination as sw2 and Mock route
- IDeviceManagerService.fcStore.
+ IDeviceService.fcStore.
put(cntx,
- IDeviceManagerService.CONTEXT_DST_DEVICE,
+ IDeviceService.CONTEXT_DST_DEVICE,
dstDevice1);
Route route = new Route(1L, 2L);
@@ -318,9 +318,9 @@ public class ForwardingTest extends FloodlightTestCase {
null, networkDest,
1L, 3);
- IDeviceManagerService.fcStore.
+ IDeviceService.fcStore.
put(cntx,
- IDeviceManagerService.CONTEXT_DST_DEVICE,
+ IDeviceService.CONTEXT_DST_DEVICE,
dstDevice2);
expect(routingEngine.getRoute(1L, 1L)).andReturn(null).atLeastOnce();
diff --git a/src/test/java/net/floodlightcontroller/test/FloodlightTestCase.java b/src/test/java/net/floodlightcontroller/test/FloodlightTestCase.java
index c50b088c8..d067f6ade 100644
--- a/src/test/java/net/floodlightcontroller/test/FloodlightTestCase.java
+++ b/src/test/java/net/floodlightcontroller/test/FloodlightTestCase.java
@@ -22,7 +22,7 @@ import net.floodlightcontroller.core.FloodlightContext;
import net.floodlightcontroller.core.IFloodlightProviderService;
import net.floodlightcontroller.core.test.MockFloodlightProvider;
import net.floodlightcontroller.devicemanager.IDevice;
-import net.floodlightcontroller.devicemanager.IDeviceManagerService;
+import net.floodlightcontroller.devicemanager.IDeviceService;
import net.floodlightcontroller.packet.Ethernet;
import org.openflow.protocol.OFMessage;
@@ -70,13 +70,13 @@ public class FloodlightTestCase extends TestCase {
eth);
}
if (srcDevice != null) {
- IDeviceManagerService.fcStore.put(bc,
- IDeviceManagerService.CONTEXT_SRC_DEVICE,
+ IDeviceService.fcStore.put(bc,
+ IDeviceService.CONTEXT_SRC_DEVICE,
srcDevice);
}
if (dstDevice != null) {
- IDeviceManagerService.fcStore.put(bc,
- IDeviceManagerService.CONTEXT_DST_DEVICE,
+ IDeviceService.fcStore.put(bc,
+ IDeviceService.CONTEXT_DST_DEVICE,
dstDevice);
}
return bc;
--
GitLab