X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=netconf%2Fsal-netconf-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Fsal%2Fconnect%2Fnetconf%2Futil%2FNetconfMessageTransformUtil.java;h=83d903b686d9ce993a9fb3249d5957b0338ce5d9;hb=43674bdb541df3322b67994901fe2c73f3f82682;hp=9275020f3d40ffc755daee5f6cb4244a61b67497;hpb=1c545b9883f64305983a9c0ef73acdaa97866cc7;p=netconf.git diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfMessageTransformUtil.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfMessageTransformUtil.java index 9275020f3d..83d903b686 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfMessageTransformUtil.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfMessageTransformUtil.java @@ -7,20 +7,21 @@ */ package org.opendaylight.netconf.sal.connect.netconf.util; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import java.io.IOException; import java.net.URI; +import java.time.Instant; import java.time.format.DateTimeParseException; import java.util.AbstractMap; +import java.util.AbstractMap.SimpleEntry; import java.util.Collection; -import java.util.Date; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.Optional; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; import javax.xml.transform.dom.DOMResult; @@ -61,6 +62,8 @@ 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.SchemaOrderedNormalizedNodeWriter; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeAttrBuilder; +import org.opendaylight.yangtools.yang.data.util.DataSchemaContextNode; +import org.opendaylight.yangtools.yang.data.util.DataSchemaContextTree; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.NotificationDefinition; import org.opendaylight.yangtools.yang.model.api.SchemaContext; @@ -85,7 +88,9 @@ public final class NetconfMessageTransformUtil { private static final Document BLANK_DOCUMENT = XmlUtil.newDocument(); public static final String EVENT_TIME = "eventTime"; - private NetconfMessageTransformUtil() {} + private NetconfMessageTransformUtil() { + + } public static final QName IETF_NETCONF_MONITORING = QName.create(NetconfState.QNAME, "ietf-netconf-monitoring").intern(); @@ -126,10 +131,13 @@ public final class NetconfMessageTransformUtil { public static final NodeIdentifier NETCONF_CONFIG_NODEID = NodeIdentifier.create(NETCONF_CONFIG_QNAME); public static final QName NETCONF_COMMIT_QNAME = QName.create(NETCONF_QNAME, "commit").intern(); + public static final SchemaPath NETCONF_COMMIT_PATH = toPath(NETCONF_COMMIT_QNAME); public static final QName NETCONF_VALIDATE_QNAME = QName.create(NETCONF_QNAME, "validate").intern(); public static final NodeIdentifier NETCONF_VALIDATE_NODEID = NodeIdentifier.create(NETCONF_VALIDATE_QNAME); + public static final SchemaPath NETCONF_VALIDATE_PATH = toPath(NETCONF_VALIDATE_QNAME); public static final QName NETCONF_COPY_CONFIG_QNAME = QName.create(NETCONF_QNAME, "copy-config").intern(); public static final NodeIdentifier NETCONF_COPY_CONFIG_NODEID = NodeIdentifier.create(NETCONF_COPY_CONFIG_QNAME); + public static final SchemaPath NETCONF_COPY_CONFIG_PATH = toPath(NETCONF_COPY_CONFIG_QNAME); public static final QName NETCONF_OPERATION_QNAME = QName.create(NETCONF_QNAME, "operation").intern(); public static final QName NETCONF_DEFAULT_OPERATION_QNAME = @@ -138,12 +146,17 @@ public final class NetconfMessageTransformUtil { NodeIdentifier.create(NETCONF_DEFAULT_OPERATION_QNAME); public static final QName NETCONF_EDIT_CONFIG_QNAME = QName.create(NETCONF_QNAME, "edit-config").intern(); public static final NodeIdentifier NETCONF_EDIT_CONFIG_NODEID = NodeIdentifier.create(NETCONF_EDIT_CONFIG_QNAME); + public static final SchemaPath NETCONF_EDIT_CONFIG_PATH = toPath(NETCONF_EDIT_CONFIG_QNAME); public static final QName NETCONF_GET_CONFIG_QNAME = QName.create(NETCONF_QNAME, "get-config"); + public static final NodeIdentifier NETCONF_GET_CONFIG_NODEID = NodeIdentifier.create(NETCONF_GET_CONFIG_QNAME); + public static final SchemaPath NETCONF_GET_CONFIG_PATH = toPath(NETCONF_GET_CONFIG_QNAME); public static final QName NETCONF_DISCARD_CHANGES_QNAME = QName.create(NETCONF_QNAME, "discard-changes"); + public static final SchemaPath NETCONF_DISCARD_CHANGES_PATH = toPath(NETCONF_DISCARD_CHANGES_QNAME); public static final QName NETCONF_TYPE_QNAME = QName.create(NETCONF_QNAME, "type").intern(); public static final QName NETCONF_FILTER_QNAME = QName.create(NETCONF_QNAME, "filter").intern(); public static final QName NETCONF_GET_QNAME = QName.create(NETCONF_QNAME, "get").intern(); public static final NodeIdentifier NETCONF_GET_NODEID = NodeIdentifier.create(NETCONF_GET_QNAME); + public static final SchemaPath NETCONF_GET_PATH = toPath(NETCONF_GET_QNAME); public static final QName NETCONF_RPC_QNAME = QName.create(NETCONF_QNAME, "rpc").intern(); public static final QName YANG_QNAME = null; public static final URI NETCONF_ACTION_NAMESPACE = URI.create("urn:ietf:params:xml:ns:yang:1"); @@ -164,8 +177,10 @@ public final class NetconfMessageTransformUtil { public static final QName NETCONF_LOCK_QNAME = QName.create(NETCONF_QNAME, "lock").intern(); public static final NodeIdentifier NETCONF_LOCK_NODEID = NodeIdentifier.create(NETCONF_LOCK_QNAME); + public static final SchemaPath NETCONF_LOCK_PATH = toPath(NETCONF_LOCK_QNAME); public static final QName NETCONF_UNLOCK_QNAME = QName.create(NETCONF_QNAME, "unlock").intern(); public static final NodeIdentifier NETCONF_UNLOCK_NODEID = NodeIdentifier.create(NETCONF_UNLOCK_QNAME); + public static final SchemaPath NETCONF_UNLOCK_PATH = toPath(NETCONF_UNLOCK_QNAME); public static final NodeIdentifier EDIT_CONTENT_NODEID = NodeIdentifier.create(EditContent.QNAME); @@ -179,7 +194,7 @@ public final class NetconfMessageTransformUtil { // Get message public static final ContainerNode GET_RPC_CONTENT = Builders.containerBuilder() - .withNodeIdentifier(NodeIdentifier.create(NETCONF_GET_QNAME)).build(); + .withNodeIdentifier(NETCONF_GET_NODEID).build(); // Create-subscription changes message public static final ContainerNode CREATE_SUBSCRIPTION_RPC_CONTENT = Builders.containerBuilder() @@ -316,13 +331,19 @@ public final class NetconfMessageTransformUtil { return new NodeContainerProxy(next.getQName(), next.getChildNodes(), next.getAvailableAugmentations()); } + @Deprecated public static ContainerNode wrap(final QName name, final DataContainerChild... node) { - return Builders.containerBuilder().withNodeIdentifier(toId(name)).withValue(ImmutableList.copyOf(node)).build(); + return wrap(toId(name), node); + } + + public static ContainerNode wrap(final NodeIdentifier name, final DataContainerChild... node) { + return Builders.containerBuilder().withNodeIdentifier(name).withValue(ImmutableList.copyOf(node)).build(); } public static AnyXmlNode createEditConfigAnyxml( - final SchemaContext ctx, final YangInstanceIdentifier dataPath, final Optional operation, - final Optional> lastChildOverride) { + final SchemaContext ctx, final YangInstanceIdentifier dataPath, + final java.util.Optional operation, + final java.util.Optional> lastChildOverride) { final NormalizedNode configContent; if (dataPath.isEmpty()) { @@ -335,7 +356,7 @@ public final class NetconfMessageTransformUtil { } else { final Entry modifyOperation = operation.isPresent() ? new AbstractMap.SimpleEntry<>(NETCONF_OPERATION_QNAME, operation.get()) : null; - configContent = ImmutableNodes.fromInstanceId(ctx, dataPath, lastChildOverride.toJavaUtil(), + configContent = ImmutableNodes.fromInstanceId(ctx, dataPath, lastChildOverride, java.util.Optional.ofNullable(modifyOperation)); } @@ -351,18 +372,18 @@ public final class NetconfMessageTransformUtil { .build(); } - public static DataContainerChild createEditConfigStructure( - final SchemaContext ctx, final YangInstanceIdentifier dataPath, final Optional operation, - final Optional> lastChildOverride) { + public static DataContainerChild createEditConfigStructure(final SchemaContext ctx, + final YangInstanceIdentifier dataPath, final java.util.Optional operation, + final java.util.Optional> lastChildOverride) { return Builders.choiceBuilder().withNodeIdentifier(EDIT_CONTENT_NODEID) .withChild(createEditConfigAnyxml(ctx, dataPath, operation, lastChildOverride)).build(); } public static SchemaPath toPath(final QName rpc) { - return SchemaPath.create(true, rpc); + return SchemaPath.ROOT.createChild(rpc); } - public static Map.Entry stripNotification(final NetconfMessage message) { + public static Map.Entry stripNotification(final NetconfMessage message) { final XmlElement xmlElement = XmlElement.fromDomDocument(message.getDocument()); final List childElements = xmlElement.getChildElements(); Preconditions.checkArgument(childElements.size() == 2, "Unable to parse notification %s, unexpected format." @@ -382,8 +403,8 @@ public final class NetconfMessageTransformUtil { } try { - return new AbstractMap.SimpleEntry<>( - NetconfNotification.RFC3339_DATE_PARSER.apply(eventTimeElement.getTextContent()), + return new SimpleEntry<>( + NetconfNotification.RFC3339_DATE_PARSER.apply(eventTimeElement.getTextContent()).toInstant(), notificationElement); } catch (final DocumentedException e) { throw new IllegalArgumentException("Notification payload does not contain " + EVENT_TIME + " " + message, @@ -391,7 +412,8 @@ public final class NetconfMessageTransformUtil { } catch (final DateTimeParseException e) { LOG.warn("Unable to parse event time from {}. Setting time to {}", eventTimeElement, NetconfNotification.UNKNOWN_EVENT_TIME, e); - return new AbstractMap.SimpleEntry<>(NetconfNotification.UNKNOWN_EVENT_TIME, notificationElement); + return new SimpleEntry<>(NetconfNotification.UNKNOWN_EVENT_TIME.toInstant(), + notificationElement); } } @@ -407,8 +429,9 @@ public final class NetconfMessageTransformUtil { return new DOMResult(elementNS); } - public static DOMResult prepareDomResultForActionRequest(DOMDataTreeIdentifier domDataTreeIdentifier, - final SchemaPath actionSchemaPath, final MessageCounter counter, String action) { + public static DOMResult prepareDomResultForActionRequest(final DataSchemaContextTree dataSchemaContextTree, + final DOMDataTreeIdentifier domDataTreeIdentifier, final SchemaPath actionSchemaPath, + final MessageCounter counter, final String action) { final Document document = XmlUtil.newDocument(); final Element rpcNS = document.createElementNS(NETCONF_RPC_QNAME.getNamespace().toString(), NETCONF_RPC_QNAME.getLocalName()); @@ -416,8 +439,8 @@ public final class NetconfMessageTransformUtil { rpcNS.setAttribute(MESSAGE_ID_ATTR, counter.getNewMessageId(MESSAGE_ID_PREFIX)); final Element actionNS = document.createElementNS(NETCONF_ACTION_NAMESPACE.toString(), NETCONF_ACTION); - - final Element actionData = prepareActionData(actionNS, + final DataSchemaContextNode rootSchemaContextNode = dataSchemaContextTree.getRoot(); + final Element actionData = prepareActionData(rootSchemaContextNode, actionNS, domDataTreeIdentifier.getRootIdentifier().getPathArguments().iterator(), document); Element specificActionElement = document.createElement(action); @@ -427,11 +450,19 @@ public final class NetconfMessageTransformUtil { return new DOMResult(specificActionElement); } - private static Element prepareActionData(Element actionNS, Iterator iterator, Document document) { + private static Element prepareActionData(final DataSchemaContextNode currentParentSchemaNode, + final Element actionNS, final Iterator iterator, final Document document) { if (iterator.hasNext()) { - PathArgument next = iterator.next(); - final QName actualNS = next.getNodeType(); + final PathArgument next = iterator.next(); + + DataSchemaContextNode current = currentParentSchemaNode.getChild(next); + Preconditions.checkArgument(current != null, "Invalid input: schema for argument %s not found", next); + if (current.isMixin()) { + return prepareActionData(current, actionNS, iterator, document); + } + + final QName actualNS = next.getNodeType(); final Element actualElement = document.createElementNS(actualNS.getNamespace().toString(), actualNS.getLocalName()); if (next instanceof NodeWithValue) { @@ -446,7 +477,7 @@ public final class NetconfMessageTransformUtil { } } actionNS.appendChild(actualElement); - return prepareActionData(actualElement, iterator, document); + return prepareActionData(current, actualElement, iterator, document); } else { return actionNS; }