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/NeutronMl2PortsWebResource.java b/src/main/java/org/opencord/cordvtn/rest/NeutronMl2PortsWebResource.java
index 560d01d..32417bc 100644
--- a/src/main/java/org/opencord/cordvtn/rest/NeutronMl2PortsWebResource.java
+++ b/src/main/java/org/opencord/cordvtn/rest/NeutronMl2PortsWebResource.java
@@ -16,101 +16,183 @@
package org.opencord.cordvtn.rest;
import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.Maps;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import org.onlab.osgi.DefaultServiceDirectory;
-import org.onlab.packet.IpAddress;
-import org.onlab.packet.MacAddress;
-import org.opencord.cordvtn.impl.handler.VsgInstanceHandler;
-import org.onosproject.net.HostId;
+import org.opencord.cordvtn.api.CordVtnAdminService;
+import org.opencord.cordvtn.api.PortId;
import org.onosproject.rest.AbstractWebResource;
+import org.openstack4j.core.transport.ObjectMapperSingleton;
+import org.openstack4j.model.network.Port;
+import org.openstack4j.openstack.networking.domain.NeutronPort;
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.Map;
+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 ports resource requests except for the port update.
+ * Neutron ML2 mechanism driver implementation for the port resource.
*/
@Path("ports")
public class NeutronMl2PortsWebResource extends AbstractWebResource {
protected final Logger log = LoggerFactory.getLogger(getClass());
- private static final String PORTS_MESSAGE = "Received ports %s";
- private static final String PORT = "port";
- private static final String DEVICE_ID = "device_id";
- private static final String NAME = "name";
- private static final String MAC_ADDRESS = "mac_address";
- private static final String ADDRESS_PAIRS = "allowed_address_pairs";
- private static final String IP_ADDERSS = "ip_address";
- private static final String STAG_PREFIX = "stag-";
- private static final int STAG_BEGIN_INDEX = 5;
+ private static final String MESSAGE = "Received ports %s request";
+ private static final String PORT = "port";
+ private static final String PORTS = "ports";
- private final VsgInstanceHandler service = DefaultServiceDirectory.getService(VsgInstanceHandler.class);
+ private final CordVtnAdminService adminService =
+ DefaultServiceDirectory.getService(CordVtnAdminService.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) {
- log.trace(String.format(PORTS_MESSAGE, "create"));
- 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();
}
+ /**
+ * 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) {
- log.debug(String.format(PORTS_MESSAGE, "update"));
+ public Response updatePort(@PathParam("id") String id, InputStream input) {
+ log.trace(String.format(MESSAGE, "UPDATE " + id));
- // TODO get vSG updates from XOS to CORD VTN service directly
- try {
- ObjectMapper mapper = new ObjectMapper();
- JsonNode jsonNode = mapper.readTree(input).get(PORT);
- log.trace("{}", jsonNode.toString());
+ final NeutronPort port = readPort(input);
+ adminService.updatePort(port);
- String deviceId = jsonNode.path(DEVICE_ID).asText();
- String name = jsonNode.path(NAME).asText();
- if (deviceId.isEmpty() || name.isEmpty() || !name.startsWith(STAG_PREFIX)) {
- // ignore all updates other than allowed address pairs
- return Response.status(Response.Status.OK).build();
- }
-
- // this is allowed address pairs updates
- MacAddress mac = MacAddress.valueOf(jsonNode.path(MAC_ADDRESS).asText());
- Map<IpAddress, MacAddress> vsgInstances = Maps.newHashMap();
- jsonNode.path(ADDRESS_PAIRS).forEach(addrPair -> {
- IpAddress pairIp = IpAddress.valueOf(addrPair.path(IP_ADDERSS).asText());
- MacAddress pairMac = MacAddress.valueOf(addrPair.path(MAC_ADDRESS).asText());
- vsgInstances.put(pairIp, pairMac);
- });
-
- service.updateVsgInstances(HostId.hostId(mac),
- name.substring(STAG_BEGIN_INDEX),
- vsgInstances);
- } catch (Exception e) {
- return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build();
- }
-
- return Response.status(Response.Status.OK).build();
+ ObjectNode result = this.mapper().createObjectNode();
+ return ok(result.set(PORT, writePort(port))).build();
}
+ /**
+ * Returns all ports.
+ *
+ * @return 200 OK with set of ports
+ */
+ @GET
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
+ public Response getPorts() {
+ log.trace(String.format(MESSAGE, "GET"));
+
+ Set<Port> ports = adminService.getPorts();
+ ArrayNode arrayNodes = mapper().createArrayNode();
+ ports.stream().forEach(port -> {
+ arrayNodes.add(writePort(port));
+ });
+
+ ObjectNode result = this.mapper().createObjectNode();
+ return ok(result.set(PORTS, arrayNodes)).build();
+ }
+
+ /**
+ * Returns the port with the given id.
+ *
+ * @param id port id
+ * @return 200 OK with the port, 404 NOT_FOUND if the port does not exist
+ */
+ @GET
@Path("{id}")
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
+ public Response getPort(@PathParam("id") String id) {
+ log.trace(String.format(MESSAGE, "GET " + id));
+
+ Port port = adminService.getPort(PortId.of(id));
+ if (port == null) {
+ return status(NOT_FOUND).build();
+ }
+
+ ObjectNode result = this.mapper().createObjectNode();
+ return ok(result.set(PORT, writePort(port))).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(PORTS_MESSAGE, "delete"));
- return Response.noContent().build();
+ log.trace(String.format(MESSAGE, "DELETE " + id));
+
+ adminService.removePort(PortId.of(id));
+ return noContent().build();
+ }
+
+ private NeutronPort readPort(InputStream input) {
+ try {
+ 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();
+ }
+ }
+
+ private ObjectNode writePort(Port port) {
+ try {
+ String strPort = ObjectMapperSingleton.getContext(NeutronPort.class)
+ .writerFor(NeutronPort.class)
+ .writeValueAsString(port);
+ log.trace(strPort);
+ return (ObjectNode) mapper().readTree(strPort.getBytes());
+ } catch (Exception e) {
+ throw new IllegalStateException();
+ }
}
}