From ce06ff16095ecb3b07a89b094adcffe70c9ae2f9 Mon Sep 17 00:00:00 2001
From: Ananth Suryanarayana <Ananth.Suryanarayana@bigswitch.com>
Date: Mon, 27 Aug 2012 09:12:29 -0700
Subject: [PATCH] temp changes
---
src/main/java/net/floodlightcontroller/core/Main.java | 8 +++++++-
.../linkdiscovery/internal/LinkDiscoveryManager.java | 8 ++++----
.../storage/AbstractStorageSource.java | 4 +++-
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/main/java/net/floodlightcontroller/core/Main.java b/src/main/java/net/floodlightcontroller/core/Main.java
index 91b317a2f..5a5bf9cdb 100644
--- a/src/main/java/net/floodlightcontroller/core/Main.java
+++ b/src/main/java/net/floodlightcontroller/core/Main.java
@@ -14,6 +14,12 @@ import net.floodlightcontroller.restserver.IRestApiService;
* @author alexreimers
*/
public class Main {
+
+ private static IFloodlightModuleContext moduleContext;
+
+ public static IFloodlightModuleContext floodlightContextGet () {
+ return moduleContext;
+ }
/**
* Main method to load configuration and modules
@@ -36,7 +42,7 @@ public class Main {
// Load modules
FloodlightModuleLoader fml = new FloodlightModuleLoader();
- IFloodlightModuleContext moduleContext = fml.loadModulesFromConfig(settings.getModuleFile());
+ moduleContext = fml.loadModulesFromConfig(settings.getModuleFile());
// Run REST server
IRestApiService restApi = moduleContext.getServiceImpl(IRestApiService.class);
restApi.run();
diff --git a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
index a9d8c7b16..d425a96ec 100644
--- a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
@@ -1581,11 +1581,11 @@ IFloodlightModule, IInfoProvider, IHAListener {
// null role implies HA mode is not enabled.
Role role = floodlightProvider.getRole();
if (role == null || role == Role.MASTER) {
- log.trace("Rescheduling discovery task as role = {}", role);
+ // log.trace("Rescheduling discovery task as role = {}", role);
discoveryTask.reschedule(DISCOVERY_TASK_INTERVAL,
TimeUnit.SECONDS);
} else {
- log.trace("Stopped LLDP rescheduling due to role = {}.", role);
+ // log.trace("Stopped LLDP rescheduling due to role = {}.", role);
}
}
}
@@ -1608,10 +1608,10 @@ IFloodlightModule, IInfoProvider, IHAListener {
// null role implies HA mode is not enabled.
Role role = floodlightProvider.getRole();
if (role == null || role == Role.MASTER) {
- log.trace("Setup: Rescheduling discovery task. role = {}", role);
+ // log.trace("Setup: Rescheduling discovery task. role = {}", role);
discoveryTask.reschedule(DISCOVERY_TASK_INTERVAL, TimeUnit.SECONDS);
} else {
- log.trace("Setup: Not scheduling LLDP as role = {}.", role);
+ // log.trace("Setup: Not scheduling LLDP as role = {}.", role);
}
// Register for the OpenFlow messages we want to receive
floodlightProvider.addOFMessageListener(OFType.PACKET_IN, this);
diff --git a/src/main/java/net/floodlightcontroller/storage/AbstractStorageSource.java b/src/main/java/net/floodlightcontroller/storage/AbstractStorageSource.java
index e80c86bb0..0837f9f09 100644
--- a/src/main/java/net/floodlightcontroller/storage/AbstractStorageSource.java
+++ b/src/main/java/net/floodlightcontroller/storage/AbstractStorageSource.java
@@ -39,6 +39,7 @@ import net.floodlightcontroller.counter.CounterStore;
import net.floodlightcontroller.counter.ICounterStoreService;
import net.floodlightcontroller.counter.CounterValue.CounterType;
import net.floodlightcontroller.restserver.IRestApiService;
+import net.floodlightcontroller.storage.memory.MemoryStorageSource;
import net.floodlightcontroller.storage.web.StorageWebRoutable;
import org.slf4j.Logger;
@@ -485,7 +486,8 @@ public abstract class AbstractStorageSource
IFloodlightService> m =
new HashMap<Class<? extends IFloodlightService>,
IFloodlightService>();
- m.put(IStorageSourceService.class, this);
+ // m.put(IStorageSourceService.class, this);
+ m.put(IStorageSourceService.class, new MemoryStorageSource());
return m;
}
--
GitLab