CORD-176, CORD-431 Switch to new VTN API
- Implemented VTN store and manager to keep network states
- Implemented the new VTN API for service network and port
Change-Id: Id8f5d0e609fa3deba782ff2265fc0d3175cbcb4c
diff --git a/src/main/java/org/opencord/cordvtn/rest/NeutronMl2SubnetsWebResource.java b/src/main/java/org/opencord/cordvtn/rest/NeutronMl2SubnetsWebResource.java
index 71ebbb0..4a57d28 100644
--- a/src/main/java/org/opencord/cordvtn/rest/NeutronMl2SubnetsWebResource.java
+++ b/src/main/java/org/opencord/cordvtn/rest/NeutronMl2SubnetsWebResource.java
@@ -15,53 +15,184 @@
*/
package org.opencord.cordvtn.rest;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.onlab.osgi.DefaultServiceDirectory;
import org.onosproject.rest.AbstractWebResource;
+import org.opencord.cordvtn.api.CordVtnAdminService;
+import org.opencord.cordvtn.api.SubnetId;
+import org.openstack4j.core.transport.ObjectMapperSingleton;
+import org.openstack4j.model.network.Subnet;
+import org.openstack4j.openstack.networking.domain.NeutronSubnet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.PUT;
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 java.util.Set;
+
+import static com.fasterxml.jackson.databind.SerializationFeature.INDENT_OUTPUT;
+import static javax.ws.rs.core.Response.Status.NOT_FOUND;
+import static javax.ws.rs.core.Response.created;
+import static javax.ws.rs.core.Response.noContent;
+import static javax.ws.rs.core.Response.status;
/**
- * Dummy Neutron ML2 mechanism driver.
- * It just returns OK for subnets resource requests.
+ * Neutron ML2 mechanism driver implementation for the subnet resource.
*/
@Path("subnets")
public class NeutronMl2SubnetsWebResource extends AbstractWebResource {
protected final Logger log = LoggerFactory.getLogger(getClass());
- private static final String SUBNETS_MESSAGE = "Received subnets %s";
+ private static final String MESSAGE = "Received subnets %s request";
+ private static final String SUBNET = "subnet";
+ private static final String SUBNETS = "subnets";
+
+ private final CordVtnAdminService adminService =
+ DefaultServiceDirectory.getService(CordVtnAdminService.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) {
- log.trace(String.format(SUBNETS_MESSAGE, "create"));
- 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("{id}")
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
public Response updateSubnet(@PathParam("id") String id, InputStream input) {
- log.trace(String.format(SUBNETS_MESSAGE, "update"));
- return Response.status(Response.Status.OK).build();
+ log.trace(String.format(MESSAGE, "UPDATE " + id));
+ final NeutronSubnet subnet = readSubnet(input);
+ adminService.updateSubnet(subnet);
+
+ ObjectNode result = this.mapper().createObjectNode();
+ return ok(result.set(SUBNET, writeSubnet(subnet))).build();
}
+ /**
+ * Returns all subnets.
+ *
+ * @return 200 OK with set of subnets
+ */
+ @GET
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
+ public Response getSubnets() {
+ log.trace(String.format(MESSAGE, "GET"));
+
+ Set<Subnet> subnets = adminService.getSubnets();
+ ArrayNode arrayNodes = mapper().createArrayNode();
+ subnets.stream().forEach(subnet -> {
+ arrayNodes.add(writeSubnet(subnet));
+ });
+
+ ObjectNode result = this.mapper().createObjectNode();
+ return ok(result.set(SUBNETS, arrayNodes)).build();
+ }
+
+ /**
+ * Returns the subnet with the given subnet id.
+ *
+ * @param id subnet id
+ * @return 200 OK with the subnet, 404 NOT_FOUND if the subnet does not exist
+ */
+ @GET
+ @Path("{id}")
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
+ public Response getSubnet(@PathParam("id") String id) {
+ log.trace(String.format(MESSAGE, "GET " + id));
+
+ Subnet subnet = adminService.getSubnet(SubnetId.of(id));
+ if (subnet == null) {
+ return status(NOT_FOUND).build();
+ }
+
+ ObjectNode result = this.mapper().createObjectNode();
+ return ok(result.set(SUBNET, writeSubnet(subnet))).build();
+ }
+
+ /**
+ * Removes the subnet.
+ *
+ * @param id subnet identifier
+ * @return 204 NO_CONTENT, 400 BAD_REQUEST if the subnet does not exist
+ */
@DELETE
@Path("{id}")
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
public Response deleteSubnet(@PathParam("id") String id) {
- log.trace(String.format(SUBNETS_MESSAGE, "delete"));
- return Response.noContent().build();
+ log.trace(String.format(MESSAGE, "DELETE " + id));
+
+ adminService.removeSubnet(SubnetId.of(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();
+ }
+ }
+
+ private ObjectNode writeSubnet(Subnet subnet) {
+ try {
+ String strSubnet = ObjectMapperSingleton.getContext(NeutronSubnet.class)
+ .writerFor(NeutronSubnet.class)
+ .writeValueAsString(subnet);
+ log.trace(strSubnet);
+ return (ObjectNode) mapper().readTree(strSubnet.getBytes());
+ } catch (Exception e) {
+ throw new IllegalStateException();
+ }
}
}