commit 111b42b7a33b3751cc771db0835ec8177a2638cf
author Jonathan Hart <jono@onlab.us> Tue Jul 14 13:28:05 2015 -0700
committer Jonathan Hart <jono@onlab.us> Thu Jul 23 10:25:54 2015 -0700
tree 979c24d482c91813e79a51eab7e152a5a745558f
parent cab114c7c90e1bff35b780c1d4c9e20b042173de

Move address-bindings config to new config system

Change-Id: I6d87ddbf98789dbe8355c453a3263f50fbc5d99c

web/api/src/main/java/org/onosproject/rest/resources/NetworkConfigWebResource.java

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
index 58564bf..15c472d 100644
--- a/web/api/src/main/java/org/onosproject/rest/resources/NetworkConfigWebResource.java
+++ b/web/api/src/main/java/org/onosproject/rest/resources/NetworkConfigWebResource.java
@@ -109,7 +109,7 @@
                              @PathParam("configKey") String configKey) {
         NetworkConfigService service = get(NetworkConfigService.class);
         return ok(service.getConfig(service.getSubjectFactory(subjectKey).createSubject(subject),
-                                    service.getConfigClass(configKey)).node()).build();
+                                    service.getConfigClass(subjectKey, configKey)).node()).build();
     }
 
     @SuppressWarnings("unchecked")
@@ -183,7 +183,8 @@
         NetworkConfigService service = get(NetworkConfigService.class);
         ObjectNode root = (ObjectNode) mapper().readTree(request);
         consumeSubjectJson(service, root,
-                           service.getSubjectFactory(subjectKey).createSubject(subject));
+                           service.getSubjectFactory(subjectKey).createSubject(subject),
+                           subjectKey);
         return Response.ok().build();
     }
 
@@ -209,7 +210,7 @@
         NetworkConfigService service = get(NetworkConfigService.class);
         ObjectNode root = (ObjectNode) mapper().readTree(request);
         service.applyConfig(service.getSubjectFactory(subjectKey).createSubject(subject),
-                            service.getConfigClass(configKey), root);
+                            service.getConfigClass(subjectKey, configKey), root);
         return Response.ok().build();
     }
 
@@ -217,13 +218,15 @@
                              SubjectFactory subjectFactory) {
         classNode.fieldNames().forEachRemaining(s ->
             consumeSubjectJson(service, (ObjectNode) classNode.path(s),
-                               subjectFactory.createSubject(s)));
+                               subjectFactory.createSubject(s),
+                               subjectFactory.subjectKey()));
     }
 
     private void consumeSubjectJson(NetworkConfigService service,
-                                    ObjectNode subjectNode, Object subject) {
+                                    ObjectNode subjectNode, Object subject,
+                                    String subjectKey) {
         subjectNode.fieldNames().forEachRemaining(c ->
-            service.applyConfig(subject, service.getConfigClass(c),
+            service.applyConfig(subject, service.getConfigClass(subjectKey, c),
                                 (ObjectNode) subjectNode.path(c)));
     }
 
@@ -265,7 +268,7 @@
                            @PathParam("configKey") String configKey) {
         NetworkConfigService service = get(NetworkConfigService.class);
         service.removeConfig(service.getSubjectFactory(subjectKey).createSubject(subject),
-                service.getConfigClass(configKey));
+                service.getConfigClass(subjectKey, configKey));
         return Response.ok().build();
     }