X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=netconf%2Fsal-netconf-connector%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Fsal%2Fconnect%2Fnetconf%2Fschema%2Fmapping%2FNetconfMessageTransformerTest.java;h=533c31f6e0a47f3d2743b38f4079a712f0c3a67a;hb=b0441fda6b0f5efbc7c45f19e26ce23e2974d1ea;hp=5214d8f77be0cd869f674e0d95a076244d9c1abd;hpb=af2124dc59e2a6402108c7603245eb575858a5b0;p=netconf.git diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformerTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformerTest.java index 5214d8f77b..533c31f6e0 100644 --- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformerTest.java +++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformerTest.java @@ -7,17 +7,17 @@ */ 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 static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil.CREATE_SUBSCRIPTION_RPC_CONTENT; import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil.CREATE_SUBSCRIPTION_RPC_QNAME; import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil.GET_SCHEMA_QNAME; import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil.NETCONF_CANDIDATE_QNAME; import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil.NETCONF_COMMIT_QNAME; -import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil.NETCONF_DATA_QNAME; import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil.NETCONF_DISCARD_CHANGES_QNAME; import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil.NETCONF_EDIT_CONFIG_QNAME; import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil.NETCONF_GET_CONFIG_QNAME; @@ -27,15 +27,13 @@ import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTr import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil.createEditConfigStructure; import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil.toFilterStructure; import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil.toId; -import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil.toPath; +import static org.opendaylight.netconf.util.NetconfUtil.NETCONF_DATA_QNAME; -import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import java.io.IOException; -import java.util.Arrays; -import java.util.Collections; +import java.util.ArrayList; +import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -46,52 +44,152 @@ import org.custommonkey.xmlunit.Diff; import org.custommonkey.xmlunit.ElementNameAndAttributeQualifier; import org.custommonkey.xmlunit.XMLUnit; import org.hamcrest.CoreMatchers; +import org.junit.AfterClass; import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Test; -import org.opendaylight.controller.md.sal.dom.api.DOMRpcResult; -import org.opendaylight.mdsal.binding.generator.impl.ModuleInfoBackedContext; +import org.opendaylight.mdsal.binding.runtime.spi.BindingRuntimeHelpers; import org.opendaylight.mdsal.dom.api.DOMActionResult; import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier; +import org.opendaylight.mdsal.dom.api.DOMRpcResult; import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.xml.XmlUtil; +import org.opendaylight.netconf.sal.connect.netconf.AbstractBaseSchemasTest; import org.opendaylight.netconf.sal.connect.netconf.schema.NetconfRemoteSchemaYangSourceProvider; +import org.opendaylight.netconf.sal.connect.netconf.util.FieldsFilter; import org.opendaylight.netconf.sal.connect.netconf.util.NetconfBaseOps; import org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.$YangModuleInfoImpl; +import org.opendaylight.netconf.util.NetconfUtil; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.IetfNetconfService; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.NetconfState; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.Capabilities; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.Datastores; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.Schemas; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.Sessions; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.Statistics; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.datastores.Datastore; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.datastores.datastore.Locks; +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.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.NodeIdentifier; 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.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.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.SchemaContext; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; +import org.opendaylight.yangtools.yang.data.impl.schema.NormalizedNodeResult; +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; import org.w3c.dom.Node; import org.xml.sax.SAXException; -public class NetconfMessageTransformerTest { +public class NetconfMessageTransformerTest extends AbstractBaseSchemasTest { private static final String REVISION_EXAMPLE_SERVER_FARM = "2018-08-07"; private static final String URN_EXAMPLE_SERVER_FARM = "urn:example:server-farm"; + private static final String REVISION_EXAMPLE_SERVER_FARM_2 = "2019-05-20"; + private static final String URN_EXAMPLE_SERVER_FARM_2 = "urn:example:server-farm-2"; + + private static final String URN_EXAMPLE_CONFLICT = "urn:example:conflict"; + + private static final String URN_EXAMPLE_AUGMENTED_ACTION = "urn:example:augmented-action"; + + private static final String URN_EXAMPLE_RPCS_ACTIONS_OUTPUTS = "urn:example:rpcs-actions-outputs"; + + private static final QName SERVER_QNAME = + QName.create(URN_EXAMPLE_SERVER_FARM, REVISION_EXAMPLE_SERVER_FARM, "server"); + private static final QName RESET_QNAME = QName.create(SERVER_QNAME, "reset"); + private static final Absolute RESET_SERVER_PATH = Absolute.of(SERVER_QNAME, RESET_QNAME); + private static final QName APPLICATIONS_QNAME = QName.create(URN_EXAMPLE_SERVER_FARM_2, + REVISION_EXAMPLE_SERVER_FARM_2, "applications"); + private static final QName APPLICATION_QNAME = QName.create(APPLICATIONS_QNAME, "application"); + private static final QName KILL_QNAME = QName.create(APPLICATION_QNAME, "kill"); + private static final Absolute KILL_SERVER_APP_PATH = + Absolute.of(SERVER_QNAME, APPLICATIONS_QNAME, APPLICATION_QNAME, KILL_QNAME); + + private static final QName DEVICE_QNAME = + QName.create(URN_EXAMPLE_SERVER_FARM, REVISION_EXAMPLE_SERVER_FARM, "device"); + private static final QName START_QNAME = QName.create(DEVICE_QNAME, "start"); + private static final Absolute START_DEVICE_PATH = Absolute.of(DEVICE_QNAME, START_QNAME); + private static final QName INTERFACE_QNAME = QName.create(DEVICE_QNAME, "interface"); + private static final QName ENABLE_QNAME = QName.create(INTERFACE_QNAME, "enable"); + private static final Absolute ENABLE_INTERFACE_PATH = Absolute.of(DEVICE_QNAME, INTERFACE_QNAME, ENABLE_QNAME); + + private static final QName DISABLE_QNAME = QName.create(URN_EXAMPLE_AUGMENTED_ACTION, "disable"); + private static final Absolute DISABLE_INTERFACE_PATH = Absolute.of(DEVICE_QNAME, INTERFACE_QNAME, DISABLE_QNAME); + + private static final QName CHECK_WITH_OUTPUT_QNAME = + QName.create(URN_EXAMPLE_RPCS_ACTIONS_OUTPUTS, "check-with-output"); + private static final Absolute CHECK_WITH_OUTPUT_INTERFACE_PATH = + Absolute.of(DEVICE_QNAME, INTERFACE_QNAME, CHECK_WITH_OUTPUT_QNAME); + private static final QName CHECK_WITHOUT_OUTPUT_QNAME = + QName.create(URN_EXAMPLE_RPCS_ACTIONS_OUTPUTS, "check-without-output"); + private static final Absolute CHECK_WITHOUT_OUTPUT_INTERFACE_PATH = + Absolute.of(DEVICE_QNAME, INTERFACE_QNAME, CHECK_WITHOUT_OUTPUT_QNAME); + private static final QName RPC_WITH_OUTPUT_QNAME = + QName.create(URN_EXAMPLE_RPCS_ACTIONS_OUTPUTS, "rpc-with-output"); + private static final QName RPC_WITHOUT_OUTPUT_QNAME = + QName.create(URN_EXAMPLE_RPCS_ACTIONS_OUTPUTS, "rpc-without-output"); + + private static final QName BOX_OUT_QNAME = + QName.create(URN_EXAMPLE_SERVER_FARM, REVISION_EXAMPLE_SERVER_FARM, "box-out"); + private static final QName BOX_IN_QNAME = QName.create(BOX_OUT_QNAME, "box-in"); + private static final QName OPEN_QNAME = QName.create(BOX_IN_QNAME, "open"); + private static final Absolute OPEN_BOXES_PATH = Absolute.of(BOX_OUT_QNAME, BOX_IN_QNAME, OPEN_QNAME); + + private static final QName FOO_QNAME = QName.create(URN_EXAMPLE_CONFLICT, "foo"); + private static final QName BAR_QNAME = QName.create(URN_EXAMPLE_CONFLICT, "bar"); + private static final QName XYZZY_QNAME = QName.create(URN_EXAMPLE_CONFLICT, "xyzzy"); + private static final Absolute XYZZY_FOO_PATH = Absolute.of(FOO_QNAME, XYZZY_QNAME); + private static final Absolute XYZZY_BAR_PATH = Absolute.of(BAR_QNAME, XYZZY_QNAME); + + private static final QName CONFLICT_CHOICE_QNAME = QName.create(URN_EXAMPLE_CONFLICT, "conflict-choice"); + private static final QName CHOICE_CONT_QNAME = QName.create(URN_EXAMPLE_CONFLICT, "choice-cont"); + private static final QName CHOICE_ACTION_QNAME = QName.create(URN_EXAMPLE_CONFLICT, "choice-action"); + private static final Absolute CHOICE_ACTION_PATH = + Absolute.of(CONFLICT_CHOICE_QNAME, CHOICE_CONT_QNAME, CHOICE_CONT_QNAME, CHOICE_ACTION_QNAME); + + private static EffectiveModelContext PARTIAL_SCHEMA; + private static EffectiveModelContext SCHEMA; + private static EffectiveModelContext ACTION_SCHEMA; + private NetconfMessageTransformer actionNetconfMessageTransformer; private NetconfMessageTransformer netconfMessageTransformer; - private SchemaContext schema; + + @BeforeClass + public static void beforeClass() { + PARTIAL_SCHEMA = BindingRuntimeHelpers.createEffectiveModel(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", + "/schemas/rpcs-actions-outputs.yang"); + } + + @AfterClass + public static void afterClass() { + PARTIAL_SCHEMA = null; + SCHEMA = null; + ACTION_SCHEMA = null; + } @Before public void setUp() throws Exception { @@ -99,16 +197,15 @@ public class NetconfMessageTransformerTest { XMLUnit.setIgnoreAttributeOrder(true); XMLUnit.setIgnoreComments(true); - schema = getSchema(true); - netconfMessageTransformer = getTransformer(schema); - actionNetconfMessageTransformer = getActionMessageTransformer(); + netconfMessageTransformer = getTransformer(SCHEMA); + actionNetconfMessageTransformer = new NetconfMessageTransformer(new EmptyMountPointContext(ACTION_SCHEMA), + true, BASE_SCHEMAS.getBaseSchema()); } @Test public void testLockRequestBaseSchemaNotPresent() throws Exception { - final SchemaContext partialSchema = getSchema(false); - final NetconfMessageTransformer transformer = getTransformer(partialSchema); - final NetconfMessage netconfMessage = transformer.toRpcRequest(toPath(NETCONF_LOCK_QNAME), + final NetconfMessageTransformer transformer = getTransformer(PARTIAL_SCHEMA); + final NetconfMessage netconfMessage = transformer.toRpcRequest(NETCONF_LOCK_QNAME, NetconfBaseOps.getLockContent(NETCONF_CANDIDATE_QNAME)); assertThat(XmlUtil.toString(netconfMessage.getDocument()), CoreMatchers.containsString(""; + + transformer.toRpcResult(new NetconfMessage(XmlUtil.readXmlToDocument(result)), NETCONF_LOCK_QNAME); + } + + @Test + public void testRpcEmptyBodyWithOutputDefinedSchemaResult() throws Exception { + final String result = ""; + + DOMRpcResult domRpcResult = actionNetconfMessageTransformer + .toRpcResult(new NetconfMessage(XmlUtil.readXmlToDocument(result)), RPC_WITH_OUTPUT_QNAME); + assertNotNull(domRpcResult); + } + + @Test + public void testRpcEmptyBodyWithoutOutputDefinedSchemaResult() throws Exception { final String result = ""; - transformer.toRpcResult(new NetconfMessage(XmlUtil.readXmlToDocument(result)), toPath(NETCONF_LOCK_QNAME)); + DOMRpcResult domRpcResult = actionNetconfMessageTransformer + .toRpcResult(new NetconfMessage(XmlUtil.readXmlToDocument(result)), RPC_WITHOUT_OUTPUT_QNAME); + assertNotNull(domRpcResult); } @Test public void testDiscardChangesRequest() throws Exception { final NetconfMessage netconfMessage = - netconfMessageTransformer.toRpcRequest(toPath(NETCONF_DISCARD_CHANGES_QNAME), null); + netconfMessageTransformer.toRpcRequest(NETCONF_DISCARD_CHANGES_QNAME, null); assertThat(XmlUtil.toString(netconfMessage.getDocument()), CoreMatchers.containsString("\n" + "\n" @@ -165,7 +273,7 @@ public class NetconfMessageTransformerTest { @Test public void testGetSchemaResponse() throws Exception { - final NetconfMessageTransformer transformer = getTransformer(getSchema(true)); + final NetconfMessageTransformer transformer = getTransformer(SCHEMA); final NetconfMessage response = new NetconfMessage(XmlUtil.readXmlToDocument( "\n" @@ -177,11 +285,11 @@ public class NetconfMessageTransformerTest { + "\n" + "" )); - final DOMRpcResult compositeNodeRpcResult = transformer.toRpcResult(response, toPath(GET_SCHEMA_QNAME)); + final DOMRpcResult compositeNodeRpcResult = transformer.toRpcResult(response, GET_SCHEMA_QNAME); assertTrue(compositeNodeRpcResult.getErrors().isEmpty()); assertNotNull(compositeNodeRpcResult.getResult()); - final DOMSource schemaContent = - ((AnyXmlNode) ((ContainerNode) compositeNodeRpcResult.getResult()).getValue().iterator().next()).getValue(); + final DOMSource schemaContent = ((DOMSourceAnyxmlNode) ((ContainerNode) compositeNodeRpcResult.getResult()) + .body().iterator().next()).body(); assertThat(schemaContent.getNode().getTextContent(), CoreMatchers.containsString("Random YANG SCHEMA")); } @@ -203,46 +311,49 @@ public class NetconfMessageTransformerTest { + "\n" + "")); - final NetconfMessageTransformer transformer = getTransformer(getSchema(true)); - final DOMRpcResult compositeNodeRpcResult = - transformer.toRpcResult(response, toPath(NETCONF_GET_CONFIG_QNAME)); + final NetconfMessageTransformer transformer = getTransformer(SCHEMA); + final DOMRpcResult compositeNodeRpcResult = transformer.toRpcResult(response, NETCONF_GET_CONFIG_QNAME); assertTrue(compositeNodeRpcResult.getErrors().isEmpty()); assertNotNull(compositeNodeRpcResult.getResult()); - final List> values = Lists.newArrayList( + final List values = Lists.newArrayList( NetconfRemoteSchemaYangSourceProvider - .createGetSchemaRequest("module", Optional.of("2012-12-12")).getValue()); + .createGetSchemaRequest("module", Optional.of("2012-12-12")).body()); - final Map keys = Maps.newHashMap(); - for (final DataContainerChild value : values) { - keys.put(value.getNodeType(), value.getValue()); + final Map keys = new HashMap<>(); + for (final DataContainerChild value : values) { + keys.put(value.getIdentifier().getNodeType(), value.body()); } - final YangInstanceIdentifier.NodeIdentifierWithPredicates identifierWithPredicates = - new YangInstanceIdentifier.NodeIdentifierWithPredicates(Schema.QNAME, keys); + final NodeIdentifierWithPredicates identifierWithPredicates = + NodeIdentifierWithPredicates.of(Schema.QNAME, keys); final MapEntryNode schemaNode = Builders.mapEntryBuilder().withNodeIdentifier(identifierWithPredicates).withValue(values).build(); - final ContainerNode data = (ContainerNode) ((ContainerNode) compositeNodeRpcResult - .getResult()).getChild(toId(NETCONF_DATA_QNAME)).get(); - final ContainerNode state = (ContainerNode) data.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 DOMSourceAnyxmlNode data = (DOMSourceAnyxmlNode) ((ContainerNode) compositeNodeRpcResult.getResult()) + .findChildByArg(toId(NETCONF_DATA_QNAME)).get(); + + NormalizedNodeResult nodeResult = + NetconfUtil.transformDOMSourceToNormalizedNode(SCHEMA, data.body()); + ContainerNode result = (ContainerNode) nodeResult.getResult(); + 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), - new NodeIdentifierWithPredicates(Schema.QNAME, ImmutableMap.of()), - toId(QName.create(Schemas.QNAME, "version"))), schema); + 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(toPath(NETCONF_GET_CONFIG_QNAME), + final NetconfMessage netconfMessage = netconfMessageTransformer.toRpcRequest(NETCONF_GET_CONFIG_QNAME, NetconfMessageTransformUtil.wrap(NETCONF_GET_CONFIG_QNAME, source, filter)); assertSimilarXml(netconfMessage, "\n" @@ -265,12 +376,12 @@ public class NetconfMessageTransformerTest { @Test public void testGetConfigRequest() throws Exception { - final DataContainerChild filter = toFilterStructure( - YangInstanceIdentifier.create(toId(NetconfState.QNAME), toId(Schemas.QNAME)), schema); + 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(toPath(NETCONF_GET_CONFIG_QNAME), + final NetconfMessage netconfMessage = netconfMessageTransformer.toRpcRequest(NETCONF_GET_CONFIG_QNAME, NetconfMessageTransformUtil.wrap(NETCONF_GET_CONFIG_QNAME, source, filter)); assertSimilarXml(netconfMessage, "\n" @@ -289,33 +400,32 @@ public class NetconfMessageTransformerTest { @Test public void testEditConfigRequest() throws Exception { - final List> values = Lists.newArrayList( + final List values = Lists.newArrayList( NetconfRemoteSchemaYangSourceProvider - .createGetSchemaRequest("module", Optional.of("2012-12-12")).getValue()); + .createGetSchemaRequest("module", Optional.of("2012-12-12")).body()); - final Map keys = Maps.newHashMap(); - for (final DataContainerChild value : values) { - keys.put(value.getNodeType(), value.getValue()); + final Map keys = new HashMap<>(); + for (final DataContainerChild value : values) { + keys.put(value.getIdentifier().getNodeType(), value.body()); } - final YangInstanceIdentifier.NodeIdentifierWithPredicates identifierWithPredicates = - new YangInstanceIdentifier.NodeIdentifierWithPredicates(Schema.QNAME, keys); + final NodeIdentifierWithPredicates identifierWithPredicates = + NodeIdentifierWithPredicates.of(Schema.QNAME, keys); final MapEntryNode schemaNode = Builders.mapEntryBuilder().withNodeIdentifier(identifierWithPredicates).withValue(values).build(); final YangInstanceIdentifier id = YangInstanceIdentifier.builder() .node(NetconfState.QNAME).node(Schemas.QNAME).node(Schema.QNAME) .nodeWithKey(Schema.QNAME, keys).build(); - final DataContainerChild editConfigStructure = - createEditConfigStructure(BaseSchema.BASE_NETCONF_CTX_WITH_NOTIFICATIONS.getSchemaContext(), id, - com.google.common.base.Optional.absent(), com.google.common.base.Optional.fromNullable(schemaNode)); + 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); - final NetconfMessage netconfMessage = - netconfMessageTransformer.toRpcRequest(toPath(NETCONF_EDIT_CONFIG_QNAME), wrap); + final NetconfMessage netconfMessage = netconfMessageTransformer.toRpcRequest(NETCONF_EDIT_CONFIG_QNAME, wrap); assertSimilarXml(netconfMessage, "\n" + "\n" @@ -348,11 +458,11 @@ public class NetconfMessageTransformerTest { 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 YangInstanceIdentifier.NodeWithValue<>(capability, "a:b:c")), schema); + new NodeWithValue<>(capability, "a:b:c")), SCHEMA); - final NetconfMessage netconfMessage = netconfMessageTransformer.toRpcRequest(toPath(NETCONF_GET_QNAME), + final NetconfMessage netconfMessage = netconfMessageTransformer.toRpcRequest(NETCONF_GET_QNAME, NetconfMessageTransformUtil.wrap(NETCONF_GET_QNAME, filter)); assertSimilarXml(netconfMessage, "" @@ -368,8 +478,54 @@ public class NetconfMessageTransformerTest { + ""); } - private static NetconfMessageTransformer getTransformer(final SchemaContext schema) { - return new NetconfMessageTransformer(schema, true); + @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, "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\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, "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n"); + } + + private static NetconfMessageTransformer getTransformer(final EffectiveModelContext schema) { + return new NetconfMessageTransformer(new EmptyMountPointContext(schema), true, BASE_SCHEMAS.getBaseSchema()); } @Test @@ -378,137 +534,608 @@ public class NetconfMessageTransformerTest { "" )); final DOMRpcResult compositeNodeRpcResult = - netconfMessageTransformer.toRpcResult(response, toPath(NETCONF_COMMIT_QNAME)); + netconfMessageTransformer.toRpcResult(response, NETCONF_COMMIT_QNAME); assertTrue(compositeNodeRpcResult.getErrors().isEmpty()); assertNull(compositeNodeRpcResult.getResult()); } - public SchemaContext getSchema(final boolean addBase) { - final ModuleInfoBackedContext moduleInfoBackedContext = ModuleInfoBackedContext.create(); - if (addBase) { - moduleInfoBackedContext.addModuleInfos(Collections.singleton($YangModuleInfoImpl.getInstance())); - } - moduleInfoBackedContext - .addModuleInfos(Collections.singleton(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf - .netconf.monitoring.rev101004.$YangModuleInfoImpl.getInstance())); - return moduleInfoBackedContext.tryToCreateSchemaContext().get(); - } - @Test public void getActionsTest() { - QName reset = QName.create(URN_EXAMPLE_SERVER_FARM, REVISION_EXAMPLE_SERVER_FARM, "reset"); - QName start = QName.create(reset, "start"); - QName open = QName.create(start, "open"); - Set qnames = new HashSet<>(Arrays.asList(reset, start, open)); - Set actions = actionNetconfMessageTransformer.getActions(); - assertTrue(!actions.isEmpty()); - for (ActionDefinition actionDefinition : actions) { - QName qname = actionDefinition.getQName(); - assertTrue(qnames.contains(qname)); - qnames.remove(qname); + Set schemaPaths = new HashSet<>(); + schemaPaths.add(RESET_SERVER_PATH); + schemaPaths.add(START_DEVICE_PATH); + schemaPaths.add(ENABLE_INTERFACE_PATH); + schemaPaths.add(OPEN_BOXES_PATH); + schemaPaths.add(KILL_SERVER_APP_PATH); + schemaPaths.add(XYZZY_FOO_PATH); + schemaPaths.add(XYZZY_BAR_PATH); + schemaPaths.add(CHOICE_ACTION_PATH); + schemaPaths.add(DISABLE_INTERFACE_PATH); + schemaPaths.add(CHECK_WITH_OUTPUT_INTERFACE_PATH); + schemaPaths.add(CHECK_WITHOUT_OUTPUT_INTERFACE_PATH); + + var actions = NetconfMessageTransformer.getActions(ACTION_SCHEMA); + assertEquals(schemaPaths.size(), actions.size()); + + for (var path : schemaPaths) { + assertNotNull("Action for " + path + " not found", actions.get(path)); } } @Test public void toActionRequestListTopLevelTest() { - QName qname = QName.create(URN_EXAMPLE_SERVER_FARM, REVISION_EXAMPLE_SERVER_FARM, "server"); - QName nameQname = QName.create(qname, "name"); - QName actionResetQName = QName.create(qname, "reset"); - - Set nodeIdentifiers = - Collections.singleton(new NodeIdentifierWithPredicates(qname, nameQname, "test")); + QName nameQname = QName.create(SERVER_QNAME, "name"); + List nodeIdentifiers = new ArrayList<>(); + nodeIdentifiers.add(new NodeIdentifier(SERVER_QNAME)); + nodeIdentifiers.add(NodeIdentifierWithPredicates.of(SERVER_QNAME, nameQname, "test")); DOMDataTreeIdentifier domDataTreeIdentifier = prepareDataTreeId(nodeIdentifiers); - ContainerNode data = initInputAction(QName.create(qname, "reset-at"), "now"); + ContainerNode data = initInputAction(QName.create(SERVER_QNAME, "reset-at"), "now"); NetconfMessage actionRequest = actionNetconfMessageTransformer.toActionRequest( - SchemaPath.create(true, actionResetQName), domDataTreeIdentifier, data); + RESET_SERVER_PATH, domDataTreeIdentifier, data); Node childAction = checkBasePartOfActionRequest(actionRequest); Node childServer = childAction.getFirstChild(); - checkNode(childServer, "server", "server", qname.getNamespace().toString()); + checkNode(childServer, "server", "server", URN_EXAMPLE_SERVER_FARM); Node childName = childServer.getFirstChild(); - checkNode(childName, "name", "name", qname.getNamespace().toString()); + checkNode(childName, "name", "name", URN_EXAMPLE_SERVER_FARM); Node childTest = childName.getFirstChild(); assertEquals(childTest.getNodeValue(), "test"); - checkAction(actionResetQName, childName.getNextSibling(), "reset-at", "reset-at", "now"); + checkAction(RESET_QNAME, childName.getNextSibling(), "reset-at", "reset-at", "now"); } @Test public void toActionRequestContainerTopLevelTest() { - QName qname = QName.create(URN_EXAMPLE_SERVER_FARM, REVISION_EXAMPLE_SERVER_FARM, "device"); - QName actionStartQName = QName.create(qname, "start"); - - Set nodeIdentifiers = Collections.singleton(NodeIdentifier.create(qname)); + List nodeIdentifiers = List.of(NodeIdentifier.create(DEVICE_QNAME)); DOMDataTreeIdentifier domDataTreeIdentifier = prepareDataTreeId(nodeIdentifiers); - NormalizedNode payload = initInputAction(QName.create(qname, "start-at"), "now"); + ContainerNode payload = initInputAction(QName.create(DEVICE_QNAME, "start-at"), "now"); NetconfMessage actionRequest = actionNetconfMessageTransformer.toActionRequest( - SchemaPath.create(true, actionStartQName), domDataTreeIdentifier, payload); + START_DEVICE_PATH, domDataTreeIdentifier, payload); Node childAction = checkBasePartOfActionRequest(actionRequest); Node childDevice = childAction.getFirstChild(); - checkNode(childDevice, "device", "device", qname.getNamespace().toString()); + checkNode(childDevice, "device", "device", URN_EXAMPLE_SERVER_FARM); - checkAction(actionStartQName, childDevice.getFirstChild(), "start-at", "start-at", "now"); + checkAction(START_QNAME, childDevice.getFirstChild(), "start-at", "start-at", "now"); } @Test public void toActionRequestContainerInContainerTest() { - QName boxOutQName = QName.create(URN_EXAMPLE_SERVER_FARM, REVISION_EXAMPLE_SERVER_FARM, "box-out"); - QName boxInQName = QName.create(URN_EXAMPLE_SERVER_FARM, REVISION_EXAMPLE_SERVER_FARM, "box-in"); - QName actionOpenQName = QName.create(boxOutQName, "open"); - - Set nodeIdentifiers = new HashSet<>(); - nodeIdentifiers.add(NodeIdentifier.create(boxOutQName)); - nodeIdentifiers.add(NodeIdentifier.create(boxInQName)); + List nodeIdentifiers = new ArrayList<>(); + nodeIdentifiers.add(NodeIdentifier.create(BOX_OUT_QNAME)); + nodeIdentifiers.add(NodeIdentifier.create(BOX_IN_QNAME)); DOMDataTreeIdentifier domDataTreeIdentifier = prepareDataTreeId(nodeIdentifiers); - NormalizedNode payload = initInputAction(QName.create(boxOutQName, "start-at"), "now"); + ContainerNode payload = initInputAction(QName.create(BOX_OUT_QNAME, "start-at"), "now"); NetconfMessage actionRequest = actionNetconfMessageTransformer.toActionRequest( - SchemaPath.create(true, actionOpenQName), domDataTreeIdentifier, payload); + OPEN_BOXES_PATH, domDataTreeIdentifier, payload); Node childAction = checkBasePartOfActionRequest(actionRequest); Node childBoxOut = childAction.getFirstChild(); - checkNode(childBoxOut, "box-out", "box-out", boxOutQName.getNamespace().toString()); + checkNode(childBoxOut, "box-out", "box-out", URN_EXAMPLE_SERVER_FARM); Node childBoxIn = childBoxOut.getFirstChild(); - checkNode(childBoxIn, "box-in", "box-in", boxOutQName.getNamespace().toString()); + checkNode(childBoxIn, "box-in", "box-in", URN_EXAMPLE_SERVER_FARM); Node action = childBoxIn.getFirstChild(); - checkNode(action, null, actionOpenQName.getLocalName(), null); + checkNode(action, OPEN_QNAME.getLocalName(), OPEN_QNAME.getLocalName(), OPEN_QNAME.getNamespace().toString()); } - @SuppressWarnings({ "rawtypes", "unchecked" }) @Test - public void toActionResultTest() throws Exception { - QName qname = QName.create(URN_EXAMPLE_SERVER_FARM, REVISION_EXAMPLE_SERVER_FARM, "reset"); + public void toActionRequestListInContainerTest() { + QName nameQname = QName.create(INTERFACE_QNAME, "name"); + + List nodeIdentifiers = new ArrayList<>(); + nodeIdentifiers.add(NodeIdentifier.create(DEVICE_QNAME)); + nodeIdentifiers.add(NodeIdentifier.create(INTERFACE_QNAME)); + nodeIdentifiers.add(NodeIdentifierWithPredicates.of(INTERFACE_QNAME, nameQname, "test")); + + DOMDataTreeIdentifier domDataTreeIdentifier = prepareDataTreeId(nodeIdentifiers); + + ContainerNode payload = initEmptyInputAction(INTERFACE_QNAME); + NetconfMessage actionRequest = actionNetconfMessageTransformer.toActionRequest( + ENABLE_INTERFACE_PATH, domDataTreeIdentifier, payload); + + Node childAction = checkBasePartOfActionRequest(actionRequest); + + Node childDevice = childAction.getFirstChild(); + checkNode(childDevice, "device", "device", URN_EXAMPLE_SERVER_FARM); + + Node childInterface = childDevice.getFirstChild(); + checkNode(childInterface, "interface", "interface", URN_EXAMPLE_SERVER_FARM); + + Node childName = childInterface.getFirstChild(); + checkNode(childName, "name", "name", nameQname.getNamespace().toString()); + + Node childTest = childName.getFirstChild(); + assertEquals(childTest.getNodeValue(), "test"); + + Node action = childInterface.getLastChild(); + checkNode(action, ENABLE_QNAME.getLocalName(), ENABLE_QNAME.getLocalName(), + ENABLE_QNAME.getNamespace().toString()); + } + + @Test + public void toActionRequestListInContainerAugmentedIntoListTest() { + QName serverNameQname = QName.create(SERVER_QNAME, "name"); + QName applicationNameQname = QName.create(APPLICATION_QNAME, "name"); + + List nodeIdentifiers = new ArrayList<>(); + nodeIdentifiers.add(NodeIdentifier.create(SERVER_QNAME)); + nodeIdentifiers.add(NodeIdentifierWithPredicates.of(SERVER_QNAME, serverNameQname, "testServer")); + 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, + applicationNameQname, "testApplication")); + + DOMDataTreeIdentifier domDataTreeIdentifier = prepareDataTreeId(nodeIdentifiers); + + ContainerNode payload = initEmptyInputAction(APPLICATION_QNAME); + NetconfMessage actionRequest = actionNetconfMessageTransformer.toActionRequest( + KILL_SERVER_APP_PATH, domDataTreeIdentifier, payload); + + Node childAction = checkBasePartOfActionRequest(actionRequest); + + Node childServer = childAction.getFirstChild(); + checkNode(childServer, "server", "server", URN_EXAMPLE_SERVER_FARM); + + Node childServerName = childServer.getFirstChild(); + checkNode(childServerName, "name", "name", URN_EXAMPLE_SERVER_FARM); + + Node childServerNameTest = childServerName.getFirstChild(); + assertEquals(childServerNameTest.getNodeValue(), "testServer"); + + Node childApplications = childServer.getLastChild(); + checkNode(childApplications, "applications", "applications", URN_EXAMPLE_SERVER_FARM_2); + + Node childApplication = childApplications.getFirstChild(); + checkNode(childApplication, "application", "application", URN_EXAMPLE_SERVER_FARM_2); + + Node childApplicationName = childApplication.getFirstChild(); + checkNode(childApplicationName, "name", "name", URN_EXAMPLE_SERVER_FARM_2); + + Node childApplicationNameTest = childApplicationName.getFirstChild(); + assertEquals(childApplicationNameTest.getNodeValue(), "testApplication"); + + Node childKillAction = childApplication.getLastChild(); + checkNode(childApplication, "application", "application", URN_EXAMPLE_SERVER_FARM_2); + checkNode(childKillAction, KILL_QNAME.getLocalName(), KILL_QNAME.getLocalName(), + KILL_QNAME.getNamespace().toString()); + } + + @Test + public void toActionRequestConflictingInListTest() { + QName barInputQname = QName.create(BAR_QNAME, "bar"); + QName barIdQname = QName.create(BAR_QNAME, "bar-id"); + Byte barInput = 1; + + List nodeIdentifiers = new ArrayList<>(); + nodeIdentifiers.add(NodeIdentifier.create(BAR_QNAME)); + nodeIdentifiers.add(NodeIdentifierWithPredicates.of(BAR_QNAME, barIdQname, "test")); + + DOMDataTreeIdentifier domDataTreeIdentifier = prepareDataTreeId(nodeIdentifiers); + + 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); + + Node childAction = checkBasePartOfActionRequest(actionRequest); + + Node childBar = childAction.getFirstChild(); + checkNode(childBar, "bar", "bar", URN_EXAMPLE_CONFLICT); + + Node childBarId = childBar.getFirstChild(); + checkNode(childBarId, "bar-id", "bar-id", URN_EXAMPLE_CONFLICT); + + Node childTest = childBarId.getFirstChild(); + assertEquals(childTest.getNodeValue(), "test"); + + Node action = childBar.getLastChild(); + checkNode(action, XYZZY_QNAME.getLocalName(), XYZZY_QNAME.getLocalName(), + XYZZY_QNAME.getNamespace().toString()); + } + + @Test + public void toActionRequestConflictingInContainerTest() { + QName fooInputQname = QName.create(FOO_QNAME, "foo"); + + List nodeIdentifiers = new ArrayList<>(); + nodeIdentifiers.add(NodeIdentifier.create(FOO_QNAME)); + DOMDataTreeIdentifier domDataTreeIdentifier = prepareDataTreeId(nodeIdentifiers); + ContainerNode payload = initInputAction(fooInputQname, "test"); + + NetconfMessage actionRequest = actionNetconfMessageTransformer.toActionRequest( + XYZZY_FOO_PATH, domDataTreeIdentifier, payload); + + Node childAction = checkBasePartOfActionRequest(actionRequest); + + Node childBar = childAction.getFirstChild(); + checkNode(childBar, "foo", "foo", URN_EXAMPLE_CONFLICT); + + Node action = childBar.getLastChild(); + checkNode(action, XYZZY_QNAME.getLocalName(), XYZZY_QNAME.getLocalName(), + XYZZY_QNAME.getNamespace().toString()); + } + + @Test + public void toActionRequestChoiceTest() { + List nodeIdentifiers = new ArrayList<>(); + nodeIdentifiers.add(NodeIdentifier.create(CONFLICT_CHOICE_QNAME)); + nodeIdentifiers.add(NodeIdentifier.create(CHOICE_CONT_QNAME)); + DOMDataTreeIdentifier domDataTreeIdentifier = prepareDataTreeId(nodeIdentifiers); + NormalizedNode payload = initEmptyInputAction(CHOICE_ACTION_QNAME); + + NetconfMessage actionRequest = actionNetconfMessageTransformer.toActionRequest( + CHOICE_ACTION_PATH, domDataTreeIdentifier, payload); + + Node childAction = checkBasePartOfActionRequest(actionRequest); + + Node childChoiceCont = childAction.getFirstChild(); + checkNode(childChoiceCont, "choice-cont", "choice-cont", URN_EXAMPLE_CONFLICT); + Node action = childChoiceCont.getLastChild(); + checkNode(action, CHOICE_ACTION_QNAME.getLocalName(), CHOICE_ACTION_QNAME.getLocalName(), + CHOICE_ACTION_QNAME.getNamespace().toString()); + } + + @Test + public void toAugmentedActionRequestListInContainerTest() { + QName nameQname = QName.create(INTERFACE_QNAME, "name"); + + List nodeIdentifiers = new ArrayList<>(); + nodeIdentifiers.add(NodeIdentifier.create(DEVICE_QNAME)); + nodeIdentifiers.add(NodeIdentifier.create(INTERFACE_QNAME)); + nodeIdentifiers.add(NodeIdentifierWithPredicates.of(INTERFACE_QNAME, nameQname, "test")); + + DOMDataTreeIdentifier domDataTreeIdentifier = prepareDataTreeId(nodeIdentifiers); + + NormalizedNode payload = initEmptyInputAction(INTERFACE_QNAME); + NetconfMessage actionRequest = actionNetconfMessageTransformer.toActionRequest( + DISABLE_INTERFACE_PATH, domDataTreeIdentifier, payload); + + Node childAction = checkBasePartOfActionRequest(actionRequest); + + Node childDevice = childAction.getFirstChild(); + checkNode(childDevice, "device", "device", URN_EXAMPLE_SERVER_FARM); + + Node childInterface = childDevice.getFirstChild(); + checkNode(childInterface, "interface", "interface", URN_EXAMPLE_SERVER_FARM); + + Node childName = childInterface.getFirstChild(); + checkNode(childName, "name", "name", nameQname.getNamespace().toString()); + + Node childTest = childName.getFirstChild(); + assertEquals(childTest.getNodeValue(), "test"); + + Node action = childInterface.getLastChild(); + checkNode(action, DISABLE_QNAME.getLocalName(), DISABLE_QNAME.getLocalName(), + DISABLE_QNAME.getNamespace().toString()); + } + + @Test + public void toActionResultTest() throws Exception { NetconfMessage message = new NetconfMessage(XmlUtil.readXmlToDocument( "" + "" + "now" + "" + "")); - DOMActionResult actionResult = actionNetconfMessageTransformer.toActionResult( - SchemaPath.create(true, qname), message); + DOMActionResult actionResult = actionNetconfMessageTransformer.toActionResult(RESET_SERVER_PATH, message); assertNotNull(actionResult); ContainerNode containerNode = actionResult.getOutput().get(); assertNotNull(containerNode); - LeafNode leaf = (LeafNode) containerNode.getValue().iterator().next(); - assertEquals("now", leaf.getValue()); + assertEquals("now", containerNode.body().iterator().next().body()); + } + + @Test + public void toActionEmptyBodyWithOutputDefinedResultTest() throws Exception { + NetconfMessage message = new NetconfMessage(XmlUtil.readXmlToDocument( + "" + + "" + + "")); + DOMActionResult actionResult = + actionNetconfMessageTransformer.toActionResult(CHECK_WITH_OUTPUT_INTERFACE_PATH, message); + assertNotNull(actionResult); + assertTrue(actionResult.getOutput().isEmpty()); + } + + @Test + public void toActionEmptyBodyWithoutOutputDefinedResultTest() throws Exception { + NetconfMessage message = new NetconfMessage(XmlUtil.readXmlToDocument( + "" + + "" + + "")); + DOMActionResult actionResult = + actionNetconfMessageTransformer.toActionResult(CHECK_WITHOUT_OUTPUT_INTERFACE_PATH, message); + assertNotNull(actionResult); + assertTrue(actionResult.getOutput().isEmpty()); + } + + @Test + public void getTwoNonOverlappingFieldsTest() throws IOException, SAXException { + // preparation of the fields + final YangInstanceIdentifier parentYiid = YangInstanceIdentifier.create(toId(NetconfState.QNAME)); + final YangInstanceIdentifier netconfStartTimeField = YangInstanceIdentifier.create(toId(Statistics.QNAME), + toId(QName.create(Statistics.QNAME, "netconf-start-time"))); + final YangInstanceIdentifier datastoresField = YangInstanceIdentifier.create(toId(Datastores.QNAME)); + + // building filter structure and NETCONF message + 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)); + + // testing + assertSimilarXml(netconfMessage, "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + ""); + } + + @Test + public void getOverlappingFieldsTest() throws IOException, SAXException { + // preparation of the fields + final YangInstanceIdentifier parentYiid = YangInstanceIdentifier.create(toId(NetconfState.QNAME)); + final YangInstanceIdentifier capabilitiesField = YangInstanceIdentifier.create(toId(Capabilities.QNAME)); + final YangInstanceIdentifier capabilityField = YangInstanceIdentifier.create(toId(Capabilities.QNAME), + toId(QName.create(Capabilities.QNAME, "capability").intern())); + final YangInstanceIdentifier datastoreField = YangInstanceIdentifier.create(toId(Datastores.QNAME)); + final YangInstanceIdentifier locksFields = YangInstanceIdentifier.create(toId(Datastores.QNAME), + toId(Datastore.QNAME), NodeIdentifierWithPredicates.of(Datastore.QNAME), toId(Locks.QNAME)); + + // building filter structure and NETCONF message + 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)); + + // testing + assertSimilarXml(netconfMessage, "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + ""); + } + + @Test + public void getOverlappingFieldsWithEmptyFieldTest() throws IOException, SAXException { + // preparation of the fields + final YangInstanceIdentifier parentYiid = YangInstanceIdentifier.create(toId(NetconfState.QNAME)); + final YangInstanceIdentifier capabilitiesField = YangInstanceIdentifier.create(toId(Capabilities.QNAME)); + + // building filter structure and NETCONF message + 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)); + + // testing + assertSimilarXml(netconfMessage, "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + ""); + } + + @Test + public void getSpecificFieldsUnderListTest() throws IOException, SAXException { + // preparation of the fields + final YangInstanceIdentifier parentYiid = YangInstanceIdentifier.create(toId(NetconfState.QNAME), + toId(Schemas.QNAME), toId(Schema.QNAME), NodeIdentifierWithPredicates.of(Schema.QNAME)); + final YangInstanceIdentifier versionField = YangInstanceIdentifier.create( + toId(QName.create(Schema.QNAME, "version").intern())); + final YangInstanceIdentifier identifierField = YangInstanceIdentifier.create( + toId(QName.create(Schema.QNAME, "namespace").intern())); + + // building filter structure and NETCONF message + 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)); + + // testing + assertSimilarXml(netconfMessage, "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + // explicitly fetched list keys - identifier and format + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + ""); + } + + @Test + public void getSpecificFieldsUnderMultipleLists() throws IOException, SAXException { + // preparation of the fields + final YangInstanceIdentifier parentYiid = YangInstanceIdentifier.create( + toId(NetconfState.QNAME), toId(Datastores.QNAME)); + final YangInstanceIdentifier partialLockYiid = YangInstanceIdentifier.create(toId(Datastore.QNAME), + NodeIdentifierWithPredicates.of(Datastore.QNAME), toId(Locks.QNAME), + toId(QName.create(Locks.QNAME, "lock-type").intern()), toId(PartialLock.QNAME), + NodeIdentifierWithPredicates.of(PartialLock.QNAME)); + final YangInstanceIdentifier lockedTimeField = partialLockYiid.node( + QName.create(Locks.QNAME, "locked-time").intern()); + final YangInstanceIdentifier lockedBySessionField = partialLockYiid.node( + QName.create(Locks.QNAME, "locked-by-session").intern()); + + // building filter structure and NETCONF message + final AnyxmlNode filterStructure = toFilterStructure( + List.of(FieldsFilter.of(parentYiid, List.of(lockedTimeField, lockedBySessionField))), + SCHEMA); + final NetconfMessage netconfMessage = netconfMessageTransformer.toRpcRequest(NETCONF_GET_QNAME, + NetconfMessageTransformUtil.wrap(toId(NETCONF_GET_QNAME), filterStructure)); + + // testing + assertSimilarXml(netconfMessage, "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + ""); + } + + @Test + public void getWholeListsUsingFieldsTest() throws IOException, SAXException { + // preparation of the fields + final YangInstanceIdentifier parentYiid = YangInstanceIdentifier.create(toId(NetconfState.QNAME)); + final YangInstanceIdentifier datastoreListField = YangInstanceIdentifier.create(toId(Datastores.QNAME), + toId(Datastore.QNAME), NodeIdentifierWithPredicates.of(Datastore.QNAME)); + final YangInstanceIdentifier sessionListField = YangInstanceIdentifier.create(toId(Sessions.QNAME), + toId(Session.QNAME), NodeIdentifierWithPredicates.of(Session.QNAME)); + + // building filter structure and NETCONF message + 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)); + + // testing + assertSimilarXml(netconfMessage, "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + ""); + } + + @Test + public void getSpecificListEntriesWithSpecificFieldsTest() throws IOException, SAXException { + // preparation of the fields + final YangInstanceIdentifier parentYiid = YangInstanceIdentifier.create(toId(NetconfState.QNAME), + toId(Sessions.QNAME)); + final QName sessionId = QName.create(Session.QNAME, "session-id").intern(); + final YangInstanceIdentifier session1Field = YangInstanceIdentifier.create(toId(Session.QNAME), + NodeIdentifierWithPredicates.of(Session.QNAME, sessionId, 1)); + final YangInstanceIdentifier session2TransportField = YangInstanceIdentifier.create(toId(Session.QNAME), + NodeIdentifierWithPredicates.of(Session.QNAME, sessionId, 2), + toId(QName.create(Session.QNAME, "transport").intern())); + + // building filter structure and NETCONF message + 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)); + + // testing + assertSimilarXml(netconfMessage, "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "1\n" + + "\n" + + "\n" + + "2\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + ""); + } + + @Test + // Proof that YANGTOOLS-1362 works on DOM level + public void testConfigChangeToNotification() throws SAXException, IOException { + final var message = new NetconfMessage(XmlUtil.readXmlToDocument( + "\n" + + " 2021-11-11T11:26:16Z \n" + + " \n" + + " \n" + + " root \n" + + " 3 \n" + + " \n" + + " running \n" + + " \n" + + " /ncm:netconf-state" + + "/ncm:datastores/ncm:datastore[ncm:name='running']\n" + + " replace \n" + + " \n" + + " \n" + + "")); + + 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, null, actionQname.getLocalName(), null); + checkNode(action, actionQname.getLocalName(), actionQname.getLocalName(), + actionQname.getNamespace().toString()); Node childResetAt = action.getFirstChild(); checkNode(childResetAt, inputLocalName, inputNodeName, actionQname.getNamespace().toString()); @@ -519,20 +1146,20 @@ public class NetconfMessageTransformerTest { private static Node checkBasePartOfActionRequest(final NetconfMessage actionRequest) { Node baseRpc = actionRequest.getDocument().getFirstChild(); - checkNode(baseRpc, "rpc", "rpc", NetconfMessageTransformUtil.NETCONF_QNAME.getNamespace().toString()); + checkNode(baseRpc, "rpc", "rpc", NetconfUtil.NETCONF_QNAME.getNamespace().toString()); assertTrue(baseRpc.getLocalName().equals("rpc")); assertTrue(baseRpc.getNodeName().equals("rpc")); Node messageId = baseRpc.getAttributes().getNamedItem("message-id"); assertNotNull(messageId); assertTrue(messageId.getNodeValue().contains("m-")); - Node childAction = baseRpc.getFirstChild(); + checkNode(childAction, "action", "action", NetconfMessageTransformUtil.NETCONF_ACTION_NAMESPACE.toString()); return childAction; } - private static DOMDataTreeIdentifier prepareDataTreeId(final Set nodeIdentifiers) { + private static DOMDataTreeIdentifier prepareDataTreeId(final List nodeIdentifiers) { YangInstanceIdentifier yangInstanceIdentifier = YangInstanceIdentifier.builder().append(nodeIdentifiers).build(); DOMDataTreeIdentifier domDataTreeIdentifier = @@ -542,12 +1169,16 @@ public class NetconfMessageTransformerTest { } private static ContainerNode initInputAction(final QName qname, final String value) { - ImmutableLeafNodeBuilder immutableLeafNodeBuilder = new ImmutableLeafNodeBuilder<>(); - DataContainerChild 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 Builders.containerBuilder() + .withNodeIdentifier(NodeIdentifier.create(QName.create(qname, "input"))) + .build(); } private static void checkNode(final Node childServer, final String expectedLocalName, final String expectedNodeName, @@ -557,12 +1188,4 @@ public class NetconfMessageTransformerTest { assertEquals(childServer.getNodeName(), expectedNodeName); assertEquals(childServer.getNamespaceURI(), expectedNamespace); } - - private static SchemaContext getActionSchema() { - return YangParserTestUtils.parseYangResource("/schemas/example-server-farm.yang"); - } - - private static NetconfMessageTransformer getActionMessageTransformer() { - return new NetconfMessageTransformer(getActionSchema(), true); - } }