From 2ef2e881825e11bdfad902883c16fb2db9c5706e Mon Sep 17 00:00:00 2001
From: Alex Reimers <alex@bigswitch.com>
Date: Fri, 10 Feb 2012 13:29:48 -0800
Subject: [PATCH] Create the port channel table in DeviceManager.
---
.../internal/DeviceManagerImpl.java | 16 +++-------------
.../internal/DeviceManagerImplTest.java | 10 +++++-----
2 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java b/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
index eca3a45a9..3061253db 100755
--- a/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
+++ b/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
@@ -1271,18 +1271,6 @@ public class DeviceManagerImpl implements IDeviceManagerService, IOFMessageListe
// no-op
}
- /**
- * @param deviceManagerAware the deviceManagerAware to set
- */
- public void setDeviceManagerAware(Set<IDeviceManagerAware>
- deviceManagerAware) {
- this.deviceManagerAware = deviceManagerAware;
- }
-
- public void setStorageSource(IStorageSource storageSource) {
- this.storageSource = storageSource;
- }
-
/**
* Process device manager aware updates. Call without any lock held
*/
@@ -2139,7 +2127,9 @@ public class DeviceManagerImpl implements IDeviceManagerService, IOFMessageListe
storageSource.createTable(DEVICE_NETWORK_ADDRESS_TABLE_NAME, null);
storageSource.setTablePrimaryKeyName(
DEVICE_NETWORK_ADDRESS_TABLE_NAME, ID_COLUMN_NAME);
-
+ storageSource.createTable(PORT_CHANNEL_TABLE_NAME, null);
+ storageSource.setTablePrimaryKeyName(
+ PORT_CHANNEL_TABLE_NAME, PC_ID_COLUMN_NAME);
storageSource.addListener(PORT_CHANNEL_TABLE_NAME, this);
ScheduledExecutorService ses = floodlightProvider.getScheduledExecutor();
diff --git a/src/test/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImplTest.java b/src/test/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImplTest.java
index b03d77cd1..27a2942a1 100644
--- a/src/test/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImplTest.java
+++ b/src/test/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImplTest.java
@@ -36,7 +36,7 @@ import net.floodlightcontroller.packet.ARP;
import net.floodlightcontroller.packet.Ethernet;
import net.floodlightcontroller.packet.IPacket;
import net.floodlightcontroller.packet.IPv4;
-import net.floodlightcontroller.storage.IStorageSource;
+import net.floodlightcontroller.storage.IStorageSourceService;
import net.floodlightcontroller.storage.memory.MemoryStorageSource;
import net.floodlightcontroller.test.FloodlightTestCase;
import net.floodlightcontroller.topology.ITopologyService;
@@ -61,7 +61,7 @@ public class DeviceManagerImplTest extends FloodlightTestCase {
private OFPacketIn thirdPacketIn;
MockFloodlightProvider mockFloodlightProvider;
DeviceManagerImpl deviceManager;
- IStorageSource storageSource;
+ IStorageSourceService storageSource;
@Before
public void setUp() throws Exception {
@@ -70,7 +70,8 @@ public class DeviceManagerImplTest extends FloodlightTestCase {
mockFloodlightProvider = getMockFloodlightProvider();
deviceManager = new DeviceManagerImpl();
deviceManager.setFloodlightProvider(mockFloodlightProvider);
- deviceManager.storageSource = new MemoryStorageSource();
+ storageSource = new MemoryStorageSource();
+ deviceManager.storageSource = storageSource;
deviceManager.startUp(null);
// Build our test packet
@@ -415,7 +416,6 @@ public class DeviceManagerImplTest extends FloodlightTestCase {
}
private void setupPortChannel() {
-
storageSource.insertRow(DeviceManagerImpl.PORT_CHANNEL_TABLE_NAME, pcPort1);
storageSource.insertRow(DeviceManagerImpl.PORT_CHANNEL_TABLE_NAME, pcPort2);
deviceManager.readPortChannelConfigFromStorage();
@@ -443,7 +443,7 @@ public class DeviceManagerImplTest extends FloodlightTestCase {
IOFSwitch mockSwitch = createMock(IOFSwitch.class);
expect(mockSwitch.getId()).andReturn(1L).anyTimes();
expect(mockSwitch.getStringId()).andReturn("00:00:00:00:00:00:00:01").anyTimes();
- ITopology mockTopology = createMock(ITopology.class);
+ ITopologyService mockTopology = createMock(ITopologyService.class);
expect(mockTopology.isInternal(new SwitchPortTuple(mockSwitch, 1)))
.andReturn(false).atLeastOnce();
expect(mockTopology.isInternal(new SwitchPortTuple(mockSwitch, 2)))
--
GitLab