Implement REST API for Hosts objects
Change-Id: Ie1d4f7c19c47d2d357dedf81016e4d4d197e4052
diff --git a/web/api/src/main/java/org/onosproject/codec/impl/CodecManager.java b/web/api/src/main/java/org/onosproject/codec/impl/CodecManager.java
index 4d3a9d0..d0e871a 100644
--- a/web/api/src/main/java/org/onosproject/codec/impl/CodecManager.java
+++ b/web/api/src/main/java/org/onosproject/codec/impl/CodecManager.java
@@ -25,6 +25,8 @@
import org.onosproject.net.Annotations;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.Device;
+import org.onosproject.net.Host;
+import org.onosproject.net.HostLocation;
import org.onosproject.net.Link;
import org.onosproject.net.Port;
import org.slf4j.Logger;
@@ -53,11 +55,13 @@
registerCodec(Port.class, new PortCodec());
registerCodec(ConnectPoint.class, new ConnectPointCodec());
registerCodec(Link.class, new LinkCodec());
+ registerCodec(Host.class, new HostCodec());
+ registerCodec(HostLocation.class, new HostLocationCodec());
log.info("Started");
}
@Deactivate
- public void deativate() {
+ public void deactivate() {
codecs.clear();
log.info("Stopped");
}
diff --git a/web/api/src/main/java/org/onosproject/codec/impl/HostCodec.java b/web/api/src/main/java/org/onosproject/codec/impl/HostCodec.java
new file mode 100644
index 0000000..9bb4c2e
--- /dev/null
+++ b/web/api/src/main/java/org/onosproject/codec/impl/HostCodec.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2014 Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onosproject.codec.impl;
+
+import org.onlab.packet.IpAddress;
+import org.onosproject.codec.CodecContext;
+import org.onosproject.codec.JsonCodec;
+import org.onosproject.net.Host;
+import org.onosproject.net.HostLocation;
+
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * Host JSON codec.
+ */
+public class HostCodec extends AnnotatedCodec<Host> {
+
+ @Override
+ public ObjectNode encode(Host host, CodecContext context) {
+ checkNotNull(host, "Host cannot be null");
+ final JsonCodec<HostLocation> locationCodec = new HostLocationCodec();
+ final ObjectNode result = context.mapper().createObjectNode()
+ .put("id", host.id().toString())
+ .put("mac", host.mac().toString())
+ .put("vlan", host.vlan().toString());
+
+ final ArrayNode jsonIpAddresses = result.putArray("ipAddresses");
+ for (final IpAddress ipAddress : host.ipAddresses()) {
+ jsonIpAddresses.add(ipAddress.toString());
+ }
+ result.set("ipAddresses", jsonIpAddresses);
+ result.set("location", locationCodec.encode(host.location(), context));
+
+ return annotate(result, host, context);
+ }
+
+}
+
diff --git a/web/api/src/main/java/org/onosproject/codec/impl/HostLocationCodec.java b/web/api/src/main/java/org/onosproject/codec/impl/HostLocationCodec.java
new file mode 100644
index 0000000..133a18b
--- /dev/null
+++ b/web/api/src/main/java/org/onosproject/codec/impl/HostLocationCodec.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2014 Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onosproject.codec.impl;
+
+import org.onosproject.codec.CodecContext;
+import org.onosproject.codec.JsonCodec;
+import org.onosproject.net.HostLocation;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * Host JSON codec.
+ */
+public class HostLocationCodec extends JsonCodec<HostLocation> {
+
+ @Override
+ public ObjectNode encode(HostLocation hostLocation, CodecContext context) {
+ checkNotNull(hostLocation, "Host location cannot be null");
+ return context.mapper().createObjectNode()
+ .put("elementId", hostLocation.elementId().toString())
+ .put("port", hostLocation.port().toString());
+ }
+
+}
diff --git a/web/api/src/main/java/org/onosproject/rest/HostsWebResource.java b/web/api/src/main/java/org/onosproject/rest/HostsWebResource.java
new file mode 100644
index 0000000..6a0f44a
--- /dev/null
+++ b/web/api/src/main/java/org/onosproject/rest/HostsWebResource.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2014 Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onosproject.rest;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.onosproject.net.Host;
+import org.onosproject.net.host.HostService;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+import static org.onosproject.net.HostId.hostId;
+
+/**
+ * REST resource for interacting with the inventory of hosts.
+ */
+@Path("hosts")
+public class HostsWebResource extends AbstractWebResource {
+
+ public static final String HOST_NOT_FOUND = "Host is not found";
+
+ @GET
+ @Produces(MediaType.APPLICATION_JSON)
+ public Response getHosts() {
+ final Iterable<Host> hosts = get(HostService.class).getHosts();
+ final ObjectNode root = encodeArray(Host.class, "hosts", hosts);
+ return ok(root.toString()).build();
+ }
+
+ @GET
+ @Produces(MediaType.APPLICATION_JSON)
+ @Path("{id}")
+ public Response getHostById(@PathParam("id") String id) {
+ final Host host = nullIsNotFound(get(HostService.class).getHost(hostId(id)),
+ HOST_NOT_FOUND);
+ final ObjectNode root = codec(Host.class).encode(host, this);
+ return ok(root.toString()).build();
+ }
+
+ @GET
+ @Produces(MediaType.APPLICATION_JSON)
+ @Path("{mac}/{vlan}")
+ public Response getHostByMacAndVlan(@PathParam("mac") String mac,
+ @PathParam("vlan") String vlan) {
+ final Host host = nullIsNotFound(get(HostService.class).getHost(hostId(mac + "/" + vlan)),
+ HOST_NOT_FOUND);
+ final ObjectNode root = codec(Host.class).encode(host, this);
+ return ok(root.toString()).build();
+ }
+}
+