Adding RouteService bulk add/remove Rest API
Change-Id: Idb1129ede59f9c7926bc3b8e81b93b7832b54628
diff --git a/apps/route-service/app/src/main/java/org/onosproject/routeservice/rest/RouteServiceWebResource.java b/apps/route-service/app/src/main/java/org/onosproject/routeservice/rest/RouteServiceWebResource.java
index bc03799..eb17d79 100644
--- a/apps/route-service/app/src/main/java/org/onosproject/routeservice/rest/RouteServiceWebResource.java
+++ b/apps/route-service/app/src/main/java/org/onosproject/routeservice/rest/RouteServiceWebResource.java
@@ -16,11 +16,13 @@
package org.onosproject.routeservice.rest;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.onosproject.rest.AbstractWebResource;
+import org.onosproject.routeservice.ResolvedRoute;
+import org.onosproject.routeservice.Route;
+import org.onosproject.routeservice.RouteAdminService;
+import org.onosproject.routeservice.RouteService;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
@@ -30,14 +32,13 @@
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
-import org.onosproject.rest.AbstractWebResource;
-import org.onosproject.routeservice.ResolvedRoute;
-import org.onosproject.routeservice.Route;
-import org.onosproject.routeservice.RouteAdminService;
-import org.onosproject.routeservice.RouteService;
-
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import static org.onlab.util.Tools.nullIsIllegal;
/**
* Manage the unicast routing information.
@@ -45,6 +46,9 @@
@Path("routes")
public class RouteServiceWebResource extends AbstractWebResource {
+ protected static final String ROUTES = "routes";
+ protected static final String ROUTES_KEY_ERROR = "Routes key must be present";
+
/**
* Get all unicast routes.
* Returns array of all known unicast routes.
@@ -73,10 +77,10 @@
* API are always created as STATIC routes, so there is no need to specify
* the type.
*
- * @onos.rsModel RoutePost
* @param route unicast route JSON
* @return status of the request - CREATED if the JSON is correct,
* BAD_REQUEST if the JSON is invalid, NO_CONTENT otherwise
+ * @onos.rsModel RoutePost
*/
@POST
@Consumes(MediaType.APPLICATION_JSON)
@@ -97,6 +101,39 @@
}
/**
+ * Creates new unicast routes.
+ * Creates new routes in the unicast RIB. Routes created through the REST
+ * API are always created as STATIC routes, so there is no need to specify
+ * the type.
+ *
+ * @param routesStream unicast routes JSON array
+ * @return status of the request - CREATED if the JSON is correct,
+ * BAD_REQUEST if the JSON is invalid, NO_CONTENT otherwise
+ * @onos.rsModel RoutesPost
+ */
+ @POST
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
+ @Path("/bulk")
+ public Response createRoutes(InputStream routesStream) {
+ RouteAdminService service = get(RouteAdminService.class);
+ try {
+ ObjectNode jsonTree = (ObjectNode) mapper().readTree(routesStream);
+ ArrayNode routesArray = nullIsIllegal((ArrayNode) jsonTree.get(ROUTES),
+ ROUTES_KEY_ERROR);
+ List<Route> routes = codec(Route.class).decode(routesArray, this);
+ service.update(routes);
+
+ } catch (IOException ex) {
+ throw new IllegalArgumentException(ex);
+ }
+
+ return Response
+ .noContent()
+ .build();
+ }
+
+ /**
* Remove a unicast route.
* Removes a route from the unicast RIB.
*
@@ -117,4 +154,32 @@
}
return Response.noContent().build();
}
+
+ /**
+ * Removes unicast routes.
+ * Removes multiple routes from the unicast RIB.
+ *
+ * @param routesStream unicast routes array JSON
+ * @return 204 NO CONTENT
+ */
+ @DELETE
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Path("/bulk")
+ public Response deleteRoutes(InputStream routesStream) {
+ RouteAdminService service = get(RouteAdminService.class);
+ try {
+ ObjectNode jsonTree = (ObjectNode) mapper().readTree(routesStream);
+ ArrayNode routesArray = nullIsIllegal((ArrayNode) jsonTree.get(ROUTES),
+ ROUTES_KEY_ERROR);
+ List<Route> routes = codec(Route.class).decode(routesArray, this);
+ service.withdraw(routes);
+
+ } catch (IOException ex) {
+ throw new IllegalArgumentException(ex);
+ }
+
+ return Response
+ .noContent()
+ .build();
+ }
}
diff --git a/apps/route-service/app/src/main/resources/definitions/RoutePost.json b/apps/route-service/app/src/main/resources/definitions/RoutePost.json
index c55578a..caa863d 100644
--- a/apps/route-service/app/src/main/resources/definitions/RoutePost.json
+++ b/apps/route-service/app/src/main/resources/definitions/RoutePost.json
@@ -17,4 +17,4 @@
"description": "Next hop IP address"
}
}
-}
+}
\ No newline at end of file
diff --git a/apps/route-service/app/src/main/resources/definitions/RoutesPost.json b/apps/route-service/app/src/main/resources/definitions/RoutesPost.json
new file mode 100644
index 0000000..66fbcea
--- /dev/null
+++ b/apps/route-service/app/src/main/resources/definitions/RoutesPost.json
@@ -0,0 +1,36 @@
+{
+ "type": "object",
+ "title": "routes",
+ "required": [
+ "routes"
+ ],
+ "properties": {
+ "routes": {
+ "type": "array",
+ "xml": {
+ "name": "routes",
+ "wrapped": true
+ },
+ "items": {
+ "type": "object",
+ "title": "route",
+ "required": [
+ "prefix",
+ "nextHop"
+ ],
+ "properties": {
+ "prefix": {
+ "type": "string",
+ "example": "10.1.1.0/24",
+ "description": "Route prefix"
+ },
+ "nextHop": {
+ "type": "string",
+ "example": "1.1.1.1",
+ "description": "Next hop IP address"
+ }
+ }
+ }
+ }
+ }
+}