[ONOS-5088] YANG SBI Broker Implementation.
Change-Id: Ibe87e095a4c209c54e3e90aceca0ec9097c5ede0
diff --git a/providers/ietfte/topology/src/main/java/org/onosproject/provider/te/topology/JsonYdtCodec.java b/providers/ietfte/topology/src/main/java/org/onosproject/provider/te/topology/JsonYdtCodec.java
index 1cb17f5..f53bac8 100644
--- a/providers/ietfte/topology/src/main/java/org/onosproject/provider/te/topology/JsonYdtCodec.java
+++ b/providers/ietfte/topology/src/main/java/org/onosproject/provider/te/topology/JsonYdtCodec.java
@@ -15,11 +15,8 @@
*/
package org.onosproject.provider.te.topology;
-import static org.onosproject.yms.ydt.YdtContextOperationType.NONE;
-
-import java.io.IOException;
-import java.io.InputStream;
-
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.commons.io.IOUtils;
import org.onosproject.protocol.restconf.server.utils.parser.json.ParserUtils;
import org.onosproject.yms.ych.YangCompositeEncoding;
@@ -30,8 +27,10 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import java.io.IOException;
+import java.io.InputStream;
+
+import static org.onosproject.yms.ydt.YdtContextOperationType.NONE;
/**
@@ -49,18 +48,16 @@
}
@Override
- public String encodeYdtToProtocolFormat(YdtBuilder builder,
- YmsOperationType opType) {
- String json = ParserUtils.convertYdtToJson(builder.getRootNode().getName(),
- builder.getRootNode(),
+ public String encodeYdtToProtocolFormat(YdtBuilder ydtBuilder) {
+ String json = ParserUtils.convertYdtToJson(ydtBuilder.getRootNode().getName(),
+ ydtBuilder.getRootNode(),
ymsService.getYdtWalker())
- .textValue();
+ .textValue();
return json;
- }
+ }
@Override
- public YangCompositeEncoding encodeYdtToCompositeProtocolFormat(YdtBuilder builder,
- YmsOperationType opType) {
+ public YangCompositeEncoding encodeYdtToCompositeProtocolFormat(YdtBuilder ydtBuilder) {
// Mainly for POST/PUT operation.
// YdtBuilder/YdtContext has YdtContextType NONE for URI,
// YdtContextType CREATE/MERGE/REPLACE for Resource data.
diff --git a/providers/ietfte/topology/src/main/java/org/onosproject/provider/te/topology/TeTopologyRestconfProvider.java b/providers/ietfte/topology/src/main/java/org/onosproject/provider/te/topology/TeTopologyRestconfProvider.java
index b19795e..06a8acf 100644
--- a/providers/ietfte/topology/src/main/java/org/onosproject/provider/te/topology/TeTopologyRestconfProvider.java
+++ b/providers/ietfte/topology/src/main/java/org/onosproject/provider/te/topology/TeTopologyRestconfProvider.java
@@ -136,7 +136,7 @@
codecHandler.addDeviceSchema(IetfTeTopology.class);
// Register JSON CODEC functions
codecHandler.registerOverriddenCodec(new JsonYdtCodec(ymsService),
- YangProtocolEncodingFormat.JSON_ENCODING);
+ YangProtocolEncodingFormat.JSON);
appId = coreService.registerApplication(APP_NAME);
topologyProviderService = topologyProviderRegistry.register(this);
@@ -225,7 +225,7 @@
networkLevelJsonString);
Object yo = codecHandler.decode(yce,
- YangProtocolEncodingFormat.JSON_ENCODING,
+ YangProtocolEncodingFormat.JSON,
YmsOperationType.QUERY_REPLY);
if ((yo == null)) {
diff --git a/providers/ietfte/topology/src/main/java/org/onosproject/provider/te/topology/YangCompositeEncodingImpl.java b/providers/ietfte/topology/src/main/java/org/onosproject/provider/te/topology/YangCompositeEncodingImpl.java
index 3597536..2f025e8 100644
--- a/providers/ietfte/topology/src/main/java/org/onosproject/provider/te/topology/YangCompositeEncodingImpl.java
+++ b/providers/ietfte/topology/src/main/java/org/onosproject/provider/te/topology/YangCompositeEncodingImpl.java
@@ -11,17 +11,17 @@
/**
* Resource identifier for composite encoding.
*/
- private final String resourceIdentifier;
+ private String resourceIdentifier;
/**
* Resource information for composite encoding.
*/
- private final String resourceInformation;
+ private String resourceInformation;
/**
* Resource identifier type.
*/
- public final YangResourceIdentifierType resourceIdentifierType;
+ public YangResourceIdentifierType resourceIdentifierType;
/**
* Creates an instance of YangCompositeEncodingImpl.
@@ -52,5 +52,20 @@
public String getResourceInformation() {
return resourceInformation;
}
+
+ @Override
+ public void setResourceIdentifier(String resourceId) {
+ resourceIdentifier = resourceId;
+ }
+
+ @Override
+ public void setResourceInformation(String resourceInfo) {
+ resourceInformation = resourceInfo;
+ }
+
+ @Override
+ public void setResourceIdentifierType(YangResourceIdentifierType idType) {
+ resourceIdentifierType = idType;
+ }
}