fix [ONOS-6115] and change RestconfManager's call api to Dynamic Config
Change-Id: I45be6a721c66da6fea1ac29fd14b1f978b962f3a
diff --git a/apps/restconf/restconfmgr/src/main/java/org/onosproject/restconf/restconfmanager/RestconfManager.java b/apps/restconf/restconfmgr/src/main/java/org/onosproject/restconf/restconfmanager/RestconfManager.java
index 73044fb..c0fdc31 100644
--- a/apps/restconf/restconfmgr/src/main/java/org/onosproject/restconf/restconfmanager/RestconfManager.java
+++ b/apps/restconf/restconfmgr/src/main/java/org/onosproject/restconf/restconfmanager/RestconfManager.java
@@ -138,7 +138,7 @@
}
DataNode dataNode = dataNodeList.get(0);
try {
- dynamicConfigService.createNode(rid, dataNode);
+ dynamicConfigService.createNodeRecursive(rid, dataNode);
} catch (FailedException e) {
log.error("ERROR: DynamicConfigService: ", e);
throw new RestconfException("ERROR: DynamicConfigService",
@@ -157,7 +157,7 @@
throws RestconfException {
ResourceId rid = convertUriToRid(uri);
try {
- dynamicConfigService.deleteNode(rid);
+ dynamicConfigService.deleteNodeRecursive(rid);
} catch (FailedException e) {
log.error("ERROR: DynamicConfigService: ", e);
throw new RestconfException("ERROR: DynamicConfigService",
diff --git a/apps/restconf/utils/src/main/java/org/onosproject/restconf/utils/RestconfUtils.java b/apps/restconf/utils/src/main/java/org/onosproject/restconf/utils/RestconfUtils.java
index 203dcbb..253411b 100644
--- a/apps/restconf/utils/src/main/java/org/onosproject/restconf/utils/RestconfUtils.java
+++ b/apps/restconf/utils/src/main/java/org/onosproject/restconf/utils/RestconfUtils.java
@@ -52,7 +52,7 @@
/**
* Data format required by YangRuntime Service.
*/
- private static final String JSON_FORMAT = "json";
+ private static final String JSON_FORMAT = "JSON";
private static final YangRuntimeService YANG_RUNTIME =
DefaultServiceDirectory.getService(YangRuntimeService.class);
@@ -81,7 +81,7 @@
* @return the InputStream from Resource Data
*/
public static InputStream convertObjectNodeToInputStream(ObjectNode rootNode) {
- String json = rootNode.asText();
+ String json = rootNode.toString();
InputStream inputStream;
try {
inputStream = IOUtils.toInputStream(json);