X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-rest-connector%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Frestconf%2Fimpl%2Ftest%2FTestUtils.java;h=366d99dbcb88a3dcb18f55c826b0b1c2dcc09b93;hp=bc941b997e35dd63c8a3250cb52e8ccf66e27314;hb=9212fed678702583f4a555641208cf1c7b45b829;hpb=1306d0ed4b53625a1ba83e6aa5d693cd12ce7001 diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/TestUtils.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/TestUtils.java index bc941b997e..366d99dbcb 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/TestUtils.java +++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/TestUtils.java @@ -1,13 +1,13 @@ package org.opendaylight.controller.sal.restconf.impl.test; -import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import java.io.*; -import java.net.*; +import java.net.URI; +import java.net.URISyntaxException; import java.sql.Date; import java.util.*; import java.util.concurrent.Future; @@ -20,21 +20,23 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; import org.opendaylight.controller.md.sal.common.api.TransactionStatus; -import org.opendaylight.controller.sal.rest.impl.StructuredDataToJsonProvider; +import org.opendaylight.controller.sal.rest.impl.*; import org.opendaylight.controller.sal.restconf.impl.*; -import org.opendaylight.yangtools.yang.common.*; +import org.opendaylight.yangtools.yang.common.QName; +import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.data.api.*; import org.opendaylight.yangtools.yang.data.impl.XmlTreeBuilder; import org.opendaylight.yangtools.yang.model.api.*; import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser; import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.w3c.dom.Document; import org.xml.sax.SAXException; import com.google.common.base.Preconditions; -final class TestUtils { +public final class TestUtils { private static final Logger logger = LoggerFactory.getLogger(TestUtils.class); @@ -75,27 +77,7 @@ final class TestUtils { return result; } - public static CompositeNode loadCompositeNode(InputStream xmlInputStream) throws FileNotFoundException { - if (xmlInputStream == null) { - throw new IllegalArgumentException(); - } - Node dataTree; - try { - dataTree = XmlTreeBuilder.buildDataTree(xmlInputStream); - } catch (XMLStreamException e) { - logger.error("Error during building data tree from XML", e); - return null; - } - if (dataTree == null) { - logger.error("data tree is null"); - return null; - } - if (dataTree instanceof SimpleNode) { - logger.error("RPC XML was resolved as SimpleNode"); - return null; - } - return (CompositeNode) dataTree; - } + public static Document loadDocumentFrom(InputStream inputStream) { try { @@ -131,22 +113,36 @@ final class TestUtils { } - static String convertCompositeNodeDataAndYangToJson(CompositeNode compositeNode, String yangPath, String outputPath) { - return convertCompositeNodeDataAndYangToJson(compositeNode, yangPath, outputPath, null, null); - } - - static String convertCompositeNodeDataAndYangToJson(CompositeNode compositeNode, String yangPath, + public static String convertCompositeNodeDataAndYangToJson(CompositeNode compositeNode, String yangPath, String outputPath, String searchedModuleName, String searchedDataSchemaName) { - String jsonResult = null; - Set modules = null; + Set modules = resolveModules(yangPath); + Module module = resolveModule(searchedModuleName, modules); + DataSchemaNode dataSchemaNode = resolveDataSchemaNode(module, searchedDataSchemaName); + + normalizeCompositeNode(compositeNode, modules, dataSchemaNode, searchedModuleName + ":" + + searchedDataSchemaName); try { - modules = TestUtils.loadModules(ToJsonBasicDataTypesTest.class.getResource(yangPath).getPath()); - } catch (FileNotFoundException e) { + return writeCompNodeWithSchemaContextToJson(compositeNode, modules, dataSchemaNode); + } catch (WebApplicationException | IOException e) { + // TODO Auto-generated catch block e.printStackTrace(); } - assertNotNull("modules can't be null.", modules); + return null; + + } + public static void normalizeCompositeNode(CompositeNode compositeNode, Set modules, + DataSchemaNode dataSchemaNode, String schemaNodePath) { + RestconfImpl restconf = RestconfImpl.getInstance(); + ControllerContext.getInstance().setSchemas(TestUtils.loadSchemaContext(modules)); + + TestUtils.prepareMockForRestconfBeforeNormalization(modules, dataSchemaNode, restconf); + restconf.createConfigurationData(schemaNodePath, compositeNode); + } + + public static Module resolveModule(String searchedModuleName, Set modules) { + assertNotNull("modules can't be null.", modules); Module module = null; if (searchedModuleName != null) { for (Module m : modules) { @@ -158,12 +154,24 @@ final class TestUtils { } else if (modules.size() == 1) { module = modules.iterator().next(); } - assertNotNull("Module is missing", module); + return module; + } - assertNotNull("Composite node can't be null", compositeNode); + public static Set resolveModules(String yangPath) { + Set modules = null; + + try { + modules = TestUtils.loadModules(TestUtils.class.getResource(yangPath).getPath()); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } + + return modules; + } + + public static DataSchemaNode resolveDataSchemaNode(Module module, String searchedDataSchemaName) { + assertNotNull("Module is missing", module); - StructuredDataToJsonProvider structuredDataToJsonProvider = StructuredDataToJsonProvider.INSTANCE; - ByteArrayOutputStream byteArrayOS = new ByteArrayOutputStream(); DataSchemaNode dataSchemaNode = null; if (searchedDataSchemaName != null) { for (DataSchemaNode dsn : module.getChildNodes()) { @@ -174,36 +182,36 @@ final class TestUtils { } else if (module.getChildNodes().size() == 1) { dataSchemaNode = module.getChildNodes().iterator().next(); } + return dataSchemaNode; + } + + public static String writeCompNodeWithSchemaContextToJson(CompositeNode compositeNode, Set modules, + DataSchemaNode dataSchemaNode) throws IOException, WebApplicationException { + String jsonResult; + assertNotNull(dataSchemaNode); - // SchemaContextUtil. + assertNotNull("Composite node can't be null", compositeNode); + ByteArrayOutputStream byteArrayOS = new ByteArrayOutputStream(); - ControllerContext controllerContext = ControllerContext.getInstance(); - controllerContext.setSchemas(loadSchemaContext(modules)); - StructuredData structuredData = new StructuredData(compositeNode, dataSchemaNode); - try { - structuredDataToJsonProvider.writeTo(structuredData, null, null, null, null, null, byteArrayOS); - } catch (WebApplicationException | IOException e) { - e.printStackTrace(); - } - assertFalse("Returning JSON string can't be empty for node " + dataSchemaNode.getQName().getLocalName(), - byteArrayOS.toString().isEmpty()); + ControllerContext.getInstance().setSchemas(loadSchemaContext(modules)); + + StructuredDataToJsonProvider structuredDataToJsonProvider = StructuredDataToJsonProvider.INSTANCE; + structuredDataToJsonProvider.writeTo(new StructuredData(compositeNode, dataSchemaNode), null, null, null, null, + null, byteArrayOS); jsonResult = byteArrayOS.toString(); - try { - outputToFile(byteArrayOS, outputPath); - } catch (IOException e) { - System.out.println("Output file wasn't cloased sucessfuly."); - } return jsonResult; } - static CompositeNode loadCompositeNode(String xmlDataPath) { - InputStream xmlStream = ToJsonBasicDataTypesTest.class.getResourceAsStream(xmlDataPath); + public static CompositeNode loadCompositeNode(String xmlDataPath) { + InputStream xmlStream = TestUtils.class.getResourceAsStream(xmlDataPath); CompositeNode compositeNode = null; try { - compositeNode = TestUtils.loadCompositeNode(xmlStream); - } catch (FileNotFoundException e) { + XmlReader xmlReader = new XmlReader(); + compositeNode = xmlReader.read(xmlStream); + + } catch (UnsupportedFormatException | XMLStreamException e) { e.printStackTrace(); } return compositeNode; @@ -212,7 +220,7 @@ final class TestUtils { static void outputToFile(ByteArrayOutputStream outputStream, String outputDir) throws IOException { FileOutputStream fileOS = null; try { - String path = ToJsonBasicDataTypesTest.class.getResource(outputDir).getPath(); + String path = TestUtils.class.getResource(outputDir).getPath(); File outFile = new File(path + "/data.json"); fileOS = new FileOutputStream(outFile); try { @@ -261,7 +269,7 @@ final class TestUtils { } private static FileReader getFileReader(String path) { - String fullPath = ToJsonBasicDataTypesTest.class.getResource(path).getPath(); + String fullPath = TestUtils.class.getResource(path).getPath(); assertNotNull("Path to file can't be null.", fullPath); File file = new File(fullPath); assertNotNull("File can't be null", file); @@ -293,7 +301,7 @@ final class TestUtils { return strBuilder.toString(); } - static QName buildQName(String name, String uri, String date) { + public static QName buildQName(String name, String uri, String date) { try { URI u = new URI(uri); Date dt = null; @@ -306,11 +314,11 @@ final class TestUtils { } } - static QName buildQName(String name) { + public static QName buildQName(String name) { return buildQName(name, "", null); } - static void supplementNamespace(DataSchemaNode dataSchemaNode, CompositeNode compositeNode) { + public static void supplementNamespace(DataSchemaNode dataSchemaNode, CompositeNode compositeNode) { RestconfImpl restconf = RestconfImpl.getInstance(); InstanceIdWithSchemaNode instIdAndSchema = new InstanceIdWithSchemaNode(mock(InstanceIdentifier.class), @@ -319,7 +327,8 @@ final class TestUtils { ControllerContext controllerContext = mock(ControllerContext.class); BrokerFacade broker = mock(BrokerFacade.class); - RpcResult rpcResult = DummyRpcResult.builder().result(TransactionStatus.COMMITED).build(); + RpcResult rpcResult = new DummyRpcResult.Builder().result( + TransactionStatus.COMMITED).build(); Future> future = DummyFuture.builder().rpcResult(rpcResult).build(); when(controllerContext.toInstanceIdentifier(any(String.class))).thenReturn(instIdAndSchema); when(broker.commitConfigurationDataPut(any(InstanceIdentifier.class), any(CompositeNode.class))).thenReturn( @@ -333,13 +342,14 @@ final class TestUtils { restconf.createConfigurationData("something", compositeNode); } - static DataSchemaNode obtainSchemaFromYang(String yangFolder) throws FileNotFoundException { + public static DataSchemaNode obtainSchemaFromYang(String yangFolder) throws FileNotFoundException { return obtainSchemaFromYang(yangFolder, null); } - static DataSchemaNode obtainSchemaFromYang(String yangFolder, String moduleName) throws FileNotFoundException { + public static DataSchemaNode obtainSchemaFromYang(String yangFolder, String moduleName) + throws FileNotFoundException { Set modules = null; - modules = TestUtils.loadModules(ToJsonBasicDataTypesTest.class.getResource(yangFolder).getPath()); + modules = TestUtils.loadModules(TestUtils.class.getResource(yangFolder).getPath()); if (modules == null) { return null; @@ -378,7 +388,7 @@ final class TestUtils { } - static void addDummyNamespaceToAllNodes(NodeWrapper wrappedNode) throws URISyntaxException { + public static void addDummyNamespaceToAllNodes(NodeWrapper wrappedNode) throws URISyntaxException { wrappedNode.setNamespace(new URI("")); if (wrappedNode instanceof CompositeNodeWrapper) { for (NodeWrapper childNodeWrapper : ((CompositeNodeWrapper) wrappedNode).getValues()) { @@ -387,4 +397,56 @@ final class TestUtils { } } + public static void prepareMockForRestconfBeforeNormalization(Set modules, DataSchemaNode dataSchemaNode, + RestconfImpl restconf) { + ControllerContext instance = ControllerContext.getInstance(); + instance.setSchemas(TestUtils.loadSchemaContext(modules)); + restconf.setControllerContext(ControllerContext.getInstance()); + + BrokerFacade mockedBrokerFacade = mock(BrokerFacade.class); + when(mockedBrokerFacade.commitConfigurationDataPut(any(InstanceIdentifier.class), any(CompositeNode.class))) + .thenReturn( + new DummyFuture.Builder().rpcResult( + new DummyRpcResult.Builder().result(TransactionStatus.COMMITED) + .build()).build()); + restconf.setBroker(mockedBrokerFacade); + } + + static CompositeNode loadCompositeNodeWithXmlTreeBuilder(String xmlDataPath) { + InputStream xmlStream = TestUtils.class.getResourceAsStream(xmlDataPath); + CompositeNode compositeNode = null; + try { + compositeNode = TestUtils.loadCompositeNodeWithXmlTreeBuilder(xmlStream); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } + return compositeNode; + + + + } + + + public static CompositeNode loadCompositeNodeWithXmlTreeBuilder(InputStream xmlInputStream) throws FileNotFoundException { + if (xmlInputStream == null) { + throw new IllegalArgumentException(); + } + Node dataTree; + try { + dataTree = XmlTreeBuilder.buildDataTree(xmlInputStream); + } catch (XMLStreamException e) { + logger.error("Error during building data tree from XML", e); + return null; + } + if (dataTree == null) { + logger.error("data tree is null"); + return null; + } + if (dataTree instanceof SimpleNode) { + logger.error("RPC XML was resolved as SimpleNode"); + return null; + } + return (CompositeNode) dataTree; + } + }