ONOS-5182 Refactored SONA to cache network states
Change-Id: Ib316fa5fa5d36e9da370a1578ac55de4a8dd9b04
diff --git a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackSubnetWebResource.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackSubnetWebResource.java
index ca9f3ab..1897a3b 100644
--- a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackSubnetWebResource.java
+++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackSubnetWebResource.java
@@ -18,7 +18,13 @@
/**
* Handles Rest API call from Neutron ML2 plugin.
*/
+
+import com.fasterxml.jackson.databind.JsonNode;
+import org.onlab.osgi.DefaultServiceDirectory;
+import org.onosproject.openstacknetworking.api.OpenstackNetworkAdminService;
import org.onosproject.rest.AbstractWebResource;
+import org.openstack4j.core.transport.ObjectMapperSingleton;
+import org.openstack4j.openstack.networking.domain.NeutronSubnet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -29,36 +35,101 @@
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriBuilder;
+import javax.ws.rs.core.UriInfo;
import java.io.InputStream;
+import static com.fasterxml.jackson.databind.SerializationFeature.INDENT_OUTPUT;
+import static javax.ws.rs.core.Response.created;
+import static javax.ws.rs.core.Response.noContent;
+import static javax.ws.rs.core.Response.status;
+
@Path("subnets")
public class OpenstackSubnetWebResource extends AbstractWebResource {
- protected static final Logger log = LoggerFactory
- .getLogger(OpenstackSubnetWebResource.class);
+ protected final Logger log = LoggerFactory.getLogger(getClass());
+ private static final String MESSAGE = "Received subnets %s request";
+ private static final String SUBNETS = "subnets";
+
+ private final OpenstackNetworkAdminService adminService =
+ DefaultServiceDirectory.getService(OpenstackNetworkAdminService.class);
+
+ @Context
+ private UriInfo uriInfo;
+
+ /**
+ * Creates a subnet from the JSON input stream.
+ *
+ * @param input subnet JSON input stream
+ * @return 201 CREATED if the JSON is correct, 400 BAD_REQUEST if the JSON
+ * is invalid or duplicated subnet already exists
+ */
@POST
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
public Response createSubnet(InputStream input) {
- return Response.status(Response.Status.OK).build();
+ log.trace(String.format(MESSAGE, "CREATE"));
+
+ final NeutronSubnet subnet = readSubnet(input);
+ adminService.createSubnet(subnet);
+ UriBuilder locationBuilder = uriInfo.getBaseUriBuilder()
+ .path(SUBNETS)
+ .path(subnet.getId());
+
+ // TODO fix networking-onos to send Network UPDATE when subnet created
+ return created(locationBuilder.build()).build();
}
-
+ /**
+ * Updates the subnet with the specified identifier.
+ *
+ * @param id subnet identifier
+ * @param input subnet JSON input stream
+ * @return 200 OK with the updated subnet, 400 BAD_REQUEST if the requested
+ * subnet does not exist
+ */
@PUT
- @Path("{subnetId}")
+ @Path("{id}")
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
- public Response updateSubnet(@PathParam("subnetId") String id,
- final InputStream input) {
- return Response.status(Response.Status.OK).build();
+ public Response updateSubnet(@PathParam("id") String id, InputStream input) {
+ log.trace(String.format(MESSAGE, "UPDATE " + id));
+
+ final NeutronSubnet subnet = readSubnet(input);
+ adminService.updateSubnet(subnet);
+
+ return status(Response.Status.OK).build();
}
+ /**
+ * Removes the subnet.
+ *
+ * @param id subnet identifier
+ * @return 204 NO_CONTENT, 400 BAD_REQUEST if the subnet does not exist
+ */
@DELETE
- @Path("{subnetId}")
+ @Path("{id}")
+ @Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
- public Response deleteSubnet(@PathParam("subnetId") String id) {
- return Response.noContent().build();
+ public Response deleteSubnet(@PathParam("id") String id) {
+ log.trace(String.format(MESSAGE, "DELETE " + id));
+
+ adminService.removeSubnet(id);
+ return noContent().build();
+ }
+
+ private NeutronSubnet readSubnet(InputStream input) {
+ try {
+ JsonNode jsonTree = mapper().enable(INDENT_OUTPUT).readTree(input);
+ log.trace(mapper().writeValueAsString(jsonTree));
+ return ObjectMapperSingleton.getContext(NeutronSubnet.class)
+ .readerFor(NeutronSubnet.class)
+ .readValue(jsonTree);
+ } catch (Exception e) {
+ throw new IllegalArgumentException();
+ }
}
}