X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=restconf%2Fsal-rest-connector%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Frest%2Fimpl%2Ftest%2Fproviders%2FTestXmlBodyReaderMountPoint.java;h=9e1237b7ba19719f419381a30b53bae65f82d072;hb=eb8a4d946d946f39c5d73fc392c5c59f14c4ea97;hp=8376c76b9b07ad72bf4979317cb8bdea968edd71;hpb=9bb49e5b92bcfe0be0597eb0e9e0faaa14028134;p=netconf.git diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestXmlBodyReaderMountPoint.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestXmlBodyReaderMountPoint.java index 8376c76b9b..9e1237b7ba 100644 --- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestXmlBodyReaderMountPoint.java +++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestXmlBodyReaderMountPoint.java @@ -8,6 +8,7 @@ package org.opendaylight.controller.sal.rest.impl.test.providers; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.any; @@ -19,9 +20,9 @@ import java.io.File; import java.io.InputStream; import java.net.URI; import java.text.ParseException; -import java.text.SimpleDateFormat; import java.util.Collection; import javax.ws.rs.core.MediaType; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; import org.opendaylight.controller.md.sal.dom.api.DOMMountPoint; @@ -30,8 +31,11 @@ import org.opendaylight.controller.md.sal.rest.common.TestRestconfUtils; import org.opendaylight.netconf.sal.rest.impl.XmlNormalizedNodeBodyReader; import org.opendaylight.netconf.sal.restconf.impl.ControllerContext; import org.opendaylight.netconf.sal.restconf.impl.NormalizedNodeContext; +import org.opendaylight.netconf.sal.restconf.impl.RestconfDocumentedException; +import org.opendaylight.netconf.sal.restconf.impl.RestconfError; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; +import org.opendaylight.yangtools.yang.common.SimpleDateFormatUtil; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; @@ -40,6 +44,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodes; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; /** * sal-rest-connector org.opendaylight.controller.sal.rest.impl.test.providers @@ -59,17 +64,15 @@ public class TestXmlBodyReaderMountPoint extends AbstractBodyReaderTest { private static QNameModule initializeInstanceIdentifierModule() { try { return QNameModule.create(URI.create("instance:identifier:module"), - new SimpleDateFormat("yyyy-MM-dd").parse("2014-01-17")); + SimpleDateFormatUtil.getRevisionFormat().parse("2014-01-17")); } catch (final ParseException e) { throw new Error(e); } } - - public TestXmlBodyReaderMountPoint() throws NoSuchFieldException, - SecurityException { + public TestXmlBodyReaderMountPoint() throws Exception { super(); - xmlBodyReader = new XmlNormalizedNodeBodyReader(); + this.xmlBodyReader = new XmlNormalizedNodeBodyReader(); } @Override @@ -80,9 +83,8 @@ public class TestXmlBodyReaderMountPoint extends AbstractBodyReaderTest { @BeforeClass public static void initialization() throws Exception { final Collection testFiles = TestRestconfUtils.loadFiles("/instanceidentifier/yang"); - testFiles.addAll(TestRestconfUtils.loadFiles("/modules")); testFiles.addAll(TestRestconfUtils.loadFiles("/invoke-rpc")); - schemaContext = TestRestconfUtils.parseYangSources(testFiles); + schemaContext = YangParserTestUtils.parseYangSources(testFiles); final DOMMountPoint mountInstance = mock(DOMMountPoint.class); when(mountInstance.getSchemaContext()).thenReturn(schemaContext); @@ -99,11 +101,11 @@ public class TestXmlBodyReaderMountPoint extends AbstractBodyReaderTest { final DataSchemaNode dataSchemaNode = schemaContext .getDataChildByName(QName.create(INSTANCE_IDENTIFIER_MODULE_QNAME, "cont")); final String uri = "instance-identifier-module:cont/yang-ext:mount/instance-identifier-module:cont"; - mockBodyReader(uri, xmlBodyReader, false); + mockBodyReader(uri, this.xmlBodyReader, false); final InputStream inputStream = TestXmlBodyReaderMountPoint.class .getResourceAsStream("/instanceidentifier/xml/xmldata.xml"); - final NormalizedNodeContext returnValue = xmlBodyReader.readFrom(null, - null, null, mediaType, null, inputStream); + final NormalizedNodeContext returnValue = this.xmlBodyReader.readFrom(null, + null, null, this.mediaType, null, inputStream); checkMountPointNormalizedNodeContext(returnValue); checkExpectValueNormalizeNodeContext(dataSchemaNode, returnValue); } @@ -113,11 +115,11 @@ public class TestXmlBodyReaderMountPoint extends AbstractBodyReaderTest { final DataSchemaNode dataSchemaNode = schemaContext .getDataChildByName(QName.create(INSTANCE_IDENTIFIER_MODULE_QNAME, "cont")); final String uri = "instance-identifier-module:cont/yang-ext:mount/instance-identifier-module:cont/cont1"; - mockBodyReader(uri, xmlBodyReader, false); + mockBodyReader(uri, this.xmlBodyReader, false); final InputStream inputStream = TestXmlBodyReaderMountPoint.class .getResourceAsStream("/instanceidentifier/xml/xml_sub_container.xml"); - final NormalizedNodeContext returnValue = xmlBodyReader.readFrom(null, - null, null, mediaType, null, inputStream); + final NormalizedNodeContext returnValue = this.xmlBodyReader.readFrom(null, + null, null, this.mediaType, null, inputStream); checkMountPointNormalizedNodeContext(returnValue); checkExpectValueNormalizeNodeContext(dataSchemaNode, returnValue, QName.create(dataSchemaNode.getQName(), "cont1")); @@ -128,11 +130,11 @@ public class TestXmlBodyReaderMountPoint extends AbstractBodyReaderTest { final DataSchemaNode dataSchemaNode = schemaContext .getDataChildByName(QName.create(INSTANCE_IDENTIFIER_MODULE_QNAME, "cont")); final String uri = "instance-identifier-module:cont/yang-ext:mount/instance-identifier-module:cont"; - mockBodyReader(uri, xmlBodyReader, true); + mockBodyReader(uri, this.xmlBodyReader, true); final InputStream inputStream = TestXmlBodyReaderMountPoint.class .getResourceAsStream("/instanceidentifier/xml/xml_sub_container.xml"); - final NormalizedNodeContext returnValue = xmlBodyReader.readFrom(null, - null, null, mediaType, null, inputStream); + final NormalizedNodeContext returnValue = this.xmlBodyReader.readFrom(null, + null, null, this.mediaType, null, inputStream); checkMountPointNormalizedNodeContext(returnValue); checkExpectValueNormalizeNodeContext(dataSchemaNode, returnValue); } @@ -140,11 +142,11 @@ public class TestXmlBodyReaderMountPoint extends AbstractBodyReaderTest { @Test public void rpcModuleInputTest() throws Exception { final String uri = "instance-identifier-module:cont/yang-ext:mount/invoke-rpc-module:rpc-test"; - mockBodyReader(uri, xmlBodyReader, true); + mockBodyReader(uri, this.xmlBodyReader, true); final InputStream inputStream = TestXmlBodyReaderMountPoint.class .getResourceAsStream("/invoke-rpc/xml/rpc-input.xml"); - final NormalizedNodeContext returnValue = xmlBodyReader.readFrom(null, - null, null, mediaType, null, inputStream); + final NormalizedNodeContext returnValue = this.xmlBodyReader.readFrom(null, + null, null, this.mediaType, null, inputStream); checkNormalizedNodeContext(returnValue); final ContainerNode contNode = (ContainerNode) returnValue.getData(); final YangInstanceIdentifier yangCont = YangInstanceIdentifier.of(QName.create(contNode.getNodeType(), "cont")); @@ -176,7 +178,7 @@ public class TestXmlBodyReaderMountPoint extends AbstractBodyReaderTest { .getSchemaContext().getDataChildByName( dataSchemaNode.getQName()); assertNotNull(mountDataSchemaNode); - if (qName != null && dataSchemaNode instanceof DataNodeContainer) { + if ((qName != null) && (dataSchemaNode instanceof DataNodeContainer)) { final DataSchemaNode child = ((DataNodeContainer) dataSchemaNode) .getDataChildByName(qName); dataNodeIdent = YangInstanceIdentifier.builder(dataNodeIdent) @@ -189,4 +191,68 @@ public class TestXmlBodyReaderMountPoint extends AbstractBodyReaderTest { assertNotNull(NormalizedNodes.findNode(nnContext.getData(), dataNodeIdent)); } + + /** + * Test when container with the same name is placed in two modules (foo-module and bar-module). Namespace must be + * used to distinguish between them to find correct one. Check if container was found not only according to its name + * but also by correct namespace used in payload. + */ + @Test + public void findFooContainerUsingNamespaceTest() throws Exception { + mockBodyReader("instance-identifier-module:cont/yang-ext:mount", this.xmlBodyReader, true); + final InputStream inputStream = TestXmlBodyReader.class + .getResourceAsStream("/instanceidentifier/xml/xmlDataFindFooContainer.xml"); + final NormalizedNodeContext returnValue = this.xmlBodyReader + .readFrom(null, null, null, this.mediaType, null, inputStream); + + // check return value + checkMountPointNormalizedNodeContext(returnValue); + // check if container was found both according to its name and namespace + assertEquals("Not correct container found, name was ignored", + "foo-bar-container", returnValue.getData().getNodeType().getLocalName()); + assertEquals("Not correct container found, namespace was ignored", + "foo:module", returnValue.getData().getNodeType().getNamespace().toString()); + } + + /** + * Test when container with the same name is placed in two modules (foo-module and bar-module). Namespace must be + * used to distinguish between them to find correct one. Check if container was found not only according to its name + * but also by correct namespace used in payload. + */ + @Test + public void findBarContainerUsingNamespaceTest() throws Exception { + mockBodyReader("instance-identifier-module:cont/yang-ext:mount", this.xmlBodyReader, true); + final InputStream inputStream = TestXmlBodyReader.class + .getResourceAsStream("/instanceidentifier/xml/xmlDataFindBarContainer.xml"); + final NormalizedNodeContext returnValue = this.xmlBodyReader + .readFrom(null, null, null, this.mediaType, null, inputStream); + + // check return value + checkMountPointNormalizedNodeContext(returnValue); + // check if container was found both according to its name and namespace + assertEquals("Not correct container found, name was ignored", + "foo-bar-container", returnValue.getData().getNodeType().getLocalName()); + assertEquals("Not correct container found, namespace was ignored", + "bar:module", returnValue.getData().getNodeType().getNamespace().toString()); + } + + /** + * Test PUT operation when message root element is not the same as the last element in request URI. + * PUT operation message should always start with schema node from URI otherwise exception should be + * thrown. + */ + @Test + public void wrongRootElementTest() throws Exception { + mockBodyReader("instance-identifier-module:cont/yang-ext:mount", this.xmlBodyReader, false); + final InputStream inputStream = TestXmlBodyReader.class.getResourceAsStream( + "/instanceidentifier/xml/bug7933.xml"); + try { + this.xmlBodyReader.readFrom(null, null, null, this.mediaType, null, inputStream); + Assert.fail("Test should fail due to malformed PUT operation message"); + } catch (final RestconfDocumentedException exception) { + final RestconfError restconfError = exception.getErrors().get(0); + Assert.assertEquals(RestconfError.ErrorType.PROTOCOL, restconfError.getErrorType()); + Assert.assertEquals(RestconfError.ErrorTag.MALFORMED_MESSAGE, restconfError.getErrorTag()); + } + } }