X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=restconf%2Fsal-rest-connector%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Frestconf%2Futils%2Fmapping%2FRestconfMappingNodeUtilTest.java;h=c078a8468fb44a948007c4e1057fcc1be9e41ace;hb=266c09557b7cc6d97879e1c7efa7a7e0503c855a;hp=7cec6de6317d901a5f59db44a9f118a94fe5a2e9;hpb=82cc7322e6f45e858e2e9254669d03fd0e7d1c59;p=netconf.git diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/utils/mapping/RestconfMappingNodeUtilTest.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/utils/mapping/RestconfMappingNodeUtilTest.java index 7cec6de631..c078a8468f 100644 --- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/utils/mapping/RestconfMappingNodeUtilTest.java +++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/utils/mapping/RestconfMappingNodeUtilTest.java @@ -13,17 +13,19 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; - import com.google.common.collect.Sets; import java.util.AbstractMap; +import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; +import java.util.List; import java.util.Map; import java.util.Map.Entry; -import java.util.NoSuchElementException; import java.util.Set; +import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Rule; @@ -35,19 +37,27 @@ import org.opendaylight.controller.md.sal.rest.common.TestRestconfUtils; import org.opendaylight.netconf.sal.restconf.impl.RestconfDocumentedException; import org.opendaylight.netconf.sal.restconf.impl.RestconfError.ErrorTag; import org.opendaylight.netconf.sal.restconf.impl.RestconfError.ErrorType; -import org.opendaylight.restconf.Draft17; -import org.opendaylight.restconf.Draft17.MonitoringModule; -import org.opendaylight.restconf.Draft17.RestconfModule; +import org.opendaylight.restconf.Draft18; +import org.opendaylight.restconf.Draft18.IetfYangLibrary; +import org.opendaylight.restconf.Draft18.MonitoringModule; +import org.opendaylight.restconf.Draft18.MonitoringModule.QueryParams; +import org.opendaylight.restconf.Draft18.RestconfModule; import org.opendaylight.restconf.utils.schema.context.RestconfSchemaUtil; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.SimpleDateFormatUtil; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; +import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; +import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; import org.opendaylight.yangtools.yang.data.api.schema.LeafNode; +import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode; +import org.opendaylight.yangtools.yang.data.api.schema.LeafSetNode; import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.MapNode; +import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.impl.schema.nodes.AbstractImmutableDataContainerAttrNode; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; -import org.opendaylight.yangtools.yang.model.api.GroupingDefinition; import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; @@ -70,13 +80,20 @@ public class RestconfMappingNodeUtilTest { private static Set modules; private static SchemaContext schemaContext; + private static SchemaContext schemaContextCapabilites; + + private static Set modulesRest; + private Set allStreamChildNodes; @BeforeClass public static void loadTestSchemaContextAndModules() throws Exception { RestconfMappingNodeUtilTest.schemaContext = TestRestconfUtils.loadSchemaContext( "/modules/restconf-module-testing"); - RestconfMappingNodeUtilTest.modules = TestRestconfUtils.loadSchemaContext("/modules").getModules(); + RestconfMappingNodeUtilTest.schemaContextCapabilites = TestRestconfUtils.loadSchemaContext("/modules"); + RestconfMappingNodeUtilTest.modules = schemaContextCapabilites.getModules(); + RestconfMappingNodeUtilTest.modulesRest = + TestRestconfUtils.loadSchemaContext("/modules/restconf-module-testing").getModules(); } @Before @@ -101,11 +118,40 @@ public class RestconfMappingNodeUtilTest { @Test public void restconfMappingNodeTest() { // write modules into list module in Restconf - final MapNode modules = RestconfMappingNodeUtil.restconfMappingNode( - getTestingRestconfModule("ietf-restconf"), RestconfMappingNodeUtilTest.modules); + final Module ietfYangLibMod = + schemaContext.findModuleByNamespaceAndRevision(IetfYangLibrary.URI_MODULE, IetfYangLibrary.DATE); + final NormalizedNode>> modules = + RestconfMappingNodeUtil.mapModulesByIetfYangLibraryYang(RestconfMappingNodeUtilTest.modules, + ietfYangLibMod, schemaContext, "1"); // verify loaded modules - verifyLoadedModules(modules); + verifyLoadedModules((ContainerNode) modules); + } + + @Test + public void restconfStateCapabilitesTest() { + final Module monitoringModule = schemaContextCapabilites + .findModuleByNamespaceAndRevision(MonitoringModule.URI_MODULE, MonitoringModule.DATE); + final NormalizedNode>> normNode = + RestconfMappingNodeUtil.mapCapabilites(monitoringModule); + assertNotNull(normNode); + final List listOfValues = new ArrayList<>(); + + for (final DataContainerChild child : ((ContainerNode) normNode).getValue()) { + if (child.getNodeType().equals(MonitoringModule.CONT_CAPABILITES_QNAME)) { + for (final DataContainerChild dataContainerChild : ((ContainerNode) child) + .getValue()) { + for (final Object entry : ((LeafSetNode) dataContainerChild).getValue()) { + listOfValues.add(((LeafSetEntryNode) entry).getValue()); + } + } + } + } + Assert.assertTrue(listOfValues.contains(QueryParams.DEPTH)); + Assert.assertTrue(listOfValues.contains(QueryParams.FIELDS)); + Assert.assertTrue(listOfValues.contains(QueryParams.FILTER)); + Assert.assertTrue(listOfValues.contains(QueryParams.REPLAY)); + Assert.assertTrue(listOfValues.contains(QueryParams.WITH_DEFAULTS)); } /** @@ -128,293 +174,13 @@ public class RestconfMappingNodeUtilTest { verifyStream(stream1, mapEntryNode); } - /** - * Test mapping modules to list with null Restconf module. Test fails with - * NullPointerException. - */ - @Test - public void restconfMappingNodeMissingRestconfModuleNegativeTest() { - thrown.expect(NullPointerException.class); - RestconfMappingNodeUtil.restconfMappingNode(null, RestconfMappingNodeUtilTest.modules); - } - - /** - * Try to map modules into module list when Restconf module is available but does not contain node - * {@link RestconfModule#MODULE_LIST_SCHEMA_NODE}. RestconfDocumentedException is expected and error - * type, error tag and error status code are compared to expected values. - */ - @Test - public void restconfMappingNodeMissingModuleListNegativeTest() { - try { - RestconfMappingNodeUtil.restconfMappingNode( - getTestingRestconfModule("restconf-module-with-missing-list-module"), - RestconfMappingNodeUtilTest.modules); - fail("Test should fail due to missing " - + RestconfModule.MODULE_LIST_SCHEMA_NODE - + " node in Restconf module"); - } catch (final RestconfDocumentedException e) { - assertEquals("Error type is not correct", - ErrorType.PROTOCOL, e.getErrors().get(0).getErrorType()); - assertEquals("Error tag is not correct", - ErrorTag.DATA_MISSING, e.getErrors().get(0).getErrorTag()); - assertEquals("Error status code is not correct", - 404, e.getErrors().get(0).getErrorTag().getStatusCode()); - } - } - - /** - * Try to map modules into module list when Restconf module is available and contains node - * {@link RestconfModule#MODULE_LIST_SCHEMA_NODE} but it is not of type list. IllegalStateException - * should be returned. - */ - @Test - public void restconfMappingNodeIllegalModuleListNegativeTest() { - thrown.expect(IllegalStateException.class); - RestconfMappingNodeUtil.restconfMappingNode( - getTestingRestconfModule("restconf-module-with-illegal-list-module"), - RestconfMappingNodeUtilTest.modules); - } - - /** - * Map null set of modules to module list. NullPointerException is expected. - */ - @Test - public void restconfMappingNodeNullModulesNegativeTest() { - thrown.expect(NullPointerException.class); - RestconfMappingNodeUtil.restconfMappingNode(getTestingRestconfModule("ietf-restconf"), null); - } - - /** - * Try to map modules into list module of Restconf module when Restconf module does not contain grouping - * {@link RestconfModule#RESTCONF_GROUPING_SCHEMA_NODE}. RestconfDocumentedException is expected and - * error type, error tag and error status code are compared to expected values. - */ - @Test - public void restconfMappingNodeNoRestconfGroupingNegativeTest() { - try { - RestconfMappingNodeUtil.restconfMappingNode( - getTestingRestconfModule("restconf-module-with-missing-grouping-restconf"), - RestconfMappingNodeUtilTest.modules); - fail("Test should fail due to missing " - + RestconfModule.RESTCONF_GROUPING_SCHEMA_NODE - + " grouping in Restconf module groupings"); - } catch (final RestconfDocumentedException e) { - assertEquals("Error type is not correct", - ErrorType.PROTOCOL, e.getErrors().get(0).getErrorType()); - assertEquals("Error tag is not correct", - ErrorTag.DATA_MISSING, e.getErrors().get(0).getErrorTag()); - assertEquals("Error status code is not correct", - 404, e.getErrors().get(0).getErrorTag().getStatusCode()); - } - } - - /** - * Try to map modules into list module of Restconf module when Restconf module does not contain any grouping. - * Test is catching RestconfDocumentedException and checking error type, error and error status code. - */ - @Test - public void restconfMappingNodeNoGroupingsNegativeTest() { - // prepare conditions - final Module mockRestconfModule = mock(Module.class); - when(mockRestconfModule.getGroupings()).thenReturn(Sets.newHashSet()); - - // test - try { - RestconfMappingNodeUtil.restconfMappingNode(mockRestconfModule, RestconfMappingNodeUtilTest.modules); - fail("Test should fail due to no child nodes in Restconf grouping"); - } catch (final RestconfDocumentedException e) { - assertEquals("Error type is not correct", - ErrorType.PROTOCOL, e.getErrors().get(0).getErrorType()); - assertEquals("Error tag is not correct", - ErrorTag.DATA_MISSING, e.getErrors().get(0).getErrorTag()); - assertEquals("Error status code is not correct", - 404, e.getErrors().get(0).getErrorTag().getStatusCode()); - } - } - - /** - * Test when there is a grouping with name {@link RestconfModule#RESTCONF_GROUPING_SCHEMA_NODE} in Restconf - * module but contains no child nodes. NoSuchElementException is expected. - */ - @Test - public void restconfMappingNodeRestconfGroupingNoChildNegativeTest() { - // prepare conditions - final Module mockRestconfModule = mock(Module.class); - final GroupingDefinition mockRestconfGrouping = mock(GroupingDefinition.class); - when(mockRestconfGrouping.getQName()).thenReturn(QName.create( - "", RestconfModule.RESTCONF_GROUPING_SCHEMA_NODE)); - when(mockRestconfModule.getGroupings()).thenReturn(Sets.newHashSet(mockRestconfGrouping)); - when(mockRestconfGrouping.getChildNodes()).thenReturn(Sets.newHashSet()); - - // test - thrown.expect(NoSuchElementException.class); - RestconfMappingNodeUtil.restconfMappingNode(mockRestconfModule, RestconfMappingNodeUtilTest.modules); - } - - /** - * {@link RestconfModule#MODULE_LIST_SCHEMA_NODE} in Restconf module does not contain any child with name - * {@link RestconfMappingNodeConstants#NAME}. Test fails with RestconfDocumentedException checking - * error type, error tag and error status code. - */ - @Test - public void restconfMappingNodeMissingNameNegativeTest() { - try { - RestconfMappingNodeUtil.restconfMappingNode( - getTestingRestconfModule("restconf-module-with-missing-leaf-name-in-list-module"), - RestconfMappingNodeUtilTest.modules); - fail("Test should fail due to missing leaf " - + RestconfMappingNodeConstants.NAME - + " in " - + RestconfModule.MODULE_LIST_SCHEMA_NODE - + " node"); - } catch (final RestconfDocumentedException e) { - assertEquals("Error type is not correct", - ErrorType.PROTOCOL, e.getErrors().get(0).getErrorType()); - assertEquals("Error tag is not correct", - ErrorTag.DATA_MISSING, e.getErrors().get(0).getErrorTag()); - assertEquals("Error status code is not correct", - 404, e.getErrors().get(0).getErrorTag().getStatusCode()); - } - } - - /** - * {@link RestconfModule#MODULE_LIST_SCHEMA_NODE} in Restconf module does not contain any child with name - * {@link RestconfMappingNodeConstants#REVISION}. Test fails with RestconfDocumentedException checking - * error type, error tag and error status code. - */ - @Test - public void restconfMappingNodeMissingRevisionNegativeTest() { - try { - RestconfMappingNodeUtil.restconfMappingNode( - getTestingRestconfModule("restconf-module-with-missing-leaf-revision-in-list-module"), - RestconfMappingNodeUtilTest.modules); - fail("Test should fail due to missing leaf " - + RestconfMappingNodeConstants.REVISION - + " in " - + RestconfModule.MODULE_LIST_SCHEMA_NODE - + " node"); - } catch (final RestconfDocumentedException e) { - assertEquals("Error type is not correct", - ErrorType.PROTOCOL, e.getErrors().get(0).getErrorType()); - assertEquals("Error tag is not correct", - ErrorTag.DATA_MISSING, e.getErrors().get(0).getErrorTag()); - assertEquals("Error status code is not correct", - 404, e.getErrors().get(0).getErrorTag().getStatusCode()); - } - } - - /** - * {@link RestconfModule#MODULE_LIST_SCHEMA_NODE} in Restconf module does not contain any child with name - * {@link RestconfMappingNodeConstants#NAMESPACE}. Test fails with RestconfDocumentedException - * checking error type, error tag and error status code. - */ - @Test - public void restconfMappingNodeMissingNamespaceNegativeTest() { - try { - RestconfMappingNodeUtil.restconfMappingNode( - getTestingRestconfModule("restconf-module-with-missing-leaf-namespace-in-list-module"), - RestconfMappingNodeUtilTest.modules); - fail("Test should fail due to missing leaf " - + RestconfMappingNodeConstants.NAMESPACE - + " in " - + RestconfModule.MODULE_LIST_SCHEMA_NODE - + " node"); - } catch (final RestconfDocumentedException e) { - assertEquals("Error type is not correct", - ErrorType.PROTOCOL, e.getErrors().get(0).getErrorType()); - assertEquals("Error tag is not correct", - ErrorTag.DATA_MISSING, e.getErrors().get(0).getErrorTag()); - assertEquals("Error status code is not correct", - 404, e.getErrors().get(0).getErrorTag().getStatusCode()); - } - } - - /** - * {@link RestconfModule#MODULE_LIST_SCHEMA_NODE} in Restconf module does not contain any child with name - * {@link RestconfMappingNodeConstants#FEATURE}. Test fails with RestconfDocumentedException checking - * error type, error tag and error status code. - */ - @Test - public void restconfMappingNodeMissingFeaturesNegativeTest() { - try { - RestconfMappingNodeUtil.restconfMappingNode( - getTestingRestconfModule("restconf-module-with-missing-leaf-list-feature-in-list-module"), - RestconfMappingNodeUtilTest.modules); - fail("Test should fail due to missing leaf " - + RestconfMappingNodeConstants.FEATURE - + " in " - + RestconfModule.MODULE_LIST_SCHEMA_NODE - + " node"); - } catch (final RestconfDocumentedException e) { - assertEquals("Error type is not correct", - ErrorType.PROTOCOL, e.getErrors().get(0).getErrorType()); - assertEquals("Error tag is not correct", - ErrorTag.DATA_MISSING, e.getErrors().get(0).getErrorTag()); - assertEquals("Error status code is not correct", - 404, e.getErrors().get(0).getErrorTag().getStatusCode()); - } - } - - /** - * - * {@link RestconfModule#MODULE_LIST_SCHEMA_NODE} in Restconf module contains child with name - * {@link RestconfMappingNodeConstants#NAME} but it is not of type leaf. Test fails with - * IllegalStateException. - */ - @Test - public void restconfMappingNodeIllegalNameNegativeTest() { - thrown.expect(IllegalStateException.class); - RestconfMappingNodeUtil.restconfMappingNode( - getTestingRestconfModule("restconf-module-with-illegal-leaf-name-in-list-module"), - RestconfMappingNodeUtilTest.modules); - } - - /** - * - * {@link RestconfModule#MODULE_LIST_SCHEMA_NODE} in Restconf module contains child with name - * {@link RestconfMappingNodeConstants#REVISION} but it is not of type leaf. Test fails with - * IllegalStateException. - */ - @Test - public void restconfMappingNodeIllegalRevisionNegativeTest() { - thrown.expect(IllegalStateException.class); - RestconfMappingNodeUtil.restconfMappingNode( - getTestingRestconfModule("restconf-module-with-illegal-leaf-revision-in-list-module"), - RestconfMappingNodeUtilTest.modules); - } - - /** - * {@link RestconfModule#MODULE_LIST_SCHEMA_NODE} in Restconf module contains child with name - * {@link RestconfMappingNodeConstants#NAMESPACE} but it is not of type leaf. Test fails with - * IllegalStateException. - */ - @Test - public void restconfMappingNodeIllegalNamespaceNegativeTest() { - thrown.expect(IllegalStateException.class); - RestconfMappingNodeUtil.restconfMappingNode( - getTestingRestconfModule("restconf-module-with-illegal-leaf-namespace-in-list-module"), - RestconfMappingNodeUtilTest.modules); - } - - /** - * Module list in Restconf module contains child with name {@link RestconfMappingNodeConstants#FEATURE} but it is - * not of type leaf-list. Test fails with IllegalStateException. - */ - @Test - public void restconfMappingNodeIllegalFeatureNegativeTest() { - thrown.expect(IllegalStateException.class); - RestconfMappingNodeUtil.restconfMappingNode( - getTestingRestconfModule("restconf-module-with-illegal-leaf-list-feature-in-list-module"), - RestconfMappingNodeUtilTest.modules); - } - /** * Try to map streams when {@link MonitoringModule#STREAM_LIST_SCHEMA_NODE} is null. * Test is expected to fail catching IllegalStateException. */ @Test public void toStreamEntryNodeNullListStreamNegativeTest() { - thrown.expect(IllegalStateException.class); + this.thrown.expect(IllegalStateException.class); RestconfMappingNodeUtil.toStreamEntryNode("stream-1", null); } @@ -424,7 +190,7 @@ public class RestconfMappingNodeUtilTest { */ @Test public void toStreamEntryNodeIllegalListStreamNegativeTest() { - thrown.expect(IllegalStateException.class); + this.thrown.expect(IllegalStateException.class); RestconfMappingNodeUtil.toStreamEntryNode("stream-1", mock(LeafSchemaNode.class)); } @@ -581,7 +347,7 @@ public class RestconfMappingNodeUtilTest { public void toStreamEntryNodeStreamNameNegativeTest() { prepareMockListWithIllegalLeaf(this.leafName); - thrown.expect(IllegalStateException.class); + this.thrown.expect(IllegalStateException.class); RestconfMappingNodeUtil.toStreamEntryNode("stream-1", this.mockStreamList); } @@ -593,7 +359,7 @@ public class RestconfMappingNodeUtilTest { public void toStreamEntryNodeStreamDescriptionNegativeTest() { prepareMockListWithIllegalLeaf(this.leafDescription); - thrown.expect(IllegalStateException.class); + this.thrown.expect(IllegalStateException.class); RestconfMappingNodeUtil.toStreamEntryNode("stream-1", this.mockStreamList); } @@ -605,7 +371,7 @@ public class RestconfMappingNodeUtilTest { public void toStreamEntryNodeStreamReplaySupportNegativeTest() { prepareMockListWithIllegalLeaf(this.leafReplaySupport); - thrown.expect(IllegalStateException.class); + this.thrown.expect(IllegalStateException.class); RestconfMappingNodeUtil.toStreamEntryNode("stream-1", this.mockStreamList); } @@ -617,7 +383,7 @@ public class RestconfMappingNodeUtilTest { public void toStreamEntryNodeStreamReplayLogNegativeTest() { prepareMockListWithIllegalLeaf(this.leafReplayLog); - thrown.expect(IllegalStateException.class); + this.thrown.expect(IllegalStateException.class); RestconfMappingNodeUtil.toStreamEntryNode("stream-1", this.mockStreamList); } @@ -629,56 +395,46 @@ public class RestconfMappingNodeUtilTest { public void toStreamEntryNodeStreamEventsNegativeTest() { prepareMockListWithIllegalLeaf(this.leafEvents); - thrown.expect(IllegalStateException.class); + this.thrown.expect(IllegalStateException.class); RestconfMappingNodeUtil.toStreamEntryNode("stream-1", this.mockStreamList); } /** - * Utils + * Verify loaded modules + * + * @param containerNode + * - modules */ + private void verifyLoadedModules(final ContainerNode containerNode) { - /** - * Verify loaded modules from Restconf module - * @param modules Returned modules node - */ - private void verifyLoadedModules(final MapNode modules) { - final Iterator iterator = modules.getValue().iterator(); final Map loadedModules = new HashMap<>(); - while (iterator.hasNext()) { - final Iterator entries = ((AbstractImmutableDataContainerAttrNode) iterator.next()) - .getChildren().entrySet().iterator(); - - String name = null; - String revision = null; - - boolean notAllowedKey = false; - while (entries.hasNext()) { - final Entry e = ((AbstractMap.SimpleImmutableEntry) entries.next()); - final String key = ((YangInstanceIdentifier.NodeIdentifier) e.getKey()).getNodeType().getLocalName(); - - switch (key) { - case RestconfMappingNodeConstants.NAME: - name = (String) ((LeafNode) e.getValue()).getValue(); - break; - case RestconfMappingNodeConstants.REVISION: - revision = (String) ((LeafNode) e.getValue()).getValue(); - break; - case RestconfMappingNodeConstants.NAMESPACE: - // fall through - case RestconfMappingNodeConstants.FEATURE: - break; - default: - notAllowedKey = true; - break; + for (final DataContainerChild child : containerNode.getValue()) { + if (child instanceof LeafNode) { + assertEquals(IetfYangLibrary.MODULE_SET_ID_LEAF_QNAME, ((LeafNode) child).getNodeType()); + } + if (child instanceof MapNode) { + assertEquals(IetfYangLibrary.MODULE_QNAME_LIST, ((MapNode) child).getNodeType()); + for (final MapEntryNode mapEntryNode : ((MapNode) child).getValue()) { + String name = ""; + String revision = ""; + for (final DataContainerChild dataContainerChild : mapEntryNode + .getValue()) { + switch (dataContainerChild.getNodeType().getLocalName()) { + case IetfYangLibrary.SPECIFIC_MODULE_NAME_LEAF: + name = String.valueOf(((LeafNode) dataContainerChild).getValue()); + break; + case IetfYangLibrary.SPECIFIC_MODULE_REVISION_LEAF: + revision = String.valueOf(((LeafNode) dataContainerChild).getValue()); + break; + } + } + loadedModules.put(name, revision); } } - - assertFalse("Not allowed key in list module found", notAllowedKey); - loadedModules.put(name, revision); } - verifyLoadedModules(RestconfMappingNodeUtilTest.modules, loadedModules); + verifyLoadedModules(RestconfMappingNodeUtilTest.modulesRest, loadedModules); } /** @@ -756,7 +512,7 @@ public class RestconfMappingNodeUtilTest { */ private Module getTestingRestconfModule(final String s) { return RestconfMappingNodeUtilTest.schemaContext.findModuleByName( - s, Draft17.RestconfModule.IETF_RESTCONF_QNAME.getRevision()); + s, Draft18.RestconfModule.IETF_RESTCONF_QNAME.getRevision()); } /**