Skip to content
Snippets Groups Projects
Commit 0b15a036 authored by Ryan Izard's avatar Ryan Izard
Browse files

REST API port change

parent a0bd99e9
No related branches found
No related tags found
No related merge requests found
...@@ -16,9 +16,7 @@ ...@@ -16,9 +16,7 @@
package net.floodlightcontroller.topology.web; package net.floodlightcontroller.topology.web;
import java.util.Set;
import net.floodlightcontroller.core.types.NodePortTuple;
import net.floodlightcontroller.topology.ITopologyService; import net.floodlightcontroller.topology.ITopologyService;
import org.restlet.resource.Get; import org.restlet.resource.Get;
...@@ -26,7 +24,7 @@ import org.restlet.resource.ServerResource; ...@@ -26,7 +24,7 @@ import org.restlet.resource.ServerResource;
public class AllBroadcastPortsResource extends ServerResource { public class AllBroadcastPortsResource extends ServerResource {
@Get("json") @Get("json")
public Set<NodePortTuple> retrieve() { public Object retrieve() {
ITopologyService topology = ITopologyService topology =
(ITopologyService)getContext().getAttributes(). (ITopologyService)getContext().getAttributes().
get(ITopologyService.class.getCanonicalName()); get(ITopologyService.class.getCanonicalName());
......
...@@ -58,8 +58,8 @@ net.floodlightcontroller.restserver.RestApiServer.keyStorePassword=Password ...@@ -58,8 +58,8 @@ net.floodlightcontroller.restserver.RestApiServer.keyStorePassword=Password
net.floodlightcontroller.restserver.RestApiServer.httpsNeedClientAuthentication=NO net.floodlightcontroller.restserver.RestApiServer.httpsNeedClientAuthentication=NO
net.floodlightcontroller.restserver.RestApiServer.useHttps=NO net.floodlightcontroller.restserver.RestApiServer.useHttps=NO
net.floodlightcontroller.restserver.RestApiServer.useHttp=YES net.floodlightcontroller.restserver.RestApiServer.useHttp=YES
net.floodlightcontroller.restserver.RestApiServer.httpsPort=11081 net.floodlightcontroller.restserver.RestApiServer.httpsPort=8081
net.floodlightcontroller.restserver.RestApiServer.httpPort=11080 net.floodlightcontroller.restserver.RestApiServer.httpPort=8080
net.floodlightcontroller.restserver.RestApiServer.accessControlAllowAllOrigins=TRUE net.floodlightcontroller.restserver.RestApiServer.accessControlAllowAllOrigins=TRUE
net.floodlightcontroller.statistics.StatisticsCollector.enable=FALSE net.floodlightcontroller.statistics.StatisticsCollector.enable=FALSE
net.floodlightcontroller.statistics.StatisticsCollector.collectionIntervalPortStatsSeconds=10 net.floodlightcontroller.statistics.StatisticsCollector.collectionIntervalPortStatsSeconds=10
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment