import java.util.Map;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.opendaylight.restconf.nb.rfc8040.Rfc8040;
import org.opendaylight.restconf.nb.rfc8040.Rfc8040.IetfYangLibrary;
-import org.opendaylight.restconf.nb.rfc8040.Rfc8040.MonitoringModule;
-import org.opendaylight.restconf.nb.rfc8040.Rfc8040.MonitoringModule.QueryParams;
-import org.opendaylight.restconf.nb.rfc8040.Rfc8040.RestconfModule;
import org.opendaylight.restconf.nb.rfc8040.TestRestconfUtils;
import org.opendaylight.restconf.nb.rfc8040.utils.parser.ParserIdentifier;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.restconf.monitoring.rev170126.RestconfState;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.restconf.monitoring.rev170126.restconf.state.Capabilities;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.common.Revision;
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;
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.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.model.api.EffectiveModelContext;
import org.opendaylight.yangtools.yang.model.api.Module;
import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
@BeforeClass
public static void loadTestSchemaContextAndModules() throws Exception {
+ // FIXME: assemble these from dependencies
schemaContext =
YangParserTestUtils.parseYangFiles(TestRestconfUtils.loadFiles("/modules/restconf-module-testing"));
schemaContextMonitoring = YangParserTestUtils.parseYangFiles(TestRestconfUtils.loadFiles("/modules"));
@Test
public void restconfMappingNodeTest() {
// write modules into list module in Restconf
- final Module ietfYangLibMod = schemaContext.findModule(IetfYangLibrary.MODULE_QNAME).get();
final ContainerNode mods = RestconfMappingNodeUtil.mapModulesByIetfYangLibraryYang(
RestconfMappingNodeUtilTest.modules, schemaContext, "1");
@Test
public void restconfStateCapabilitesTest() {
- final Module monitoringModule = schemaContextMonitoring.findModule(MonitoringModule.MODULE_QNAME).get();
+ final Module monitoringModule = schemaContextMonitoring.findModule(RestconfState.QNAME.getModule()).get();
final ContainerNode normNode = RestconfMappingNodeUtil.mapCapabilites(monitoringModule);
assertNotNull(normNode);
final List<Object> listOfValues = new ArrayList<>();
- for (final DataContainerChild<?, ?> child : 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());
+ for (final DataContainerChild child : normNode.body()) {
+ if (child.getIdentifier().getNodeType().equals(Capabilities.QNAME)) {
+ for (final DataContainerChild dataContainerChild : ((ContainerNode) child).body()) {
+ for (final Object entry : ((LeafSetNode<?>) dataContainerChild).body()) {
+ listOfValues.add(((LeafSetEntryNode<?>) entry).body());
}
}
}
}
- assertTrue(listOfValues.contains(QueryParams.DEPTH));
- assertTrue(listOfValues.contains(QueryParams.FIELDS));
- assertTrue(listOfValues.contains(QueryParams.FILTER));
- assertTrue(listOfValues.contains(QueryParams.REPLAY));
- assertTrue(listOfValues.contains(QueryParams.WITH_DEFAULTS));
+ assertTrue(listOfValues.contains(Rfc8040.Capabilities.DEPTH));
+ assertTrue(listOfValues.contains(Rfc8040.Capabilities.FIELDS));
+ assertTrue(listOfValues.contains(Rfc8040.Capabilities.FILTER));
+ assertTrue(listOfValues.contains(Rfc8040.Capabilities.REPLAY));
+ assertTrue(listOfValues.contains(Rfc8040.Capabilities.WITH_DEFAULTS));
}
@Test
final Instant start = Instant.now();
final String outputType = "XML";
final URI uri = new URI("uri");
- final Module monitoringModule = schemaContextMonitoring.findModule(MonitoringModule.MODULE_QNAME).orElse(null);
- final boolean exist = true;
+ final String streamName = "/nested-module:depth1-cont/depth2-leaf1";
- final Map<QName, Object> map =
- prepareMap(path.getLastPathArgument().getNodeType().getLocalName(), uri, start, outputType);
-
- final NormalizedNode<?, ?> mappedData =
- RestconfMappingNodeUtil.mapDataChangeNotificationStreamByIetfRestconfMonitoring(
- path, start, outputType, uri, monitoringModule, exist, schemaContextMonitoring);
- assertNotNull(mappedData);
- testData(map, mappedData);
+ final Map<QName, Object> map = prepareMap(streamName, uri, start, outputType);
+ final MapEntryNode mappedData = RestconfMappingNodeUtil.mapDataChangeNotificationStreamByIetfRestconfMonitoring(
+ path, start, outputType, uri, schemaContextMonitoring, streamName);
+ assertMappedData(map, mappedData);
}
@Test
final Instant start = Instant.now();
final String outputType = "JSON";
final URI uri = new URI("uri");
- final Module monitoringModule = schemaContextMonitoring.findModule(MonitoringModule.MODULE_QNAME).orElse(null);
- final boolean exist = true;
final Map<QName, Object> map = prepareMap("notifi", uri, start, outputType);
- map.put(MonitoringModule.LEAF_DESCR_STREAM_QNAME, "Notifi");
+ map.put(RestconfMappingNodeUtil.DESCRIPTION_QNAME, "Notifi");
final QName notifiQName = QName.create("urn:nested:module", "2014-06-03", "notifi");
- final NormalizedNode<?, ?> mappedData =
- RestconfMappingNodeUtil.mapYangNotificationStreamByIetfRestconfMonitoring(notifiQName,
- schemaContextMonitoring.getNotifications(), start, outputType, uri, monitoringModule, exist);
- assertNotNull(mappedData);
- testData(map, mappedData);
+ final MapEntryNode mappedData = RestconfMappingNodeUtil.mapYangNotificationStreamByIetfRestconfMonitoring(
+ notifiQName, schemaContextMonitoring.getNotifications(), start, outputType, uri);
+ assertMappedData(map, mappedData);
}
private static Map<QName, Object> prepareMap(final String name, final URI uri, final Instant start,
final String outputType) {
final Map<QName, Object> map = new HashMap<>();
- map.put(MonitoringModule.LEAF_NAME_STREAM_QNAME, name);
- map.put(MonitoringModule.LEAF_LOCATION_ACCESS_QNAME, uri.toString());
- map.put(MonitoringModule.LEAF_REPLAY_SUPP_STREAM_QNAME, Boolean.TRUE);
- map.put(MonitoringModule.LEAF_START_TIME_STREAM_QNAME, DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(
+ map.put(RestconfMappingNodeUtil.NAME_QNAME, name);
+ map.put(RestconfMappingNodeUtil.LOCATION_QNAME, uri.toString());
+ map.put(RestconfMappingNodeUtil.REPLAY_SUPPORT_QNAME, Boolean.TRUE);
+ map.put(RestconfMappingNodeUtil.REPLAY_LOG_CREATION_TIME, DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(
OffsetDateTime.ofInstant(start, ZoneId.systemDefault())));
- map.put(MonitoringModule.LEAF_ENCODING_ACCESS_QNAME, outputType);
+ map.put(RestconfMappingNodeUtil.ENCODING_QNAME, outputType);
return map;
}
- private static void testData(final Map<QName, Object> map, final NormalizedNode<?, ?> mappedData) {
- for (final DataContainerChild<? extends PathArgument, ?> child : ((MapEntryNode) mappedData).getValue()) {
+ private static void assertMappedData(final Map<QName, Object> map, final MapEntryNode mappedData) {
+ assertNotNull(mappedData);
+ for (final DataContainerChild child : mappedData.body()) {
if (child instanceof LeafNode) {
final LeafNode<?> leaf = (LeafNode<?>) child;
- assertTrue(map.containsKey(leaf.getNodeType()));
- assertEquals(map.get(leaf.getNodeType()), leaf.getValue());
+ assertTrue(map.containsKey(leaf.getIdentifier().getNodeType()));
+ assertEquals(map.get(leaf.getIdentifier().getNodeType()), leaf.body());
}
}
}
*/
private static void verifyDeviations(final ContainerNode containerNode) {
int deviationsFound = 0;
- for (final DataContainerChild<?, ?> child : containerNode.getValue()) {
+ for (final DataContainerChild child : containerNode.body()) {
if (child instanceof MapNode) {
- for (final MapEntryNode mapEntryNode : ((MapNode) child).getValue()) {
- for (final DataContainerChild<?, ?> dataContainerChild : mapEntryNode.getValue()) {
- if (dataContainerChild.getNodeType()
+ for (final MapEntryNode mapEntryNode : ((MapNode) child).body()) {
+ for (final DataContainerChild dataContainerChild : mapEntryNode.body()) {
+ if (dataContainerChild.getIdentifier().getNodeType()
.equals(IetfYangLibrary.SPECIFIC_MODULE_DEVIATION_LIST_QNAME)) {
deviationsFound++;
}
* modules
*/
private static void verifyLoadedModules(final ContainerNode containerNode) {
-
final Map<String, String> loadedModules = new HashMap<>();
- for (final DataContainerChild<? extends PathArgument, ?> child : containerNode.getValue()) {
+ for (final DataContainerChild child : containerNode.body()) {
if (child instanceof LeafNode) {
- assertEquals(IetfYangLibrary.MODULE_SET_ID_LEAF_QNAME, child.getNodeType());
+ assertEquals(IetfYangLibrary.MODULE_SET_ID_LEAF_QNAME, child.getIdentifier().getNodeType());
}
if (child instanceof MapNode) {
- assertEquals(IetfYangLibrary.MODULE_QNAME_LIST, child.getNodeType());
- for (final MapEntryNode mapEntryNode : ((MapNode) child).getValue()) {
+ assertEquals(IetfYangLibrary.MODULE_QNAME_LIST, child.getIdentifier().getNodeType());
+ for (final MapEntryNode mapEntryNode : ((MapNode) child).body()) {
String name = "";
String revision = "";
- for (final DataContainerChild<? extends PathArgument, ?> dataContainerChild : mapEntryNode
- .getValue()) {
- switch (dataContainerChild.getNodeType().getLocalName()) {
+ for (final DataContainerChild dataContainerChild : mapEntryNode.body()) {
+ switch (dataContainerChild.getIdentifier().getNodeType().getLocalName()) {
case IetfYangLibrary.SPECIFIC_MODULE_NAME_LEAF:
- name = String.valueOf(dataContainerChild.getValue());
+ name = String.valueOf(dataContainerChild.body());
break;
case IetfYangLibrary.SPECIFIC_MODULE_REVISION_LEAF:
- revision = String.valueOf(dataContainerChild.getValue());
+ revision = String.valueOf(dataContainerChild.body());
break;
default :
LOG.info("Unknown local name '{}' of node.",
- dataContainerChild.getNodeType().getLocalName());
+ dataContainerChild.getIdentifier().getNodeType().getLocalName());
break;
}
}
Code Review / netconf.git / blobdiff