Implement REST API for Hosts objects

Change-Id: Ie1d4f7c19c47d2d357dedf81016e4d4d197e4052

@@ -38,6 +38,10 @@
             <version>${project.version}</version>
             <version>${project.version}</version>
             <scope>test</scope>
             <scope>test</scope>
         </dependency>
         </dependency>
+        <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+        </dependency>
     </dependencies>
     </dependencies>
 
 
     <properties>
     <properties>

@@ -25,6 +25,8 @@ import org.onosproject.codec.JsonCodec;
 import org.onosproject.net.Annotations;
 import org.onosproject.net.Annotations;
 import org.onosproject.net.ConnectPoint;
 import org.onosproject.net.ConnectPoint;
 import org.onosproject.net.Device;
 import org.onosproject.net.Device;
+import org.onosproject.net.Host;
+import org.onosproject.net.HostLocation;
 import org.onosproject.net.Link;
 import org.onosproject.net.Link;
 import org.onosproject.net.Port;
 import org.onosproject.net.Port;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
@@ -53,11 +55,13 @@ public class CodecManager implements CodecService {
         registerCodec(Port.class, new PortCodec());
         registerCodec(Port.class, new PortCodec());
         registerCodec(ConnectPoint.class, new ConnectPointCodec());
         registerCodec(ConnectPoint.class, new ConnectPointCodec());
         registerCodec(Link.class, new LinkCodec());
         registerCodec(Link.class, new LinkCodec());
+        registerCodec(Host.class, new HostCodec());
+        registerCodec(HostLocation.class, new HostLocationCodec());
         log.info("Started");
         log.info("Started");
     }
     }
 
 
     @Deactivate
     @Deactivate
-    public void deativate() {
+    public void deactivate() {
         codecs.clear();
         codecs.clear();
         log.info("Stopped");
         log.info("Stopped");
     }
     }

+/*
+ * 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);
+    }
+
+}
+

+/*
+ * 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());
+    }
+
+}

+/*
+ * 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();
+    }
+}
+

@@ -37,6 +37,7 @@
 
 
                 org.onosproject.rest.DevicesWebResource,
                 org.onosproject.rest.DevicesWebResource,
                 org.onosproject.rest.LinksWebResource,
                 org.onosproject.rest.LinksWebResource,
+                org.onosproject.rest.HostsWebResource,
                 org.onosproject.rest.ConfigResource
                 org.onosproject.rest.ConfigResource
             </param-value>
             </param-value>
         </init-param>
         </init-param>

@@ -45,7 +45,7 @@ public class GreetResourceTest extends JerseyTest {
     public void basics() {
     public void basics() {
         WebResource rs = resource();
         WebResource rs = resource();
         String response = rs.path("greet").get(String.class);
         String response = rs.path("greet").get(String.class);
-        assertTrue("incorrect response", response.contains("Whazup "));
+        assertTrue("incorrect response", response.contains("greeting"));
     }
     }
 
 
 }
 }