From 0b15a036511f6bbce3fbb96cd8000d14e26f9928 Mon Sep 17 00:00:00 2001
From: Ryan Izard <ryan.izard@bigswitch.com>
Date: Fri, 15 Jul 2016 10:43:33 -0400
Subject: [PATCH] REST API port change
---
.../topology/web/AllBroadcastPortsResource.java | 4 +---
src/main/resources/floodlightdefault.properties | 4 ++--
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/main/java/net/floodlightcontroller/topology/web/AllBroadcastPortsResource.java b/src/main/java/net/floodlightcontroller/topology/web/AllBroadcastPortsResource.java
index 80deb2e5d..ad5d956c7 100644
--- a/src/main/java/net/floodlightcontroller/topology/web/AllBroadcastPortsResource.java
+++ b/src/main/java/net/floodlightcontroller/topology/web/AllBroadcastPortsResource.java
@@ -16,9 +16,7 @@
package net.floodlightcontroller.topology.web;
-import java.util.Set;
-import net.floodlightcontroller.core.types.NodePortTuple;
import net.floodlightcontroller.topology.ITopologyService;
import org.restlet.resource.Get;
@@ -26,7 +24,7 @@ import org.restlet.resource.ServerResource;
public class AllBroadcastPortsResource extends ServerResource {
@Get("json")
- public Set<NodePortTuple> retrieve() {
+ public Object retrieve() {
ITopologyService topology =
(ITopologyService)getContext().getAttributes().
get(ITopologyService.class.getCanonicalName());
diff --git a/src/main/resources/floodlightdefault.properties b/src/main/resources/floodlightdefault.properties
index be3f53952..7c06ba4aa 100644
--- a/src/main/resources/floodlightdefault.properties
+++ b/src/main/resources/floodlightdefault.properties
@@ -58,8 +58,8 @@ net.floodlightcontroller.restserver.RestApiServer.keyStorePassword=Password
net.floodlightcontroller.restserver.RestApiServer.httpsNeedClientAuthentication=NO
net.floodlightcontroller.restserver.RestApiServer.useHttps=NO
net.floodlightcontroller.restserver.RestApiServer.useHttp=YES
-net.floodlightcontroller.restserver.RestApiServer.httpsPort=11081
-net.floodlightcontroller.restserver.RestApiServer.httpPort=11080
+net.floodlightcontroller.restserver.RestApiServer.httpsPort=8081
+net.floodlightcontroller.restserver.RestApiServer.httpPort=8080
net.floodlightcontroller.restserver.RestApiServer.accessControlAllowAllOrigins=TRUE
net.floodlightcontroller.statistics.StatisticsCollector.enable=FALSE
net.floodlightcontroller.statistics.StatisticsCollector.collectionIntervalPortStatsSeconds=10
--
GitLab