Implement GET REST API for intents
- GET /intent and GET /intent/id implemented
- Basic codec for Intents
- Unit tests
Change-Id: Idbe59d4f7a792c88c77d6f3498d01d4cb7c4467d
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 d0e871a..562cdc0 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
@@ -29,6 +29,7 @@
import org.onosproject.net.HostLocation;
import org.onosproject.net.Link;
import org.onosproject.net.Port;
+import org.onosproject.net.intent.Intent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -57,6 +58,7 @@
registerCodec(Link.class, new LinkCodec());
registerCodec(Host.class, new HostCodec());
registerCodec(HostLocation.class, new HostLocationCodec());
+ registerCodec(Intent.class, new IntentCodec());
log.info("Started");
}
diff --git a/web/api/src/main/java/org/onosproject/codec/impl/IntentCodec.java b/web/api/src/main/java/org/onosproject/codec/impl/IntentCodec.java
new file mode 100644
index 0000000..c999757
--- /dev/null
+++ b/web/api/src/main/java/org/onosproject/codec/impl/IntentCodec.java
@@ -0,0 +1,51 @@
+/*
+ * 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.NetworkResource;
+import org.onosproject.net.intent.Intent;
+
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * Intent JSON codec.
+ */
+public class IntentCodec extends JsonCodec<Intent> {
+
+ @Override
+ public ObjectNode encode(Intent intent, CodecContext context) {
+ checkNotNull(intent, "Intent cannot be null");
+ final ObjectNode result = context.mapper().createObjectNode()
+ .put("type", intent.getClass().getSimpleName())
+ .put("id", intent.id().toString())
+ .put("appId", intent.appId().toString())
+ .put("details", intent.toString());
+
+ final ArrayNode jsonResources = result.putArray("resources");
+
+ if (intent.resources() != null) {
+ for (final NetworkResource resource : intent.resources()) {
+ jsonResources.add(resource.toString());
+ }
+ }
+ return result;
+ }
+}
diff --git a/web/api/src/main/java/org/onosproject/rest/IntentsWebResource.java b/web/api/src/main/java/org/onosproject/rest/IntentsWebResource.java
new file mode 100644
index 0000000..361859d
--- /dev/null
+++ b/web/api/src/main/java/org/onosproject/rest/IntentsWebResource.java
@@ -0,0 +1,68 @@
+/*
+ * 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.intent.Intent;
+import org.onosproject.net.intent.IntentId;
+import org.onosproject.net.intent.IntentService;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+/**
+ * REST resource for interacting with the inventory of intents.
+ */
+
+@Path("intents")
+public class IntentsWebResource extends AbstractWebResource {
+ public static final String INTENT_NOT_FOUND = "Intent is not found";
+
+ /**
+ * Gets an array containing all the intents in the system.
+ *
+ * @return array of all the intents in the system
+ */
+ @GET
+ @Produces(MediaType.APPLICATION_JSON)
+ public Response getIntents() {
+ final Iterable<Intent> intents = get(IntentService.class).getIntents();
+ final ObjectNode root = encodeArray(Intent.class, "intents", intents);
+ return ok(root.toString()).build();
+ }
+
+ /**
+ * Gets a single intent by Id.
+ *
+ * @param id Id to look up
+ * @return intent data
+ */
+ @GET
+ @Produces(MediaType.APPLICATION_JSON)
+ @Path("{id}")
+ public Response getHostById(@PathParam("id") long id) {
+ final Intent intent = nullIsNotFound(get(IntentService.class)
+ .getIntent(IntentId.valueOf(id)),
+ INTENT_NOT_FOUND);
+ final ObjectNode root = codec(Intent.class).encode(intent, this);
+ return ok(root.toString()).build();
+ }
+}