ONOS-5182 Refactored SONA to cache network states
Change-Id: Ib316fa5fa5d36e9da370a1578ac55de4a8dd9b04
diff --git a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpensatckRouterWebResource.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpensatckRouterWebResource.java
index c39afd6..d58cc61 100644
--- a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpensatckRouterWebResource.java
+++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpensatckRouterWebResource.java
@@ -15,14 +15,13 @@
*/
package org.onosproject.openstacknetworking.web;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.onosproject.openstackinterface.OpenstackRouter;
-import org.onosproject.openstackinterface.OpenstackRouterInterface;
-import org.onosproject.openstackinterface.web.OpenstackRouterCodec;
-import org.onosproject.openstackinterface.web.OpenstackRouterInterfaceCodec;
-import org.onosproject.openstacknetworking.api.OpenstackRoutingService;
+import com.fasterxml.jackson.databind.JsonNode;
+import org.onlab.osgi.DefaultServiceDirectory;
+import org.onosproject.openstacknetworking.api.OpenstackRouterAdminService;
import org.onosproject.rest.AbstractWebResource;
+import org.openstack4j.core.transport.ObjectMapperSingleton;
+import org.openstack4j.openstack.networking.domain.NeutronRouter;
+import org.openstack4j.openstack.networking.domain.NeutronRouterInterface;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -33,10 +32,17 @@
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.google.common.base.Preconditions.checkNotNull;
+
+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;
/**
* Handles REST API call of Neturon L3 plugin.
@@ -46,142 +52,140 @@
public class OpensatckRouterWebResource extends AbstractWebResource {
private final Logger log = LoggerFactory.getLogger(getClass());
- private static final OpenstackRouterInterfaceCodec ROUTER_INTERFACE_CODEC
- = new OpenstackRouterInterfaceCodec();
- private static final OpenstackRouterCodec ROUTER_CODEC
- = new OpenstackRouterCodec();
+ private static final String MESSAGE_ROUTER = "Received router %s request";
+ private static final String MESSAGE_ROUTER_IFACE = "Received router interface %s request";
+ private static final String ROUTERS = "routers";
+ private final OpenstackRouterAdminService adminService =
+ DefaultServiceDirectory.getService(OpenstackRouterAdminService.class);
+
+ @Context
+ private UriInfo uriInfo;
+
+ /**
+ * Creates a router from the JSON input stream.
+ *
+ * @param input router JSON input stream
+ * @return 201 CREATED if the JSON is correct, 400 BAD_REQUEST if the JSON
+ * is invalid or duplicated router already exists
+ */
@POST
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
public Response createRouter(InputStream input) {
- checkNotNull(input);
- try {
- ObjectMapper mapper = new ObjectMapper();
- ObjectNode routerNode = (ObjectNode) mapper.readTree(input);
+ log.trace(String.format(MESSAGE_ROUTER, "CREATE"));
- OpenstackRouter openstackRouter
- = ROUTER_CODEC.decode(routerNode, this);
+ final NeutronRouter osRouter = readRouter(input);
+ adminService.createRouter(osRouter);
- OpenstackRoutingService routingService
- = getService(OpenstackRoutingService.class);
- routingService.createRouter(openstackRouter);
+ UriBuilder locationBuilder = uriInfo.getBaseUriBuilder()
+ .path(ROUTERS)
+ .path(osRouter.getId());
- log.debug("REST API CREATE router is called {}", input.toString());
- return Response.status(Response.Status.OK).build();
- } catch (Exception e) {
- log.error("Create Router failed because of exception {}",
- e.toString());
- return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(e.toString())
- .build();
- }
+ return created(locationBuilder.build()).build();
}
+ /**
+ * Updates the router with the specified identifier.
+ *
+ * @param id router identifier
+ * @param input router JSON input stream
+ * @return 200 OK with the updated router, 400 BAD_REQUEST if the requested
+ * router does not exist
+ */
@PUT
@Path("{id}")
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
public Response updateRouter(@PathParam("id") String id, InputStream input) {
- checkNotNull(input);
- try {
- ObjectMapper mapper = new ObjectMapper();
- ObjectNode routerNode = (ObjectNode) mapper.readTree(input);
+ log.trace(String.format(MESSAGE_ROUTER, "UPDATE " + id));
- OpenstackRouter or = ROUTER_CODEC.decode(routerNode, this);
+ final NeutronRouter osRouter = readRouter(input);
+ osRouter.setId(id);
+ adminService.updateRouter(osRouter);
- OpenstackRouter.Builder osBuilder = new OpenstackRouter.Builder()
- .tenantId(or.tenantId())
- .id(id)
- .name(or.name())
- .status(OpenstackRouter.RouterStatus.ACTIVE)
- .adminStateUp(Boolean.valueOf(or.adminStateUp()))
- .gatewayExternalInfo(or.gatewayExternalInfo());
-
- OpenstackRoutingService routingService
- = getService(OpenstackRoutingService.class);
- routingService.updateRouter(osBuilder.build());
-
- log.debug("REST API UPDATE router is called from router {}", input.toString());
- return Response.status(Response.Status.OK).build();
- } catch (Exception e) {
- log.error("Updates Router failed because of exception {}",
- e.toString());
- return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(e.toString())
- .build();
- }
+ return status(Response.Status.OK).build();
}
+ /**
+ * Updates the router with the specified router interface.
+ *
+ * @param id router identifier
+ * @param input router interface JSON input stream
+ * @return 200 OK with the updated router interface, 400 BAD_REQUEST if the
+ * requested router does not exist
+ */
@PUT
@Path("{id}/add_router_interface")
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
public Response addRouterInterface(@PathParam("id") String id, InputStream input) {
- checkNotNull(input);
- try {
- ObjectMapper mapper = new ObjectMapper();
- ObjectNode routerIfNode = (ObjectNode) mapper.readTree(input);
+ log.trace(String.format(MESSAGE_ROUTER_IFACE, "UPDATE " + id));
- OpenstackRouterInterface openstackRouterInterface
- = ROUTER_INTERFACE_CODEC.decode(routerIfNode, this);
+ final NeutronRouterInterface osRouterIface = readRouterInterface(input);
+ adminService.addRouterInterface(osRouterIface);
- OpenstackRoutingService routingService
- = getService(OpenstackRoutingService.class);
- routingService.addRouterInterface(openstackRouterInterface);
-
- log.debug("REST API AddRouterInterface is called from router {} portId: {}, subnetId: {}, tenantId: {}",
- openstackRouterInterface.id(), openstackRouterInterface.portId(),
- openstackRouterInterface.subnetId(), openstackRouterInterface.tenantId());
-
- return Response.status(Response.Status.OK).build();
- } catch (Exception e) {
- log.error("AddRouterInterface failed because of exception {}",
- e.toString());
- return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(e.toString())
- .build();
- }
+ return status(Response.Status.OK).build();
}
- @DELETE
- @Path("{id}")
- @Consumes(MediaType.APPLICATION_JSON)
- public Response deleteRouter(@PathParam("id") String id) {
- checkNotNull(id);
- OpenstackRoutingService routingService
- = getService(OpenstackRoutingService.class);
- routingService.removeRouter(id);
-
- log.debug("REST API DELETE routers is called {}", id);
- return Response.noContent().build();
- }
-
+ /**
+ * Updates the router with the specified router interface.
+ *
+ * @param id router identifier
+ * @param input router interface JSON input stream
+ * @return 200 OK with the updated router interface, 400 BAD_REQUEST if the
+ * requested router does not exist
+ */
@PUT
@Path("{id}/remove_router_interface")
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
public Response removeRouterInterface(@PathParam("id") String id, InputStream input) {
- checkNotNull(id);
- checkNotNull(input);
+ log.trace(String.format(MESSAGE_ROUTER_IFACE, "DELETE " + id));
+
+ final NeutronRouterInterface osRouterIface = readRouterInterface(input);
+ adminService.removeRouterInterface(osRouterIface.getPortId());
+
+ return status(Response.Status.OK).build();
+ }
+
+ /**
+ * Removes the router.
+ *
+ * @param id router identifier
+ * @return 204 NO_CONTENT, 400 BAD_REQUEST if the router does not exist
+ */
+ @DELETE
+ @Path("{id}")
+ @Consumes(MediaType.APPLICATION_JSON)
+ public Response deleteRouter(@PathParam("id") String id) {
+ log.trace(String.format(MESSAGE_ROUTER, "DELETE " + id));
+
+ adminService.removeRouter(id);
+ return noContent().build();
+ }
+
+ private NeutronRouter readRouter(InputStream input) {
try {
- ObjectMapper mapper = new ObjectMapper();
- ObjectNode routerIfNode = (ObjectNode) mapper.readTree(input);
-
- OpenstackRouterInterface openstackRouterInterface
- = ROUTER_INTERFACE_CODEC.decode(routerIfNode, this);
-
- OpenstackRoutingService routingService
- = getService(OpenstackRoutingService.class);
- routingService.removeRouterInterface(openstackRouterInterface);
-
- log.debug("REST API RemoveRouterInterface is called from router {} portId: {}, subnetId: {}," +
- "tenantId: {}", openstackRouterInterface.id(), openstackRouterInterface.portId(),
- openstackRouterInterface.subnetId(), openstackRouterInterface.tenantId());
-
- return Response.status(Response.Status.OK).build();
+ JsonNode jsonTree = mapper().enable(INDENT_OUTPUT).readTree(input);
+ log.trace(mapper().writeValueAsString(jsonTree));
+ return ObjectMapperSingleton.getContext(NeutronRouter.class)
+ .readerFor(NeutronRouter.class)
+ .readValue(jsonTree);
} catch (Exception e) {
- log.error("RemoveRouterInterface failed because of exception {}",
- e.toString());
- return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(e.toString())
- .build();
+ throw new IllegalArgumentException();
+ }
+ }
+
+ private NeutronRouterInterface readRouterInterface(InputStream input) {
+ try {
+ JsonNode jsonTree = mapper().enable(INDENT_OUTPUT).readTree(input);
+ log.trace(mapper().writeValueAsString(jsonTree));
+ return ObjectMapperSingleton.getContext(NeutronRouterInterface.class)
+ .readerFor(NeutronRouterInterface.class)
+ .readValue(jsonTree);
+ } catch (Exception e) {
+ throw new IllegalArgumentException();
}
}
}
diff --git a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackFloatingIpWebResource.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackFloatingIpWebResource.java
index a6880fd..87a8e1a 100644
--- a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackFloatingIpWebResource.java
+++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackFloatingIpWebResource.java
@@ -16,12 +16,12 @@
package org.onosproject.openstacknetworking.web;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.onosproject.openstackinterface.OpenstackFloatingIP;
-import org.onosproject.openstackinterface.web.OpenstackFloatingIpCodec;
-import org.onosproject.openstacknetworking.api.OpenstackFloatingIpService;
+import com.fasterxml.jackson.databind.JsonNode;
+import org.onlab.osgi.DefaultServiceDirectory;
+import org.onosproject.openstacknetworking.api.OpenstackRouterAdminService;
import org.onosproject.rest.AbstractWebResource;
+import org.openstack4j.core.transport.ObjectMapperSingleton;
+import org.openstack4j.openstack.networking.domain.NeutronFloatingIP;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -32,11 +32,17 @@
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.google.common.base.Preconditions.checkNotNull;
+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;
/**
* Handles REST API call of Neutron L3 plugin.
@@ -45,89 +51,84 @@
public class OpenstackFloatingIpWebResource extends AbstractWebResource {
private final Logger log = LoggerFactory.getLogger(getClass());
- private static final OpenstackFloatingIpCodec FLOATING_IP_CODEC = new OpenstackFloatingIpCodec();
+ private static final String MESSAGE = "Received floating IP %s request";
+ private static final String FLOATING_IPS = "floatingips";
+
+ private final OpenstackRouterAdminService adminService =
+ DefaultServiceDirectory.getService(OpenstackRouterAdminService.class);
+
+ @Context
+ private UriInfo uriInfo;
/**
- * Create FloatingIP.
+ * Creates a floating IP from the JSON input stream.
*
- * @param input JSON data describing FloatingIP
- * @return 200 OK
+ * @param input floating ip JSON input stream
+ * @return 201 CREATED if the JSON is correct, 400 BAD_REQUEST if the JSON
+ * is invalid or duplicated floating ip already exists
*/
@POST
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
public Response createFloatingIp(InputStream input) {
- checkNotNull(input);
+ log.trace(String.format(MESSAGE, "CREATE"));
- try {
- ObjectMapper mapper = new ObjectMapper();
- ObjectNode floatingIpNode = (ObjectNode) mapper.readTree(input);
+ final NeutronFloatingIP floatingIp = readFloatingIp(input);
+ adminService.createFloatingIp(floatingIp);
- OpenstackFloatingIP osFloatingIp = FLOATING_IP_CODEC.decode(floatingIpNode, this);
- OpenstackFloatingIpService floatingIpService =
- getService(OpenstackFloatingIpService.class);
- floatingIpService.createFloatingIp(osFloatingIp);
+ UriBuilder locationBuilder = uriInfo.getBaseUriBuilder()
+ .path(FLOATING_IPS)
+ .path(floatingIp.getId());
- log.debug("REST API CREATE floatingip called");
- return Response.status(Response.Status.OK).build();
- } catch (Exception e) {
- log.error("createFloatingIp failed with {}", e.toString());
- return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(e.toString())
- .build();
- }
+ return created(locationBuilder.build()).build();
}
/**
- * Update FloatingIP.
+ * Updates the floating IP with the specified identifier.
*
- * @param id FloatingIP identifier
- * @param input JSON data describing FloatingIP
- * @return 200 OK
+ * @param id floating ip identifier
+ * @param input floating ip JSON input stream
+ * @return 200 OK with the updated floating ip, 400 BAD_REQUEST if the requested
+ * floating ip does not exist
*/
@PUT
@Path("{id}")
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
public Response updateFloatingIp(@PathParam("id") String id, InputStream input) {
- checkNotNull(id);
- checkNotNull(input);
+ log.trace(String.format(MESSAGE, "UPDATE " + id));
- try {
- ObjectMapper mapper = new ObjectMapper();
- ObjectNode floatingIpNode = (ObjectNode) mapper.readTree(input);
+ final NeutronFloatingIP floatingIp = readFloatingIp(input);
+ adminService.updateFloatingIp(floatingIp);
- OpenstackFloatingIP osFloatingIp = FLOATING_IP_CODEC.decode(floatingIpNode, this);
- OpenstackFloatingIpService floatingIpService =
- getService(OpenstackFloatingIpService.class);
- floatingIpService.updateFloatingIp(osFloatingIp);
-
- log.debug("REST API UPDATE floatingip called {}", id);
- return Response.status(Response.Status.OK).build();
- } catch (Exception e) {
- log.error("updateFloatingIp failed with {}", e.toString());
- return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(e.toString())
- .build();
- }
+ return status(Response.Status.OK).build();
}
/**
- * Delete FloatingIP.
+ * Removes the floating IP.
*
- * @param id FloatingIP identifier
- * @return 204 OK
+ * @param id floating ip identifier
+ * @return 204 NO_CONTENT, 400 BAD_REQUEST if the floating ip does not exist
*/
@DELETE
@Path("{id}")
@Consumes(MediaType.APPLICATION_JSON)
public Response deleteFloatingIp(@PathParam("id") String id) {
- checkNotNull(id);
+ log.trace(String.format(MESSAGE, "DELETE " + id));
- OpenstackFloatingIpService floatingIpService =
- getService(OpenstackFloatingIpService.class);
- floatingIpService.deleteFloatingIp(id);
-
- log.debug("REST API DELETE floatingip is called {}", id);
- return Response.noContent().build();
+ adminService.removeFloatingIp(id);
+ return noContent().build();
}
+ private NeutronFloatingIP readFloatingIp(InputStream input) {
+ try {
+ JsonNode jsonTree = mapper().enable(INDENT_OUTPUT).readTree(input);
+ log.trace(mapper().writeValueAsString(jsonTree));
+ return ObjectMapperSingleton.getContext(NeutronFloatingIP.class)
+ .readerFor(NeutronFloatingIP.class)
+ .readValue(jsonTree);
+ } catch (Exception e) {
+ throw new IllegalArgumentException();
+ }
+ }
}
diff --git a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackNetworkWebResource.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackNetworkWebResource.java
index c547b2e..6428e60 100644
--- a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackNetworkWebResource.java
+++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackNetworkWebResource.java
@@ -15,7 +15,12 @@
*/
package org.onosproject.openstacknetworking.web;
+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.NeutronNetwork;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -24,41 +29,106 @@
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 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;
+
/**
* Handles REST API call of Neutron ML2 plugin.
*/
@Path("networks")
public class OpenstackNetworkWebResource extends AbstractWebResource {
+ protected final Logger log = LoggerFactory.getLogger(getClass());
- private final Logger log = LoggerFactory.getLogger(getClass());
+ private static final String MESSAGE = "Received networks %s request";
+ private static final String NETWORKS = "networks";
+ private final OpenstackNetworkAdminService adminService =
+ DefaultServiceDirectory.getService(OpenstackNetworkAdminService.class);
+
+ @Context
+ private UriInfo uriInfo;
+
+ /**
+ * Creates a network from the JSON input stream.
+ *
+ * @param input network JSON input stream
+ * @return 201 CREATED if the JSON is correct, 400 BAD_REQUEST if the JSON
+ * is invalid or duplicated network already exists
+ */
@POST
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
public Response createNetwork(InputStream input) {
- log.debug("REST API networks is called {}", input.toString());
- return Response.status(Response.Status.OK).build();
+ log.trace(String.format(MESSAGE, "CREATE"));
+
+ final NeutronNetwork net = readNetwork(input);
+ adminService.createNetwork(net);
+
+ UriBuilder locationBuilder = uriInfo.getBaseUriBuilder()
+ .path(NETWORKS)
+ .path(net.getId());
+
+ return created(locationBuilder.build()).build();
}
+ /**
+ * Updates the network with the specified identifier.
+ *
+ * @param id network identifier
+ * @param input network JSON input stream
+ * @return 200 OK with the updated network, 400 BAD_REQUEST if the requested
+ * network does not exist
+ */
@PUT
@Path("{id}")
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
- public Response updateNetwork(InputStream input) {
- log.debug("REST API networks is called {}", input.toString());
- return Response.status(Response.Status.OK).build();
+ public Response updateNetwork(@PathParam("id") String id, InputStream input) {
+ log.trace(String.format(MESSAGE, "UPDATE " + id));
+
+ final NeutronNetwork net = readNetwork(input);
+ adminService.updateNetwork(net);
+
+ return status(Response.Status.OK).build();
}
+ /**
+ * Removes the service network.
+ *
+ * @param id network identifier
+ * @return 204 NO_CONTENT, 400 BAD_REQUEST if the network does not exist
+ */
@DELETE
@Path("{id}")
@Consumes(MediaType.APPLICATION_JSON)
- public Response deleteNetwork(InputStream input) {
- log.debug("REST API networks is called {}", input.toString());
- return Response.noContent().build();
+ @Produces(MediaType.APPLICATION_JSON)
+ public Response deleteNetwork(@PathParam("id") String id) {
+ log.trace(String.format(MESSAGE, "DELETE " + id));
+
+ adminService.removeNetwork(id);
+ return noContent().build();
+ }
+
+ private NeutronNetwork readNetwork(InputStream input) {
+ try {
+ JsonNode jsonTree = mapper().enable(INDENT_OUTPUT).readTree(input);
+ log.trace(mapper().writeValueAsString(jsonTree));
+ return ObjectMapperSingleton.getContext(NeutronNetwork.class)
+ .readerFor(NeutronNetwork.class)
+ .readValue(jsonTree);
+ } catch (Exception e) {
+ throw new IllegalArgumentException();
+ }
}
}
diff --git a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackPortWebResource.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackPortWebResource.java
index 7683b0c..c5bb33c 100644
--- a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackPortWebResource.java
+++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackPortWebResource.java
@@ -15,12 +15,12 @@
*/
package org.onosproject.openstacknetworking.web;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.onosproject.openstackinterface.OpenstackPort;
-import org.onosproject.openstackinterface.web.OpenstackPortCodec;
-import org.onosproject.openstacknetworking.api.OpenstackSecurityGroupService;
+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.NeutronPort;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -31,60 +31,103 @@
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 java.io.IOException;
+import javax.ws.rs.core.UriBuilder;
+import javax.ws.rs.core.UriInfo;
import java.io.InputStream;
-import static com.google.common.base.Preconditions.checkNotNull;
+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;
/**
* Handles Rest API call from Neutron ML2 plugin.
*/
@Path("ports")
public class OpenstackPortWebResource extends AbstractWebResource {
- private final Logger log = LoggerFactory.getLogger(getClass());
+ protected final Logger log = LoggerFactory.getLogger(getClass());
- private static final OpenstackPortCodec PORT_CODEC
- = new OpenstackPortCodec();
+ private static final String MESSAGE = "Received ports %s request";
+ private static final String PORTS = "ports";
+ private final OpenstackNetworkAdminService adminService =
+ DefaultServiceDirectory.getService(OpenstackNetworkAdminService.class);
+
+ @Context
+ private UriInfo uriInfo;
+
+ /**
+ * Creates a port from the JSON input stream.
+ *
+ * @param input port JSON input stream
+ * @return 201 CREATED if the JSON is correct, 400 BAD_REQUEST if the JSON
+ * is invalid or duplicated port already exists
+ */
@POST
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
public Response createPorts(InputStream input) {
- return Response.status(Response.Status.OK).build();
+ log.trace(String.format(MESSAGE, "CREATE"));
+
+ final NeutronPort port = readPort(input);
+ adminService.createPort(port);
+ UriBuilder locationBuilder = uriInfo.getBaseUriBuilder()
+ .path(PORTS)
+ .path(port.getId());
+
+ return created(locationBuilder.build()).build();
}
- @Path("{portUUID}")
- @DELETE
- @Consumes(MediaType.APPLICATION_JSON)
- public Response deletePorts(@PathParam("portUUID") String id) {
- return Response.noContent().build();
- }
-
+ /**
+ * Updates the port with the specified identifier.
+ *
+ * @param id port identifier
+ * @param input port JSON input stream
+ * @return 200 OK with the updated port, 400 BAD_REQUEST if the requested
+ * port does not exist
+ */
@PUT
@Path("{id}")
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
- public Response updatePorts(@PathParam("id") String id, InputStream input) {
- checkNotNull(input);
- checkNotNull(id);
+ public Response updatePort(@PathParam("id") String id, InputStream input) {
+ log.trace(String.format(MESSAGE, "UPDATE " + id));
+ final NeutronPort port = readPort(input);
+ adminService.updatePort(port);
+
+ return status(Response.Status.OK).build();
+ }
+
+ /**
+ * Removes the port with the given id.
+ *
+ * @param id port identifier
+ * @return 204 NO_CONTENT, 400 BAD_REQUEST if the port does not exist
+ */
+ @DELETE
+ @Path("{id}")
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
+ public Response deletePorts(@PathParam("id") String id) {
+ log.trace(String.format(MESSAGE, "DELETE " + id));
+
+ adminService.removePort(id);
+ return noContent().build();
+ }
+
+ private NeutronPort readPort(InputStream input) {
try {
- ObjectMapper mapper = new ObjectMapper();
- ObjectNode portNode = (ObjectNode) mapper.readTree(input);
- OpenstackPort osPort = PORT_CODEC.decode(portNode, this);
-
- OpenstackSecurityGroupService sgService
- = getService(OpenstackSecurityGroupService.class);
- sgService.updateSecurityGroup(osPort);
-
- return Response.status(Response.Status.OK).build();
- } catch (IOException e) {
- log.error("UpdatePort post process failed due to {}", e.getMessage());
-
- return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(e.getMessage())
- .build();
+ JsonNode jsonTree = mapper().enable(INDENT_OUTPUT).readTree(input);
+ log.trace(mapper().writeValueAsString(jsonTree));
+ return ObjectMapperSingleton.getContext(NeutronPort.class)
+ .readerFor(NeutronPort.class)
+ .readValue(jsonTree);
+ } catch (Exception e) {
+ throw new IllegalArgumentException();
}
}
}
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();
+ }
}
}