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=d1ed75bb0f266cd0f504493868711ac00f4e90f7;hpb=ecd80a731e909f1374071983cf1bc2e1f05e7bb7;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 d1ed75bb0f..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(); @@ -336,8 +341,9 @@ public final class NetconfMessageTransformUtil { } 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()) { @@ -350,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)); } @@ -366,9 +372,9 @@ 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(); } @@ -377,7 +383,7 @@ public final class NetconfMessageTransformUtil { 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." @@ -397,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, @@ -406,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); } } @@ -422,8 +429,9 @@ public final class NetconfMessageTransformUtil { return new DOMResult(elementNS); } - public static DOMResult prepareDomResultForActionRequest(final DOMDataTreeIdentifier domDataTreeIdentifier, - final SchemaPath actionSchemaPath, final MessageCounter counter, final 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()); @@ -431,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); @@ -442,12 +450,19 @@ public final class NetconfMessageTransformUtil { return new DOMResult(specificActionElement); } - private static Element prepareActionData(final Element actionNS, final Iterator iterator, - final 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) { @@ -462,7 +477,7 @@ public final class NetconfMessageTransformUtil { } } actionNS.appendChild(actualElement); - return prepareActionData(actualElement, iterator, document); + return prepareActionData(current, actualElement, iterator, document); } else { return actionNS; }