<version>2.4</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.yangtools</groupId>
+ <artifactId>yang-model-util</artifactId>
+ <version>0.5.9-SNAPSHOT</version>
+ </dependency>
</dependencies>
<build>
import javax.activation.UnsupportedDataTypeException;
import org.opendaylight.controller.sal.restconf.impl.ControllerContext;
+import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.data.api.*;
import org.opendaylight.yangtools.yang.model.api.*;
import org.opendaylight.yangtools.yang.model.api.type.*;
List<SimpleNode<?>> nodeLeafLists = nodeParent.getSimpleNodesByName(node.getNodeType());
for (SimpleNode<?> nodeLeafList : nodeLeafLists) {
- writeValueOfNodeByType(writer, nodeLeafList, schema.getType());
+ writeValueOfNodeByType(writer, nodeLeafList, schema.getType(), schema);
}
-
writer.endArray();
}
private void writeLeaf(JsonWriter writer, SimpleNode<?> node, LeafSchemaNode schema) throws IOException {
writeName(node, schema, writer);
- writeValueOfNodeByType(writer, node, schema.getType());
+ writeValueOfNodeByType(writer, node, schema.getType(), schema);
}
- private void writeValueOfNodeByType(JsonWriter writer, SimpleNode<?> node, TypeDefinition<?> type)
- throws IOException {
+ private void writeValueOfNodeByType(JsonWriter writer, SimpleNode<?> node, TypeDefinition<?> type,
+ DataSchemaNode schema) throws IOException {
String value = String.valueOf(node.getValue());
- // TODO check Leafref, InstanceIdentifierTypeDefinition,
- // IdentityrefTypeDefinition, UnionTypeDefinition
TypeDefinition<?> baseType = resolveBaseTypeFrom(type);
- if (baseType instanceof InstanceIdentifierTypeDefinition) {
+
+ // TODO check InstanceIdentifierTypeDefinition,
+ // IdentityrefTypeDefinition
+ if (baseType instanceof IdentityrefTypeDefinition) {
+ if (node.getValue() instanceof QName) {
+ QName qName = (QName) node.getValue();
+
+ ControllerContext contContext = ControllerContext.getInstance();
+ String moduleName = contContext.findModuleByNamespace(qName.getNamespace());
+
+ writer.value(moduleName + ":" + qName.getLocalName());
+ }
+
+ } else if (baseType instanceof LeafrefTypeDefinition) {
+ ControllerContext contContext = ControllerContext.getInstance();
+ LeafSchemaNode lfSchemaNode = contContext.resolveTypeFromLeafref((LeafrefTypeDefinition) baseType, schema);
+ if (lfSchemaNode != null) {
+ writeValueOfNodeByType(writer, node, lfSchemaNode.getType(), lfSchemaNode);
+ } else {
+ writer.value(value);
+ }
+ } else if (baseType instanceof InstanceIdentifierTypeDefinition) {
writer.value(((InstanceIdentifierTypeDefinition) baseType).getPathStatement().toString());
} else if (baseType instanceof UnionTypeDefinition) {
processTypeIsUnionType(writer, (UnionTypeDefinition) baseType, value);
import org.opendaylight.yangtools.yang.model.api.ListSchemaNode
import org.opendaylight.yangtools.yang.model.api.RpcDefinition
import org.opendaylight.yangtools.yang.model.api.SchemaContext
+import org.opendaylight.yangtools.yang.model.api.SchemaNode
+import org.opendaylight.yangtools.yang.model.api.type.LeafrefTypeDefinition
+import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil
import static com.google.common.base.Preconditions.*
private val BiMap<URI, String> uriToModuleName = HashBiMap.create();
private val Map<String, URI> moduleNameToUri = uriToModuleName.inverse();
- private val Map<QName,RpcDefinition> qnameToRpc = new ConcurrentHashMap();
-
+ private val Map<QName, RpcDefinition> qnameToRpc = new ConcurrentHashMap();
private new() {
if (INSTANCE !== null) {
static def getInstance() {
return INSTANCE
}
-
+
private def void checkPreconditions() {
if (schemas === null) {
throw new ResponseException(Response.Status.SERVICE_UNAVAILABLE, RestconfProvider::NOT_INITALIZED_MSG)
private def dispatch CharSequence toRestconfIdentifier(PathArgument argument, DataSchemaNode node) {
throw new IllegalArgumentException("Conversion of generic path argument is not supported");
}
-
+
def findModuleByNamespace(URI namespace) {
checkPreconditions
var module = uriToModuleName.get(namespace)
return str;
}
}
-
+
private def QName toQName(String name) {
val module = name.toModuleName;
val node = name.toNodeName;
val namespace = moduleNameToUri.get(module);
- return new QName(namespace,null,node);
+ return new QName(namespace, null, node);
}
-
+
def getRpcDefinition(String name) {
return qnameToRpc.get(name.toQName)
}
override onGlobalContextUpdated(SchemaContext context) {
this.schemas = context;
- for(operation : context.operations) {
- val qname = new QName(operation.QName.namespace,null,operation.QName.localName);
- qnameToRpc.put(qname,operation);
+ for (operation : context.operations) {
+ val qname = new QName(operation.QName.namespace, null, operation.QName.localName);
+ qnameToRpc.put(qname, operation);
+ }
+ }
+
+ /**
+ * Resolve target type from leafref type.
+ *
+ * According to RFC 6020 referenced element has to be leaf (chapter 9.9).
+ * Therefore if other element is referenced then null value is returned.
+ *
+ * Currently only cases without path-predicate are supported.
+ *
+ * @param leafRef
+ * @param schemaNode
+ * data schema node which contains reference
+ * @return type if leaf is referenced and it is possible to find referenced
+ * node in schema context. In other cases null value is returned
+ */
+ def LeafSchemaNode resolveTypeFromLeafref(LeafrefTypeDefinition leafRef, DataSchemaNode schemaNode) {
+ val xPath = leafRef.getPathStatement();
+ val module = SchemaContextUtil.findParentModule(schemas, schemaNode);
+
+ var SchemaNode foundSchemaNode
+ if (xPath.isAbsolute()) {
+ foundSchemaNode = SchemaContextUtil.findDataSchemaNode(schemas, module, xPath);
+ } else {
+ foundSchemaNode = SchemaContextUtil.findDataSchemaNodeForRelativeXPath(schemas, module, schemaNode, xPath);
+ }
+
+ if (foundSchemaNode instanceof LeafSchemaNode) {
+ return foundSchemaNode as LeafSchemaNode;
}
+
+ return null;
}
-
}
null, byteArrayOS);
jsonResult = byteArrayOS.toString();
- try {
- outputToFile(byteArrayOS, outputPath);
- } catch (IOException e) {
- System.out.println("Output file wasn't cloased sucessfuly.");
+ if (outputPath != null) {
+ try {
+ outputToFile(byteArrayOS, outputPath);
+ } catch (IOException e) {
+ System.out.println("Output file wasn't cloased sucessfuly.");
+ }
}
return jsonResult;
--- /dev/null
+package org.opendaylight.controller.sal.restconf.impl.test;
+
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.util.Set;
+import java.util.regex.*;
+
+import javax.ws.rs.WebApplicationException;
+
+import org.junit.*;
+import org.opendaylight.yangtools.yang.data.api.*;
+import org.opendaylight.yangtools.yang.data.impl.NodeFactory;
+import org.opendaylight.yangtools.yang.model.api.*;
+
+public class ToJsonIdentityrefTest {
+
+ private static Set<Module> modules;
+ private static DataSchemaNode dataSchemaNode;
+
+ @BeforeClass
+ public static void initialization() {
+ modules = TestUtils.resolveModules("/yang-to-json-conversion/identityref");
+ assertEquals(2, modules.size());
+ Module module = TestUtils.resolveModule("identityref-module", modules);
+ assertNotNull(module);
+ dataSchemaNode = TestUtils.resolveDataSchemaNode(module, "cont");
+ assertNotNull(dataSchemaNode);
+
+ }
+
+ @Test
+ public void identityrefToJsonTest() {
+ String json = null;
+ try {
+ json = TestUtils
+ .writeCompNodeWithSchemaContextToJson(prepareCompositeNode(), null, modules, dataSchemaNode);
+ } catch (WebApplicationException | IOException e) {
+ // shouldn't end here
+ assertTrue(false);
+ }
+ assertNotNull(json);
+ Pattern ptrn = Pattern.compile(".*\"lf1\"\\p{Space}*:\\p{Space}*\"identityref-module:name_test\".*",
+ Pattern.DOTALL);
+ Matcher mtch = ptrn.matcher(json);
+
+ assertTrue(mtch.matches());
+ }
+
+ private CompositeNode prepareCompositeNode() {
+ MutableCompositeNode cont = NodeFactory.createMutableCompositeNode(TestUtils.buildQName("cont"), null, null,
+ ModifyAction.CREATE, null);
+ MutableSimpleNode<?> lf1 = NodeFactory.createMutableSimpleNode(TestUtils.buildQName("lf1"), cont,
+ TestUtils.buildQName("name_test", "identityref:module", "2013-12-2"), ModifyAction.CREATE, null);
+ cont.getChildren().add(lf1);
+ cont.init();
+
+ return cont;
+ }
+
+}
--- /dev/null
+package org.opendaylight.controller.sal.restconf.impl.test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.util.Set;
+import java.util.regex.Matcher;
+
+import javax.ws.rs.WebApplicationException;
+
+import org.junit.*;
+import org.opendaylight.yangtools.yang.model.api.*;
+
+public class ToJsonLeafrefType {
+ private static Set<Module> modules;
+ private static DataSchemaNode dataSchemaNode;
+
+ @BeforeClass
+ public static void initialization() {
+ modules = TestUtils.resolveModules("/yang-to-json-conversion/leafref");
+ assertEquals(2, modules.size());
+ Module module = TestUtils.resolveModule("main-module", modules);
+ assertNotNull(module);
+ dataSchemaNode = TestUtils.resolveDataSchemaNode(module, "cont");
+ assertNotNull(dataSchemaNode);
+
+ }
+
+ @Test
+ public void leafrefAbsolutePathToExistingLeafTest() {
+ String json = null;
+ try {
+ json = TestUtils.writeCompNodeWithSchemaContextToJson(TestUtils
+ .loadCompositeNode("/yang-to-json-conversion/leafref/xml/data_absolut_ref_to_existing_leaf.xml"),
+ "/yang-to-json-conversion/leafref/xml", modules, dataSchemaNode);
+ } catch (WebApplicationException | IOException e) {
+ // shouldn't end here
+ assertTrue(false);
+ }
+ assertNotNull(json);
+ java.util.regex.Pattern ptrn = java.util.regex.Pattern.compile(".*\"lf3\":\\p{Blank}*true.*",
+ java.util.regex.Pattern.DOTALL);
+ Matcher mtch = ptrn.matcher(json);
+ assertTrue(mtch.matches());
+ }
+
+ @Test
+ public void leafrefRelativePathToExistingLeafTest() {
+ String json = null;
+ try {
+ json = TestUtils.writeCompNodeWithSchemaContextToJson(TestUtils
+ .loadCompositeNode("/yang-to-json-conversion/leafref/xml/data_relativ_ref_to_existing_leaf.xml"),
+ "/yang-to-json-conversion/leafref/xml", modules, dataSchemaNode);
+ } catch (WebApplicationException | IOException e) {
+ // shouldn't end here
+ assertTrue(false);
+ }
+ assertNotNull(json);
+ java.util.regex.Pattern ptrn = java.util.regex.Pattern.compile(".*\"lf2\":\\p{Blank}*121.*",
+ java.util.regex.Pattern.DOTALL);
+ Matcher mtch = ptrn.matcher(json);
+ assertTrue(mtch.matches());
+ }
+
+ /**
+ * Tests case when reference to not existing element is present. In this
+ * case value from single node is printed as string.
+ */
+ @Test
+ public void leafrefToNonExistingLeafTest() {
+ String json = null;
+ try {
+ json = TestUtils.writeCompNodeWithSchemaContextToJson(TestUtils
+ .loadCompositeNode("/yang-to-json-conversion/leafref/xml/data_ref_to_non_existing_leaf.xml"),
+ "/yang-to-json-conversion/leafref/xml", modules, dataSchemaNode);
+ } catch (WebApplicationException | IOException e) {
+ // shouldn't end here
+ assertTrue(false);
+ }
+ assertNotNull(json);
+ java.util.regex.Pattern ptrn = java.util.regex.Pattern.compile(".*\"lf5\":\\p{Blank}*\"137\".*",
+ java.util.regex.Pattern.DOTALL);
+ Matcher mtch = ptrn.matcher(json);
+ assertTrue(mtch.matches());
+ }
+
+ /**
+ * Tests case when non leaf element is referenced. In this case value from
+ * single node is printed as string.
+ */
+ @Test
+ public void leafrefToNotLeafTest() {
+ String json = null;
+ try {
+ json = TestUtils.writeCompNodeWithSchemaContextToJson(
+ TestUtils.loadCompositeNode("/yang-to-json-conversion/leafref/xml/data_ref_to_not_leaf.xml"),
+ "/yang-to-json-conversion/leafref/xml", modules, dataSchemaNode);
+ } catch (WebApplicationException | IOException e) {
+ // shouldn't end here
+ assertTrue(false);
+ }
+ assertNotNull(json);
+ java.util.regex.Pattern ptrn = java.util.regex.Pattern.compile(
+ ".*\"cont-augment-module\\p{Blank}*:\\p{Blank}*lf6\":\\p{Blank}*\"44.33\".*",
+ java.util.regex.Pattern.DOTALL);
+ Matcher mtch = ptrn.matcher(json);
+ assertTrue(mtch.matches());
+ }
+
+ /**
+ * Tests case when leaflist element is refers to leaf.
+ */
+ @Test
+ public void leafrefFromLeafListToLeafTest() {
+ String json = null;
+ try {
+ json = TestUtils
+ .writeCompNodeWithSchemaContextToJson(
+ TestUtils
+ .loadCompositeNode("/yang-to-json-conversion/leafref/xml/data_relativ_ref_from_leaflist_to_existing_leaf.xml"),
+ "/yang-to-json-conversion/leafref/xml", modules, dataSchemaNode);
+ } catch (WebApplicationException | IOException e) {
+ // shouldn't end here
+ assertTrue(false);
+ }
+ assertNotNull(json);
+ java.util.regex.Pattern ptrn = java.util.regex.Pattern
+ .compile(
+ ".*\"cont-augment-module\\p{Blank}*:\\p{Blank}*lflst1\":\\p{Blank}*.*345,\\p{Space}*346,\\p{Space}*347.*",
+ java.util.regex.Pattern.DOTALL);
+ Matcher mtch = ptrn.matcher(json);
+ assertTrue(mtch.matches());
+ }
+
+ /**
+ * Tests case when leaflist element is refers to leaf.
+ */
+ @Test
+ public void leafrefFromLeafrefToLeafrefTest() {
+ String json = null;
+ try {
+ json = TestUtils.writeCompNodeWithSchemaContextToJson(TestUtils
+ .loadCompositeNode("/yang-to-json-conversion/leafref/xml/data_from_leafref_to_leafref.xml"),
+ "/yang-to-json-conversion/leafref/xml", modules, dataSchemaNode);
+ } catch (WebApplicationException | IOException e) {
+ // shouldn't end here
+ assertTrue(false);
+ }
+ assertNotNull(json);
+ java.util.regex.Pattern ptrn = java.util.regex.Pattern.compile(
+ ".*\"cont-augment-module\\p{Blank}*:\\p{Blank}*lf7\":\\p{Blank}*200.*", java.util.regex.Pattern.DOTALL);
+ Matcher mtch = ptrn.matcher(json);
+ assertTrue(mtch.matches());
+ }
+
+}
--- /dev/null
+module identity-module {
+ namespace "identity:module";
+
+ prefix "idemod";
+ revision 2013-12-2 {
+ }
+
+ identity iden {
+ }
+}
\ No newline at end of file
--- /dev/null
+module identityref-module {
+ namespace "identityref:module";
+
+ prefix "iderefmod";
+
+ import identity-module {prefix idemo; revision-date 2013-12-2;}
+
+ revision 2013-12-2 {
+ }
+
+ container cont {
+ leaf lf1 {
+ type identityref {
+ base "idemo:iden";
+ }
+ }
+ }
+
+}
\ No newline at end of file
--- /dev/null
+module cont-augment-module {
+ namespace "cont:augment:module";
+
+ prefix "cntaugmod";
+
+ import main-module {prefix mamo; revision-date 2013-12-2;}
+
+ revision 2013-12-2 {
+
+ }
+
+ augment "/mamo:cont" {
+ leaf-list lflst1 {
+ type leafref {
+ path "../lf1";
+ }
+ }
+
+ leaf lf4 {
+ type leafref {
+ path "../lf1";
+ }
+ }
+
+ /* reference to not leaf element */
+ leaf lf6 {
+ type leafref {
+ path "../lflst1";
+ }
+ }
+
+ leaf lf7 {
+ type leafref {
+ path "../lf4";
+ }
+ }
+ }
+
+
+
+
+}
\ No newline at end of file
--- /dev/null
+module main-module {
+ namespace "main:module";
+
+ prefix "mainmod";
+ revision 2013-12-2 {
+ }
+
+ container cont {
+ leaf lf1 {
+ type uint32;
+ }
+
+ container cont1 {
+ leaf lf11 {
+ type boolean;
+ }
+ }
+
+ leaf lf2 {
+ type leafref {
+ path "../lf1";
+ }
+ }
+
+ leaf lf3 {
+ type leafref {
+ path "/cont/cont1/lf11";
+ }
+ }
+
+ /* reference to nonexisting leaf */
+ leaf lf5 {
+ type leafref {
+ path "/cont/lf";
+ }
+ }
+
+
+ }
+
+
+
+}
\ No newline at end of file
--- /dev/null
+<cont>
+ <cont1>
+ <lf11>true</lf11>
+ </cont1>
+ <lf3>true</lf3>
+</cont>
\ No newline at end of file
--- /dev/null
+<cont>
+ <lf7>200</lf7>
+</cont>
\ No newline at end of file
--- /dev/null
+<cont>
+ <lf5>137</lf5>
+</cont>
\ No newline at end of file
--- /dev/null
+<cont>
+ <lf6>44.33</lf6>
+</cont>
\ No newline at end of file
--- /dev/null
+<cont>
+ <lflst1>345</lflst1>
+ <lflst1>346</lflst1>
+ <lflst1>347</lflst1>
+</cont>
\ No newline at end of file
--- /dev/null
+<cont>
+ <lf1>121</lf1>
+ <lf2>121</lf2>
+</cont>
\ No newline at end of file
Code Review / controller.git / commitdiff