Implementing net config subsystem and revising its interfaces.
Added a few basic configs for device, host and links.
Added initial REST API.
Added CLI.
Tests remain to be added.
Change-Id: Ic7bba4b5ad7d553c51d69f6459b3bff146970323
diff --git a/web/api/src/main/java/org/onosproject/rest/resources/NetworkConfigWebResource.java b/web/api/src/main/java/org/onosproject/rest/resources/NetworkConfigWebResource.java
new file mode 100644
index 0000000..58564bf
--- /dev/null
+++ b/web/api/src/main/java/org/onosproject/rest/resources/NetworkConfigWebResource.java
@@ -0,0 +1,272 @@
+/*
+ * Copyright 2015 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.resources;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.onosproject.incubator.net.config.NetworkConfigService;
+import org.onosproject.incubator.net.config.SubjectFactory;
+import org.onosproject.rest.AbstractWebResource;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+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 java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * REST resource for injecting and retrieving common network configuration.
+ */
+@Path("network/configuration")
+public class NetworkConfigWebResource extends AbstractWebResource {
+
+ /**
+ * Returns entire network configuration base.
+ *
+ * @return network configuration JSON
+ */
+ @GET
+ @Produces(MediaType.APPLICATION_JSON)
+ @SuppressWarnings("unchecked")
+ public Response download() {
+ NetworkConfigService service = get(NetworkConfigService.class);
+ ObjectNode root = mapper().createObjectNode();
+ service.getSubjectClasses().forEach(sc ->
+ produceJson(service, newObject(root, service.getSubjectFactory(sc).subjectKey()), sc));
+ return ok(root).build();
+ }
+
+ /**
+ * Returns the network configuration for the specified subject class.
+ *
+ * @param subjectKey subject class key
+ * @return network configuration JSON
+ */
+ @GET
+ @Path("{subjectKey}")
+ @Produces(MediaType.APPLICATION_JSON)
+ @SuppressWarnings("unchecked")
+ public Response download(@PathParam("subjectKey") String subjectKey) {
+ NetworkConfigService service = get(NetworkConfigService.class);
+ ObjectNode root = mapper().createObjectNode();
+ produceJson(service, root, service.getSubjectFactory(subjectKey).subjectClass());
+ return ok(root).build();
+ }
+
+ /**
+ * Returns the network configuration for the specified subject.
+ *
+ * @param subjectKey subject class key
+ * @param subject subject key
+ * @return network configuration JSON
+ */
+ @GET
+ @Path("{subjectKey}/{subject}")
+ @Produces(MediaType.APPLICATION_JSON)
+ @SuppressWarnings("unchecked")
+ public Response download(@PathParam("subjectKey") String subjectKey,
+ @PathParam("subject") String subject) {
+ NetworkConfigService service = get(NetworkConfigService.class);
+ ObjectNode root = mapper().createObjectNode();
+ produceSubjectJson(service, root,
+ service.getSubjectFactory(subjectKey).createSubject(subject));
+ return ok(root).build();
+ }
+
+ /**
+ * Returns the network configuration for the specified subject and given
+ * configuration class.
+ *
+ * @param subjectKey subject class key
+ * @param subject subject key
+ * @param configKey configuration class key
+ * @return network configuration JSON
+ */
+ @GET
+ @Path("{subjectKey}/{subject}/{configKey}")
+ @Produces(MediaType.APPLICATION_JSON)
+ @SuppressWarnings("unchecked")
+ public Response download(@PathParam("subjectKey") String subjectKey,
+ @PathParam("subject") String subject,
+ @PathParam("configKey") String configKey) {
+ NetworkConfigService service = get(NetworkConfigService.class);
+ return ok(service.getConfig(service.getSubjectFactory(subjectKey).createSubject(subject),
+ service.getConfigClass(configKey)).node()).build();
+ }
+
+ @SuppressWarnings("unchecked")
+ private void produceJson(NetworkConfigService service, ObjectNode node,
+ Class subjectClass) {
+ service.getSubjects(subjectClass).forEach(s ->
+ produceSubjectJson(service, newObject(node, s.toString()), s));
+ }
+
+ private void produceSubjectJson(NetworkConfigService service, ObjectNode node,
+ Object subject) {
+ service.getConfigs(subject).forEach(c -> node.set(c.key(), c.node()));
+ }
+
+
+ /**
+ * Uploads network configuration in bulk.
+ *
+ * @param request network configuration JSON rooted at the top node
+ * @throws IOException
+ * @return empty response
+ */
+ @POST
+ @Consumes(MediaType.APPLICATION_JSON)
+ @SuppressWarnings("unchecked")
+ public Response upload(InputStream request) throws IOException {
+ NetworkConfigService service = get(NetworkConfigService.class);
+ ObjectNode root = (ObjectNode) mapper().readTree(request);
+ root.fieldNames()
+ .forEachRemaining(sk -> consumeJson(service, (ObjectNode) root.path(sk),
+ service.getSubjectFactory(sk)));
+ return Response.ok().build();
+ }
+
+ /**
+ * Uploads network configuration for the specified subject class.
+ *
+ * @param subjectKey subject class key
+ * @param request network configuration JSON rooted at the top node
+ * @return empty response
+ * @throws IOException
+ */
+ @POST
+ @Path("{subjectKey}")
+ @Consumes(MediaType.APPLICATION_JSON)
+ @SuppressWarnings("unchecked")
+ public Response upload(@PathParam("subjectKey") String subjectKey,
+ InputStream request) throws IOException {
+ NetworkConfigService service = get(NetworkConfigService.class);
+ ObjectNode root = (ObjectNode) mapper().readTree(request);
+ consumeJson(service, root, service.getSubjectFactory(subjectKey));
+ return Response.ok().build();
+ }
+
+ /**
+ * Uploads network configuration for the specified subject.
+ *
+ * @param subjectKey subject class key
+ * @param subject subject key
+ * @param request network configuration JSON rooted at the top node
+ * @return empty response
+ * @throws IOException
+ */
+ @POST
+ @Path("{subjectKey}/{subject}")
+ @Consumes(MediaType.APPLICATION_JSON)
+ @SuppressWarnings("unchecked")
+ public Response upload(@PathParam("subjectKey") String subjectKey,
+ @PathParam("subject") String subject,
+ InputStream request) throws IOException {
+ NetworkConfigService service = get(NetworkConfigService.class);
+ ObjectNode root = (ObjectNode) mapper().readTree(request);
+ consumeSubjectJson(service, root,
+ service.getSubjectFactory(subjectKey).createSubject(subject));
+ return Response.ok().build();
+ }
+
+ /**
+ * Uploads network configuration for the specified subject and given
+ * configuration class.
+ *
+ * @param subjectKey subject class key
+ * @param subject subject key
+ * @param configKey configuration class key
+ * @param request network configuration JSON rooted at the top node
+ * @return empty response
+ * @throws IOException
+ */
+ @POST
+ @Path("{subjectKey}/{subject}/{configKey}")
+ @Consumes(MediaType.APPLICATION_JSON)
+ @SuppressWarnings("unchecked")
+ public Response upload(@PathParam("subjectKey") String subjectKey,
+ @PathParam("subject") String subject,
+ @PathParam("configKey") String configKey,
+ InputStream request) throws IOException {
+ NetworkConfigService service = get(NetworkConfigService.class);
+ ObjectNode root = (ObjectNode) mapper().readTree(request);
+ service.applyConfig(service.getSubjectFactory(subjectKey).createSubject(subject),
+ service.getConfigClass(configKey), root);
+ return Response.ok().build();
+ }
+
+ private void consumeJson(NetworkConfigService service, ObjectNode classNode,
+ SubjectFactory subjectFactory) {
+ classNode.fieldNames().forEachRemaining(s ->
+ consumeSubjectJson(service, (ObjectNode) classNode.path(s),
+ subjectFactory.createSubject(s)));
+ }
+
+ private void consumeSubjectJson(NetworkConfigService service,
+ ObjectNode subjectNode, Object subject) {
+ subjectNode.fieldNames().forEachRemaining(c ->
+ service.applyConfig(subject, service.getConfigClass(c),
+ (ObjectNode) subjectNode.path(c)));
+ }
+
+
+ /**
+ * Clears network configuration for the specified subject.
+ *
+ * @param subjectKey subject class key
+ * @param subject subject key
+ * @return empty response
+ */
+ @DELETE
+ @Path("{subjectKey}/{subject}")
+ @Consumes(MediaType.APPLICATION_JSON)
+ @SuppressWarnings("unchecked")
+ public Response upload(@PathParam("subjectKey") String subjectKey,
+ @PathParam("subject") String subject) {
+ NetworkConfigService service = get(NetworkConfigService.class);
+ Object s = service.getSubjectFactory(subjectKey).createSubject(subject);
+ service.getConfigs(s).forEach(c -> service.removeConfig(s, c.getClass()));
+ return Response.ok().build();
+ }
+
+ /**
+ * Clears network configuration for the specified subject and given
+ * configuration class.
+ *
+ * @param subjectKey subject class key
+ * @param subject subject key
+ * @param configKey configuration class key
+ * @return empty response
+ */
+ @DELETE
+ @Path("{subjectKey}/{subject}/{configKey}")
+ @Consumes(MediaType.APPLICATION_JSON)
+ @SuppressWarnings("unchecked")
+ public Response upload(@PathParam("subjectKey") String subjectKey,
+ @PathParam("subject") String subject,
+ @PathParam("configKey") String configKey) {
+ NetworkConfigService service = get(NetworkConfigService.class);
+ service.removeConfig(service.getSubjectFactory(subjectKey).createSubject(subject),
+ service.getConfigClass(configKey));
+ return Response.ok().build();
+ }
+
+}