X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-netconf-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fconnect%2Fnetconf%2Futil%2FNetconfMessageTransformUtil.java;h=1da39cf751cba27b999642c20da9d7659a45a728;hp=6117a216cdf1d4a79861ab775ebe985fb3ab2b6c;hb=0ed66e3d67fe6b021844c4c3def8583e80a2e934;hpb=b77647db87d85ce51f896aea5de8622e02b26db5

diff --git a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/util/NetconfMessageTransformUtil.java b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/util/NetconfMessageTransformUtil.java
index 6117a216cd..1da39cf751 100644
--- a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/util/NetconfMessageTransformUtil.java
+++ b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/util/NetconfMessageTransformUtil.java
@@ -7,73 +7,100 @@
  */
 package org.opendaylight.controller.sal.connect.netconf.util;
 
+import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
-import com.google.common.base.Predicate;
-import com.google.common.collect.Collections2;
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
-import com.google.common.collect.Sets;
-
+import com.google.common.collect.Lists;
+import java.io.IOException;
 import java.net.URI;
-import java.util.ArrayList;
+import java.util.AbstractMap;
 import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-
-import javax.annotation.Nullable;
-
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.dom.DOMSource;
 import org.opendaylight.controller.netconf.api.NetconfDocumentedException;
 import org.opendaylight.controller.netconf.api.NetconfMessage;
 import org.opendaylight.controller.netconf.util.messages.NetconfMessageUtil;
+import org.opendaylight.controller.netconf.util.xml.XmlUtil;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.edit.config.input.EditContent;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.notification._1._0.rev080714.CreateSubscriptionInput;
 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.notifications.rev120206.NetconfCapabilityChange;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.RpcError;
 import org.opendaylight.yangtools.yang.common.RpcError.ErrorSeverity;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
-import org.opendaylight.yangtools.yang.data.api.CompositeNode;
+import org.opendaylight.yangtools.yang.data.api.ModifyAction;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.Node;
-import org.opendaylight.yangtools.yang.data.api.SimpleNode;
-import org.opendaylight.yangtools.yang.data.impl.CompositeNodeTOImpl;
-import org.opendaylight.yangtools.yang.data.impl.ImmutableCompositeNode;
-import org.opendaylight.yangtools.yang.data.impl.NodeFactory;
-import org.opendaylight.yangtools.yang.data.impl.SimpleNodeTOImpl;
-import org.opendaylight.yangtools.yang.data.impl.util.CompositeNodeBuilder;
-import org.opendaylight.yangtools.yang.model.api.DataNodeContainer;
-import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
-import org.opendaylight.yangtools.yang.model.api.RpcDefinition;
+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.DataContainerChild;
+import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter;
+import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeWriter;
+import org.opendaylight.yangtools.yang.data.impl.codec.xml.XMLStreamNormalizedNodeStreamWriter;
+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.builder.api.NormalizedNodeAttrBuilder;
+import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.NotificationDefinition;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
 public class NetconfMessageTransformUtil {
 
+    private static final Logger LOG= LoggerFactory.getLogger(NetconfMessageTransformUtil.class);
+
     public static final String MESSAGE_ID_ATTR = "message-id";
+    public static final XMLOutputFactory XML_FACTORY;
+
+    static {
+        XML_FACTORY = XMLOutputFactory.newFactory();
+        XML_FACTORY.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, false);
+    }
+
+    public static final QName CREATE_SUBSCRIPTION_RPC_QNAME = QName.cachedReference(QName.create(CreateSubscriptionInput.QNAME, "create-subscription"));
+    private static final String SUBTREE = "subtree";
+
+    // Blank document used for creation of new DOM nodes
+    private static final Document BLANK_DOCUMENT = XmlUtil.newDocument();
 
     private NetconfMessageTransformUtil() {}
 
     public static final QName IETF_NETCONF_MONITORING = QName.create(NetconfState.QNAME, "ietf-netconf-monitoring");
+    public static final QName GET_DATA_QNAME = QName.create(IETF_NETCONF_MONITORING, "data");
+    public static final QName GET_SCHEMA_QNAME = QName.create(IETF_NETCONF_MONITORING, "get-schema");
     public static final QName IETF_NETCONF_MONITORING_SCHEMA_FORMAT = QName.create(IETF_NETCONF_MONITORING, "format");
     public static final QName IETF_NETCONF_MONITORING_SCHEMA_LOCATION = QName.create(IETF_NETCONF_MONITORING, "location");
     public static final QName IETF_NETCONF_MONITORING_SCHEMA_IDENTIFIER = QName.create(IETF_NETCONF_MONITORING, "identifier");
     public static final QName IETF_NETCONF_MONITORING_SCHEMA_VERSION = QName.create(IETF_NETCONF_MONITORING, "version");
     public static final QName IETF_NETCONF_MONITORING_SCHEMA_NAMESPACE = QName.create(IETF_NETCONF_MONITORING, "namespace");
 
+    public static final QName IETF_NETCONF_NOTIFICATIONS = QName.create(NetconfCapabilityChange.QNAME, "ietf-netconf-notifications");
+
     public static URI NETCONF_URI = URI.create("urn:ietf:params:xml:ns:netconf:base:1.0");
-    public static QName NETCONF_QNAME = QName.create(NETCONF_URI, null, "netconf");
+    public static QName NETCONF_QNAME = QName.create(NETCONF_URI.toString(), "2011-06-01", "netconf");
     public static QName NETCONF_DATA_QNAME = QName.create(NETCONF_QNAME, "data");
     public static QName NETCONF_RPC_REPLY_QNAME = QName.create(NETCONF_QNAME, "rpc-reply");
+    public static QName NETCONF_OK_QNAME = QName.create(NETCONF_QNAME, "ok");
     public static QName NETCONF_ERROR_OPTION_QNAME = QName.create(NETCONF_QNAME, "error-option");
     public static QName NETCONF_RUNNING_QNAME = QName.create(NETCONF_QNAME, "running");
-    static List<Node<?>> RUNNING = Collections.<Node<?>> singletonList(new SimpleNodeTOImpl<>(NETCONF_RUNNING_QNAME, null, null));
     public static QName NETCONF_SOURCE_QNAME = QName.create(NETCONF_QNAME, "source");
-    public static CompositeNode CONFIG_SOURCE_RUNNING = new CompositeNodeTOImpl(NETCONF_SOURCE_QNAME, null, RUNNING);
     public static QName NETCONF_CANDIDATE_QNAME = QName.create(NETCONF_QNAME, "candidate");
     public static QName NETCONF_TARGET_QNAME = QName.create(NETCONF_QNAME, "target");
     public static QName NETCONF_CONFIG_QNAME = QName.create(NETCONF_QNAME, "config");
     public static QName NETCONF_COMMIT_QNAME = QName.create(NETCONF_QNAME, "commit");
+    public static QName NETCONF_VALIDATE_QNAME = QName.create(NETCONF_QNAME, "validate");
+    public static QName NETCONF_COPY_CONFIG_QNAME = QName.create(NETCONF_QNAME, "copy-config");
     public static QName NETCONF_OPERATION_QNAME = QName.create(NETCONF_QNAME, "operation");
     public static QName NETCONF_DEFAULT_OPERATION_QNAME = QName.create(NETCONF_OPERATION_QNAME, "default-operation");
     public static QName NETCONF_EDIT_CONFIG_QNAME = QName.create(NETCONF_QNAME, "edit-config");
@@ -91,39 +118,48 @@ public class NetconfMessageTransformUtil {
     public static URI NETCONF_CANDIDATE_URI = URI
             .create("urn:ietf:params:netconf:capability:candidate:1.0");
 
+    public static URI NETCONF_NOTIFICATONS_URI = URI
+            .create("urn:ietf:params:netconf:capability:notification:1.0");
+
+    public static URI NETCONF_RUNNING_WRITABLE_URI = URI
+            .create("urn:ietf:params:netconf:capability:writable-running:1.0");
+
+    public static QName NETCONF_LOCK_QNAME = QName.create(NETCONF_QNAME, "lock");
+    public static QName NETCONF_UNLOCK_QNAME = QName.create(NETCONF_QNAME, "unlock");
+
     // Discard changes message
-    public static final CompositeNode DISCARD_CHANGES_RPC_CONTENT =
-            NodeFactory.createImmutableCompositeNode(NETCONF_DISCARD_CHANGES_QNAME, null, Collections.<Node<?>>emptyList());
+    public static final ContainerNode DISCARD_CHANGES_RPC_CONTENT =
+            Builders.containerBuilder().withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(NETCONF_DISCARD_CHANGES_QNAME)).build();
 
     // Commit changes message
-    public static final CompositeNode COMMIT_RPC_CONTENT =
-            NodeFactory.createImmutableCompositeNode(NETCONF_COMMIT_QNAME, null, Collections.<Node<?>>emptyList());
+    public static final ContainerNode COMMIT_RPC_CONTENT =
+            Builders.containerBuilder().withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(NETCONF_COMMIT_QNAME)).build();
 
-    public static Node<?> toFilterStructure(final YangInstanceIdentifier identifier) {
-        Node<?> previous = null;
-        if (Iterables.isEmpty(identifier.getPathArguments())) {
-            return null;
-        }
+    // Get message
+    public static final ContainerNode GET_RPC_CONTENT =
+            Builders.containerBuilder().withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(NETCONF_GET_QNAME)).build();
 
-        for (final org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument component : identifier.getReversePathArguments()) {
-            if (component instanceof YangInstanceIdentifier.NodeIdentifierWithPredicates) {
-                previous = toNode((YangInstanceIdentifier.NodeIdentifierWithPredicates)component, previous);
-            } else {
-                previous = toNode(component, previous);
-            }
-        }
-        return filter("subtree", previous);
-    }
+    // Create-subscription changes message
+    public static final ContainerNode CREATE_SUBSCRIPTION_RPC_CONTENT =
+            Builders.containerBuilder().withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(CREATE_SUBSCRIPTION_RPC_QNAME)).build();
 
-    static Node<?> toNode(final YangInstanceIdentifier.NodeIdentifierWithPredicates argument, final Node<?> node) {
-        final List<Node<?>> list = new ArrayList<>();
-        for (final Map.Entry<QName, Object> arg : argument.getKeyValues().entrySet()) {
-            list.add(new SimpleNodeTOImpl<>(arg.getKey(), null, arg.getValue()));
-        }
-        if (node != null) {
-            list.add(node);
+    public static DataContainerChild<?, ?> toFilterStructure(final YangInstanceIdentifier identifier, final SchemaContext ctx) {
+        final NormalizedNodeAttrBuilder<YangInstanceIdentifier.NodeIdentifier, DOMSource, AnyXmlNode> anyXmlBuilder = Builders.anyXmlBuilder().withNodeIdentifier(toId(NETCONF_FILTER_QNAME));
+        anyXmlBuilder.withAttributes(Collections.singletonMap(NETCONF_TYPE_QNAME, SUBTREE));
+
+        final NormalizedNode<?, ?> filterContent = ImmutableNodes.fromInstanceId(ctx, identifier);
+
+        final Element element = XmlUtil.createElement(BLANK_DOCUMENT, NETCONF_FILTER_QNAME.getLocalName(), Optional.of(NETCONF_FILTER_QNAME.getNamespace().toString()));
+        element.setAttributeNS(NETCONF_FILTER_QNAME.getNamespace().toString(), NETCONF_TYPE_QNAME.getLocalName(), "subtree");
+
+        try {
+            writeNormalizedNode(filterContent, new DOMResult(element), SchemaPath.ROOT, ctx);
+        } catch (IOException | XMLStreamException e) {
+            throw new IllegalStateException("Unable to serialize filter element for path " + identifier, e);
         }
-        return new CompositeNodeTOImpl(argument.getNodeType(), null, list);
+        anyXmlBuilder.withValue(new DOMSource(element));
+
+        return anyXmlBuilder.build();
     }
 
     public static void checkValidReply(final NetconfMessage input, final NetconfMessage output)
@@ -132,7 +168,7 @@ public class NetconfMessageTransformUtil {
         final String outputMsgId = output.getDocument().getDocumentElement().getAttribute(MESSAGE_ID_ATTR);
 
         if(inputMsgId.equals(outputMsgId) == false) {
-            Map<String,String> errorInfo = ImmutableMap.<String,String>builder()
+            final Map<String,String> errorInfo = ImmutableMap.<String,String>builder()
                     .put( "actual-message-id", outputMsgId )
                     .put( "expected-message-id", inputMsgId )
                     .build();
@@ -146,24 +182,22 @@ public class NetconfMessageTransformUtil {
 
     public static void checkSuccessReply(final NetconfMessage output) throws NetconfDocumentedException {
         if(NetconfMessageUtil.isErrorMessage(output)) {
-            throw NetconfDocumentedException.fromXMLDocument( output.getDocument() );
+            throw NetconfDocumentedException.fromXMLDocument(output.getDocument());
         }
     }
 
-    public static RpcError toRpcError( final NetconfDocumentedException ex )
-    {
-        StringBuilder infoBuilder = new StringBuilder();
-        Map<String, String> errorInfo = ex.getErrorInfo();
-        if( errorInfo != null )
-        {
-            for( Entry<String,String> e: errorInfo.entrySet() ) {
+    public static RpcError toRpcError( final NetconfDocumentedException ex ) {
+        final StringBuilder infoBuilder = new StringBuilder();
+        final Map<String, String> errorInfo = ex.getErrorInfo();
+        if(errorInfo != null) {
+            for( final Entry<String,String> e: errorInfo.entrySet() ) {
                 infoBuilder.append( '<' ).append( e.getKey() ).append( '>' ).append( e.getValue() )
                 .append( "</" ).append( e.getKey() ).append( '>' );
 
             }
         }
 
-        ErrorSeverity severity = toRpcErrorSeverity( ex.getErrorSeverity() );
+        final ErrorSeverity severity = toRpcErrorSeverity( ex.getErrorSeverity() );
         return severity == ErrorSeverity.ERROR ?
                 RpcResultBuilder.newError(
                         toRpcErrorType( ex.getErrorType() ), ex.getErrorTag().getTagValue(),
@@ -182,8 +216,7 @@ public class NetconfMessageTransformUtil {
         }
     }
 
-    private static RpcError.ErrorType toRpcErrorType( final NetconfDocumentedException.ErrorType type )
-    {
+    private static RpcError.ErrorType toRpcErrorType(final NetconfDocumentedException.ErrorType type) {
         switch( type ) {
         case protocol:
             return RpcError.ErrorType.PROTOCOL;
@@ -196,36 +229,12 @@ public class NetconfMessageTransformUtil {
         }
     }
 
-    public static CompositeNode flattenInput(final CompositeNode node) {
-        final QName inputQName = QName.create(node.getNodeType(), "input");
-        final CompositeNode input = node.getFirstCompositeByName(inputQName);
-        if (input == null) {
-            return node;
-        }
-        if (input instanceof CompositeNode) {
-
-            final List<Node<?>> nodes = ImmutableList.<Node<?>> builder() //
-                    .addAll(input.getValue()) //
-                    .addAll(Collections2.filter(node.getValue(), new Predicate<Node<?>>() {
-                        @Override
-                        public boolean apply(@Nullable final Node<?> input) {
-                            return !inputQName.equals(input.getNodeType());
-                        }
-                    })) //
-                    .build();
-
-            return ImmutableCompositeNode.create(node.getNodeType(), nodes);
-        }
-
-        return input;
+    public static YangInstanceIdentifier.NodeIdentifier toId(final YangInstanceIdentifier.PathArgument qname) {
+        return toId(qname.getNodeType());
     }
 
-    static Node<?> toNode(final YangInstanceIdentifier.PathArgument argument, final Node<?> node) {
-        if (node != null) {
-            return new CompositeNodeTOImpl(argument.getNodeType(), null, Collections.<Node<?>> singletonList(node));
-        } else {
-            return new SimpleNodeTOImpl<Void>(argument.getNodeType(), null, null);
-        }
+    public static YangInstanceIdentifier.NodeIdentifier toId(final QName nodeType) {
+        return new YangInstanceIdentifier.NodeIdentifier(nodeType);
     }
 
     public static Element getDataSubtree(final Document doc) {
@@ -238,174 +247,78 @@ public class NetconfMessageTransformUtil {
                         NETCONF_GET_QNAME.getLocalName()));
     }
 
-    public static boolean isGetOperation(final QName rpc) {
-        return NETCONF_URI.equals(rpc.getNamespace()) && rpc.getLocalName().equals(NETCONF_GET_QNAME.getLocalName());
-    }
-
-    public static boolean isGetConfigOperation(final QName rpc) {
-        return NETCONF_URI.equals(rpc.getNamespace()) && rpc.getLocalName().equals(NETCONF_GET_CONFIG_QNAME.getLocalName());
+    public static ContainerSchemaNode createSchemaForDataRead(final SchemaContext schemaContext) {
+        final QName config = QName.create(NETCONF_EDIT_CONFIG_QNAME, "data");
+        return new NodeContainerProxy(config, schemaContext.getChildNodes());
     }
 
-    public static boolean isDataEditOperation(final QName rpc) {
-        return NETCONF_URI.equals(rpc.getNamespace())
-                && rpc.getLocalName().equals(NETCONF_EDIT_CONFIG_QNAME.getLocalName());
-    }
-
-    /**
-     * Creates artificial schema node for edit-config rpc. This artificial schema looks like:
-     * <pre>
-     * {@code
-     * rpc
-     *   edit-config
-     *     config
-     *         // All schema nodes from remote schema
-     *     config
-     *   edit-config
-     * rpc
-     * }
-     * </pre>
-     *
-     * This makes the translation of rpc edit-config request(especially the config node)
-     * to xml use schema which is crucial for some types of nodes e.g. identity-ref.
-     */
-    public static DataNodeContainer createSchemaForEdit(final SchemaContext schemaContext) {
-        final QName config = QName.create(NETCONF_EDIT_CONFIG_QNAME, "config");
-        final QName editConfig = QName.create(NETCONF_EDIT_CONFIG_QNAME, "edit-config");
-        final NodeContainerProxy configProxy = new NodeContainerProxy(config, schemaContext.getChildNodes());
-        final NodeContainerProxy editConfigProxy = new NodeContainerProxy(editConfig, Sets.<DataSchemaNode>newHashSet(configProxy));
-        return new NodeContainerProxy(NETCONF_RPC_QNAME, Sets.<DataSchemaNode>newHashSet(editConfigProxy));
+    public static ContainerSchemaNode createSchemaForNotification(final NotificationDefinition next) {
+        return new NodeContainerProxy(next.getQName(), next.getChildNodes(), next.getAvailableAugmentations());
     }
 
-    /**
-     * Creates artificial schema node for edit-config rpc. This artificial schema looks like:
-     * <pre>
-     * {@code
-     * rpc
-     *   get
-     *     filter
-     *         // All schema nodes from remote schema
-     *     filter
-     *   get
-     * rpc
-     * }
-     * </pre>
-     *
-     * This makes the translation of rpc get request(especially the config node)
-     * to xml use schema which is crucial for some types of nodes e.g. identity-ref.
-     */
-    public static DataNodeContainer createSchemaForGet(final SchemaContext schemaContext) {
-        final QName filter = QName.create(NETCONF_GET_QNAME, "filter");
-        final QName get = QName.create(NETCONF_GET_QNAME, "get");
-        final NodeContainerProxy configProxy = new NodeContainerProxy(filter, schemaContext.getChildNodes());
-        final NodeContainerProxy editConfigProxy = new NodeContainerProxy(get, Sets.<DataSchemaNode>newHashSet(configProxy));
-        return new NodeContainerProxy(NETCONF_RPC_QNAME, Sets.<DataSchemaNode>newHashSet(editConfigProxy));
+    public static ContainerNode wrap(final QName name, final DataContainerChild<?, ?>... node) {
+        return Builders.containerBuilder().withNodeIdentifier(toId(name)).withValue(Lists.newArrayList(node)).build();
     }
 
-    /**
-     * Creates artificial schema node for get rpc. This artificial schema looks like:
-     * <pre>
-     * {@code
-     * rpc
-     *   get-config
-     *     filter
-     *         // All schema nodes from remote schema
-     *     filter
-     *   get-config
-     * rpc
-     * }
-     * </pre>
-     *
-     * This makes the translation of rpc get-config request(especially the config node)
-     * to xml use schema which is crucial for some types of nodes e.g. identity-ref.
-     */
-    public static DataNodeContainer createSchemaForGetConfig(final SchemaContext schemaContext) {
-        final QName filter = QName.create(NETCONF_GET_CONFIG_QNAME, "filter");
-        final QName getConfig = QName.create(NETCONF_GET_CONFIG_QNAME, "get-config");
-        final NodeContainerProxy configProxy = new NodeContainerProxy(filter, schemaContext.getChildNodes());
-        final NodeContainerProxy editConfigProxy = new NodeContainerProxy(getConfig, Sets.<DataSchemaNode>newHashSet(configProxy));
-        return new NodeContainerProxy(NETCONF_RPC_QNAME, Sets.<DataSchemaNode>newHashSet(editConfigProxy));
-    }
+    public static DataContainerChild<?, ?> createEditConfigStructure(final SchemaContext ctx, final YangInstanceIdentifier dataPath,
+                                                                     final Optional<ModifyAction> operation, final Optional<NormalizedNode<?, ?>> lastChildOverride) {
+        final NormalizedNode<?, ?> configContent;
 
-    /**
-     * Creates artificial schema node for schema defined rpc. This artificial schema looks like:
-     * <pre>
-     * {@code
-     * rpc
-     *   rpc-name
-     *      // All schema nodes from remote schema
-     *   rpc-name
-     * rpc
-     * }
-     * </pre>
-     *
-     * This makes the translation of schema defined rpc request
-     * to xml use schema which is crucial for some types of nodes e.g. identity-ref.
-     */
-    public static DataNodeContainer createSchemaForRpc(final QName rpcName, final SchemaContext schemaContext) {
-        Preconditions.checkNotNull(rpcName);
-        Preconditions.checkNotNull(schemaContext);
-
-        for (final RpcDefinition rpcDefinition : schemaContext.getOperations()) {
-            if(rpcDefinition.getQName().equals(rpcName)) {
-                final NodeContainerProxy rpcBodyProxy = new NodeContainerProxy(rpcName, rpcDefinition.getInput().getChildNodes());
-                return new NodeContainerProxy(NETCONF_RPC_QNAME, Sets.<DataSchemaNode>newHashSet(rpcBodyProxy));
-            }
-        }
-
-        throw new IllegalArgumentException("Rpc " + rpcName + " not found in schema context " + schemaContext + ". Unable to invoke Rpc");
-    }
-
-    public static CompositeNodeTOImpl wrap(final QName name, final Node<?> node) {
-        if (node != null) {
-            return new CompositeNodeTOImpl(name, null, Collections.<Node<?>> singletonList(node));
+        if(Iterables.isEmpty(dataPath.getPathArguments())) {
+            Preconditions.checkArgument(lastChildOverride.isPresent(), "Data has to be present when creating structure for top level element");
+            Preconditions.checkArgument(lastChildOverride.get() instanceof DataContainerChild<?, ?>,
+                    "Data has to be either container or a list node when creating structure for top level element, but was: %s", lastChildOverride.get());
+            configContent = lastChildOverride.get();
         } else {
-            return new CompositeNodeTOImpl(name, null, Collections.<Node<?>> emptyList());
+            final Entry<QName, ModifyAction> modifyOperation =
+                    operation.isPresent() ? new AbstractMap.SimpleEntry<>(NETCONF_OPERATION_QNAME, operation.get()) : null;
+            configContent = ImmutableNodes.fromInstanceId(ctx, dataPath, lastChildOverride, Optional.fromNullable(modifyOperation));
         }
-    }
 
-    public static CompositeNodeTOImpl wrap(final QName name, final Node<?> additional, final Node<?> node) {
-        if (node != null) {
-            return new CompositeNodeTOImpl(name, null, ImmutableList.of(additional, node));
-        } else {
-            return new CompositeNodeTOImpl(name, null, ImmutableList.<Node<?>> of(additional));
+        final Element element = XmlUtil.createElement(BLANK_DOCUMENT, NETCONF_CONFIG_QNAME.getLocalName(), Optional.of(NETCONF_CONFIG_QNAME.getNamespace().toString()));
+        try {
+            writeNormalizedNode(configContent, new DOMResult(element), SchemaPath.ROOT, ctx);
+        } catch (IOException | XMLStreamException e) {
+            throw new IllegalStateException("Unable to serialize edit config content element for path " + dataPath, e);
         }
-    }
+        final DOMSource value = new DOMSource(element);
 
-    static ImmutableCompositeNode filter(final String type, final Node<?> node) {
-        final CompositeNodeBuilder<ImmutableCompositeNode> it = ImmutableCompositeNode.builder(); //
-        it.setQName(NETCONF_FILTER_QNAME);
-        it.setAttribute(NETCONF_TYPE_QNAME, type);
-        if (node != null) {
-            return it.add(node).toInstance();
-        } else {
-            return it.toInstance();
-        }
+        return Builders.choiceBuilder().withNodeIdentifier(toId(EditContent.QNAME)).withChild(
+                Builders.anyXmlBuilder().withNodeIdentifier(toId(NETCONF_CONFIG_QNAME)).withValue(value).build()).build();
     }
 
-    public static Node<?> findNode(final CompositeNode node, final YangInstanceIdentifier identifier) {
-
-        Node<?> current = node;
-        for (final YangInstanceIdentifier.PathArgument arg : identifier.getPathArguments()) {
-            if (current instanceof SimpleNode<?>) {
-                return null;
-            } else if (current instanceof CompositeNode) {
-                final CompositeNode currentComposite = (CompositeNode) current;
+    public static SchemaPath toPath(final QName rpc) {
+        return SchemaPath.create(true, rpc);
+    }
 
-                current = currentComposite.getFirstCompositeByName(arg.getNodeType());
-                if (current == null) {
-                    current = currentComposite.getFirstCompositeByName(arg.getNodeType().withoutRevision());
-                }
-                if (current == null) {
-                    current = currentComposite.getFirstSimpleByName(arg.getNodeType());
+    // FIXME similar code is in netconf-notifications-impl , DRY
+    public static void writeNormalizedNode(final NormalizedNode<?, ?> normalized, final DOMResult result, final SchemaPath schemaPath, final SchemaContext context)
+            throws IOException, XMLStreamException {
+        NormalizedNodeWriter normalizedNodeWriter = null;
+        NormalizedNodeStreamWriter normalizedNodeStreamWriter = null;
+        XMLStreamWriter writer = null;
+        try {
+            writer = XML_FACTORY.createXMLStreamWriter(result);
+            normalizedNodeStreamWriter = XMLStreamNormalizedNodeStreamWriter.create(writer, context, schemaPath);
+            normalizedNodeWriter = NormalizedNodeWriter.forStreamWriter(normalizedNodeStreamWriter);
+
+            normalizedNodeWriter.write(normalized);
+
+            normalizedNodeWriter.flush();
+        } finally {
+            try {
+                if(normalizedNodeWriter != null) {
+                    normalizedNodeWriter.close();
                 }
-                if (current == null) {
-                    current = currentComposite.getFirstSimpleByName(arg.getNodeType().withoutRevision());
+                if(normalizedNodeStreamWriter != null) {
+                    normalizedNodeStreamWriter.close();
                 }
-                if (current == null) {
-                    return null;
+                if(writer != null) {
+                    writer.close();
                 }
+            } catch (final Exception e) {
+                LOG.warn("Unable to close resource properly", e);
             }
         }
-        return current;
     }
 }