X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-rest-connector%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Frestconf%2Fimpl%2Ftest%2FRestGetOperationTest.java;h=ac660e32bce0f654e8801a56c723f6ec6736c80c;hb=11e9ade9af527aba7faeb633d3c9c7552fd09d2d;hp=536d140cf1b78e05b7a3e77d38e43a32d8a1f8f4;hpb=73c9fecf86aad02761df47fe0cc943af4ea1f2bc;p=controller.git diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetOperationTest.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetOperationTest.java index 536d140cf1..ac660e32bc 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetOperationTest.java +++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetOperationTest.java @@ -10,6 +10,7 @@ package org.opendaylight.controller.sal.restconf.impl.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.mockito.Matchers.any; @@ -17,8 +18,6 @@ import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import java.io.FileNotFoundException; import java.io.InputStream; import java.io.UnsupportedEncodingException; @@ -28,16 +27,20 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; + import javax.ws.rs.core.Application; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedHashMap; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; + import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.test.JerseyTest; import org.junit.BeforeClass; @@ -59,16 +62,21 @@ import org.opendaylight.controller.sal.restconf.impl.RestconfImpl; import org.opendaylight.controller.sal.restconf.impl.SimpleNodeWrapper; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.CompositeNode; -import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier; -import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.PathArgument; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.Node; import org.opendaylight.yangtools.yang.data.impl.ImmutableCompositeNode; import org.opendaylight.yangtools.yang.data.impl.util.CompositeNodeBuilder; +import org.opendaylight.yangtools.yang.model.api.Module; +import org.opendaylight.yangtools.yang.model.api.RpcDefinition; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; + public class RestGetOperationTest extends JerseyTest { static class NodeData { @@ -90,6 +98,8 @@ public class RestGetOperationTest extends JerseyTest { private static SchemaContext schemaContextModules; private static SchemaContext schemaContextBehindMountPoint; + private static final String RESTCONF_NS = "urn:ietf:params:xml:ns:yang:ietf-restconf"; + @BeforeClass public static void init() throws FileNotFoundException { schemaContextYangsIetf = TestUtils.loadSchemaContext("/full-versions/yangs"); @@ -154,11 +164,11 @@ public class RestGetOperationTest extends JerseyTest { public void getDataWithUrlMountPoint() throws UnsupportedEncodingException, URISyntaxException { when( brokerFacade.readConfigurationDataBehindMountPoint(any(MountInstance.class), - any(InstanceIdentifier.class))).thenReturn(prepareCnDataForMountPointTest()); + any(YangInstanceIdentifier.class))).thenReturn(prepareCnDataForMountPointTest()); MountInstance mountInstance = mock(MountInstance.class); when(mountInstance.getSchemaContext()).thenReturn(schemaContextTestModule); MountService mockMountService = mock(MountService.class); - when(mockMountService.getMountPoint(any(InstanceIdentifier.class))).thenReturn(mountInstance); + when(mockMountService.getMountPoint(any(YangInstanceIdentifier.class))).thenReturn(mountInstance); ControllerContext.getInstance().setMountService(mockMountService); @@ -175,7 +185,7 @@ public class RestGetOperationTest extends JerseyTest { * Slashes in URI behind mount point. lst1 element with key GigabitEthernet0%2F0%2F0%2F0 (GigabitEthernet0/0/0/0) is * requested via GET HTTP operation. It is tested whether %2F character is replaced with simple / in * InstanceIdentifier parameter in method - * {@link BrokerFacade#readConfigurationDataBehindMountPoint(MountInstance, InstanceIdentifier)} which is called in + * {@link BrokerFacade#readConfigurationDataBehindMountPoint(MountInstance, YangInstanceIdentifier)} which is called in * method {@link RestconfImpl#readConfigurationData} * * @@ -184,14 +194,14 @@ public class RestGetOperationTest extends JerseyTest { @Test public void getDataWithSlashesBehindMountPoint() throws UnsupportedEncodingException, URISyntaxException, ParseException { - InstanceIdentifier awaitedInstanceIdentifier = prepareInstanceIdentifierForList(); + YangInstanceIdentifier awaitedInstanceIdentifier = prepareInstanceIdentifierForList(); when( brokerFacade.readConfigurationDataBehindMountPoint(any(MountInstance.class), eq(awaitedInstanceIdentifier))).thenReturn(prepareCnDataForMountPointTest()); MountInstance mountInstance = mock(MountInstance.class); when(mountInstance.getSchemaContext()).thenReturn(schemaContextTestModule); MountService mockMountService = mock(MountService.class); - when(mockMountService.getMountPoint(any(InstanceIdentifier.class))).thenReturn(mountInstance); + when(mockMountService.getMountPoint(any(YangInstanceIdentifier.class))).thenReturn(mountInstance); ControllerContext.getInstance().setMountService(mockMountService); @@ -199,7 +209,7 @@ public class RestGetOperationTest extends JerseyTest { assertEquals(200, get(uri, MediaType.APPLICATION_XML)); } - private InstanceIdentifier prepareInstanceIdentifierForList() throws URISyntaxException, ParseException { + private YangInstanceIdentifier prepareInstanceIdentifierForList() throws URISyntaxException, ParseException { List parameters = new ArrayList<>(); Date revision = new SimpleDateFormat("yyyy-MM-dd").parse("2014-01-09"); @@ -208,21 +218,21 @@ public class RestGetOperationTest extends JerseyTest { QName qNameList = QName.create(uri, revision, "lst1"); QName qNameKeyList = QName.create(uri, revision, "lf11"); - parameters.add(new InstanceIdentifier.NodeIdentifier(qNameCont)); - parameters.add(new InstanceIdentifier.NodeIdentifierWithPredicates(qNameList, qNameKeyList, + parameters.add(new YangInstanceIdentifier.NodeIdentifier(qNameCont)); + parameters.add(new YangInstanceIdentifier.NodeIdentifierWithPredicates(qNameList, qNameKeyList, "GigabitEthernet0/0/0/0")); - return InstanceIdentifier.create(parameters); + return YangInstanceIdentifier.create(parameters); } @Test public void getDataMountPointIntoHighestElement() throws UnsupportedEncodingException, URISyntaxException { when( brokerFacade.readConfigurationDataBehindMountPoint(any(MountInstance.class), - any(InstanceIdentifier.class))).thenReturn(prepareCnDataForMountPointTest()); + any(YangInstanceIdentifier.class))).thenReturn(prepareCnDataForMountPointTest()); MountInstance mountInstance = mock(MountInstance.class); when(mountInstance.getSchemaContext()).thenReturn(schemaContextTestModule); MountService mockMountService = mock(MountService.class); - when(mockMountService.getMountPoint(any(InstanceIdentifier.class))).thenReturn(mountInstance); + when(mockMountService.getMountPoint(any(YangInstanceIdentifier.class))).thenReturn(mountInstance); ControllerContext.getInstance().setMountService(mockMountService); @@ -241,7 +251,7 @@ public class RestGetOperationTest extends JerseyTest { validateModulesResponseJson(response); response = target(uri).request("application/yang.api+xml").get(); - validateModulesResponseXml(response); + validateModulesResponseXml(response,schemaContextModules); } // /streams/ @@ -257,9 +267,12 @@ public class RestGetOperationTest extends JerseyTest { assertTrue(responseBody.contains("streams")); response = target(uri).request("application/yang.api+xml").get(); - responseBody = response.readEntity(String.class); - assertNotNull(responseBody); - assertTrue(responseBody.contains(" foundOperations = new HashSet<>(); + + NodeList operationsList = operationsElem.getChildNodes(); + for(int i = 0;i < operationsList.getLength();i++) { + org.w3c.dom.Node operation = operationsList.item(i); + + String namespace = operation.getNamespaceURI(); + String name = operation.getLocalName(); + QName opQName = QName.create(URI.create(namespace), null, name); + foundOperations.add(opQName); + } + + for(RpcDefinition schemaOp : schemaContext.getOperations()) { + assertTrue(foundOperations.contains(schemaOp.getQName().withoutRevision())); + } + + } + // /operations/pathToMountPoint/yang-ext:mount @Test public void getOperationsBehindMountPointTest() throws FileNotFoundException, UnsupportedEncodingException { @@ -329,7 +364,7 @@ public class RestGetOperationTest extends JerseyTest { MountInstance mountInstance = mock(MountInstance.class); when(mountInstance.getSchemaContext()).thenReturn(schemaContextBehindMountPoint); MountService mockMountService = mock(MountService.class); - when(mockMountService.getMountPoint(any(InstanceIdentifier.class))).thenReturn(mountInstance); + when(mockMountService.getMountPoint(any(YangInstanceIdentifier.class))).thenReturn(mountInstance); controllerContext.setMountService(mockMountService); @@ -337,15 +372,13 @@ public class RestGetOperationTest extends JerseyTest { Response response = target(uri).request("application/yang.api+xml").get(); assertEquals(200, response.getStatus()); - String responseBody = response.readEntity(String.class); - assertTrue("Xml response for /operations/mount_point rpc-behind-module1 is incorrect", - validateOperationsResponseXml(responseBody, "rpc-behind-module1", "module:1:behind:mount:point").find()); - assertTrue("Xml response for /operations/mount_point rpc-behind-module2 is incorrect", - validateOperationsResponseXml(responseBody, "rpc-behind-module2", "module:2:behind:mount:point").find()); + + Document responseDoc = response.readEntity(Document.class); + validateOperationsResponseXml(responseDoc, schemaContextBehindMountPoint); response = target(uri).request("application/yang.api+json").get(); assertEquals(200, response.getStatus()); - responseBody = response.readEntity(String.class); + String responseBody = response.readEntity(String.class); assertTrue("Json response for /operations/mount_point rpc-behind-module1 is incorrect", validateOperationsResponseJson(responseBody, "rpc-behind-module1", "module1-behind-mount-point").find()); assertTrue("Json response for /operations/mount_point rpc-behind-module2 is incorrect", @@ -420,7 +453,7 @@ public class RestGetOperationTest extends JerseyTest { MountInstance mountInstance = mock(MountInstance.class); when(mountInstance.getSchemaContext()).thenReturn(schemaContextBehindMountPoint); MountService mockMountService = mock(MountService.class); - when(mockMountService.getMountPoint(any(InstanceIdentifier.class))).thenReturn(mountInstance); + when(mockMountService.getMountPoint(any(YangInstanceIdentifier.class))).thenReturn(mountInstance); controllerContext.setMountService(mockMountService); @@ -441,15 +474,7 @@ public class RestGetOperationTest extends JerseyTest { response = target(uri).request("application/yang.api+xml").get(); assertEquals(200, response.getStatus()); - responseBody = response.readEntity(String.class); - assertTrue( - "module1-behind-mount-point in json wasn't found", - prepareXmlRegex("module1-behind-mount-point", "2014-02-03", "module:1:behind:mount:point", responseBody) - .find()); - assertTrue( - "module2-behind-mount-point in json wasn't found", - prepareXmlRegex("module2-behind-mount-point", "2014-02-04", "module:2:behind:mount:point", responseBody) - .find()); + validateModulesResponseXml(response, schemaContextBehindMountPoint); } @@ -462,7 +487,7 @@ public class RestGetOperationTest extends JerseyTest { MountInstance mountInstance = mock(MountInstance.class); when(mountInstance.getSchemaContext()).thenReturn(schemaContextBehindMountPoint); MountService mockMountService = mock(MountService.class); - when(mockMountService.getMountPoint(any(InstanceIdentifier.class))).thenReturn(mountInstance); + when(mockMountService.getMountPoint(any(YangInstanceIdentifier.class))).thenReturn(mountInstance); controllerContext.setMountService(mockMountService); @@ -481,26 +506,83 @@ public class RestGetOperationTest extends JerseyTest { response = target(uri).request("application/yang.api+xml").get(); assertEquals(200, response.getStatus()); - responseBody = response.readEntity(String.class); - assertTrue( - "module1-behind-mount-point in json wasn't found", - prepareXmlRegex("module1-behind-mount-point", "2014-02-03", "module:1:behind:mount:point", responseBody) - .find()); - split = responseBody.split(" 0); + + HashSet foundModules = new HashSet<>(); + + for(int i=0;i < moduleNodes.getLength();i++) { + org.w3c.dom.Node module = moduleNodes.item(i); + + QName name = assertedModuleXmlToModuleQName(module); + foundModules.add(name); + } + + assertAllModules(foundModules,schemaContext); + } + + private void assertAllModules(final Set foundModules, final SchemaContext schemaContext) { + for(Module module : schemaContext.getModules()) { + QName current = QName.create(module.getQNameModule(),module.getName()); + assertTrue("Module not found in response.",foundModules.contains(current)); + } + + } + + private QName assertedModuleXmlToModuleQName(final org.w3c.dom.Node module) { + assertEquals("module", module.getLocalName()); + assertEquals(RESTCONF_NS, module.getNamespaceURI()); + String revision = null; + String namespace = null; + String name = null; + + + NodeList childNodes = module.getChildNodes(); + + for(int i =0;i < childNodes.getLength(); i++) { + org.w3c.dom.Node child = childNodes.item(i); + assertEquals(RESTCONF_NS, child.getNamespaceURI()); + + switch(child.getLocalName()) { + case "name": + assertNull("Name element appeared multiple times",name); + name = child.getTextContent().trim(); + break; + case "revision": + assertNull("Revision element appeared multiple times",revision); + revision = child.getTextContent().trim(); + break; + + case "namespace": + assertNull("Namespace element appeared multiple times",namespace); + namespace = child.getTextContent().trim(); + break; + } + } + + assertNotNull("Revision was not part of xml",revision); + assertNotNull("Module namespace was not part of xml",namespace); + assertNotNull("Module identiffier was not part of xml",name); + + + // TODO Auto-generated method stub + + return QName.create(namespace,revision,name); } private void validateModulesResponseJson(final Response response) { @@ -542,34 +624,6 @@ public class RestGetOperationTest extends JerseyTest { } - private Matcher prepareXmlRegex(final String module, final String revision, final String namespace, - final String searchIn) { - StringBuilder regex = new StringBuilder(); - regex.append("^"); - - regex.append(".*"); - - regex.append(".*"); - regex.append(".*" + module); - regex.append(".*<\\/name>"); - - regex.append(".*"); - regex.append(".*" + revision); - regex.append(".*<\\/revision>"); - - regex.append(".*"); - regex.append(".*" + namespace); - regex.append(".*<\\/namespace>"); - - regex.append(".*<\\/module.*>"); - - regex.append(".*"); - regex.append("$"); - - Pattern ptrn = Pattern.compile(regex.toString(), Pattern.DOTALL); - return ptrn.matcher(searchIn); - } private void prepareMockForModulesTest(final ControllerContext mockedControllerContext) throws FileNotFoundException { @@ -590,11 +644,11 @@ public class RestGetOperationTest extends JerseyTest { } private void mockReadOperationalDataMethod() { - when(brokerFacade.readOperationalData(any(InstanceIdentifier.class))).thenReturn(answerFromGet); + when(brokerFacade.readOperationalData(any(YangInstanceIdentifier.class))).thenReturn(answerFromGet); } private void mockReadConfigurationDataMethod() { - when(brokerFacade.readConfigurationData(any(InstanceIdentifier.class))).thenReturn(answerFromGet); + when(brokerFacade.readConfigurationData(any(YangInstanceIdentifier.class))).thenReturn(answerFromGet); } private static CompositeNode prepareCompositeNodeWithIetfInterfacesInterfacesData() { @@ -626,7 +680,7 @@ public class RestGetOperationTest extends JerseyTest { getDataWithUriIncludeWhiteCharsParameter("operational"); } - private void getDataWithUriIncludeWhiteCharsParameter(String target) throws UnsupportedEncodingException { + private void getDataWithUriIncludeWhiteCharsParameter(final String target) throws UnsupportedEncodingException { mockReadConfigurationDataMethod(); String uri = "/" + target + "/ietf-interfaces:interfaces/interface/eth0"; Response response = target(uri).queryParam("prettyPrint", "false").request("application/xml").get(); @@ -672,7 +726,7 @@ public class RestGetOperationTest extends JerseyTest { toSimpleNodeData(toNestedQName("depth3-leaf2"), "depth3-leaf2-value")), toSimpleNodeData(toNestedQName("depth2-leaf1"), "depth2-leaf1-value"))); - when(brokerFacade.readConfigurationData(any(InstanceIdentifier.class))).thenReturn(depth1Cont); + when(brokerFacade.readConfigurationData(any(YangInstanceIdentifier.class))).thenReturn(depth1Cont); // Test config with depth 1 @@ -798,7 +852,7 @@ public class RestGetOperationTest extends JerseyTest { toSimpleNodeData(toNestedQName("depth4-leaf1"), "depth4-leaf1-value")), toSimpleNodeData(toNestedQName("depth3-leaf1"), "depth3-leaf1-value"))); - when(brokerFacade.readOperationalData(any(InstanceIdentifier.class))).thenReturn(depth2Cont1); + when(brokerFacade.readOperationalData(any(YangInstanceIdentifier.class))).thenReturn(depth2Cont1); response = target("/operational/nested-module:depth1-cont/depth2-cont1").queryParam("depth", "3") .request("application/xml").get();