*/
package org.opendaylight.netconf.sal.connect.netconf.schema.mapping;
+import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import com.google.common.collect.Lists;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.datastores.datastore.locks.lock.type.partial.lock.PartialLock;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.schemas.Schema;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.sessions.Session;
-import org.opendaylight.yangtools.rcf8528.data.util.EmptyMountPointContext;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.NetconfConfigChange;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.netconf.config.change.Edit;
+import org.opendaylight.yangtools.rfc8528.data.util.EmptyMountPointContext;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
+import org.opendaylight.yangtools.yang.data.api.schema.AnyxmlNode;
import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
import org.opendaylight.yangtools.yang.data.api.schema.DOMSourceAnyxmlNode;
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.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.api.schema.UnkeyedListNode;
import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
+import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
import org.opendaylight.yangtools.yang.data.impl.schema.NormalizedNodeResult;
-import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder;
-import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableLeafNodeBuilder;
-import org.opendaylight.yangtools.yang.model.api.ActionDefinition;
import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Absolute;
import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
@BeforeClass
public static void beforeClass() {
PARTIAL_SCHEMA = BindingRuntimeHelpers.createEffectiveModel(NetconfState.class);
- SCHEMA = BindingRuntimeHelpers.createEffectiveModel(IetfNetconfService.class, NetconfState.class);
+ SCHEMA = BindingRuntimeHelpers.createEffectiveModel(IetfNetconfService.class, NetconfState.class,
+ NetconfConfigChange.class);
ACTION_SCHEMA = YangParserTestUtils.parseYangResources(NetconfMessageTransformerTest.class,
"/schemas/example-server-farm.yang","/schemas/example-server-farm-2.yang",
"/schemas/conflicting-actions.yang", "/schemas/augmented-action.yang",
assertTrue(compositeNodeRpcResult.getErrors().isEmpty());
assertNotNull(compositeNodeRpcResult.getResult());
final DOMSource schemaContent = ((DOMSourceAnyxmlNode) ((ContainerNode) compositeNodeRpcResult.getResult())
- .getValue().iterator().next()).getValue();
+ .body().iterator().next()).body();
assertThat(schemaContent.getNode().getTextContent(),
CoreMatchers.containsString("Random YANG SCHEMA"));
}
assertTrue(compositeNodeRpcResult.getErrors().isEmpty());
assertNotNull(compositeNodeRpcResult.getResult());
- final List<DataContainerChild<?, ?>> values = Lists.newArrayList(
+ final List<DataContainerChild> values = Lists.newArrayList(
NetconfRemoteSchemaYangSourceProvider
- .createGetSchemaRequest("module", Optional.of("2012-12-12")).getValue());
+ .createGetSchemaRequest("module", Optional.of("2012-12-12")).body());
final Map<QName, Object> keys = new HashMap<>();
- for (final DataContainerChild<?, ?> value : values) {
- keys.put(value.getNodeType(), value.getValue());
+ for (final DataContainerChild value : values) {
+ keys.put(value.getIdentifier().getNodeType(), value.body());
}
final NodeIdentifierWithPredicates identifierWithPredicates =
Builders.mapEntryBuilder().withNodeIdentifier(identifierWithPredicates).withValue(values).build();
final DOMSourceAnyxmlNode data = (DOMSourceAnyxmlNode) ((ContainerNode) compositeNodeRpcResult.getResult())
- .getChild(toId(NETCONF_DATA_QNAME)).get();
+ .findChildByArg(toId(NETCONF_DATA_QNAME)).get();
NormalizedNodeResult nodeResult =
- NetconfUtil.transformDOMSourceToNormalizedNode(SCHEMA, data.getValue());
+ NetconfUtil.transformDOMSourceToNormalizedNode(SCHEMA, data.body());
ContainerNode result = (ContainerNode) nodeResult.getResult();
- final ContainerNode state = (ContainerNode) result.getChild(toId(NetconfState.QNAME)).get();
- final ContainerNode schemas = (ContainerNode) state.getChild(toId(Schemas.QNAME)).get();
- final MapNode schemaParent = (MapNode) schemas.getChild(toId(Schema.QNAME)).get();
- assertEquals(1, Iterables.size(schemaParent.getValue()));
+ final ContainerNode state = (ContainerNode) result.findChildByArg(toId(NetconfState.QNAME)).get();
+ final ContainerNode schemas = (ContainerNode) state.findChildByArg(toId(Schemas.QNAME)).get();
+ final MapNode schemaParent = (MapNode) schemas.findChildByArg(toId(Schema.QNAME)).get();
+ assertEquals(1, Iterables.size(schemaParent.body()));
- assertEquals(schemaNode, schemaParent.getValue().iterator().next());
+ assertEquals(schemaNode, schemaParent.body().iterator().next());
}
@Test
public void testGetConfigLeafRequest() throws Exception {
- final DataContainerChild<?, ?> filter = toFilterStructure(
+ final AnyxmlNode<?> filter = toFilterStructure(
YangInstanceIdentifier.create(toId(NetconfState.QNAME), toId(Schemas.QNAME), toId(Schema.QNAME),
NodeIdentifierWithPredicates.of(Schema.QNAME),
toId(QName.create(Schemas.QNAME, "version"))), SCHEMA);
- final DataContainerChild<?, ?> source = NetconfBaseOps.getSourceNode(NETCONF_RUNNING_QNAME);
+ final ContainerNode source = NetconfBaseOps.getSourceNode(NETCONF_RUNNING_QNAME);
final NetconfMessage netconfMessage = netconfMessageTransformer.toRpcRequest(NETCONF_GET_CONFIG_QNAME,
NetconfMessageTransformUtil.wrap(NETCONF_GET_CONFIG_QNAME, source, filter));
@Test
public void testGetConfigRequest() throws Exception {
- final DataContainerChild<?, ?> filter = toFilterStructure(
+ final AnyxmlNode<?> filter = toFilterStructure(
YangInstanceIdentifier.create(toId(NetconfState.QNAME), toId(Schemas.QNAME)), SCHEMA);
- final DataContainerChild<?, ?> source = NetconfBaseOps.getSourceNode(NETCONF_RUNNING_QNAME);
+ final ContainerNode source = NetconfBaseOps.getSourceNode(NETCONF_RUNNING_QNAME);
final NetconfMessage netconfMessage = netconfMessageTransformer.toRpcRequest(NETCONF_GET_CONFIG_QNAME,
NetconfMessageTransformUtil.wrap(NETCONF_GET_CONFIG_QNAME, source, filter));
@Test
public void testEditConfigRequest() throws Exception {
- final List<DataContainerChild<?, ?>> values = Lists.newArrayList(
+ final List<DataContainerChild> values = Lists.newArrayList(
NetconfRemoteSchemaYangSourceProvider
- .createGetSchemaRequest("module", Optional.of("2012-12-12")).getValue());
+ .createGetSchemaRequest("module", Optional.of("2012-12-12")).body());
final Map<QName, Object> keys = new HashMap<>();
- for (final DataContainerChild<?, ?> value : values) {
- keys.put(value.getNodeType(), value.getValue());
+ for (final DataContainerChild value : values) {
+ keys.put(value.getIdentifier().getNodeType(), value.body());
}
final NodeIdentifierWithPredicates identifierWithPredicates =
final YangInstanceIdentifier id = YangInstanceIdentifier.builder()
.node(NetconfState.QNAME).node(Schemas.QNAME).node(Schema.QNAME)
.nodeWithKey(Schema.QNAME, keys).build();
- final DataContainerChild<?, ?> editConfigStructure =
+ final DataContainerChild editConfigStructure =
createEditConfigStructure(BASE_SCHEMAS.getBaseSchemaWithNotifications().getEffectiveModelContext(), id,
Optional.empty(), Optional.ofNullable(schemaNode));
- final DataContainerChild<?, ?> target = NetconfBaseOps.getTargetNode(NETCONF_CANDIDATE_QNAME);
+ final DataContainerChild target = NetconfBaseOps.getTargetNode(NETCONF_CANDIDATE_QNAME);
final ContainerNode wrap =
NetconfMessageTransformUtil.wrap(NETCONF_EDIT_CONFIG_QNAME, editConfigStructure, target);
public void testGetRequest() throws Exception {
final QName capability = QName.create(Capabilities.QNAME, "capability");
- final DataContainerChild<?, ?> filter = toFilterStructure(
+ final DataContainerChild filter = toFilterStructure(
YangInstanceIdentifier.create(toId(NetconfState.QNAME), toId(Capabilities.QNAME), toId(capability),
new NodeWithValue<>(capability, "a:b:c")), SCHEMA);
+ "</rpc>");
}
+ @Test
+ public void testGetLeafList() throws IOException, SAXException {
+ final YangInstanceIdentifier path = YangInstanceIdentifier.create(
+ toId(NetconfState.QNAME),
+ toId(Capabilities.QNAME),
+ toId(QName.create(Capabilities.QNAME, "capability")));
+ final DataContainerChild filter = toFilterStructure(path, SCHEMA);
+ final NetconfMessage netconfMessage = netconfMessageTransformer.toRpcRequest(NETCONF_GET_QNAME,
+ NetconfMessageTransformUtil.wrap(toId(NETCONF_GET_QNAME), filter));
+
+ assertSimilarXml(netconfMessage, "<rpc message-id=\"m-0\" xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\">\n"
+ + "<get>\n"
+ + "<filter xmlns:ns0=\"urn:ietf:params:xml:ns:netconf:base:1.0\" ns0:type=\"subtree\">\n"
+ + "<netconf-state xmlns=\"urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring\">\n"
+ + "<capabilities>\n"
+ + "<capability/>\n"
+ + "</capabilities>\n"
+ + "</netconf-state>\n"
+ + "</filter>\n"
+ + "</get>\n"
+ + "</rpc>\n");
+ }
+
+ @Test
+ public void testGetList() throws IOException, SAXException {
+ final YangInstanceIdentifier path = YangInstanceIdentifier.create(
+ toId(NetconfState.QNAME),
+ toId(Datastores.QNAME),
+ toId(QName.create(Datastores.QNAME, "datastore")));
+ final DataContainerChild filter = toFilterStructure(path, SCHEMA);
+ final NetconfMessage netconfMessage = netconfMessageTransformer.toRpcRequest(NETCONF_GET_QNAME,
+ NetconfMessageTransformUtil.wrap(toId(NETCONF_GET_QNAME), filter));
+
+ assertSimilarXml(netconfMessage, "<rpc message-id=\"m-0\" xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\">\n"
+ + "<get>\n"
+ + "<filter xmlns:ns0=\"urn:ietf:params:xml:ns:netconf:base:1.0\" ns0:type=\"subtree\">\n"
+ + "<netconf-state xmlns=\"urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring\">\n"
+ + "<datastores>\n"
+ + "<datastore/>\n"
+ + "</datastores>\n"
+ + "</netconf-state>\n"
+ + "</filter>\n"
+ + "</get>\n"
+ + "</rpc>\n");
+ }
+
private static NetconfMessageTransformer getTransformer(final EffectiveModelContext schema) {
return new NetconfMessageTransformer(new EmptyMountPointContext(schema), true, BASE_SCHEMAS.getBaseSchema());
}
schemaPaths.add(CHECK_WITH_OUTPUT_INTERFACE_PATH);
schemaPaths.add(CHECK_WITHOUT_OUTPUT_INTERFACE_PATH);
- List<ActionDefinition> actions = NetconfMessageTransformer.getActions(ACTION_SCHEMA);
+ var actions = NetconfMessageTransformer.getActions(ACTION_SCHEMA);
assertEquals(schemaPaths.size(), actions.size());
- for (ActionDefinition actionDefinition : actions) {
- Absolute path = actionDefinition.getPath().asAbsolute();
- assertTrue(schemaPaths.remove(path));
+
+ for (var path : schemaPaths) {
+ assertNotNull("Action for " + path + " not found", actions.get(path));
}
}
@Test
public void toActionRequestContainerTopLevelTest() {
- List<PathArgument> nodeIdentifiers = Collections.singletonList(NodeIdentifier.create(DEVICE_QNAME));
+ List<PathArgument> nodeIdentifiers = List.of(NodeIdentifier.create(DEVICE_QNAME));
DOMDataTreeIdentifier domDataTreeIdentifier = prepareDataTreeId(nodeIdentifiers);
- NormalizedNode<?, ?> payload = initInputAction(QName.create(DEVICE_QNAME, "start-at"), "now");
+ ContainerNode payload = initInputAction(QName.create(DEVICE_QNAME, "start-at"), "now");
NetconfMessage actionRequest = actionNetconfMessageTransformer.toActionRequest(
START_DEVICE_PATH, domDataTreeIdentifier, payload);
DOMDataTreeIdentifier domDataTreeIdentifier = prepareDataTreeId(nodeIdentifiers);
- NormalizedNode<?, ?> payload = initInputAction(QName.create(BOX_OUT_QNAME, "start-at"), "now");
+ ContainerNode payload = initInputAction(QName.create(BOX_OUT_QNAME, "start-at"), "now");
NetconfMessage actionRequest = actionNetconfMessageTransformer.toActionRequest(
OPEN_BOXES_PATH, domDataTreeIdentifier, payload);
DOMDataTreeIdentifier domDataTreeIdentifier = prepareDataTreeId(nodeIdentifiers);
- NormalizedNode<?, ?> payload = initEmptyInputAction(INTERFACE_QNAME);
+ ContainerNode payload = initEmptyInputAction(INTERFACE_QNAME);
NetconfMessage actionRequest = actionNetconfMessageTransformer.toActionRequest(
ENABLE_INTERFACE_PATH, domDataTreeIdentifier, payload);
List<PathArgument> nodeIdentifiers = new ArrayList<>();
nodeIdentifiers.add(NodeIdentifier.create(SERVER_QNAME));
nodeIdentifiers.add(NodeIdentifierWithPredicates.of(SERVER_QNAME, serverNameQname, "testServer"));
- nodeIdentifiers.add(new AugmentationIdentifier(Collections.singleton(APPLICATIONS_QNAME)));
+ nodeIdentifiers.add(new AugmentationIdentifier(Set.of(APPLICATIONS_QNAME)));
nodeIdentifiers.add(NodeIdentifier.create(APPLICATIONS_QNAME));
nodeIdentifiers.add(NodeIdentifier.create(APPLICATION_QNAME));
nodeIdentifiers.add(NodeIdentifierWithPredicates.of(APPLICATION_QNAME,
DOMDataTreeIdentifier domDataTreeIdentifier = prepareDataTreeId(nodeIdentifiers);
- NormalizedNode<?, ?> payload = initEmptyInputAction(APPLICATION_QNAME);
+ ContainerNode payload = initEmptyInputAction(APPLICATION_QNAME);
NetconfMessage actionRequest = actionNetconfMessageTransformer.toActionRequest(
KILL_SERVER_APP_PATH, domDataTreeIdentifier, payload);
DOMDataTreeIdentifier domDataTreeIdentifier = prepareDataTreeId(nodeIdentifiers);
- ImmutableLeafNodeBuilder<Byte> immutableLeafNodeBuilder = new ImmutableLeafNodeBuilder<>();
- DataContainerChild<NodeIdentifier, Byte> build = immutableLeafNodeBuilder.withNodeIdentifier(
- NodeIdentifier.create(barInputQname)).withValue(barInput).build();
- NormalizedNode<?, ?> payload = ImmutableContainerNodeBuilder.create().withNodeIdentifier(NodeIdentifier.create(
- QName.create(barInputQname, "input"))).withChild(build).build();
+ ContainerNode payload = Builders.containerBuilder()
+ .withNodeIdentifier(NodeIdentifier.create(QName.create(barInputQname, "input")))
+ .withChild(ImmutableNodes.leafNode(barInputQname, barInput))
+ .build();
NetconfMessage actionRequest = actionNetconfMessageTransformer.toActionRequest(
XYZZY_BAR_PATH, domDataTreeIdentifier, payload);
List<PathArgument> nodeIdentifiers = new ArrayList<>();
nodeIdentifiers.add(NodeIdentifier.create(FOO_QNAME));
DOMDataTreeIdentifier domDataTreeIdentifier = prepareDataTreeId(nodeIdentifiers);
- NormalizedNode<?, ?> payload = initInputAction(fooInputQname, "test");
+ ContainerNode payload = initInputAction(fooInputQname, "test");
NetconfMessage actionRequest = actionNetconfMessageTransformer.toActionRequest(
XYZZY_FOO_PATH, domDataTreeIdentifier, payload);
nodeIdentifiers.add(NodeIdentifier.create(CONFLICT_CHOICE_QNAME));
nodeIdentifiers.add(NodeIdentifier.create(CHOICE_CONT_QNAME));
DOMDataTreeIdentifier domDataTreeIdentifier = prepareDataTreeId(nodeIdentifiers);
- NormalizedNode<?, ?> payload = initEmptyInputAction(CHOICE_ACTION_QNAME);
+ NormalizedNode payload = initEmptyInputAction(CHOICE_ACTION_QNAME);
NetconfMessage actionRequest = actionNetconfMessageTransformer.toActionRequest(
CHOICE_ACTION_PATH, domDataTreeIdentifier, payload);
DOMDataTreeIdentifier domDataTreeIdentifier = prepareDataTreeId(nodeIdentifiers);
- NormalizedNode<?, ?> payload = initEmptyInputAction(INTERFACE_QNAME);
+ NormalizedNode payload = initEmptyInputAction(INTERFACE_QNAME);
NetconfMessage actionRequest = actionNetconfMessageTransformer.toActionRequest(
DISABLE_INTERFACE_PATH, domDataTreeIdentifier, payload);
DISABLE_QNAME.getNamespace().toString());
}
- @SuppressWarnings({ "rawtypes", "unchecked" })
@Test
public void toActionResultTest() throws Exception {
NetconfMessage message = new NetconfMessage(XmlUtil.readXmlToDocument(
assertNotNull(actionResult);
ContainerNode containerNode = actionResult.getOutput().get();
assertNotNull(containerNode);
- LeafNode<String> leaf = (LeafNode) containerNode.getValue().iterator().next();
- assertEquals("now", leaf.getValue());
+ assertEquals("now", containerNode.body().iterator().next().body());
}
@Test
final YangInstanceIdentifier datastoresField = YangInstanceIdentifier.create(toId(Datastores.QNAME));
// building filter structure and NETCONF message
- final DataContainerChild<?, ?> filterStructure = toFilterStructure(Collections.singletonList(FieldsFilter.of(
- parentYiid, List.of(netconfStartTimeField, datastoresField))), SCHEMA);
+ final AnyxmlNode<?> filterStructure = toFilterStructure(
+ List.of(FieldsFilter.of(parentYiid, List.of(netconfStartTimeField, datastoresField))), SCHEMA);
final NetconfMessage netconfMessage = netconfMessageTransformer.toRpcRequest(NETCONF_GET_QNAME,
NetconfMessageTransformUtil.wrap(toId(NETCONF_GET_QNAME), filterStructure));
toId(Datastore.QNAME), NodeIdentifierWithPredicates.of(Datastore.QNAME), toId(Locks.QNAME));
// building filter structure and NETCONF message
- final DataContainerChild<?, ?> filterStructure = toFilterStructure(Collections.singletonList(FieldsFilter.of(
- parentYiid, List.of(capabilitiesField, capabilityField, datastoreField, locksFields))), SCHEMA);
+ final AnyxmlNode<?> filterStructure = toFilterStructure(
+ List.of(FieldsFilter.of(parentYiid,
+ List.of(capabilitiesField, capabilityField, datastoreField, locksFields))),
+ SCHEMA);
final NetconfMessage netconfMessage = netconfMessageTransformer.toRpcRequest(NETCONF_GET_QNAME,
NetconfMessageTransformUtil.wrap(toId(NETCONF_GET_QNAME), filterStructure));
final YangInstanceIdentifier capabilitiesField = YangInstanceIdentifier.create(toId(Capabilities.QNAME));
// building filter structure and NETCONF message
- final DataContainerChild<?, ?> filterStructure = toFilterStructure(Collections.singletonList(FieldsFilter.of(
- parentYiid, List.of(capabilitiesField, YangInstanceIdentifier.empty()))), SCHEMA);
+ final AnyxmlNode<?> filterStructure = toFilterStructure(
+ List.of(FieldsFilter.of(parentYiid, List.of(capabilitiesField, YangInstanceIdentifier.empty()))),
+ SCHEMA);
final NetconfMessage netconfMessage = netconfMessageTransformer.toRpcRequest(NETCONF_GET_QNAME,
NetconfMessageTransformUtil.wrap(toId(NETCONF_GET_QNAME), filterStructure));
toId(QName.create(Schema.QNAME, "namespace").intern()));
// building filter structure and NETCONF message
- final DataContainerChild<?, ?> filterStructure = toFilterStructure(Collections.singletonList(FieldsFilter.of(
- parentYiid, List.of(versionField, identifierField))), SCHEMA);
+ final AnyxmlNode<?> filterStructure = toFilterStructure(
+ List.of(FieldsFilter.of(parentYiid, List.of(versionField, identifierField))), SCHEMA);
final NetconfMessage netconfMessage = netconfMessageTransformer.toRpcRequest(NETCONF_GET_QNAME,
NetconfMessageTransformUtil.wrap(toId(NETCONF_GET_QNAME), filterStructure));
QName.create(Locks.QNAME, "locked-by-session").intern());
// building filter structure and NETCONF message
- final DataContainerChild<?, ?> filterStructure = toFilterStructure(
+ final AnyxmlNode<?> filterStructure = toFilterStructure(
List.of(FieldsFilter.of(parentYiid, List.of(lockedTimeField, lockedBySessionField))),
SCHEMA);
final NetconfMessage netconfMessage = netconfMessageTransformer.toRpcRequest(NETCONF_GET_QNAME,
toId(Session.QNAME), NodeIdentifierWithPredicates.of(Session.QNAME));
// building filter structure and NETCONF message
- final DataContainerChild<?, ?> filterStructure = toFilterStructure(Collections.singletonList(FieldsFilter.of(
- parentYiid, List.of(datastoreListField, sessionListField))), SCHEMA);
+ final AnyxmlNode<?> filterStructure = toFilterStructure(
+ List.of(FieldsFilter.of(parentYiid, List.of(datastoreListField, sessionListField))), SCHEMA);
final NetconfMessage netconfMessage = netconfMessageTransformer.toRpcRequest(NETCONF_GET_QNAME,
NetconfMessageTransformUtil.wrap(toId(NETCONF_GET_QNAME), filterStructure));
toId(QName.create(Session.QNAME, "transport").intern()));
// building filter structure and NETCONF message
- final DataContainerChild<?, ?> filterStructure = toFilterStructure(Collections.singletonList(FieldsFilter.of(
- parentYiid, List.of(session1Field, session2TransportField))), SCHEMA);
+ final AnyxmlNode<?> filterStructure = toFilterStructure(
+ List.of(FieldsFilter.of(parentYiid, List.of(session1Field, session2TransportField))), SCHEMA);
final NetconfMessage netconfMessage = netconfMessageTransformer.toRpcRequest(NETCONF_GET_QNAME,
NetconfMessageTransformUtil.wrap(toId(NETCONF_GET_QNAME), filterStructure));
+ "</rpc>");
}
+ @Test
+ // Proof that YANGTOOLS-1362 works on DOM level
+ public void testConfigChangeToNotification() throws SAXException, IOException {
+ final var message = new NetconfMessage(XmlUtil.readXmlToDocument(
+ "<notification xmlns=\"urn:ietf:params:xml:ns:netconf:notification:1.0\">\n"
+ + " <eventTime>2021-11-11T11:26:16Z</eventTime> \n"
+ + " <netconf-config-change xmlns=\"urn:ietf:params:xml:ns:yang:ietf-netconf-notifications\">\n"
+ + " <changed-by> \n"
+ + " <username>root</username> \n"
+ + " <session-id>3</session-id> \n"
+ + " </changed-by> \n"
+ + " <datastore>running</datastore> \n"
+ + " <edit> \n"
+ + " <target xmlns:ncm=\"urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring\">/ncm:netconf-state"
+ + "/ncm:datastores/ncm:datastore[ncm:name='running']</target>\n"
+ + " <operation>replace</operation> \n"
+ + " </edit> \n"
+ + " </netconf-config-change> \n"
+ + "</notification>"));
+
+ final var change = netconfMessageTransformer.toNotification(message).getBody();
+ final var editList = change.getChildByArg(new NodeIdentifier(Edit.QNAME));
+ assertThat(editList, instanceOf(UnkeyedListNode.class));
+ final var edits = ((UnkeyedListNode) editList).body();
+ assertEquals(1, edits.size());
+ final var edit = edits.iterator().next();
+ final var target = edit.getChildByArg(new NodeIdentifier(QName.create(Edit.QNAME, "target"))).body();
+ assertThat(target, instanceOf(YangInstanceIdentifier.class));
+
+ final var args = ((YangInstanceIdentifier) target).getPathArguments();
+ assertEquals(4, args.size());
+ }
+
private static void checkAction(final QName actionQname, final Node action , final String inputLocalName,
final String inputNodeName, final String inputValue) {
checkNode(action, actionQname.getLocalName(), actionQname.getLocalName(),
}
private static ContainerNode initInputAction(final QName qname, final String value) {
- ImmutableLeafNodeBuilder<String> immutableLeafNodeBuilder = new ImmutableLeafNodeBuilder<>();
- DataContainerChild<NodeIdentifier, String> build = immutableLeafNodeBuilder.withNodeIdentifier(
- NodeIdentifier.create(qname)).withValue(value).build();
- ContainerNode data = ImmutableContainerNodeBuilder.create().withNodeIdentifier(NodeIdentifier.create(
- QName.create(qname, "input"))).withChild(build).build();
- return data;
+ return Builders.containerBuilder()
+ .withNodeIdentifier(NodeIdentifier.create(QName.create(qname, "input")))
+ .withChild(ImmutableNodes.leafNode(qname, value))
+ .build();
}
private static ContainerNode initEmptyInputAction(final QName qname) {
- return ImmutableContainerNodeBuilder.create().withNodeIdentifier(NodeIdentifier.create(
- QName.create(qname, "input"))).build();
+ return Builders.containerBuilder()
+ .withNodeIdentifier(NodeIdentifier.create(QName.create(qname, "input")))
+ .build();
}
private static void checkNode(final Node childServer, final String expectedLocalName, final String expectedNodeName,
Code Review / netconf.git / blobdiff