From 6e66dae66433dfb1ae42785c74553117189c5e04 Mon Sep 17 00:00:00 2001
From: Lalith Suresh <suresh.lalith@gmail.com>
Date: Wed, 29 Feb 2012 15:22:50 +0100
Subject: [PATCH] Fix restPort hard coding
---
src/main/java/net/floodlightcontroller/core/Main.java | 2 +-
.../floodlightcontroller/restserver/IRestApiService.java | 2 +-
.../net/floodlightcontroller/restserver/RestApiServer.java | 7 +++----
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/main/java/net/floodlightcontroller/core/Main.java b/src/main/java/net/floodlightcontroller/core/Main.java
index 10ad853e1..7e1d6a917 100644
--- a/src/main/java/net/floodlightcontroller/core/Main.java
+++ b/src/main/java/net/floodlightcontroller/core/Main.java
@@ -36,7 +36,7 @@ public class Main {
FloodlightModuleLoader fml = new FloodlightModuleLoader();
IFloodlightModuleContext moduleContext = fml.loadModulesFromConfig(settings.getModuleFile());
IRestApiService restApi = moduleContext.getServiceImpl(IRestApiService.class);
- restApi.run();
+ restApi.run(settings.getRestPort());
IFloodlightProviderService controller =
moduleContext.getServiceImpl(IFloodlightProviderService.class);
controller.setCmdLineOptions(settings);
diff --git a/src/main/java/net/floodlightcontroller/restserver/IRestApiService.java b/src/main/java/net/floodlightcontroller/restserver/IRestApiService.java
index d90679580..bd4d573d8 100644
--- a/src/main/java/net/floodlightcontroller/restserver/IRestApiService.java
+++ b/src/main/java/net/floodlightcontroller/restserver/IRestApiService.java
@@ -12,5 +12,5 @@ public interface IRestApiService extends IFloodlightService {
/**
* Runs the REST API server
*/
- public void run();
+ public void run(int restPort);
}
diff --git a/src/main/java/net/floodlightcontroller/restserver/RestApiServer.java b/src/main/java/net/floodlightcontroller/restserver/RestApiServer.java
index 95a3b8dee..892de25e9 100644
--- a/src/main/java/net/floodlightcontroller/restserver/RestApiServer.java
+++ b/src/main/java/net/floodlightcontroller/restserver/RestApiServer.java
@@ -30,7 +30,6 @@ public class RestApiServer
implements IFloodlightModule, IRestApiService {
protected static Logger logger = LoggerFactory.getLogger(RestApiServer.class);
protected List<RestletRoutable> restlets;
- protected int restPort = 8080;
protected FloodlightModuleContext fmlContext;
// ***********
@@ -72,7 +71,7 @@ public class RestApiServer
return slashFilter;
}
- public void run(FloodlightModuleContext fmlContext) {
+ public void run(FloodlightModuleContext fmlContext, int restPort) {
// Add everything in the module context to the rest
for (Class<? extends IFloodlightService> s : fmlContext.getAllServices()) {
context.getAttributes().put(s.getCanonicalName(),
@@ -108,9 +107,9 @@ public class RestApiServer
}
@Override
- public void run() {
+ public void run(int restPort) {
RestApplication restApp = new RestApplication();
- restApp.run(fmlContext);
+ restApp.run(fmlContext, restPort);
}
// *****************
--
GitLab