Merge "Fix modules Restconf call for mounted devices"
[controller.git] / opendaylight / md-sal / sal-rest-connector / src / main / java / org / opendaylight / controller / sal / restconf / impl / RestconfImpl.java
index 4073c2fabd0b11164f03cc0ea3b90a03cf84afc5..1bdbe6b66398a0b67c10d98a13842d642fb41787 100644 (file)
@@ -8,16 +8,17 @@
  */
 package org.opendaylight.controller.sal.restconf.impl;
 
-import com.google.common.base.Objects;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Predicates;
 import com.google.common.base.Splitter;
 import com.google.common.base.Strings;
 import com.google.common.base.Throwables;
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import com.google.common.util.concurrent.CheckedFuture;
+import com.google.common.util.concurrent.Futures;
 import java.math.BigInteger;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -32,7 +33,10 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ExecutionException;
 import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.ResponseBuilder;
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.core.UriBuilder;
 import javax.ws.rs.core.UriInfo;
@@ -41,44 +45,38 @@ import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataCh
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.OptimisticLockFailedException;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
-import org.opendaylight.controller.md.sal.common.impl.util.compat.DataNormalizer;
 import org.opendaylight.controller.md.sal.dom.api.DOMMountPoint;
+import org.opendaylight.controller.md.sal.dom.api.DOMRpcException;
+import org.opendaylight.controller.md.sal.dom.api.DOMRpcResult;
+import org.opendaylight.controller.md.sal.dom.api.DOMRpcService;
+import org.opendaylight.controller.md.sal.dom.spi.DefaultDOMRpcResult;
 import org.opendaylight.controller.sal.rest.api.Draft02;
 import org.opendaylight.controller.sal.rest.api.RestconfService;
 import org.opendaylight.controller.sal.restconf.impl.RestconfError.ErrorTag;
 import org.opendaylight.controller.sal.restconf.impl.RestconfError.ErrorType;
-import org.opendaylight.controller.sal.restconf.rpc.impl.BrokerRpcExecutor;
-import org.opendaylight.controller.sal.restconf.rpc.impl.MountPointRpcExecutor;
-import org.opendaylight.controller.sal.restconf.rpc.impl.RpcExecutor;
 import org.opendaylight.controller.sal.streams.listeners.ListenerAdapter;
 import org.opendaylight.controller.sal.streams.listeners.Notificator;
 import org.opendaylight.controller.sal.streams.websockets.WebSocketServer;
-import org.opendaylight.yangtools.concepts.Codec;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
-import org.opendaylight.yangtools.yang.common.RpcResult;
-import org.opendaylight.yangtools.yang.data.api.CompositeNode;
-import org.opendaylight.yangtools.yang.data.api.MutableCompositeNode;
-import org.opendaylight.yangtools.yang.data.api.Node;
-import org.opendaylight.yangtools.yang.data.api.SimpleNode;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.InstanceIdentifierBuilder;
 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.PathArgument;
+import org.opendaylight.yangtools.yang.data.api.schema.AugmentationNode;
 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.LeafSetEntryNode;
 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.tree.ModifiedNodeDoesNotExistException;
-import org.opendaylight.yangtools.yang.data.composite.node.schema.cnsn.parser.CnSnToNormalizedNodeParserFactory;
-import org.opendaylight.yangtools.yang.data.impl.ImmutableCompositeNode;
-import org.opendaylight.yangtools.yang.data.impl.NodeFactory;
 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.CollectionNodeBuilder;
 import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeAttrBuilder;
 import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.ListNodeBuilder;
+import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder;
 import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.DataNodeContainer;
@@ -90,15 +88,11 @@ import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.RpcDefinition;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.model.api.SchemaNode;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
-import org.opendaylight.yangtools.yang.model.api.type.IdentityrefTypeDefinition;
-import org.opendaylight.yangtools.yang.model.api.type.LeafrefTypeDefinition;
-import org.opendaylight.yangtools.yang.model.util.EmptyType;
 import org.opendaylight.yangtools.yang.model.util.ExtendedType;
 import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil;
-import org.opendaylight.yangtools.yang.parser.builder.impl.ContainerSchemaNodeBuilder;
-import org.opendaylight.yangtools.yang.parser.builder.impl.LeafSchemaNodeBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -156,8 +150,6 @@ public class RestconfImpl implements RestconfService {
 
     private static final URI NAMESPACE_EVENT_SUBSCRIPTION_AUGMENT = URI.create("urn:sal:restconf:event:subscription");
 
-    private static final Date EVENT_SUBSCRIPTION_AUGMENT_REVISION;
-
     private static final String DATASTORE_PARAM_NAME = "datastore";
 
     private static final String SCOPE_PARAM_NAME = "scope";
@@ -168,10 +160,18 @@ public class RestconfImpl implements RestconfService {
 
     private static final QName NETCONF_BASE_QNAME;
 
+    private static final QNameModule SAL_REMOTE_AUGMENT;
+
+    private static final YangInstanceIdentifier.AugmentationIdentifier SAL_REMOTE_AUG_IDENTIFIER;
+
     static {
         try {
-            EVENT_SUBSCRIPTION_AUGMENT_REVISION = new SimpleDateFormat("yyyy-MM-dd").parse("2014-07-08");
+            final Date eventSubscriptionAugRevision = new SimpleDateFormat("yyyy-MM-dd").parse("2014-07-08");
             NETCONF_BASE_QNAME = QName.create(QNameModule.create(new URI(NETCONF_BASE), null), NETCONF_BASE_PAYLOAD_NAME );
+            SAL_REMOTE_AUGMENT = QNameModule.create(NAMESPACE_EVENT_SUBSCRIPTION_AUGMENT,
+                    eventSubscriptionAugRevision);
+            SAL_REMOTE_AUG_IDENTIFIER = new YangInstanceIdentifier.AugmentationIdentifier(Sets.newHashSet(QName.create(SAL_REMOTE_AUGMENT, "scope"),
+                    QName.create(SAL_REMOTE_AUGMENT, "datastore")));
         } catch (final ParseException e) {
             throw new RestconfDocumentedException(
                     "It wasn't possible to convert revision date of sal-remote-augment to date", ErrorType.APPLICATION,
@@ -246,7 +246,7 @@ public class RestconfImpl implements RestconfService {
         moduleContainerBuilder.withChild(mountPointModulesMap);
 
         return new NormalizedNodeContext(new InstanceIdentifierContext(null, modulesSchemaNode,
-                mountPoint, schemaContext), moduleContainerBuilder.build());
+                mountPoint, controllerContext.getGlobalSchema()), moduleContainerBuilder.build());
     }
 
     @Override
@@ -344,46 +344,6 @@ public class RestconfImpl implements RestconfService {
         throw new RestconfDocumentedException(errMsg, ErrorType.APPLICATION, ErrorTag.OPERATION_NOT_SUPPORTED);
     }
 
-    /**
-     * @deprecated method will be removed in Lithium release
-     */
-    @Deprecated
-    private StructuredData operationsFromModulesToStructuredData(final Set<Module> modules,
-            final DOMMountPoint mountPoint, final boolean prettyPrint) {
-        final List<Node<?>> operationsAsData = new ArrayList<Node<?>>();
-        final Module restconfModule = getRestconfModule();
-        final DataSchemaNode operationsSchemaNode = controllerContext.getRestconfModuleRestConfSchemaNode(
-                restconfModule, Draft02.RestConfModule.OPERATIONS_CONTAINER_SCHEMA_NODE);
-        final QName qName = operationsSchemaNode.getQName();
-        final SchemaPath path = operationsSchemaNode.getPath();
-        final ContainerSchemaNodeBuilder containerSchemaNodeBuilder = new ContainerSchemaNodeBuilder(
-                Draft02.RestConfModule.NAME, 0, qName, path);
-        final ContainerSchemaNodeBuilder fakeOperationsSchemaNode = containerSchemaNodeBuilder;
-        for (final Module module : modules) {
-            final Set<RpcDefinition> rpcs = module.getRpcs();
-            for (final RpcDefinition rpc : rpcs) {
-                final QName rpcQName = rpc.getQName();
-                final SimpleNode<Object> immutableSimpleNode = NodeFactory.<Object> createImmutableSimpleNode(rpcQName, null,
-                        null);
-                operationsAsData.add(immutableSimpleNode);
-
-                final String name = module.getName();
-                final LeafSchemaNodeBuilder leafSchemaNodeBuilder = new LeafSchemaNodeBuilder(name, 0, rpcQName,
-                        SchemaPath.create(true, QName.create("dummy")));
-                final LeafSchemaNodeBuilder fakeRpcSchemaNode = leafSchemaNodeBuilder;
-                fakeRpcSchemaNode.setAugmenting(true);
-
-                final EmptyType instance = EmptyType.getInstance();
-                fakeRpcSchemaNode.setType(instance);
-                fakeOperationsSchemaNode.addChildNode(fakeRpcSchemaNode.build());
-            }
-        }
-
-        final CompositeNode operationsNode = NodeFactory.createImmutableCompositeNode(qName, null, operationsAsData);
-        final ContainerSchemaNode schemaNode = fakeOperationsSchemaNode.build();
-        return new StructuredData(operationsNode, schemaNode, mountPoint, prettyPrint);
-    }
-
     private Module getRestconfModule() {
         final Module restconfModule = controllerContext.getRestconfModule();
         if (restconfModule == null) {
@@ -423,111 +383,87 @@ public class RestconfImpl implements RestconfService {
         }
     }
 
-    /**
-     * @deprecated method will be removed for Lithium release
-     *      so, please use toStreamEntryNode method
-     *
-     * @param streamName
-     * @param streamSchemaNode
-     * @return
-     */
-    @Deprecated
-    private CompositeNode toStreamCompositeNode(final String streamName, final DataSchemaNode streamSchemaNode) {
-        final List<Node<?>> streamNodeValues = new ArrayList<Node<?>>();
-        List<DataSchemaNode> instanceDataChildrenByName = ControllerContext.findInstanceDataChildrenByName(
-                ((DataNodeContainer) streamSchemaNode), "name");
-        final DataSchemaNode nameSchemaNode = Iterables.getFirst(instanceDataChildrenByName, null);
-        streamNodeValues
-        .add(NodeFactory.<String> createImmutableSimpleNode(nameSchemaNode.getQName(), null, streamName));
-
-        instanceDataChildrenByName = ControllerContext.findInstanceDataChildrenByName(
-                ((DataNodeContainer) streamSchemaNode), "description");
-        final DataSchemaNode descriptionSchemaNode = Iterables.getFirst(instanceDataChildrenByName, null);
-        streamNodeValues.add(NodeFactory.<String> createImmutableSimpleNode(descriptionSchemaNode.getQName(), null,
-                "DESCRIPTION_PLACEHOLDER"));
-
-        instanceDataChildrenByName = ControllerContext.findInstanceDataChildrenByName(
-                ((DataNodeContainer) streamSchemaNode), "replay-support");
-        final DataSchemaNode replaySupportSchemaNode = Iterables.getFirst(instanceDataChildrenByName, null);
-        streamNodeValues.add(NodeFactory.<Boolean> createImmutableSimpleNode(replaySupportSchemaNode.getQName(), null,
-                Boolean.valueOf(true)));
-
-        instanceDataChildrenByName = ControllerContext.findInstanceDataChildrenByName(
-                ((DataNodeContainer) streamSchemaNode), "replay-log-creation-time");
-        final DataSchemaNode replayLogCreationTimeSchemaNode = Iterables.getFirst(instanceDataChildrenByName, null);
-        streamNodeValues.add(NodeFactory.<String> createImmutableSimpleNode(replayLogCreationTimeSchemaNode.getQName(),
-                null, ""));
-
-        instanceDataChildrenByName = ControllerContext.findInstanceDataChildrenByName(
-                ((DataNodeContainer) streamSchemaNode), "events");
-        final DataSchemaNode eventsSchemaNode = Iterables.getFirst(instanceDataChildrenByName, null);
-        streamNodeValues.add(NodeFactory.<String> createImmutableSimpleNode(eventsSchemaNode.getQName(), null, ""));
-
-        return NodeFactory.createImmutableCompositeNode(streamSchemaNode.getQName(), null, streamNodeValues);
+    @Override
+    public Object getRoot() {
+        return null;
     }
 
-    /**
-     * @deprecated method will be removed for Lithium release
-     *      so, please use toModuleEntryNode method
-     *
-     * @param module
-     * @param moduleSchemaNode
-     * @return
-     */
-    @Deprecated
-    private CompositeNode toModuleCompositeNode(final Module module, final DataSchemaNode moduleSchemaNode) {
-        final List<Node<?>> moduleNodeValues = new ArrayList<Node<?>>();
-        List<DataSchemaNode> instanceDataChildrenByName = ControllerContext.findInstanceDataChildrenByName(
-                ((DataNodeContainer) moduleSchemaNode), "name");
-        final DataSchemaNode nameSchemaNode = Iterables.getFirst(instanceDataChildrenByName, null);
-        moduleNodeValues.add(NodeFactory.<String> createImmutableSimpleNode(nameSchemaNode.getQName(), null,
-                module.getName()));
-
-        instanceDataChildrenByName = ControllerContext.findInstanceDataChildrenByName(
-                ((DataNodeContainer) moduleSchemaNode), "revision");
-        final DataSchemaNode revisionSchemaNode = Iterables.getFirst(instanceDataChildrenByName, null);
-        final Date _revision = module.getRevision();
-        moduleNodeValues.add(NodeFactory.<String> createImmutableSimpleNode(revisionSchemaNode.getQName(), null,
-                REVISION_FORMAT.format(_revision)));
+    @Override
+    public NormalizedNodeContext invokeRpc(final String identifier, final NormalizedNodeContext payload, final UriInfo uriInfo) {
+        final SchemaPath type = payload.getInstanceIdentifierContext().getSchemaNode().getPath();
+        final URI namespace = payload.getInstanceIdentifierContext().getSchemaNode().getQName().getNamespace();
+        final CheckedFuture<DOMRpcResult, DOMRpcException> response;
+        final DOMMountPoint mountPoint = payload.getInstanceIdentifierContext().getMountPoint();
+        final SchemaContext schemaContext;
+        if (identifier.contains(MOUNT_POINT_MODULE_NAME) && mountPoint != null) {
+            final Optional<DOMRpcService> mountRpcServices = mountPoint.getService(DOMRpcService.class);
+            if ( ! mountRpcServices.isPresent()) {
+                throw new RestconfDocumentedException("Rpc service is missing.");
+            }
+            schemaContext = mountPoint.getSchemaContext();
+            response = mountRpcServices.get().invokeRpc(type, payload.getData());
+        } else {
+            if (namespace.toString().equals(SAL_REMOTE_NAMESPACE)) {
+                response = invokeSalRemoteRpcSubscribeRPC(payload);
+            } else {
+                response = broker.invokeRpc(type, payload.getData());
+            }
+            schemaContext = controllerContext.getGlobalSchema();
+        }
 
-        instanceDataChildrenByName = ControllerContext.findInstanceDataChildrenByName(
-                ((DataNodeContainer) moduleSchemaNode), "namespace");
-        final DataSchemaNode namespaceSchemaNode = Iterables.getFirst(instanceDataChildrenByName, null);
-        moduleNodeValues.add(NodeFactory.<String> createImmutableSimpleNode(namespaceSchemaNode.getQName(), null,
-                module.getNamespace().toString()));
+        final DOMRpcResult result = checkRpcResponse(response);
 
-        instanceDataChildrenByName = ControllerContext.findInstanceDataChildrenByName(
-                ((DataNodeContainer) moduleSchemaNode), "feature");
-        final DataSchemaNode featureSchemaNode = Iterables.getFirst(instanceDataChildrenByName, null);
-        for (final FeatureDefinition feature : module.getFeatures()) {
-            moduleNodeValues.add(NodeFactory.<String> createImmutableSimpleNode(featureSchemaNode.getQName(), null,
-                    feature.getQName().getLocalName()));
+        RpcDefinition resultNodeSchema = null;
+        final NormalizedNode<?, ?> resultData = result.getResult();
+        if (result != null && result.getResult() != null) {
+            resultNodeSchema = (RpcDefinition) payload.getInstanceIdentifierContext().getSchemaNode();
         }
 
-        return NodeFactory.createImmutableCompositeNode(moduleSchemaNode.getQName(), null, moduleNodeValues);
+        return new NormalizedNodeContext(new InstanceIdentifierContext<RpcDefinition>(null,
+                resultNodeSchema, mountPoint, schemaContext), resultData);
     }
 
-    @Override
-    public Object getRoot() {
-        return null;
-    }
-
-    @Override
-    public StructuredData invokeRpc(final String identifier, final CompositeNode payload, final UriInfo uriInfo) {
-        final RpcExecutor rpc = resolveIdentifierInInvokeRpc(identifier);
-        final QName rpcName = rpc.getRpcDefinition().getQName();
-        final URI rpcNamespace = rpcName.getNamespace();
-        if (Objects.equal(rpcNamespace.toString(), SAL_REMOTE_NAMESPACE)
-                && Objects.equal(rpcName.getLocalName(), SAL_REMOTE_RPC_SUBSRCIBE)) {
-            return invokeSalRemoteRpcSubscribeRPC(payload, rpc.getRpcDefinition(), parsePrettyPrintParameter(uriInfo));
+    private DOMRpcResult checkRpcResponse(final CheckedFuture<DOMRpcResult, DOMRpcException> response) {
+        if (response == null) {
+            return null;
+        }
+        try {
+            final DOMRpcResult retValue = response.get();
+            if (retValue.getErrors() == null || retValue.getErrors().isEmpty()) {
+                return retValue;
+            }
+            throw new RestconfDocumentedException("RpcError message", null, retValue.getErrors());
         }
+        catch (final InterruptedException e) {
+            throw new RestconfDocumentedException(
+                    "The operation was interrupted while executing and did not complete.", ErrorType.RPC,
+                    ErrorTag.PARTIAL_OPERATION);
+        }
+        catch (final ExecutionException e) {
+            Throwable cause = e.getCause();
+            if (cause instanceof CancellationException) {
+                throw new RestconfDocumentedException("The operation was cancelled while executing.", ErrorType.RPC,
+                        ErrorTag.PARTIAL_OPERATION);
+            } else if (cause != null) {
+                while (cause.getCause() != null) {
+                    cause = cause.getCause();
+                }
 
-        validateInput(rpc.getRpcDefinition().getInput(), payload);
+                if (cause instanceof IllegalArgumentException) {
+                    throw new RestconfDocumentedException(cause.getMessage(), ErrorType.PROTOCOL,
+                            ErrorTag.INVALID_VALUE);
+                }
 
-        return callRpc(rpc, payload, parsePrettyPrintParameter(uriInfo));
+                throw new RestconfDocumentedException("The operation encountered an unexpected error while executing.",
+                        cause);
+            } else {
+                throw new RestconfDocumentedException("The operation encountered an unexpected error while executing.",
+                        e);
+            }
+        }
     }
 
-    private void validateInput(final DataSchemaNode inputSchema, final NormalizedNodeContext payload) {
+    private void validateInput(final SchemaNode inputSchema, final NormalizedNodeContext payload) {
         if (inputSchema != null && payload.getData() == null) {
             // expected a non null payload
             throw new RestconfDocumentedException("Input is required.", ErrorType.PROTOCOL, ErrorTag.MALFORMED_MESSAGE);
@@ -543,35 +479,12 @@ public class RestconfImpl implements RestconfService {
         // }
     }
 
-    /**
-     * @deprecated method will be removed for Lithium release
-     *
-     * @param inputSchema
-     * @param payload
-     */
-    @Deprecated
-    private void validateInput(final DataSchemaNode inputSchema, final Node<?> payload) {
-        if (inputSchema != null && payload == null) {
-            // expected a non null payload
-            throw new RestconfDocumentedException("Input is required.", ErrorType.PROTOCOL, ErrorTag.MALFORMED_MESSAGE);
-        } else if (inputSchema == null && payload != null) {
-            // did not expect any input
-            throw new RestconfDocumentedException("No input expected.", ErrorType.PROTOCOL, ErrorTag.MALFORMED_MESSAGE);
-        }
-        // else
-        // {
-        // TODO: Validate "mandatory" and "config" values here??? Or should those be
-        // those be
-        // validate in a more central location inside MD-SAL core.
-        // }
-    }
-
-    private StructuredData invokeSalRemoteRpcSubscribeRPC(final CompositeNode payload, final RpcDefinition rpc,
-            final boolean prettyPrint) {
-        final CompositeNode value = this.normalizeNode(payload, rpc.getInput(), null);
-        final SimpleNode<? extends Object> pathNode = value == null ? null : value.getFirstSimpleByName(QName.create(
-                rpc.getQName(), "path"));
-        final Object pathValue = pathNode == null ? null : pathNode.getValue();
+    private CheckedFuture<DOMRpcResult, DOMRpcException> invokeSalRemoteRpcSubscribeRPC(final NormalizedNodeContext payload) {
+        final ContainerNode value = (ContainerNode) payload.getData();
+        final QName rpcQName = payload.getInstanceIdentifierContext().getSchemaNode().getQName();
+        final Optional<DataContainerChild<? extends PathArgument, ?>> path = value.getChild(new NodeIdentifier(
+                QName.create(payload.getInstanceIdentifierContext().getSchemaNode().getQName(), "path")));
+        final Object pathValue = path.isPresent() ? path.get().getValue() : null;
 
         if (!(pathValue instanceof YangInstanceIdentifier)) {
             throw new RestconfDocumentedException("Instance identifier was not normalized correctly.",
@@ -581,7 +494,7 @@ public class RestconfImpl implements RestconfService {
         final YangInstanceIdentifier pathIdentifier = ((YangInstanceIdentifier) pathValue);
         String streamName = null;
         if (!Iterables.isEmpty(pathIdentifier.getPathArguments())) {
-            final String fullRestconfIdentifier = controllerContext.toFullRestconfIdentifier(pathIdentifier);
+            final String fullRestconfIdentifier = controllerContext.toFullRestconfIdentifier(pathIdentifier, null);
 
             LogicalDatastoreType datastore = parseEnumTypeParameter(value, LogicalDatastoreType.class,
                     DATASTORE_PARAM_NAME);
@@ -596,41 +509,40 @@ public class RestconfImpl implements RestconfService {
 
         if (Strings.isNullOrEmpty(streamName)) {
             throw new RestconfDocumentedException(
-                    "Path is empty or contains data node which is not Container or List build-in type.",
+                    "Path is empty or contains value node which is not Container or List build-in type.",
                     ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE);
         }
 
-        final SimpleNode<String> streamNameNode = NodeFactory.<String> createImmutableSimpleNode(
-                QName.create(rpc.getOutput().getQName(), "stream-name"), null, streamName);
-        final List<Node<?>> output = new ArrayList<Node<?>>();
-        output.add(streamNameNode);
+        final QName outputQname = QName.create(rpcQName, "output");
+        final QName streamNameQname = QName.create(rpcQName, "stream-name");
 
-        final MutableCompositeNode responseData = NodeFactory.createMutableCompositeNode(rpc.getOutput().getQName(),
-                null, output, null, null);
+        final ContainerNode output = ImmutableContainerNodeBuilder.create().withNodeIdentifier(new NodeIdentifier(outputQname))
+                .withChild(ImmutableNodes.leafNode(streamNameQname, streamName)).build();
 
         if (!Notificator.existListenerFor(streamName)) {
-            Notificator.createListener(pathIdentifier, streamName);
+            final YangInstanceIdentifier normalizedPathIdentifier = controllerContext.toNormalized(pathIdentifier);
+            Notificator.createListener(normalizedPathIdentifier, streamName);
         }
 
-        return new StructuredData(responseData, rpc.getOutput(), null, prettyPrint);
+        final DOMRpcResult defaultDOMRpcResult = new DefaultDOMRpcResult(output);
+
+        return Futures.immediateCheckedFuture(defaultDOMRpcResult);
     }
 
     @Override
-    public StructuredData invokeRpc(final String identifier, final String noPayload, final UriInfo uriInfo) {
+    public NormalizedNodeContext invokeRpc(final String identifier, final String noPayload, final UriInfo uriInfo) {
         if (StringUtils.isNotBlank(noPayload)) {
             throw new RestconfDocumentedException("Content must be empty.", ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE);
         }
-        return invokeRpc(identifier, (CompositeNode) null, uriInfo);
-    }
 
-    private RpcExecutor resolveIdentifierInInvokeRpc(final String identifier) {
         String identifierEncoded = null;
         DOMMountPoint mountPoint = null;
+        final SchemaContext schemaContext;
         if (identifier.contains(ControllerContext.MOUNT)) {
             // mounted RPC call - look up mount instance.
             final InstanceIdentifierContext mountPointId = controllerContext.toMountPointIdentifier(identifier);
             mountPoint = mountPointId.getMountPoint();
-
+            schemaContext = mountPoint.getSchemaContext();
             final int startOfRemoteRpcName = identifier.lastIndexOf(ControllerContext.MOUNT)
                     + ControllerContext.MOUNT.length() + 1;
             final String remoteRpcName = identifier.substring(startOfRemoteRpcName);
@@ -642,6 +554,7 @@ public class RestconfImpl implements RestconfService {
             throw new RestconfDocumentedException(slashErrorMsg, ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE);
         } else {
             identifierEncoded = identifier;
+            schemaContext = controllerContext.getGlobalSchema();
         }
 
         final String identifierDecoded = controllerContext.urlPathArgDecode(identifierEncoded);
@@ -657,12 +570,35 @@ public class RestconfImpl implements RestconfService {
             throw new RestconfDocumentedException("RPC does not exist.", ErrorType.RPC, ErrorTag.UNKNOWN_ELEMENT);
         }
 
-        if (mountPoint == null) {
-            return new BrokerRpcExecutor(rpc, broker);
+        if (rpc.getInput() != null) {
+            // FIXME : find a correct Error from specification
+            throw new IllegalStateException("RPC " + rpc + " does'n need input value!");
+        }
+
+        final CheckedFuture<DOMRpcResult, DOMRpcException> response;
+        if (mountPoint != null) {
+            final Optional<DOMRpcService> mountRpcServices = mountPoint.getService(DOMRpcService.class);
+            if ( ! mountRpcServices.isPresent()) {
+                throw new RestconfDocumentedException("Rpc service is missing.");
+            }
+            response = mountRpcServices.get().invokeRpc(rpc.getPath(), null);
         } else {
-            return new MountPointRpcExecutor(rpc, mountPoint);
+            response = broker.invokeRpc(rpc.getPath(), null);
+        }
+
+        final DOMRpcResult result = checkRpcResponse(response);
+
+        DataSchemaNode resultNodeSchema = null;
+        NormalizedNode<?, ?> resultData = null;
+        if (result != null && result.getResult() != null) {
+            resultData = result.getResult();
+            final ContainerSchemaNode rpcDataSchemaNode =
+                    SchemaContextUtil.getRpcDataSchema(schemaContext, rpc.getOutput().getPath());
+            resultNodeSchema = rpcDataSchemaNode.getDataChildByName(result.getResult().getNodeType());
         }
 
+        return new NormalizedNodeContext(new InstanceIdentifierContext(null, resultNodeSchema, mountPoint,
+                schemaContext), resultData);
     }
 
     private RpcDefinition findRpc(final SchemaContext schemaContext, final String identifierDecoded) {
@@ -684,81 +620,23 @@ public class RestconfImpl implements RestconfService {
         return null;
     }
 
-    private StructuredData callRpc(final RpcExecutor rpcExecutor, final CompositeNode payload, final boolean prettyPrint) {
-        if (rpcExecutor == null) {
-            throw new RestconfDocumentedException("RPC does not exist.", ErrorType.RPC, ErrorTag.UNKNOWN_ELEMENT);
-        }
-
-        CompositeNode rpcRequest = null;
-        final RpcDefinition rpc = rpcExecutor.getRpcDefinition();
-        final QName rpcName = rpc.getQName();
-
-        if (payload == null) {
-            rpcRequest = NodeFactory.createMutableCompositeNode(rpcName, null, null, null, null);
-        } else {
-            final CompositeNode value = this.normalizeNode(payload, rpc.getInput(), null);
-            final List<Node<?>> input = Collections.<Node<?>> singletonList(value);
-            rpcRequest = NodeFactory.createMutableCompositeNode(rpcName, null, input, null, null);
-        }
-
-        final RpcResult<CompositeNode> rpcResult = rpcExecutor.invokeRpc(rpcRequest);
-
-        checkRpcSuccessAndThrowException(rpcResult);
-
-        if (rpcResult.getResult() == null) {
-            return null;
-        }
-
-        if (rpc.getOutput() == null) {
-            return null; // no output, nothing to send back.
-        }
-
-        return new StructuredData(rpcResult.getResult(), rpc.getOutput(), null, prettyPrint);
-    }
-
-    private void checkRpcSuccessAndThrowException(final RpcResult<CompositeNode> rpcResult) {
-        if (rpcResult.isSuccessful() == false) {
-
-            throw new RestconfDocumentedException("The operation was not successful", null,
-                    rpcResult.getErrors());
-        }
-    }
-
     @Override
     public NormalizedNodeContext readConfigurationData(final String identifier, final UriInfo uriInfo) {
         final InstanceIdentifierContext iiWithData = controllerContext.toInstanceIdentifier(identifier);
         final DOMMountPoint mountPoint = iiWithData.getMountPoint();
         NormalizedNode<?, ?> data = null;
-        YangInstanceIdentifier normalizedII;
+        final YangInstanceIdentifier normalizedII = iiWithData.getInstanceIdentifier();
         if (mountPoint != null) {
-            normalizedII = new DataNormalizer(mountPoint.getSchemaContext()).toNormalized(iiWithData
-                    .getInstanceIdentifier());
             data = broker.readConfigurationData(mountPoint, normalizedII);
         } else {
-            normalizedII = controllerContext.toNormalized(iiWithData.getInstanceIdentifier());
             data = broker.readConfigurationData(normalizedII);
         }
-        return new NormalizedNodeContext(iiWithData, data);
-    }
-
-    @SuppressWarnings("unchecked")
-    private <T extends Node<?>> T pruneDataAtDepth(final T node, final Integer depth) {
-        if (depth == null) {
-            return node;
-        }
-
-        if (node instanceof CompositeNode) {
-            final ImmutableList.Builder<Node<?>> newChildNodes = ImmutableList.<Node<?>> builder();
-            if (depth > 1) {
-                for (final Node<?> childNode : ((CompositeNode) node).getValue()) {
-                    newChildNodes.add(pruneDataAtDepth(childNode, depth - 1));
-                }
-            }
-
-            return (T) ImmutableCompositeNode.create(node.getNodeType(), newChildNodes.build());
-        } else { // SimpleNode
-            return node;
+        if(data == null) {
+            throw new RestconfDocumentedException(
+                "Request could not be completed because the relevant data model content does not exist.",
+                ErrorType.APPLICATION, ErrorTag.DATA_MISSING);
         }
+        return new NormalizedNodeContext(iiWithData, data);
     }
 
     private Integer parseDepthParameter(final UriInfo info) {
@@ -788,16 +666,17 @@ public class RestconfImpl implements RestconfService {
         final InstanceIdentifierContext iiWithData = controllerContext.toInstanceIdentifier(identifier);
         final DOMMountPoint mountPoint = iiWithData.getMountPoint();
         NormalizedNode<?, ?> data = null;
-        YangInstanceIdentifier normalizedII;
+        final YangInstanceIdentifier normalizedII = iiWithData.getInstanceIdentifier();
         if (mountPoint != null) {
-            normalizedII = new DataNormalizer(mountPoint.getSchemaContext()).toNormalized(iiWithData
-                    .getInstanceIdentifier());
             data = broker.readOperationalData(mountPoint, normalizedII);
         } else {
-            normalizedII = controllerContext.toNormalized(iiWithData.getInstanceIdentifier());
             data = broker.readOperationalData(normalizedII);
         }
-
+        if(data == null) {
+            throw new RestconfDocumentedException(
+                "Request could not be completed because the relevant data model content does not exist.",
+                ErrorType.APPLICATION, ErrorTag.DATA_MISSING);
+        }
         return new NormalizedNodeContext(iiWithData, data);
     }
 
@@ -809,14 +688,14 @@ public class RestconfImpl implements RestconfService {
     @Override
     public Response updateConfigurationData(final String identifier, final NormalizedNodeContext payload) {
         Preconditions.checkNotNull(identifier);
-        final InstanceIdentifierContext iiWithData = controllerContext.toInstanceIdentifier(identifier);
+        final InstanceIdentifierContext<DataSchemaNode> iiWithData =
+                (InstanceIdentifierContext<DataSchemaNode>) payload.getInstanceIdentifierContext();
 
         validateInput(iiWithData.getSchemaNode(), payload);
         validateTopLevelNodeName(payload, iiWithData.getInstanceIdentifier());
         validateListKeysEqualityInPayloadAndUri(iiWithData, payload.getData());
 
         final DOMMountPoint mountPoint = iiWithData.getMountPoint();
-
         final YangInstanceIdentifier normalizedII = iiWithData.getInstanceIdentifier();
 
         /*
@@ -883,36 +762,6 @@ public class RestconfImpl implements RestconfService {
         }
     }
 
-    /**
-     * @deprecated method will be removed for Lithium release
-     *
-     * @param node
-     * @param identifier
-     */
-    @Deprecated
-    private void validateTopLevelNodeName(final Node<?> node,
-            final YangInstanceIdentifier identifier) {
-        final String payloadName = getName(node);
-        final Iterator<PathArgument> pathArguments = identifier.getReversePathArguments().iterator();
-
-        //no arguments
-        if (!pathArguments.hasNext()) {
-            //no "data" payload
-            if (!node.getNodeType().equals(NETCONF_BASE_QNAME)) {
-                throw new RestconfDocumentedException("Instance identifier has to contain at least one path argument",
-                        ErrorType.PROTOCOL, ErrorTag.MALFORMED_MESSAGE);
-            }
-        //any arguments
-        } else {
-            final String identifierName = pathArguments.next().getNodeType().getLocalName();
-            if (!payloadName.equals(identifierName)) {
-                throw new RestconfDocumentedException("Payload name (" + payloadName
-                        + ") is different from identifier name (" + identifierName + ")", ErrorType.PROTOCOL,
-                        ErrorTag.MALFORMED_MESSAGE);
-            }
-        }
-    }
-
     /**
      * Validates whether keys in {@code payload} are equal to values of keys in {@code iiWithData} for list schema node
      *
@@ -920,7 +769,7 @@ public class RestconfImpl implements RestconfService {
      *             if key values or key count in payload and URI isn't equal
      *
      */
-    private void validateListKeysEqualityInPayloadAndUri(final InstanceIdentifierContext iiWithData,
+    private void validateListKeysEqualityInPayloadAndUri(final InstanceIdentifierContext<DataSchemaNode> iiWithData,
             final NormalizedNode<?, ?> payload) {
         if (iiWithData.getSchemaNode() instanceof ListSchemaNode) {
             final List<QName> keyDefinitions = ((ListSchemaNode) iiWithData.getSchemaNode()).getKeyDefinition();
@@ -933,29 +782,6 @@ public class RestconfImpl implements RestconfService {
         }
     }
 
-    /**
-     * @deprecated method will be removed for Lithium release
-     *
-     * Validates whether keys in {@code payload} are equal to values of keys in {@code iiWithData} for list schema node
-     *
-     * @throws RestconfDocumentedException
-     *             if key values or key count in payload and URI isn't equal
-     *
-     */
-    @Deprecated
-    private void validateListKeysEqualityInPayloadAndUri(final InstanceIdentifierContext iiWithData,
-            final CompositeNode payload) {
-        if (iiWithData.getSchemaNode() instanceof ListSchemaNode) {
-            final List<QName> keyDefinitions = ((ListSchemaNode) iiWithData.getSchemaNode()).getKeyDefinition();
-            final PathArgument lastPathArgument = iiWithData.getInstanceIdentifier().getLastPathArgument();
-            if (lastPathArgument instanceof NodeIdentifierWithPredicates) {
-                final Map<QName, Object> uriKeyValues = ((NodeIdentifierWithPredicates) lastPathArgument)
-                        .getKeyValues();
-                isEqualUriAndPayloadKeyValues(uriKeyValues, payload, keyDefinitions);
-            }
-        }
-    }
-
     private void isEqualUriAndPayloadKeyValues(final Map<QName, Object> uriKeyValues, final NormalizedNode<?, ?> payload,
             final List<QName> keyDefinitions) {
         for (final QName keyDefinition : keyDefinitions) {
@@ -981,95 +807,63 @@ public class RestconfImpl implements RestconfService {
         }
     }
 
-    /**
-     * @deprecated method will be removed for Lithium release
-     *
-     * @param uriKeyValues
-     * @param payload
-     * @param keyDefinitions
-     */
-    @Deprecated
-    private void isEqualUriAndPayloadKeyValues(final Map<QName, Object> uriKeyValues, final CompositeNode payload,
-            final List<QName> keyDefinitions) {
-        for (final QName keyDefinition : keyDefinitions) {
-            final Object uriKeyValue = uriKeyValues.get(keyDefinition);
-            // should be caught during parsing URI to InstanceIdentifier
-            if (uriKeyValue == null) {
-                throw new RestconfDocumentedException("Missing key " + keyDefinition + " in URI.", ErrorType.PROTOCOL,
-                        ErrorTag.DATA_MISSING);
-            }
-            final List<SimpleNode<?>> payloadKeyValues = payload.getSimpleNodesByName(keyDefinition.getLocalName());
-            if (payloadKeyValues.isEmpty()) {
-                throw new RestconfDocumentedException("Missing key " + keyDefinition.getLocalName()
-                        + " in the message body.", ErrorType.PROTOCOL, ErrorTag.DATA_MISSING);
-            }
-
-            final Object payloadKeyValue = payloadKeyValues.iterator().next().getValue();
-            if (!uriKeyValue.equals(payloadKeyValue)) {
-                throw new RestconfDocumentedException("The value '" + uriKeyValue + "' for key '"
-                        + keyDefinition.getLocalName() + "' specified in the URI doesn't match the value '"
-                        + payloadKeyValue + "' specified in the message body. ", ErrorType.PROTOCOL,
-                        ErrorTag.INVALID_VALUE);
+    @Override
+    public Response createConfigurationData(final String identifier, final NormalizedNodeContext payload, final UriInfo uriInfo) {
+       return createConfigurationData(payload, uriInfo);
+    }
+
+    // FIXME create RestconfIdetifierHelper and move this method there
+    private YangInstanceIdentifier checkConsistencyOfNormalizedNodeContext(final NormalizedNodeContext payload) {
+        Preconditions.checkArgument(payload != null);
+        Preconditions.checkArgument(payload.getData() != null);
+        Preconditions.checkArgument(payload.getData().getNodeType() != null);
+        Preconditions.checkArgument(payload.getInstanceIdentifierContext() != null);
+        Preconditions.checkArgument(payload.getInstanceIdentifierContext().getInstanceIdentifier() != null);
+
+        final QName payloadNodeQname = payload.getData().getNodeType();
+        final YangInstanceIdentifier yangIdent = payload.getInstanceIdentifierContext().getInstanceIdentifier();
+        if (payloadNodeQname.compareTo(yangIdent.getLastPathArgument().getNodeType()) > 0) {
+            return yangIdent;
+        }
+        final InstanceIdentifierContext parentContext = payload.getInstanceIdentifierContext();
+        final SchemaNode parentSchemaNode = parentContext.getSchemaNode();
+        if(parentSchemaNode instanceof DataNodeContainer) {
+            final DataNodeContainer cast = (DataNodeContainer) parentSchemaNode;
+            for (final DataSchemaNode child : cast.getChildNodes()) {
+                if (payloadNodeQname.compareTo(child.getQName()) == 0) {
+                    return YangInstanceIdentifier.builder(yangIdent).node(child.getQName()).build();
+                }
             }
         }
+        if (parentSchemaNode instanceof RpcDefinition) {
+            return yangIdent;
+        }
+        final String errMsg = "Error parsing input: DataSchemaNode has not children";
+        throw new RestconfDocumentedException(errMsg, ErrorType.PROTOCOL, ErrorTag.MALFORMED_MESSAGE);
     }
 
     @Override
-    public Response createConfigurationData(final String identifier, final Node<?> payload) {
+    public Response createConfigurationData(final NormalizedNodeContext payload, final UriInfo uriInfo) {
         if (payload == null) {
             throw new RestconfDocumentedException("Input is required.", ErrorType.PROTOCOL, ErrorTag.MALFORMED_MESSAGE);
         }
 
-        final URI payloadNS = namespace(payload);
+        final URI payloadNS = payload.getData().getNodeType().getNamespace();
         if (payloadNS == null) {
             throw new RestconfDocumentedException(
                     "Data has bad format. Root element node must have namespace (XML format) or module name(JSON format)",
                     ErrorType.PROTOCOL, ErrorTag.UNKNOWN_NAMESPACE);
         }
 
-        InstanceIdentifierContext iiWithData = null;
-        CompositeNode value = null;
-        if (representsMountPointRootData(payload)) {
-            // payload represents mount point data and URI represents path to the mount point
-
-            if (endsWithMountPoint(identifier)) {
-                throw new RestconfDocumentedException("URI has bad format. URI should be without \""
-                        + ControllerContext.MOUNT + "\" for POST operation.", ErrorType.PROTOCOL,
-                        ErrorTag.INVALID_VALUE);
-            }
-
-            final String completeIdentifier = addMountPointIdentifier(identifier);
-            iiWithData = controllerContext.toInstanceIdentifier(completeIdentifier);
-
-            value = this.normalizeNode(payload, iiWithData.getSchemaNode(), iiWithData.getMountPoint());
-        } else {
-            final InstanceIdentifierContext incompleteInstIdWithData = controllerContext
-                    .toInstanceIdentifier(identifier);
-            final DataNodeContainer parentSchema = (DataNodeContainer) incompleteInstIdWithData.getSchemaNode();
-            final DOMMountPoint mountPoint = incompleteInstIdWithData.getMountPoint();
-            final Module module = findModule(mountPoint, payload);
-
-            final String payloadName = getName(payload);
-            final DataSchemaNode schemaNode = ControllerContext.findInstanceDataChildByNameAndNamespace(
-                    parentSchema, payloadName, module.getNamespace());
-            value = this.normalizeNode(payload, schemaNode, mountPoint);
-
-            iiWithData = addLastIdentifierFromData(incompleteInstIdWithData, value, schemaNode,incompleteInstIdWithData.getSchemaContext());
-        }
-
-        final NormalizedNode<?, ?> datastoreNormalizedData = compositeNodeToDatastoreNormalizedNode(value,
-                iiWithData.getSchemaNode());
-        final DOMMountPoint mountPoint = iiWithData.getMountPoint();
-        YangInstanceIdentifier normalizedII;
-
+        final DOMMountPoint mountPoint = payload.getInstanceIdentifierContext().getMountPoint();
+        final InstanceIdentifierContext<DataSchemaNode> iiWithData = (InstanceIdentifierContext<DataSchemaNode>) payload.getInstanceIdentifierContext();
+        final YangInstanceIdentifier normalizedII = iiWithData.getInstanceIdentifier();
+        final YangInstanceIdentifier resultII;
         try {
             if (mountPoint != null) {
-                normalizedII = new DataNormalizer(mountPoint.getSchemaContext()).toNormalized(iiWithData
-                        .getInstanceIdentifier());
-                broker.commitConfigurationDataPost(mountPoint, normalizedII, datastoreNormalizedData);
+                broker.commitConfigurationDataPost(mountPoint, normalizedII, payload.getData()).checkedGet();
             } else {
-                normalizedII = controllerContext.toNormalized(iiWithData.getInstanceIdentifier());
-                broker.commitConfigurationDataPost(normalizedII, datastoreNormalizedData);
+                broker.commitConfigurationDataPost(normalizedII, payload.getData()).checkedGet();
             }
         } catch(final RestconfDocumentedException e) {
             throw e;
@@ -1077,65 +871,37 @@ public class RestconfImpl implements RestconfService {
             throw new RestconfDocumentedException("Error creating data", e);
         }
 
-        return Response.status(Status.NO_CONTENT).build();
-    }
-
-    @Override
-    public Response createConfigurationData(final Node<?> payload) {
-        if (payload == null) {
-            throw new RestconfDocumentedException("Input is required.", ErrorType.PROTOCOL, ErrorTag.MALFORMED_MESSAGE);
-        }
-
-        final URI payloadNS = namespace(payload);
-        if (payloadNS == null) {
-            throw new RestconfDocumentedException(
-                    "Data has bad format. Root element node must have namespace (XML format) or module name(JSON format)",
-                    ErrorType.PROTOCOL, ErrorTag.UNKNOWN_NAMESPACE);
+        final ResponseBuilder responseBuilder = Response.status(Status.NO_CONTENT);
+        // FIXME: Provide path to result.
+        final URI location = resolveLocation(uriInfo, "", mountPoint, normalizedII);
+        if (location != null) {
+            responseBuilder.location(location);
         }
+        return responseBuilder.build();
+    }
 
-        final Module module = this.findModule(null, payload);
-
-        final String payloadName = getName(payload);
-        final DataSchemaNode schemaNode = ControllerContext.findInstanceDataChildByNameAndNamespace(module,
-                payloadName, module.getNamespace());
-        final CompositeNode value = this.normalizeNode(payload, schemaNode, null);
-        final InstanceIdentifierContext iiWithData = addLastIdentifierFromData(null, value, schemaNode,ControllerContext.getInstance().getGlobalSchema());
-        final NormalizedNode<?, ?> datastoreNormalizedData = compositeNodeToDatastoreNormalizedNode(value, schemaNode);
-        final DOMMountPoint mountPoint = iiWithData.getMountPoint();
-        YangInstanceIdentifier normalizedII;
-
+    private URI resolveLocation(final UriInfo uriInfo, final String uriBehindBase, final DOMMountPoint mountPoint, final YangInstanceIdentifier normalizedII) {
+        final UriBuilder uriBuilder = uriInfo.getBaseUriBuilder();
+        uriBuilder.path("config");
         try {
-            if (mountPoint != null) {
-                normalizedII = new DataNormalizer(mountPoint.getSchemaContext()).toNormalized(iiWithData
-                        .getInstanceIdentifier());
-                broker.commitConfigurationDataPost(mountPoint, normalizedII, datastoreNormalizedData);
-
-            } else {
-                normalizedII = controllerContext.toNormalized(iiWithData.getInstanceIdentifier());
-                broker.commitConfigurationDataPost(normalizedII, datastoreNormalizedData);
-            }
-        } catch(final RestconfDocumentedException e) {
-            throw e;
+            uriBuilder.path(controllerContext.toFullRestconfIdentifier(normalizedII, mountPoint));
         } catch (final Exception e) {
-            throw new RestconfDocumentedException("Error creating data", e);
+            LOG.debug("Location for instance identifier"+normalizedII+"wasn't created", e);
+            return null;
         }
-
-        return Response.status(Status.NO_CONTENT).build();
+        return uriBuilder.build();
     }
 
     @Override
     public Response deleteConfigurationData(final String identifier) {
-        final InstanceIdentifierContext iiWithData = controllerContext.toInstanceIdentifier(identifier);
+        final InstanceIdentifierContext<DataSchemaNode> iiWithData = controllerContext.toInstanceIdentifier(identifier);
         final DOMMountPoint mountPoint = iiWithData.getMountPoint();
-        YangInstanceIdentifier normalizedII;
+        final YangInstanceIdentifier normalizedII = iiWithData.getInstanceIdentifier();
 
         try {
             if (mountPoint != null) {
-                normalizedII = new DataNormalizer(mountPoint.getSchemaContext()).toNormalized(iiWithData
-                        .getInstanceIdentifier());
                 broker.commitConfigurationDataDelete(mountPoint, normalizedII);
             } else {
-                normalizedII = controllerContext.toNormalized(iiWithData.getInstanceIdentifier());
                 broker.commitConfigurationDataDelete(normalizedII).get();
             }
         } catch (final Exception e) {
@@ -1193,8 +959,8 @@ public class RestconfImpl implements RestconfService {
         } catch (final NullPointerException e) {
             WebSocketServer.createInstance(NOTIFICATION_PORT);
         }
-        final UriBuilder port = uriBuilder.port(notificationPort);
-        final URI uriToWebsocketServer = port.replacePath(streamName).build();
+        final UriBuilder uriToWebsocketServerBuilder = uriBuilder.port(notificationPort).scheme("ws");
+        final URI uriToWebsocketServer = uriToWebsocketServerBuilder.replacePath(streamName).build();
 
         return Response.status(Status.OK).location(uriToWebsocketServer).build();
     }
@@ -1206,15 +972,18 @@ public class RestconfImpl implements RestconfService {
      *            contains value
      * @return enum object if its string value is equal to {@code paramName}. In other cases null.
      */
-    private <T> T parseEnumTypeParameter(final CompositeNode compNode, final Class<T> classDescriptor,
+    private <T> T parseEnumTypeParameter(final ContainerNode value, final Class<T> classDescriptor,
             final String paramName) {
-        final QNameModule salRemoteAugment = QNameModule.create(NAMESPACE_EVENT_SUBSCRIPTION_AUGMENT,
-                EVENT_SUBSCRIPTION_AUGMENT_REVISION);
-        final SimpleNode<?> simpleNode = compNode.getFirstSimpleByName(QName.create(salRemoteAugment, paramName));
-        if (simpleNode == null) {
+        final Optional<DataContainerChild<? extends PathArgument, ?>> augNode = value.getChild(SAL_REMOTE_AUG_IDENTIFIER);
+        if (!augNode.isPresent() && !(augNode instanceof AugmentationNode)) {
+            return null;
+        }
+        final Optional<DataContainerChild<? extends PathArgument, ?>> enumNode =
+                ((AugmentationNode) augNode.get()).getChild(new NodeIdentifier(QName.create(SAL_REMOTE_AUGMENT, paramName)));
+        if (!enumNode.isPresent()) {
             return null;
         }
-        final Object rawValue = simpleNode.getValue();
+        final Object rawValue = enumNode.get().getValue();
         if (!(rawValue instanceof String)) {
             return null;
         }
@@ -1259,119 +1028,10 @@ public class RestconfImpl implements RestconfService {
         return result;
     }
 
-    private Module findModule(final DOMMountPoint mountPoint, final Node<?> data) {
-        Module module = null;
-        if (data instanceof NodeWrapper) {
-            module = findModule(mountPoint, (NodeWrapper<?>) data);
-        } else if (data != null) {
-            final URI namespace = data.getNodeType().getNamespace();
-            if (mountPoint != null) {
-                module = controllerContext.findModuleByNamespace(mountPoint, namespace);
-            } else {
-                module = controllerContext.findModuleByNamespace(namespace);
-            }
-        }
-        if (module != null) {
-            return module;
-        }
-        throw new RestconfDocumentedException(
-                "Data has bad format. Root element node has incorrect namespace (XML format) or module name(JSON format)",
-                ErrorType.PROTOCOL, ErrorTag.UNKNOWN_NAMESPACE);
-    }
-
-    private Module findModule(final DOMMountPoint mountPoint, final NodeWrapper<?> data) {
-        final URI namespace = data.getNamespace();
-        Preconditions.<URI> checkNotNull(namespace);
-
-        Module module = null;
-        if (mountPoint != null) {
-            module = controllerContext.findModuleByNamespace(mountPoint, namespace);
-            if (module == null) {
-                module = controllerContext.findModuleByName(mountPoint, namespace.toString());
-            }
-        } else {
-            module = controllerContext.findModuleByNamespace(namespace);
-            if (module == null) {
-                module = controllerContext.findModuleByName(namespace.toString());
-            }
-        }
-
-        return module;
-    }
-
-    private InstanceIdentifierContext addLastIdentifierFromData(final InstanceIdentifierContext identifierWithSchemaNode,
-            final CompositeNode data, final DataSchemaNode schemaOfData, final SchemaContext schemaContext) {
-        YangInstanceIdentifier instanceIdentifier = null;
-        if (identifierWithSchemaNode != null) {
-            instanceIdentifier = identifierWithSchemaNode.getInstanceIdentifier();
-        }
-
-        final YangInstanceIdentifier iiOriginal = instanceIdentifier;
-        InstanceIdentifierBuilder iiBuilder = null;
-        if (iiOriginal == null) {
-            iiBuilder = YangInstanceIdentifier.builder();
-        } else {
-            iiBuilder = YangInstanceIdentifier.builder(iiOriginal);
-        }
-
-        if ((schemaOfData instanceof ListSchemaNode)) {
-            final HashMap<QName, Object> keys = resolveKeysFromData(((ListSchemaNode) schemaOfData), data);
-            iiBuilder.nodeWithKey(schemaOfData.getQName(), keys);
-        } else {
-            iiBuilder.node(schemaOfData.getQName());
-        }
-
-        final YangInstanceIdentifier instance = iiBuilder.toInstance();
-        DOMMountPoint mountPoint = null;
-        final SchemaContext schemaCtx = null;
-        if (identifierWithSchemaNode != null) {
-            mountPoint = identifierWithSchemaNode.getMountPoint();
-        }
-
-        return new InstanceIdentifierContext(instance, schemaOfData, mountPoint,schemaContext);
-    }
-
-    private HashMap<QName, Object> resolveKeysFromData(final ListSchemaNode listNode, final CompositeNode dataNode) {
-        final HashMap<QName, Object> keyValues = new HashMap<QName, Object>();
-        final List<QName> _keyDefinition = listNode.getKeyDefinition();
-        for (final QName key : _keyDefinition) {
-            SimpleNode<? extends Object> head = null;
-            final String localName = key.getLocalName();
-            final List<SimpleNode<? extends Object>> simpleNodesByName = dataNode.getSimpleNodesByName(localName);
-            if (simpleNodesByName != null) {
-                head = Iterables.getFirst(simpleNodesByName, null);
-            }
-
-            Object dataNodeKeyValueObject = null;
-            if (head != null) {
-                dataNodeKeyValueObject = head.getValue();
-            }
-
-            if (dataNodeKeyValueObject == null) {
-                throw new RestconfDocumentedException("Data contains list \"" + dataNode.getNodeType().getLocalName()
-                        + "\" which does not contain key: \"" + key.getLocalName() + "\"", ErrorType.PROTOCOL,
-                        ErrorTag.INVALID_VALUE);
-            }
-
-            keyValues.put(key, dataNodeKeyValueObject);
-        }
-
-        return keyValues;
-    }
-
     private boolean endsWithMountPoint(final String identifier) {
         return identifier.endsWith(ControllerContext.MOUNT) || identifier.endsWith(ControllerContext.MOUNT + "/");
     }
 
-    private boolean representsMountPointRootData(final Node<?> data) {
-        final URI namespace = namespace(data);
-        return (SchemaContext.NAME.getNamespace().equals(namespace) /*
-         * || MOUNT_POINT_MODULE_NAME .equals( namespace .
-         * toString( ) )
-         */)
-         && SchemaContext.NAME.getLocalName().equals(localName(data));
-    }
-
     private String addMountPointIdentifier(final String identifier) {
         final boolean endsWith = identifier.endsWith("/");
         if (endsWith) {
@@ -1381,301 +1041,6 @@ public class RestconfImpl implements RestconfService {
         return identifier + "/" + ControllerContext.MOUNT;
     }
 
-    /**
-     * @deprecated method will be removed in Lithium release
-     *      we don't wish to use Node and CompositeNode anywhere
-     */
-    @Deprecated
-    public CompositeNode normalizeNode(final Node<?> node, final DataSchemaNode schema, final DOMMountPoint mountPoint) {
-        if (schema == null) {
-            final String localName = node == null ? null :
-                    node instanceof NodeWrapper ? ((NodeWrapper<?>)node).getLocalName() :
-                    node.getNodeType().getLocalName();
-
-            throw new RestconfDocumentedException("Data schema node was not found for " + localName,
-                    ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE);
-        }
-
-        if (!(schema instanceof DataNodeContainer)) {
-            throw new RestconfDocumentedException("Root element has to be container or list yang datatype.",
-                    ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE);
-        }
-
-        if ((node instanceof NodeWrapper<?>)) {
-            NodeWrapper<?> nodeWrap = (NodeWrapper<?>) node;
-            final boolean isChangeAllowed = ((NodeWrapper<?>) node).isChangeAllowed();
-            if (isChangeAllowed) {
-                nodeWrap = topLevelElementAsCompositeNodeWrapper((NodeWrapper<?>) node, schema);
-                try {
-                    this.normalizeNode(nodeWrap, schema, null, mountPoint);
-                } catch (final IllegalArgumentException e) {
-                    final RestconfDocumentedException restconfDocumentedException = new RestconfDocumentedException(e.getMessage(), ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE);
-                    restconfDocumentedException.addSuppressed(e);
-                    throw restconfDocumentedException;
-                }
-                if (nodeWrap instanceof CompositeNodeWrapper) {
-                    return ((CompositeNodeWrapper) nodeWrap).unwrap();
-                }
-            }
-        }
-
-        if (node instanceof CompositeNode) {
-            return (CompositeNode) node;
-        }
-
-        throw new RestconfDocumentedException("Top level element is not interpreted as composite node.",
-                ErrorType.APPLICATION, ErrorTag.INVALID_VALUE);
-    }
-
-    private void normalizeNode(final NodeWrapper<? extends Object> nodeBuilder, final DataSchemaNode schema,
-            final QName previousAugment, final DOMMountPoint mountPoint) {
-        if (schema == null) {
-            throw new RestconfDocumentedException("Data has bad format.\n\"" + nodeBuilder.getLocalName()
-                    + "\" does not exist in yang schema.", ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE);
-        }
-
-        QName currentAugment = null;
-        if (nodeBuilder.getQname() != null) {
-            currentAugment = previousAugment;
-        } else {
-            currentAugment = normalizeNodeName(nodeBuilder, schema, previousAugment, mountPoint);
-            if (nodeBuilder.getQname() == null) {
-                throw new RestconfDocumentedException(
-                        "Data has bad format.\nIf data is in XML format then namespace for \""
-                                + nodeBuilder.getLocalName() + "\" should be \"" + schema.getQName().getNamespace()
-                                + "\".\n" + "If data is in JSON format then module name for \""
-                                + nodeBuilder.getLocalName() + "\" should be corresponding to namespace \""
-                                + schema.getQName().getNamespace() + "\".", ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE);
-            }
-        }
-
-        if (nodeBuilder instanceof CompositeNodeWrapper) {
-            if (schema instanceof DataNodeContainer) {
-                normalizeCompositeNode((CompositeNodeWrapper) nodeBuilder, (DataNodeContainer) schema, mountPoint,
-                        currentAugment);
-            } else if (schema instanceof AnyXmlSchemaNode) {
-                normalizeAnyXmlNode((CompositeNodeWrapper) nodeBuilder, (AnyXmlSchemaNode) schema);
-            }
-        } else if (nodeBuilder instanceof SimpleNodeWrapper) {
-            normalizeSimpleNode((SimpleNodeWrapper) nodeBuilder, schema, mountPoint);
-        } else if ((nodeBuilder instanceof EmptyNodeWrapper)) {
-            normalizeEmptyNode((EmptyNodeWrapper) nodeBuilder, schema);
-        }
-    }
-
-    private void normalizeAnyXmlNode(final CompositeNodeWrapper compositeNode, final AnyXmlSchemaNode schema) {
-        final List<NodeWrapper<?>> children = compositeNode.getValues();
-        for (final NodeWrapper<? extends Object> child : children) {
-            child.setNamespace(schema.getQName().getNamespace());
-            if (child instanceof CompositeNodeWrapper) {
-                normalizeAnyXmlNode((CompositeNodeWrapper) child, schema);
-            }
-        }
-    }
-
-    private void normalizeEmptyNode(final EmptyNodeWrapper emptyNodeBuilder, final DataSchemaNode schema) {
-        if ((schema instanceof LeafSchemaNode)) {
-            emptyNodeBuilder.setComposite(false);
-        } else {
-            if ((schema instanceof ContainerSchemaNode)) {
-                // FIXME: Add presence check
-                emptyNodeBuilder.setComposite(true);
-            }
-        }
-    }
-
-    private void normalizeSimpleNode(final SimpleNodeWrapper simpleNode, final DataSchemaNode schema,
-            final DOMMountPoint mountPoint) {
-        final Object value = simpleNode.getValue();
-        Object inputValue = value;
-        final TypeDef typeDef = this.typeDefinition(schema);
-        TypeDefinition<? extends Object> typeDefinition = typeDef != null ? typeDef.typedef : null;
-
-        // For leafrefs, extract the type it is pointing to
-        if(typeDefinition instanceof LeafrefTypeDefinition) {
-            if (schema.getQName().equals(typeDef.qName)) {
-                typeDefinition = SchemaContextUtil.getBaseTypeForLeafRef(((LeafrefTypeDefinition) typeDefinition), mountPoint == null ? controllerContext.getGlobalSchema() : mountPoint.getSchemaContext(), schema);
-            } else {
-                typeDefinition = SchemaContextUtil.getBaseTypeForLeafRef(((LeafrefTypeDefinition) typeDefinition), mountPoint == null ? controllerContext.getGlobalSchema() : mountPoint.getSchemaContext(), typeDef.qName);
-            }
-        }
-
-        if (typeDefinition instanceof IdentityrefTypeDefinition) {
-            inputValue = parseToIdentityValuesDTO(simpleNode, value, inputValue);
-        }
-
-        Object outputValue = inputValue;
-
-        if (typeDefinition != null) {
-            final Codec<Object, Object> codec = RestCodec.from(typeDefinition, mountPoint);
-            outputValue = codec == null ? null : codec.deserialize(inputValue);
-        }
-
-        simpleNode.setValue(outputValue);
-    }
-
-    private Object parseToIdentityValuesDTO(final SimpleNodeWrapper simpleNode, final Object value, Object inputValue) {
-        if ((value instanceof String)) {
-            inputValue = new IdentityValuesDTO(simpleNode.getNamespace().toString(), (String) value, null,
-                    (String) value);
-        } // else value is already instance of IdentityValuesDTO
-        return inputValue;
-    }
-
-    private void normalizeCompositeNode(final CompositeNodeWrapper compositeNodeBuilder,
-            final DataNodeContainer schema, final DOMMountPoint mountPoint, final QName currentAugment) {
-        final List<NodeWrapper<?>> children = compositeNodeBuilder.getValues();
-        checkNodeMultiplicityAccordingToSchema(schema, children);
-        for (final NodeWrapper<? extends Object> child : children) {
-            final List<DataSchemaNode> potentialSchemaNodes = ControllerContext.findInstanceDataChildrenByName(
-                    schema, child.getLocalName());
-
-            if (potentialSchemaNodes.size() > 1 && child.getNamespace() == null) {
-                final StringBuilder builder = new StringBuilder();
-                for (final DataSchemaNode potentialSchemaNode : potentialSchemaNodes) {
-                    builder.append("   ").append(potentialSchemaNode.getQName().getNamespace().toString()).append("\n");
-                }
-
-                throw new RestconfDocumentedException("Node \"" + child.getLocalName()
-                        + "\" is added as augment from more than one module. "
-                        + "Therefore node must have namespace (XML format) or module name (JSON format)."
-                        + "\nThe node is added as augment from modules with namespaces:\n" + builder,
-                        ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE);
-            }
-
-            boolean rightNodeSchemaFound = false;
-            for (final DataSchemaNode potentialSchemaNode : potentialSchemaNodes) {
-                if (!rightNodeSchemaFound) {
-                    final QName potentialCurrentAugment = normalizeNodeName(child, potentialSchemaNode,
-                            currentAugment, mountPoint);
-                    if (child.getQname() != null) {
-                        this.normalizeNode(child, potentialSchemaNode, potentialCurrentAugment, mountPoint);
-                        rightNodeSchemaFound = true;
-                    }
-                }
-            }
-
-            if (!rightNodeSchemaFound) {
-                throw new RestconfDocumentedException("Schema node \"" + child.getLocalName()
-                        + "\" was not found in module.", ErrorType.APPLICATION, ErrorTag.UNKNOWN_ELEMENT);
-            }
-        }
-
-        if ((schema instanceof ListSchemaNode)) {
-            final ListSchemaNode listSchemaNode = (ListSchemaNode) schema;
-            final List<QName> listKeys = listSchemaNode.getKeyDefinition();
-            for (final QName listKey : listKeys) {
-                boolean foundKey = false;
-                for (final NodeWrapper<? extends Object> child : children) {
-                    if (Objects.equal(child.unwrap().getNodeType().getLocalName(), listKey.getLocalName())) {
-                        foundKey = true;
-                    }
-                }
-
-                if (!foundKey) {
-                    throw new RestconfDocumentedException("Missing key in URI \"" + listKey.getLocalName()
-                            + "\" of list \"" + listSchemaNode.getQName().getLocalName() + "\"", ErrorType.PROTOCOL,
-                            ErrorTag.DATA_MISSING);
-                }
-            }
-        }
-    }
-
-    private void checkNodeMultiplicityAccordingToSchema(final DataNodeContainer dataNodeContainer,
-            final List<NodeWrapper<?>> nodes) {
-        final Map<String, Integer> equalNodeNamesToCounts = new HashMap<String, Integer>();
-        for (final NodeWrapper<?> child : nodes) {
-            Integer count = equalNodeNamesToCounts.get(child.getLocalName());
-            equalNodeNamesToCounts.put(child.getLocalName(), count == null ? 1 : ++count);
-        }
-
-        for (final DataSchemaNode childSchemaNode : dataNodeContainer.getChildNodes()) {
-            if (childSchemaNode instanceof ContainerSchemaNode || childSchemaNode instanceof LeafSchemaNode) {
-                final String localName = childSchemaNode.getQName().getLocalName();
-                final Integer count = equalNodeNamesToCounts.get(localName);
-                if (count != null && count > 1) {
-                    throw new RestconfDocumentedException("Multiple input data elements were specified for '"
-                            + childSchemaNode.getQName().getLocalName()
-                            + "'. The data for this element type can only be specified once.", ErrorType.APPLICATION,
-                            ErrorTag.BAD_ELEMENT);
-                }
-            }
-        }
-    }
-
-    private QName normalizeNodeName(final NodeWrapper<? extends Object> nodeBuilder, final DataSchemaNode schema,
-            final QName previousAugment, final DOMMountPoint mountPoint) {
-        QName validQName = schema.getQName();
-        QName currentAugment = previousAugment;
-        if (schema.isAugmenting()) {
-            currentAugment = schema.getQName();
-        } else if (previousAugment != null
-                && !Objects.equal(schema.getQName().getNamespace(), previousAugment.getNamespace())) {
-            validQName = QName.create(currentAugment, schema.getQName().getLocalName());
-        }
-
-        String moduleName = null;
-        if (mountPoint == null) {
-            moduleName = controllerContext.findModuleNameByNamespace(validQName.getNamespace());
-        } else {
-            moduleName = controllerContext.findModuleNameByNamespace(mountPoint, validQName.getNamespace());
-        }
-
-        if (nodeBuilder.getNamespace() == null || Objects.equal(nodeBuilder.getNamespace(), validQName.getNamespace())
-                || Objects.equal(nodeBuilder.getNamespace().toString(), moduleName)) {
-            /*
-             * || Note : this check is wrong -
-             * can never be true as it compares
-             * a URI with a String not sure what
-             * the intention is so commented out
-             * ... Objects . equal ( nodeBuilder
-             * . getNamespace ( ) ,
-             * MOUNT_POINT_MODULE_NAME )
-             */
-
-            nodeBuilder.setQname(validQName);
-        }
-
-        return currentAugment;
-    }
-
-    private URI namespace(final Node<?> data) {
-        if (data instanceof NodeWrapper) {
-            return ((NodeWrapper<?>) data).getNamespace();
-        } else if (data != null) {
-            return data.getNodeType().getNamespace();
-        } else {
-            throw new IllegalArgumentException("Unhandled parameter types: " + Arrays.<Object> asList(data).toString());
-        }
-    }
-
-    private String localName(final Node<?> data) {
-        if (data instanceof NodeWrapper) {
-            return ((NodeWrapper<?>) data).getLocalName();
-        } else if (data != null) {
-            return data.getNodeType().getLocalName();
-        } else {
-            throw new IllegalArgumentException("Unhandled parameter types: " + Arrays.<Object> asList(data).toString());
-        }
-    }
-
-    /**
-     * @deprecated method will be removed for Lithium release
-     *
-     * @param data
-     * @return
-     */
-    @Deprecated
-    private String getName(final Node<?> data) {
-        if (data instanceof NodeWrapper) {
-            return ((NodeWrapper<?>) data).getLocalName();
-        } else if (data != null) {
-            return data.getNodeType().getLocalName();
-        } else {
-            throw new IllegalArgumentException("Unhandled parameter types: " + Arrays.<Object> asList(data).toString());
-        }
-    }
-
     private TypeDef typeDefinition(final TypeDefinition<?> type, final QName nodeQName) {
         TypeDefinition<?> baseType = type;
         QName qName = nodeQName;
@@ -1702,46 +1067,6 @@ public class RestconfImpl implements RestconfService {
         }
     }
 
-    private CompositeNode datastoreNormalizedNodeToCompositeNode(final NormalizedNode<?, ?> dataNode, final DataSchemaNode schema) {
-        Node<?> nodes = null;
-        if (dataNode == null) {
-            throw new RestconfDocumentedException(new RestconfError(ErrorType.APPLICATION, ErrorTag.DATA_MISSING,
-                    "No data was found."));
-        }
-        nodes = DataNormalizer.toLegacy(dataNode);
-        if (nodes != null) {
-            if (nodes instanceof CompositeNode) {
-                return (CompositeNode) nodes;
-            } else {
-                LOG.error("The node " + dataNode.getNodeType() + " couldn't be transformed to compositenode.");
-            }
-        } else {
-            LOG.error("Top level node isn't of type Container or List schema node but "
-                    + schema.getClass().getSimpleName());
-        }
-
-        throw new RestconfDocumentedException(new RestconfError(ErrorType.APPLICATION, ErrorTag.INVALID_VALUE,
-                "It wasn't possible to correctly interpret data."));
-    }
-
-    private NormalizedNode<?, ?> compositeNodeToDatastoreNormalizedNode(final CompositeNode compNode,
-            final DataSchemaNode schema) {
-        final List<Node<?>> lst = new ArrayList<Node<?>>();
-        lst.add(compNode);
-        if (schema instanceof ContainerSchemaNode) {
-            return CnSnToNormalizedNodeParserFactory.getInstance().getContainerNodeParser()
-                    .parse(lst, (ContainerSchemaNode) schema);
-        } else if (schema instanceof ListSchemaNode) {
-            return CnSnToNormalizedNodeParserFactory.getInstance().getMapEntryNodeParser()
-                    .parse(lst, (ListSchemaNode) schema);
-        }
-
-        LOG.error("Top level isn't of type container, list, leaf schema node but " + schema.getClass().getSimpleName());
-
-        throw new RestconfDocumentedException(new RestconfError(ErrorType.APPLICATION, ErrorTag.INVALID_VALUE,
-                "It wasn't possible to translate specified data to datastore readable form."));
-    }
-
     private InstanceIdentifierContext normalizeInstanceIdentifierWithSchemaNode(
             final InstanceIdentifierContext iiWithSchemaNode) {
         return normalizeInstanceIdentifierWithSchemaNode(iiWithSchemaNode, false);
@@ -1769,19 +1094,6 @@ public class RestconfImpl implements RestconfService {
         return YangInstanceIdentifier.create(result);
     }
 
-    private CompositeNodeWrapper topLevelElementAsCompositeNodeWrapper(final NodeWrapper<?> node,
-            final DataSchemaNode schemaNode) {
-        if (node instanceof CompositeNodeWrapper) {
-            return (CompositeNodeWrapper) node;
-        } else if (node instanceof SimpleNodeWrapper && isDataContainerNode(schemaNode)) {
-            final SimpleNodeWrapper simpleNodeWrapper = (SimpleNodeWrapper) node;
-            return new CompositeNodeWrapper(namespace(simpleNodeWrapper), localName(simpleNodeWrapper));
-        }
-
-        throw new RestconfDocumentedException(new RestconfError(ErrorType.APPLICATION, ErrorTag.INVALID_VALUE,
-                "Top level element has to be composite node or has to represent data container node."));
-    }
-
     private boolean isDataContainerNode(final DataSchemaNode schemaNode) {
         if (schemaNode instanceof ContainerSchemaNode || schemaNode instanceof ListSchemaNode) {
             return true;
@@ -1812,8 +1124,47 @@ public class RestconfImpl implements RestconfService {
 
     protected MapEntryNode toModuleEntryNode(final Module module, final DataSchemaNode moduleSchemaNode) {
         Preconditions.checkArgument(moduleSchemaNode instanceof ListSchemaNode,
-                "moduleSchemaNode has to be of type ListSchemaNode");\r        final ListSchemaNode listModuleSchemaNode = (ListSchemaNode) moduleSchemaNode;\r        final DataContainerNodeAttrBuilder<NodeIdentifierWithPredicates, MapEntryNode> moduleNodeValues = Builders\r                .mapEntryBuilder(listModuleSchemaNode);\r\r        List<DataSchemaNode> instanceDataChildrenByName = ControllerContext.findInstanceDataChildrenByName(\r                (listModuleSchemaNode), "name");\r        final DataSchemaNode nameSchemaNode = Iterables.getFirst(instanceDataChildrenByName, null);\r        Preconditions.checkState(nameSchemaNode instanceof LeafSchemaNode);\r        moduleNodeValues.withChild(Builders.leafBuilder((LeafSchemaNode) nameSchemaNode).withValue(module.getName())\r                .build());\r\r        instanceDataChildrenByName = ControllerContext.findInstanceDataChildrenByName(\r                (listModuleSchemaNode), "revision");\r        final DataSchemaNode revisionSchemaNode = Iterables.getFirst(instanceDataChildrenByName, null);\r        Preconditions.checkState(revisionSchemaNode instanceof LeafSchemaNode);\r        final String revision = REVISION_FORMAT.format(module.getRevision());\r        moduleNodeValues.withChild(Builders.leafBuilder((LeafSchemaNode) revisionSchemaNode).withValue(revision)\r                .build());\r\r        instanceDataChildrenByName = ControllerContext.findInstanceDataChildrenByName(\r                (listModuleSchemaNode), "namespace");\r        final DataSchemaNode namespaceSchemaNode = Iterables.getFirst(instanceDataChildrenByName, null);\r        Preconditions.checkState(namespaceSchemaNode instanceof LeafSchemaNode);\r        moduleNodeValues.withChild(Builders.leafBuilder((LeafSchemaNode) namespaceSchemaNode)\r                .withValue(module.getNamespace().toString()).build());\r\r        instanceDataChildrenByName = ControllerContext.findInstanceDataChildrenByName(\r                (listModuleSchemaNode), "feature");\r        final DataSchemaNode featureSchemaNode = Iterables.getFirst(instanceDataChildrenByName, null);\r        Preconditions.checkState(featureSchemaNode instanceof LeafListSchemaNode);\r        final ListNodeBuilder<Object, LeafSetEntryNode<Object>> featuresBuilder = Builders\r                .leafSetBuilder((LeafListSchemaNode) featureSchemaNode);\r        for (final FeatureDefinition feature : module.getFeatures()) {\r            featuresBuilder.withChild(Builders.leafSetEntryBuilder(((LeafListSchemaNode) featureSchemaNode))\r                    .withValue(feature.getQName().getLocalName()).build());\r        }\r        moduleNodeValues.withChild(featuresBuilder.build());
-\r        return moduleNodeValues.build();\r    }
+                "moduleSchemaNode has to be of type ListSchemaNode");
+        final ListSchemaNode listModuleSchemaNode = (ListSchemaNode) moduleSchemaNode;
+        final DataContainerNodeAttrBuilder<NodeIdentifierWithPredicates, MapEntryNode> moduleNodeValues = Builders
+                .mapEntryBuilder(listModuleSchemaNode);
+
+        List<DataSchemaNode> instanceDataChildrenByName = ControllerContext.findInstanceDataChildrenByName(
+                (listModuleSchemaNode), "name");
+        final DataSchemaNode nameSchemaNode = Iterables.getFirst(instanceDataChildrenByName, null);
+        Preconditions.checkState(nameSchemaNode instanceof LeafSchemaNode);
+        moduleNodeValues.withChild(Builders.leafBuilder((LeafSchemaNode) nameSchemaNode).withValue(module.getName())
+                .build());
+
+        instanceDataChildrenByName = ControllerContext.findInstanceDataChildrenByName(
+                (listModuleSchemaNode), "revision");
+        final DataSchemaNode revisionSchemaNode = Iterables.getFirst(instanceDataChildrenByName, null);
+        Preconditions.checkState(revisionSchemaNode instanceof LeafSchemaNode);
+        final String revision = REVISION_FORMAT.format(module.getRevision());
+        moduleNodeValues.withChild(Builders.leafBuilder((LeafSchemaNode) revisionSchemaNode).withValue(revision)
+                .build());
+
+        instanceDataChildrenByName = ControllerContext.findInstanceDataChildrenByName(
+                (listModuleSchemaNode), "namespace");
+        final DataSchemaNode namespaceSchemaNode = Iterables.getFirst(instanceDataChildrenByName, null);
+        Preconditions.checkState(namespaceSchemaNode instanceof LeafSchemaNode);
+        moduleNodeValues.withChild(Builders.leafBuilder((LeafSchemaNode) namespaceSchemaNode)
+                .withValue(module.getNamespace().toString()).build());
+
+        instanceDataChildrenByName = ControllerContext.findInstanceDataChildrenByName(
+                (listModuleSchemaNode), "feature");
+        final DataSchemaNode featureSchemaNode = Iterables.getFirst(instanceDataChildrenByName, null);
+        Preconditions.checkState(featureSchemaNode instanceof LeafListSchemaNode);
+        final ListNodeBuilder<Object, LeafSetEntryNode<Object>> featuresBuilder = Builders
+                .leafSetBuilder((LeafListSchemaNode) featureSchemaNode);
+        for (final FeatureDefinition feature : module.getFeatures()) {
+            featuresBuilder.withChild(Builders.leafSetEntryBuilder(((LeafListSchemaNode) featureSchemaNode))
+                    .withValue(feature.getQName().getLocalName()).build());
+        }
+        moduleNodeValues.withChild(featuresBuilder.build());
+
+        return moduleNodeValues.build();
+    }
 
     protected MapEntryNode toStreamEntryNode(final String streamName, final DataSchemaNode streamSchemaNode) {
         Preconditions.checkArgument(streamSchemaNode instanceof ListSchemaNode,