Separated ONOS specific REST API modules from floodlight.
Renamed floodlight REST API paths.
diff --git a/src/main/java/net/floodlightcontroller/core/web/CoreWebRoutable.java b/src/main/java/net/floodlightcontroller/core/web/CoreWebRoutable.java
index 9b22617..e55c6cf 100644
--- a/src/main/java/net/floodlightcontroller/core/web/CoreWebRoutable.java
+++ b/src/main/java/net/floodlightcontroller/core/web/CoreWebRoutable.java
@@ -19,10 +19,6 @@
import net.floodlightcontroller.core.module.ModuleLoaderResource;
import net.floodlightcontroller.restserver.RestletRoutable;
-import net.onrc.onos.ofcontroller.core.web.ClearFlowTableResource;
-import net.onrc.onos.ofcontroller.core.web.TopoLinksResource;
-import net.onrc.onos.ofcontroller.core.web.TopoSwitchesResource;
-import net.onrc.onos.ofcontroller.devicemanager.web.TopoDevicesResource;
import org.restlet.Context;
import org.restlet.Restlet;
@@ -35,7 +31,7 @@
public class CoreWebRoutable implements RestletRoutable {
@Override
public String basePath() {
- return "/wm/core";
+ return "/fl/core";
}
@Override
@@ -57,11 +53,6 @@
EventHistoryTopologyClusterResource.class);
router.attach("/health/json", HealthCheckResource.class);
router.attach("/system/uptime/json", SystemUptimeResource.class);
- // Following added by ONOS
- router.attach("/topology/switches/{filter}/json", TopoSwitchesResource.class);
- router.attach("/topology/links/json", TopoLinksResource.class);
- router.attach("/topology/devices/json", TopoDevicesResource.class);
- router.attach("/clearflowtable/json", ClearFlowTableResource.class);
return router;
}
}