Remove yang-data-operations 87/24087/5
authorMaros Marsalek <mmarsale@cisco.com>
Tue, 14 Jul 2015 08:43:06 +0000 (10:43 +0200)
committerMaros Marsalek <mmarsale@cisco.com>
Mon, 2 Nov 2015 18:38:21 +0000 (18:38 +0000)
Not used anywhere and not needed anymore.

Change-Id: Ie21d18dfaaffe14ddbc843cc568fa1e47004644c
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Signed-off-by: Robert Varga <rovarga@cisco.com>
85 files changed:
common/artifacts/pom.xml
common/features/pom.xml
common/features/src/main/features/features.xml
yang/pom.xml
yang/yang-data-operations/pom.xml [deleted file]
yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/AbstractContainerNodeModification.java [deleted file]
yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/AugmentationNodeModification.java [deleted file]
yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/ChoiceNodeModification.java [deleted file]
yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/ContainerNodeModification.java [deleted file]
yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/DataModificationException.java [deleted file]
yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/DataOperations.java [deleted file]
yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/LeafNodeModification.java [deleted file]
yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/LeafSetNodeModification.java [deleted file]
yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/MapEntryNodeModification.java [deleted file]
yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/MapNodeModification.java [deleted file]
yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/Modification.java [deleted file]
yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/OperationStack.java [deleted file]
yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/UnkeyedListNodeModification.java [deleted file]
yang/yang-data-operations/src/test/java/org/opendaylight/yangtools/yang/data/operations/YangDataOperationsNegativeTest.java [deleted file]
yang/yang-data-operations/src/test/java/org/opendaylight/yangtools/yang/data/operations/YangDataOperationsTest.java [deleted file]
yang/yang-data-operations/src/test/resources/schemas/test.yang [deleted file]
yang/yang-data-operations/src/test/resources/xmls-negative/containerTest_choiceModificationMultipleCasesReferenced/current.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls-negative/containerTest_choiceModificationMultipleCasesReferenced/merge.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls-negative/containerTest_createContainerActualPresent/current.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls-negative/containerTest_createContainerActualPresent/merge.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls-negative/containerTest_deleteContainerActualMissing/merge.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls-negative/containerTest_noneContainerActualMissing/defaultOperation.txt [deleted file]
yang/yang-data-operations/src/test/resources/xmls-negative/containerTest_noneContainerActualMissing/merge.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls-negative/leafListTest_createLeafActualPresent/current.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls-negative/leafListTest_createLeafActualPresent/merge.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls-negative/leafListTest_deleteLeafActualMissing/current.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls-negative/leafListTest_deleteLeafActualMissing/merge.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls-negative/leafTest_createLeafActualPresent/current.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls-negative/leafTest_createLeafActualPresent/merge.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls-negative/leafTest_deleteLeafActualMissing/current.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls-negative/leafTest_deleteLeafActualMissing/merge.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls-negative/listTest_createListActualPresent/current.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls-negative/listTest_createListActualPresent/merge.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls-negative/listTest_deleteListActualMissing/current.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls-negative/listTest_deleteListActualMissing/merge.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls-negative/listTest_noneListActualMissing/current.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls-negative/listTest_noneListActualMissing/defaultOperation.txt [deleted file]
yang/yang-data-operations/src/test/resources/xmls-negative/listTest_noneListActualMissing/merge.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls/containerTest_choiceActualModificationDifferentCases/current.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls/containerTest_choiceActualModificationDifferentCases/merge.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls/containerTest_choiceActualModificationDifferentCases/result.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls/containerTest_choiceActualModificationSameCase/current.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls/containerTest_choiceActualModificationSameCase/merge.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls/containerTest_choiceActualModificationSameCase/result.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls/containerTest_choiceActualOneCaseModificationOtherCase/current.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls/containerTest_choiceActualOneCaseModificationOtherCase/merge.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls/containerTest_choiceActualOneCaseModificationOtherCase/result.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls/containerTest_createContainer/merge.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls/containerTest_createContainer/result.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls/containerTest_deleteContainer/current.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls/containerTest_deleteContainer/merge.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls/containerTest_innerContainerContainer/current.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls/containerTest_innerContainerContainer/merge.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls/containerTest_innerContainerContainer/result.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls/containerTest_innerLeavesBaseOperationsContainer/current.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls/containerTest_innerLeavesBaseOperationsContainer/merge.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls/containerTest_innerLeavesBaseOperationsContainer/result.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls/containerTest_noneContainer/current.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls/containerTest_noneContainer/defaultOperation.txt [deleted file]
yang/yang-data-operations/src/test/resources/xmls/containerTest_noneContainer/merge.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls/containerTest_noneContainer/result.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls/containerTest_removeContainer/current.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls/containerTest_removeContainer/merge.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls/containerTest_replaceContainer/current.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls/containerTest_replaceContainer/merge.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls/containerTest_replaceContainer/result.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls/leafListTest/current.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls/leafListTest/merge.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls/leafListTest/result.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls/listTest/current.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls/listTest/merge.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls/listTest/result.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls/listTest_alterInnerValue/current.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls/listTest_alterInnerValue/defaultOperation.txt [deleted file]
yang/yang-data-operations/src/test/resources/xmls/listTest_alterInnerValue/merge.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls/listTest_alterInnerValue/result.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls/none_NoChange/current.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls/none_NoChange/defaultOperation.txt [deleted file]
yang/yang-data-operations/src/test/resources/xmls/none_NoChange/merge.xml [deleted file]
yang/yang-data-operations/src/test/resources/xmls/none_NoChange/result.xml [deleted file]

index e03958268a379cf563880c09cf586ae1cf2c9b78..797334c641655e60def4cdb444ace57ca8f72b3f 100644 (file)
                 <version>${project.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-data-operations</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>features-yangtools</artifactId>
index 70f9939ac452cad230ec67e12b34cb305565dde7..7b1d411f281a1e479e1d9d6c9bd1973efcad0b8f 100644 (file)
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-impl</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-data-operations</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-util</artifactId>
index 9dccd7f9e0b3eb7d4fabc678047ee3c007f8ccd5..b5ec8f94f7e5e273794ec52c6f989a56d3bfe342 100644 (file)
@@ -15,7 +15,6 @@
         <feature version='${project.version}'>odl-yangtools-yang-parser</feature>
         <bundle>mvn:org.opendaylight.yangtools/yang-data-api/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/yang-data-impl/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.yangtools/yang-data-operations/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/yang-data-util/{{VERSION}}</bundle>
 
         <!-- GSON-based JSON codec. Can be split out -->
index 4f2c80323fe2d17e9ad9e57c0404e8a8aa690793..0e3f9e9e25fcd27a75a971370b46a4637b45eec3 100644 (file)
@@ -26,7 +26,6 @@
         <module>yang-data-util</module>
         <module>yang-data-impl</module>
         <module>yang-data-transform</module>
-        <module>yang-data-operations</module>
         <module>yang-data-codec-gson</module>
         <module>yang-model-api</module>
         <module>yang-maven-plugin</module>
diff --git a/yang/yang-data-operations/pom.xml b/yang/yang-data-operations/pom.xml
deleted file mode 100644 (file)
index a11ebf8..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <parent>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yangtools-parent</artifactId>
-        <version>0.8.0-SNAPSHOT</version>
-        <relativePath>/../../common/parent/pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>yang-data-operations</artifactId>
-    <name>${project.artifactId}</name>
-    <description>${project.artifactId}</description>
-
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Export-Package>
-                            org.opendaylight.yangtools.yang.data.operations
-                        </Export-Package>
-                        <Import-Package>
-                            *
-                        </Import-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>yang-data-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>yang-model-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>yang-data-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>yang-parser-impl</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-</project>
diff --git a/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/AbstractContainerNodeModification.java b/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/AbstractContainerNodeModification.java
deleted file mode 100644 (file)
index e653818..0000000
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.yangtools.yang.data.operations;
-
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-import java.util.List;
-import java.util.Set;
-import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.AugmentationNode;
-import org.opendaylight.yangtools.yang.data.api.schema.ChoiceNode;
-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.DataContainerNode;
-import org.opendaylight.yangtools.yang.data.api.schema.LeafNode;
-import org.opendaylight.yangtools.yang.data.api.schema.LeafSetNode;
-import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
-import org.opendaylight.yangtools.yang.data.api.schema.UnkeyedListNode;
-import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder;
-import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;
-import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode;
-import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
-import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode;
-import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
-import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
-
-abstract class AbstractContainerNodeModification<S, N extends DataContainerNode<?>> implements Modification<S, N> {
-
-    @Override
-    public final Optional<N> modify(final S schema, final Optional<N> actual, final Optional<N> modification,
-            final OperationStack operationStack) throws DataModificationException {
-
-        operationStack.enteringNode(modification);
-
-        Optional<N> result;
-        QName nodeQName = getQName(schema);
-
-        switch (operationStack.getCurrentOperation()) {
-        case DELETE: {
-            DataModificationException.DataMissingException.check(nodeQName, actual);
-        }
-        case REMOVE: {
-            result = Optional.absent();
-            break;
-        }
-        case CREATE: {
-            DataModificationException.DataExistsException.check(nodeQName, actual, null);
-        }
-        case REPLACE: {
-            result = modification;
-            break;
-        }
-        case NONE: {
-            DataModificationException.DataMissingException.check(nodeQName, actual);
-        }
-        case MERGE: {
-            // Recursively modify all child nodes
-            result = modifyContainer(schema, actual, modification, operationStack);
-            break;
-        }
-        default:
-            throw new UnsupportedOperationException(String.format("Unable to perform operation: %s on: %s, unknown",
-                    operationStack.getCurrentOperation(), schema));
-        }
-
-        operationStack.exitingNode(modification);
-        return result;
-    }
-
-    protected abstract QName getQName(S schema);
-
-    private Optional<N> modifyContainer(final S schema, final Optional<N> actual, final Optional<N> modification,
-            final OperationStack operationStack) throws DataModificationException {
-
-        if (!actual.isPresent()) {
-            return modification;
-        }
-
-        if (!modification.isPresent()) {
-            return actual;
-        }
-
-        Set<YangInstanceIdentifier.PathArgument> toProcess = getChildrenToProcess(schema, actual, modification);
-
-        List<? extends DataContainerChild<?, ?>> merged = modifyContainerChildNodes(schema, operationStack,
-                actual.get(), modification.get(), toProcess);
-        return build(schema, merged);
-    }
-
-    private List<? extends DataContainerChild<?, ?>> modifyContainerChildNodes(final S schema, final OperationStack operationStack,
-            final N actual, final N modification, final Set<YangInstanceIdentifier.PathArgument> toProcess) throws DataModificationException {
-        List<DataContainerChild<?, ?>> result = Lists.newArrayList();
-
-        for (YangInstanceIdentifier.PathArgument childToProcessId : toProcess) {
-            Object schemaOfChildToProcess = findSchema(schema, childToProcessId);
-
-            Optional<? extends DataContainerChild<?, ?>> modifiedValues = modifyContainerNode(operationStack, actual,
-                    modification, childToProcessId, schemaOfChildToProcess);
-
-            if (modifiedValues.isPresent()) {
-                result.add(modifiedValues.get());
-            }
-        }
-
-        return result;
-    }
-
-    private Optional<? extends DataContainerChild<?, ?>> modifyContainerNode(final OperationStack operationStack, final N actual,
-            final N modification, final YangInstanceIdentifier.PathArgument childToProcess, final Object schemaChild)
-            throws DataModificationException {
-
-        Optional<DataContainerChild<?, ?>> storedChildren = actual.getChild(childToProcess);
-        Optional<DataContainerChild<?, ?>> modifiedChildren = modification.getChild(childToProcess);
-
-        return NodeDispatcher.dispatchChildModification(schemaChild, storedChildren, modifiedChildren, operationStack);
-    }
-
-    private Object findSchema(final S schema, final YangInstanceIdentifier.PathArgument childToProcessId) {
-        if (childToProcessId instanceof YangInstanceIdentifier.AugmentationIdentifier) {
-            return findSchemaForAugment(schema, (YangInstanceIdentifier.AugmentationIdentifier) childToProcessId);
-        } else {
-            return findSchemaForChild(schema, childToProcessId.getNodeType());
-        }
-    }
-
-    protected abstract Object findSchemaForChild(S schema, QName nodeType);
-
-    protected abstract Object findSchemaForAugment(S schema, YangInstanceIdentifier.AugmentationIdentifier childToProcessId);
-
-    private Optional<N> build(final S schema, final List<? extends DataContainerChild<?, ?>> result) {
-        DataContainerNodeBuilder<?, N> b = getBuilder(schema);
-
-        // TODO skip empty container nodes ? e.g. if container looses all its child nodes
-//        if(result.isEmpty()) {
-//            return Optional.absent();
-//        }
-
-        for (DataContainerChild<?, ?> dataContainerChild : result) {
-            b.withChild(dataContainerChild);
-        }
-        return Optional.of(b.build());
-    }
-
-    protected abstract DataContainerNodeBuilder<?, N> getBuilder(S schema);
-
-    protected Set<YangInstanceIdentifier.PathArgument> getChildrenToProcess(final S schema, final Optional<N> actual,
-            final Optional<N> modification) throws DataModificationException {
-        Set<YangInstanceIdentifier.PathArgument> qNames = Sets.newLinkedHashSet();
-
-        qNames.addAll(getChildQNames(actual));
-        qNames.addAll(getChildQNames(modification));
-        return qNames;
-    }
-
-    private Set<? extends YangInstanceIdentifier.PathArgument> getChildQNames(final Optional<N> actual) {
-        Set<YangInstanceIdentifier.PathArgument> qNames = Sets.newLinkedHashSet();
-
-        for (DataContainerChild<? extends YangInstanceIdentifier.PathArgument, ?> child : actual.get().getValue()) {
-            qNames.add(child.getIdentifier());
-        }
-
-        return qNames;
-    }
-
-    private static final class NodeDispatcher {
-
-        private static final LeafNodeModification LEAF_NODE_MODIFICATION = new LeafNodeModification();
-        private static final LeafSetNodeModification LEAF_SET_NODE_MODIFICATION = new LeafSetNodeModification();
-        private static final AugmentationNodeModification AUGMENTATION_NODE_MODIFICATION = new AugmentationNodeModification();
-        private static final MapNodeModification MAP_NODE_MODIFICATION = new MapNodeModification();
-        private static final UnkeyedListNodeModification UNKEYED_LIST_NODE_MODIFICATION = new UnkeyedListNodeModification();
-        private static final ContainerNodeModification CONTAINER_NODE_MODIFICATION = new ContainerNodeModification();
-        private static final ChoiceNodeModification CHOICE_NODE_MODIFICATION = new ChoiceNodeModification();
-
-        private NodeDispatcher() {
-            throw new UnsupportedOperationException("Utility class should not be instantiated!");
-        }
-
-        static Optional<? extends DataContainerChild<?, ?>> dispatchChildModification(final Object schemaChild,
-                final Optional<DataContainerChild<?, ?>> actual, final Optional<DataContainerChild<?, ?>> modification,
-                final OperationStack operations) throws DataModificationException {
-
-            if (schemaChild instanceof LeafSchemaNode) {
-                return onLeafNode((LeafSchemaNode) schemaChild, actual, modification, operations);
-            } else if (schemaChild instanceof ContainerSchemaNode) {
-                return onContainerNode((ContainerSchemaNode) schemaChild, actual, modification, operations);
-            } else if (schemaChild instanceof LeafListSchemaNode) {
-                return onLeafSetNode((LeafListSchemaNode) schemaChild, actual, modification, operations);
-            } else if (schemaChild instanceof AugmentationSchema) {
-                return onAugmentationNode((AugmentationSchema) schemaChild, actual, modification, operations);
-            } else if (schemaChild instanceof ListSchemaNode) {
-                if (((ListSchemaNode)schemaChild).getKeyDefinition().isEmpty()) {
-                    return onUnkeyedNode((ListSchemaNode) schemaChild, actual, modification, operations);
-                } else {
-                    return onMapNode((ListSchemaNode) schemaChild, actual, modification, operations);
-                }
-            } else if (schemaChild instanceof ChoiceSchemaNode) {
-                return onChoiceNode((ChoiceSchemaNode) schemaChild, actual,
-                        modification, operations);
-            }
-
-            throw new IllegalArgumentException("Unknown schema node type " + schemaChild);
-        }
-
-        private static Optional<? extends DataContainerChild<?, ?>> onChoiceNode(
-            final ChoiceSchemaNode schemaChild,
-                final Optional<? extends DataContainerChild<?, ?>> actual,
-                final Optional<? extends DataContainerChild<?, ?>> modification, final OperationStack operations)
-                throws DataModificationException {
-            checkType(actual, ChoiceNode.class);
-            checkType(modification, ChoiceNode.class);
-            return CHOICE_NODE_MODIFICATION.modify(schemaChild, (Optional<ChoiceNode>) actual,
-                    (Optional<ChoiceNode>) modification, operations);
-        }
-
-        private static Optional<? extends DataContainerChild<?, ?>> onMapNode(final ListSchemaNode schemaChild,
-                final Optional<? extends DataContainerChild<?, ?>> actual,
-                final Optional<? extends DataContainerChild<?, ?>> modification, final OperationStack operations)
-                throws DataModificationException {
-            checkType(actual, MapNode.class);
-            checkType(modification, MapNode.class);
-            return MAP_NODE_MODIFICATION.modify(schemaChild, (Optional<MapNode>) actual,
-                    (Optional<MapNode>) modification, operations);
-        }
-
-        private static Optional<? extends DataContainerChild<?, ?>> onUnkeyedNode(final ListSchemaNode schemaChild,
-                final Optional<? extends DataContainerChild<?, ?>> actual,
-                        final Optional<? extends DataContainerChild<?, ?>> modification, final OperationStack operations)
-                                throws DataModificationException {
-            checkType(actual, UnkeyedListNode.class);
-            checkType(modification, UnkeyedListNode.class);
-            return UNKEYED_LIST_NODE_MODIFICATION.modify(schemaChild, (Optional<UnkeyedListNode>) actual,
-                    (Optional<UnkeyedListNode>) modification, operations);
-        }
-
-        private static Optional<? extends DataContainerChild<?, ?>> onAugmentationNode(final AugmentationSchema schemaChild,
-                final Optional<? extends DataContainerChild<?, ?>> actual,
-                final Optional<? extends DataContainerChild<?, ?>> modification, final OperationStack operations)
-                throws DataModificationException {
-            checkType(actual, AugmentationNode.class);
-            checkType(modification, AugmentationNode.class);
-            return AUGMENTATION_NODE_MODIFICATION.modify(schemaChild, (Optional<AugmentationNode>) actual,
-                    (Optional<AugmentationNode>) modification, operations);
-        }
-
-        private static Optional<? extends DataContainerChild<?, ?>> onLeafSetNode(final LeafListSchemaNode schemaChild,
-                final Optional<? extends DataContainerChild<?, ?>> actual,
-                final Optional<? extends DataContainerChild<?, ?>> modification, final OperationStack operations)
-                throws DataModificationException {
-            checkType(actual, LeafSetNode.class);
-            checkType(modification, LeafSetNode.class);
-            return LEAF_SET_NODE_MODIFICATION.modify(schemaChild, (Optional<LeafSetNode<?>>) actual,
-                    (Optional<LeafSetNode<?>>) modification, operations);
-        }
-
-        private static Optional<? extends DataContainerChild<?, ?>> onContainerNode(final ContainerSchemaNode schemaChild,
-                final Optional<? extends DataContainerChild<?, ?>> actual,
-                final Optional<? extends DataContainerChild<?, ?>> modification, final OperationStack operations)
-                throws DataModificationException {
-            checkType(actual, ContainerNode.class);
-            checkType(modification, ContainerNode.class);
-            return CONTAINER_NODE_MODIFICATION.modify(schemaChild, (Optional<ContainerNode>) actual,
-                    (Optional<ContainerNode>) modification, operations);
-        }
-
-        private static Optional<? extends DataContainerChild<?, ?>> onLeafNode(final LeafSchemaNode schemaChild,
-                final Optional<? extends DataContainerChild<?, ?>> actual,
-                final Optional<? extends DataContainerChild<?, ?>> modification, final OperationStack operations)
-                throws DataModificationException {
-            checkType(actual, LeafNode.class);
-            checkType(modification, LeafNode.class);
-            return LEAF_NODE_MODIFICATION.modify(schemaChild, (Optional<LeafNode<?>>) actual,
-                    (Optional<LeafNode<?>>) modification, operations);
-        }
-
-        private static void checkType(final Optional<? extends DataContainerChild<?, ?>> actual, final Class<?> leafNodeClass) {
-            if (actual.isPresent()) {
-                Preconditions.checkArgument(leafNodeClass.isAssignableFrom(actual.get().getClass()),
-                        "Unexpected node type, should be: %s, but was: %s, for: %s", leafNodeClass, actual.getClass(),
-                        actual);
-            }
-        }
-    }
-}
diff --git a/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/AugmentationNodeModification.java b/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/AugmentationNodeModification.java
deleted file mode 100644 (file)
index b6f3611..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.yangtools.yang.data.operations;
-
-import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.AugmentationNode;
-import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
-import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder;
-import org.opendaylight.yangtools.yang.data.impl.schema.SchemaUtils;
-import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;
-
-final class AugmentationNodeModification extends AbstractContainerNodeModification<AugmentationSchema, AugmentationNode> {
-
-    @Override
-    protected QName getQName(AugmentationSchema schema) {
-        // FIXME null qname for AUGMENT
-        return null;
-    }
-
-    @Override
-    protected Object findSchemaForChild(AugmentationSchema schema, QName nodeType) {
-        return SchemaUtils.findSchemaForChild(schema, nodeType);
-    }
-
-    @Override
-    protected Object findSchemaForAugment(AugmentationSchema schema, YangInstanceIdentifier.AugmentationIdentifier childToProcessId) {
-        throw new UnsupportedOperationException("Augmentation cannot be augmented directly, " + schema);
-    }
-
-    @Override
-    protected DataContainerNodeBuilder<?, AugmentationNode> getBuilder(AugmentationSchema schema) {
-        return Builders.augmentationBuilder(schema);
-    }
-}
diff --git a/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/ChoiceNodeModification.java b/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/ChoiceNodeModification.java
deleted file mode 100644 (file)
index a7840ba..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.yangtools.yang.data.operations;
-
-import com.google.common.base.Optional;
-import com.google.common.collect.Sets;
-import java.util.Set;
-import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.ChoiceNode;
-import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
-import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
-import org.opendaylight.yangtools.yang.data.impl.schema.SchemaUtils;
-import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder;
-import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode;
-import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode;
-
-final class ChoiceNodeModification extends AbstractContainerNodeModification<ChoiceSchemaNode, ChoiceNode> {
-
-    @Override
-    protected QName getQName(final ChoiceSchemaNode schema) {
-        return schema.getQName();
-    }
-
-    @Override
-    protected Object findSchemaForChild(final ChoiceSchemaNode schema, final QName nodeType) {
-        return SchemaUtils.findSchemaForChild(schema, nodeType);
-    }
-
-    @Override
-    protected Set<YangInstanceIdentifier.PathArgument> getChildrenToProcess(final ChoiceSchemaNode schema,
-            final Optional<ChoiceNode> actual,
-            final Optional<ChoiceNode> modification)
-            throws DataModificationException {
-        Set<YangInstanceIdentifier.PathArgument> childrenToProcess = super.getChildrenToProcess(schema, actual,
-                modification);
-
-        if (!modification.isPresent()) {
-            return childrenToProcess;
-        }
-
-        // Detect case node from modification
-        ChoiceCaseNode detectedCase = null;
-        for (DataContainerChild<? extends YangInstanceIdentifier.PathArgument, ?> child : modification.get().getValue()) {
-            Optional<ChoiceCaseNode> detectedCaseForChild = SchemaUtils.detectCase(schema, child);
-
-            if(!detectedCaseForChild.isPresent()) {
-                DataModificationException.IllegalChoiceValuesException.throwUnknownChild(schema.getQName(),
-                        child.getNodeType());
-            }
-
-            if (detectedCase != null && (!detectedCase.equals(detectedCaseForChild.get()))) {
-                DataModificationException.IllegalChoiceValuesException.throwMultipleCasesReferenced(schema.getQName(),
-                        modification.get(), detectedCase.getQName(), detectedCaseForChild.get().getQName());
-            }
-            detectedCase = detectedCaseForChild.get();
-        }
-
-        if (detectedCase == null) {
-            return childrenToProcess;
-        }
-
-        // Filter out child nodes that do not belong to detected case =
-        // Nodes from other cases present in actual
-        Set<YangInstanceIdentifier.PathArgument> childrenToProcessFiltered = Sets.newLinkedHashSet();
-        for (YangInstanceIdentifier.PathArgument childToProcess : childrenToProcess) {
-            // child from other cases, skip
-            if (childToProcess instanceof YangInstanceIdentifier.AugmentationIdentifier
-                    && (!SchemaUtils.belongsToCaseAugment(detectedCase,
-                            (YangInstanceIdentifier.AugmentationIdentifier) childToProcess))) {
-                continue;
-            } else if (!belongsToCase(detectedCase, childToProcess)) {
-                continue;
-            }
-
-            childrenToProcessFiltered.add(childToProcess);
-        }
-
-        return childrenToProcessFiltered;
-    }
-
-    private boolean belongsToCase(final ChoiceCaseNode detectedCase, final YangInstanceIdentifier.PathArgument childToProcess) {
-        return detectedCase.getDataChildByName(childToProcess.getNodeType()) != null;
-    }
-
-    @Override
-    protected Object findSchemaForAugment(final ChoiceSchemaNode schema, final YangInstanceIdentifier.AugmentationIdentifier childToProcessId) {
-        return SchemaUtils.findSchemaForAugment(schema, childToProcessId.getPossibleChildNames());
-    }
-
-    @Override
-    protected DataContainerNodeBuilder<?, ChoiceNode> getBuilder(
-            final ChoiceSchemaNode schema) {
-        return Builders.choiceBuilder(schema);
-    }
-}
diff --git a/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/ContainerNodeModification.java b/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/ContainerNodeModification.java
deleted file mode 100644 (file)
index 17b1f6a..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.yangtools.yang.data.operations;
-
-import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
-import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
-import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder;
-import org.opendaylight.yangtools.yang.data.impl.schema.SchemaUtils;
-import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
-
-final class ContainerNodeModification extends AbstractContainerNodeModification<ContainerSchemaNode, ContainerNode> {
-
-    // FIXME normalized nodes as a result from merge contain attributes e.g. operation="merge" from modification
-
-    @Override
-    protected QName getQName(ContainerSchemaNode schema) {
-        return schema.getQName();
-    }
-
-    @Override
-    protected Object findSchemaForChild(ContainerSchemaNode schema, QName nodeType) {
-        return SchemaUtils.findSchemaForChild(schema, nodeType);
-    }
-
-    @Override
-    protected Object findSchemaForAugment(ContainerSchemaNode schema,
-            YangInstanceIdentifier.AugmentationIdentifier childToProcessId) {
-        return SchemaUtils.findSchemaForAugment(schema, childToProcessId.getPossibleChildNames());
-    }
-
-    @Override
-    protected DataContainerNodeBuilder<?, ContainerNode> getBuilder(ContainerSchemaNode schema) {
-        return Builders.containerBuilder(schema);
-    }
-
-}
diff --git a/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/DataModificationException.java b/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/DataModificationException.java
deleted file mode 100644 (file)
index c8cbe54..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.yangtools.yang.data.operations;
-
-import com.google.common.base.Optional;
-import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.data.api.schema.ChoiceNode;
-import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode;
-import org.opendaylight.yangtools.yang.data.api.schema.LeafSetNode;
-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;
-
-public class DataModificationException extends Exception {
-    // TODO replace QName as identifier for node with schema or NodeIdentifier,
-    // Augmentation does not have a QName
-
-    private static final long serialVersionUID = 1L;
-    private final QName node;
-
-    public DataModificationException(final String message, final QName node) {
-        super(message);
-        this.node = node;
-    }
-
-    public QName getNodeQName() {
-        return node;
-    }
-
-    public static final class DataMissingException extends DataModificationException {
-        private static final long serialVersionUID = 1L;
-
-        public DataMissingException(final QName nodeType) {
-            super(String.format("Data missing for node: %s", nodeType), nodeType);
-        }
-
-        public DataMissingException(final QName nodeType, final NormalizedNode<?, ?> modificationNode) {
-            super(String.format("Data missing for node: %s, %s", nodeType, modificationNode), nodeType);
-        }
-
-        static void check(final QName nodeQName, final Optional<? extends NormalizedNode<?, ?>> actualNode) throws DataMissingException {
-            if (!actualNode.isPresent()) {
-                throw new DataMissingException(nodeQName);
-            }
-        }
-
-        static void check(final QName nodeQName, final Optional<LeafSetNode<?>> actualNodes, final LeafSetEntryNode<?> modificationNode)
-                throws DataMissingException {
-            if (!actualNodes.isPresent() || !actualNodes.get().getChild(modificationNode.getIdentifier()).isPresent()) {
-                throw new DataMissingException(nodeQName, modificationNode);
-            }
-        }
-
-        static void check(final QName nodeQName, final Optional<MapNode> actualNodes, final MapEntryNode modificationNode)
-                throws DataModificationException {
-            if (!actualNodes.isPresent() || !actualNodes.get().getChild(modificationNode.getIdentifier()).isPresent()) {
-                throw new DataMissingException(nodeQName, modificationNode);
-            }
-        }
-    }
-
-    public static final class DataExistsException extends DataModificationException {
-        private static final long serialVersionUID = 1L;
-
-        public DataExistsException(final QName nodeType, final NormalizedNode<?, ?> actualNode, final NormalizedNode<?, ?> modificationNode) {
-            super(String
-                    .format("Data already exists for node: %s, current value: %s. modification value: %s", nodeType, actualNode, modificationNode),
-                    nodeType);
-        }
-
-        static void check(final QName nodeQName, final Optional<? extends NormalizedNode<?, ?>> actualNode, final NormalizedNode<?, ?> modificationNode) throws DataExistsException {
-            if (actualNode.isPresent()) {
-                throw new DataExistsException(nodeQName, actualNode.get(), modificationNode);
-            }
-        }
-
-        static void check(final QName nodeQName, final Optional<LeafSetNode<?>> actualNodes, final LeafSetEntryNode<?> modificationNode)
-                throws DataExistsException {
-            if (actualNodes.isPresent() && actualNodes.get().getChild(modificationNode.getIdentifier()).isPresent()) {
-                throw new DataExistsException(nodeQName, actualNodes.get(), modificationNode);
-            }
-        }
-
-        public static void check(final QName qName, final Optional<MapNode> actualNodes, final MapEntryNode listModification)
-                throws DataModificationException {
-            if (actualNodes.isPresent() && actualNodes.get().getChild(listModification.getIdentifier()).isPresent()) {
-                throw new DataExistsException(qName, actualNodes.get(), listModification);
-            }
-        }
-    }
-
-    public static final class IllegalChoiceValuesException extends DataModificationException {
-        private static final long serialVersionUID = 1L;
-
-        public IllegalChoiceValuesException(final String message, final QName node) {
-            super(message, node);
-        }
-
-        public static void throwMultipleCasesReferenced(final QName choiceQName, final ChoiceNode modification,
-                final QName case1QName, final QName case2QName) throws IllegalChoiceValuesException {
-            throw new IllegalChoiceValuesException(String.format(
-                    "Child nodes from multiple cases present in modification: %s, choice: %s, case1: %s, case2: %s",
-                    modification, choiceQName, case1QName, case2QName), choiceQName);
-        }
-
-        public static void throwUnknownChild(final QName choiceQName, final QName nodeQName) throws IllegalChoiceValuesException {
-            throw new IllegalChoiceValuesException(String.format(
-                    "Unknown child node detected, choice: %s, child node: %s",
-                    choiceQName, nodeQName), choiceQName);
-        }
-    }
-
-}
diff --git a/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/DataOperations.java b/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/DataOperations.java
deleted file mode 100644 (file)
index 401b387..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.yangtools.yang.data.operations;
-
-import org.opendaylight.yangtools.yang.data.api.ModifyAction;
-import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
-import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
-import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
-import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
-
-import com.google.common.base.Optional;
-
-/**
- * Edit config operations utilities.
- */
-public final class DataOperations {
-
-    private DataOperations() {}
-
-    public static Optional<ContainerNode> modify(ContainerSchemaNode schema, ContainerNode stored,
-            ContainerNode modified) throws DataModificationException {
-        return modify(schema, stored, modified, ModifyAction.MERGE);
-    }
-
-    public static Optional<MapNode> modify(ListSchemaNode schema, MapNode stored, MapNode modified)
-            throws DataModificationException {
-        return modify(schema, stored, modified, ModifyAction.MERGE);
-    }
-
-    public static Optional<ContainerNode> modify(ContainerSchemaNode schema, ContainerNode stored,
-            ContainerNode modified, ModifyAction defaultOperation) throws DataModificationException {
-
-        OperationStack operations = new OperationStack(defaultOperation);
-
-        return new ContainerNodeModification().modify(schema, Optional.fromNullable(stored),
-                Optional.fromNullable(modified), operations);
-    }
-
-    public static Optional<MapNode> modify(ListSchemaNode schema, MapNode stored, MapNode modified,
-            ModifyAction defaultOperation) throws DataModificationException {
-
-        OperationStack operations = new OperationStack(defaultOperation);
-
-        return new MapNodeModification().modify(schema, Optional.fromNullable(stored), Optional.fromNullable(modified),
-                operations);
-    }
-}
diff --git a/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/LeafNodeModification.java b/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/LeafNodeModification.java
deleted file mode 100644 (file)
index 39990a5..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.yangtools.yang.data.operations;
-
-import org.opendaylight.yangtools.yang.data.api.schema.LeafNode;
-import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
-
-import com.google.common.base.Optional;
-
-final class LeafNodeModification implements Modification<LeafSchemaNode, LeafNode<?>> {
-
-    @Override
-    public Optional<LeafNode<?>> modify(LeafSchemaNode schema, Optional<LeafNode<?>> actualNode,
-                                    Optional<LeafNode<?>> modificationNode, OperationStack operationStack) throws DataModificationException {
-
-        operationStack.enteringNode(modificationNode);
-
-        Optional<LeafNode<?>> result;
-
-        // Returns either actual node, modification node or empty in case of removal
-        switch (operationStack.getCurrentOperation()) {
-            case MERGE: {
-                result = modificationNode.isPresent() ? modificationNode : actualNode;
-                break;
-            }
-            case CREATE: {
-                DataModificationException.DataExistsException.check(schema.getQName(), actualNode, null);
-            }
-            case REPLACE: {
-                result = modificationNode;
-                break;
-            }
-            case DELETE: {
-                DataModificationException.DataMissingException.check(schema.getQName(), actualNode);
-            }
-            case REMOVE: {
-                result = Optional.absent();
-                break;
-            }
-            case NONE: {
-                result = actualNode;
-                break;
-            }
-            default:
-                throw new UnsupportedOperationException(String.format("Unable to perform operation: %s on: %s, unknown", operationStack.getCurrentOperation(), schema));
-
-        }
-
-        operationStack.exitingNode(modificationNode);
-
-        return result;
-    }
-}
diff --git a/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/LeafSetNodeModification.java b/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/LeafSetNodeModification.java
deleted file mode 100644 (file)
index e6235bb..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.yangtools.yang.data.operations;
-
-import com.google.common.base.Optional;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-import java.util.List;
-import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode;
-import org.opendaylight.yangtools.yang.data.api.schema.LeafSetNode;
-import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
-import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.ListNodeBuilder;
-import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode;
-
-final class LeafSetNodeModification implements Modification<LeafListSchemaNode, LeafSetNode<?>> {
-
-    @Override
-    public Optional<LeafSetNode<?>> modify(LeafListSchemaNode schema, Optional<LeafSetNode<?>> actual,
-            Optional<LeafSetNode<?>> modification, OperationStack operationStack) throws DataModificationException {
-
-        List<LeafSetEntryNode<?>> resultNodes = Lists.newArrayList();
-        if(actual.isPresent()) {
-            Iterables.addAll(resultNodes, actual.get().getValue());
-        }
-
-        // TODO implement ordering for modification nodes
-
-        for (LeafSetEntryNode<?> leafListModification : modification.get().getValue()) {
-            operationStack.enteringNode(leafListModification);
-
-            switch (operationStack.getCurrentOperation()) {
-                case MERGE:
-                case CREATE: {
-                    DataModificationException.DataExistsException.check(schema.getQName(), actual, leafListModification);
-                }
-                case REPLACE: {
-                    if (!contains(actual, leafListModification)) {
-                        resultNodes.add(leafListModification);
-                    }
-                    break;
-                }
-                case DELETE: {
-                    DataModificationException.DataMissingException.check(schema.getQName(), actual, leafListModification);
-                }
-                case REMOVE: {
-                    if (resultNodes.contains(leafListModification)) {
-                        resultNodes.remove(leafListModification);
-                    }
-                    break;
-                }
-                case NONE: {
-                    break;
-                }
-                default:
-                    throw new UnsupportedOperationException(String.format("Unable to perform operation: %s on: %s, unknown", operationStack.getCurrentOperation(), schema));
-            }
-
-            operationStack.exitingNode(leafListModification);
-        }
-        return build(schema, resultNodes);
-    }
-
-    private Optional<LeafSetNode<?>> build(LeafListSchemaNode schemaNode, List<LeafSetEntryNode<?>> resultNodes) {
-        if(resultNodes.isEmpty()) {
-            return Optional.absent();
-        }
-
-        ListNodeBuilder<Object, LeafSetEntryNode<Object>> b = Builders.leafSetBuilder(schemaNode);
-        for (LeafSetEntryNode<?> resultNode : resultNodes) {
-            // FIXME: can we do something about this SuppressWarnings?
-            @SuppressWarnings("unchecked")
-            final LeafSetEntryNode<Object> child = (LeafSetEntryNode<Object>) resultNode;
-            b.withChild(child);
-        }
-
-        return Optional.<LeafSetNode<?>>of(b.build());
-    }
-
-    private static boolean contains(Optional<LeafSetNode<?>> actual, LeafSetEntryNode<?> leafListModification) {
-        boolean contains = actual.isPresent();
-        contains &= actual.get().getChild(leafListModification.getIdentifier()).isPresent();
-
-        return contains;
-    }
-}
diff --git a/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/MapEntryNodeModification.java b/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/MapEntryNodeModification.java
deleted file mode 100644 (file)
index f7c0ea0..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.yangtools.yang.data.operations;
-
-import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
-import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
-import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder;
-import org.opendaylight.yangtools.yang.data.impl.schema.SchemaUtils;
-import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
-
-final class MapEntryNodeModification extends AbstractContainerNodeModification<ListSchemaNode, MapEntryNode> {
-
-    @Override
-    protected QName getQName(ListSchemaNode schema) {
-        return schema.getQName();
-    }
-
-    @Override
-    protected Object findSchemaForChild(ListSchemaNode schema, QName nodeType) {
-        return SchemaUtils.findSchemaForChild(schema, nodeType);
-    }
-
-    @Override
-    protected Object findSchemaForAugment(ListSchemaNode schema, YangInstanceIdentifier.AugmentationIdentifier childToProcessId) {
-        return SchemaUtils.findSchemaForAugment(schema, childToProcessId.getPossibleChildNames());
-    }
-
-    @Override
-    protected DataContainerNodeBuilder<?, MapEntryNode> getBuilder(ListSchemaNode schema) {
-        return Builders.mapEntryBuilder(schema);
-    }
-}
diff --git a/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/MapNodeModification.java b/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/MapNodeModification.java
deleted file mode 100644 (file)
index d74bafa..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-
-package org.opendaylight.yangtools.yang.data.operations;
-
-import com.google.common.base.Optional;
-import com.google.common.collect.Maps;
-import java.util.Map;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
-import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
-import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
-import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.CollectionNodeBuilder;
-import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
-
-public class MapNodeModification implements Modification<ListSchemaNode, MapNode> {
-
-    public static final MapEntryNodeModification MAP_ENTRY_NODE_MODIFICATION = new MapEntryNodeModification();
-
-    @Override
-    public Optional<MapNode> modify(ListSchemaNode schema, Optional<MapNode> actual,
-                                    Optional<MapNode> modification, OperationStack operationStack) throws DataModificationException {
-
-        // Merge or None operation on parent, leaving actual if modification not present
-        if (!modification.isPresent()) {
-            return actual;
-        }
-
-        Map<YangInstanceIdentifier.NodeIdentifierWithPredicates, MapEntryNode> resultNodes = Maps.newLinkedHashMap();
-        if(actual.isPresent()) {
-            resultNodes.putAll(mapEntries(actual.get()));
-        }
-
-        // TODO implement ordering for modification nodes
-
-        for (MapEntryNode mapEntryModification : modification.get().getValue()) {
-
-            operationStack.enteringNode(mapEntryModification);
-
-            YangInstanceIdentifier.NodeIdentifierWithPredicates entryKey = mapEntryModification.getIdentifier();
-
-            switch (operationStack.getCurrentOperation()) {
-            case NONE:
-                DataModificationException.DataMissingException.check(schema.getQName(), actual, mapEntryModification);
-            case MERGE: {
-                MapEntryNode mergedListNode;
-                if (resultNodes.containsKey(entryKey)) {
-                    MapEntryNode actualEntry = resultNodes.get(entryKey);
-                    mergedListNode = MAP_ENTRY_NODE_MODIFICATION.modify(schema, Optional.of(actualEntry), Optional.of(mapEntryModification), operationStack).get();
-                } else {
-                    mergedListNode = mapEntryModification;
-                }
-
-                resultNodes.put(mergedListNode.getIdentifier(), mergedListNode);
-                break;
-            }
-            case CREATE: {
-                DataModificationException.DataExistsException.check(schema.getQName(), actual, mapEntryModification);
-            }
-            case REPLACE: {
-                resultNodes.put(entryKey, mapEntryModification);
-                break;
-            }
-            case DELETE: {
-                DataModificationException.DataMissingException.check(schema.getQName(), actual, mapEntryModification);
-            }
-            case REMOVE: {
-                if (resultNodes.containsKey(entryKey)) {
-                    resultNodes.remove(entryKey);
-                }
-                break;
-            }
-            default:
-                throw new UnsupportedOperationException(String.format("Unable to perform operation: %s on: %s, unknown", operationStack.getCurrentOperation(), schema));
-            }
-
-            operationStack.exitingNode(mapEntryModification);
-        }
-        return build(schema, resultNodes);
-    }
-
-    private Optional<MapNode> build(ListSchemaNode schema, Map<YangInstanceIdentifier.NodeIdentifierWithPredicates, MapEntryNode> resultNodes) {
-        if(resultNodes.isEmpty()) {
-            return Optional.absent();
-        }
-
-        CollectionNodeBuilder<MapEntryNode, MapNode> b = Builders.mapBuilder(schema);
-
-        for (MapEntryNode child : resultNodes.values()) {
-            b.withChild(child);
-        }
-
-        return Optional.of(b.build());
-    }
-
-    private Map<YangInstanceIdentifier.NodeIdentifierWithPredicates, MapEntryNode> mapEntries(MapNode mapNode) {
-        Map<YangInstanceIdentifier.NodeIdentifierWithPredicates, MapEntryNode> mapped = Maps.newLinkedHashMap();
-
-        for (MapEntryNode mapEntryNode : mapNode.getValue()) {
-            mapped.put(mapEntryNode.getIdentifier(), mapEntryNode);
-        }
-
-        return mapped;
-    }
-
-}
diff --git a/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/Modification.java b/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/Modification.java
deleted file mode 100644 (file)
index 67ce361..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.yangtools.yang.data.operations;
-
-import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
-
-import com.google.common.base.Optional;
-
-/**
- * Strategy interface for data modification.
- *
- * @param <S> SchemaNode type
- * @param <N> LeafNode type
- *
- */
-interface Modification<S, N extends NormalizedNode<?, ?>> {
-
-    Optional<N> modify(S schemaNode, Optional<N> actual, Optional<N> modification, OperationStack operations) throws DataModificationException;
-}
diff --git a/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/OperationStack.java b/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/OperationStack.java
deleted file mode 100644 (file)
index dfe5a0d..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.yangtools.yang.data.operations;
-
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
-import java.net.URI;
-import java.util.Deque;
-import java.util.LinkedList;
-import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.data.api.AttributesContainer;
-import org.opendaylight.yangtools.yang.data.api.ModifyAction;
-import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Tracks netconf operations on nested nodes.
- */
-final class OperationStack {
-
-    private static final Logger LOG = LoggerFactory.getLogger(OperationStack.class);
-    private static final QName OPERATION_NAME = new QName(URI.create("urn:ietf:params:xml:ns:netconf:base:1.0"), "operation");
-
-    private final Deque<ModifyAction> operations = new LinkedList<>();
-
-    public OperationStack(ModifyAction operation) {
-        operations.add(operation);
-    }
-
-    public void enteringNode(Optional<? extends NormalizedNode<?, ?>> modificationNode) {
-        if (!modificationNode.isPresent()) {
-            return;
-        }
-
-        NormalizedNode<?, ?> modification = modificationNode.get();
-
-        enteringNode(modification);
-    }
-
-    public void enteringNode(NormalizedNode<?, ?> modificationNode) {
-        ModifyAction operation = getOperation(modificationNode);
-        if (operation == null) {
-            return;
-        }
-
-        addOperation(operation);
-    }
-
-    private ModifyAction getOperation(NormalizedNode<?, ?> modificationNode) {
-        if (!(modificationNode instanceof AttributesContainer)) {
-            return null;
-        }
-
-        String operationString = ((AttributesContainer) modificationNode).getAttributes().get(OPERATION_NAME);
-
-        return operationString == null ? null : ModifyAction.fromXmlValue(operationString);
-    }
-
-    private void addOperation(ModifyAction operation) {
-        // Add check for permitted operation
-        operations.add(operation);
-        LOG.trace("Operation added {}, {}", operation, this);
-    }
-
-    public ModifyAction getCurrentOperation() {
-        return operations.getLast();
-    }
-
-    public void exitingNode(Optional<? extends NormalizedNode<?, ?>> modificationNode) {
-        if (!modificationNode.isPresent()) {
-            return;
-        }
-
-        NormalizedNode<?, ?> modification = modificationNode.get();
-
-        exitingNode(modification);
-    }
-
-    public void exitingNode(NormalizedNode<?, ?> modification) {
-        ModifyAction operation = getOperation(modification);
-        if (operation == null) {
-            return;
-        }
-
-        Preconditions.checkState(operations.size() > 1);
-        Preconditions.checkState(operations.peekLast().equals(operation), "Operations mismatch %s, %s",
-                operations.peekLast(), operation);
-
-        ModifyAction removed = operations.removeLast();
-        LOG.trace("Operation removed {}, {}", removed, this);
-    }
-
-    @Override
-       public String toString() {
-        return operations.toString();
-    }
-
-}
diff --git a/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/UnkeyedListNodeModification.java b/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/UnkeyedListNodeModification.java
deleted file mode 100644 (file)
index 561a93a..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.yangtools.yang.data.operations;
-
-import com.google.common.base.Optional;
-import com.google.common.collect.Lists;
-import java.util.List;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.UnkeyedListEntryNode;
-import org.opendaylight.yangtools.yang.data.api.schema.UnkeyedListNode;
-import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
-import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.CollectionNodeBuilder;
-import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
-
-public class UnkeyedListNodeModification implements Modification<ListSchemaNode, UnkeyedListNode> {
-
-    public static final MapEntryNodeModification MAP_ENTRY_NODE_MODIFICATION = new MapEntryNodeModification();
-
-    @Override
-    public Optional<UnkeyedListNode> modify(ListSchemaNode schema, Optional<UnkeyedListNode> actual,
-            Optional<UnkeyedListNode> modification, OperationStack operationStack) throws DataModificationException {
-
-        // Merge or None operation on parent, leaving actual if modification not present
-        if (!modification.isPresent()) {
-            return actual;
-        }
-
-        List<UnkeyedListEntryNode> resultNodes = Lists.newArrayList();
-        if (actual.isPresent()) {
-            resultNodes = unkeyedListEntries(actual.get());
-        }
-        // TODO implement ordering for modification nodes
-
-        for (UnkeyedListEntryNode unkeyedListEntryModification : modification.get().getValue()) {
-
-            operationStack.enteringNode(unkeyedListEntryModification);
-
-            switch (operationStack.getCurrentOperation()) {
-            case NONE:
-                break;
-            case MERGE:
-            case CREATE: {
-                DataModificationException.DataExistsException.check(schema.getQName(), actual,
-                        unkeyedListEntryModification);
-                resultNodes.add(unkeyedListEntryModification);
-            }
-            case REPLACE: {
-                break;
-            }
-            case DELETE: {
-                break;
-            }
-            case REMOVE: {
-                break;
-            }
-            default:
-                throw new UnsupportedOperationException(
-                        String.format("Unable to perform operation: %s on: %s, unknown",
-                                operationStack.getCurrentOperation(), schema));
-            }
-
-            operationStack.exitingNode(unkeyedListEntryModification);
-        }
-        return build(schema, resultNodes);
-    }
-
-    private Optional<UnkeyedListNode> build(ListSchemaNode schema, List<UnkeyedListEntryNode> resultNodes) {
-        if (resultNodes.isEmpty()) {
-            return Optional.absent();
-        }
-
-        CollectionNodeBuilder<UnkeyedListEntryNode, UnkeyedListNode> b = Builders.unkeyedListBuilder();
-        b.withNodeIdentifier(new NodeIdentifier(schema.getQName()));
-
-        for (UnkeyedListEntryNode child : resultNodes) {
-            b.withChild(child);
-        }
-
-        return Optional.of(b.build());
-    }
-
-    private List<UnkeyedListEntryNode> unkeyedListEntries(UnkeyedListNode unkeyedListNode) {
-        List<UnkeyedListEntryNode> unkeyedListEntries = Lists.newArrayList();
-
-        for (UnkeyedListEntryNode unkeyedListEntryNode : unkeyedListNode.getValue()) {
-            unkeyedListEntries.add(unkeyedListEntryNode);
-        }
-
-        return unkeyedListEntries;
-    }
-
-}
diff --git a/yang/yang-data-operations/src/test/java/org/opendaylight/yangtools/yang/data/operations/YangDataOperationsNegativeTest.java b/yang/yang-data-operations/src/test/java/org/opendaylight/yangtools/yang/data/operations/YangDataOperationsNegativeTest.java
deleted file mode 100644 (file)
index 7cfdce8..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.yangtools.yang.data.operations;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-@RunWith(Parameterized.class)
-public class YangDataOperationsNegativeTest extends YangDataOperationsTest{
-
-    private static final String XML_NEG_FOLDER_NAME = "/xmls-negative";
-    private final Class<? extends DataModificationException> expected;
-
-    @Parameterized.Parameters()
-    public static Collection<Object[]> data() {
-        return Arrays.asList(new Object[][] {
-
-                // Container
-                { "/containerTest_noneContainerActualMissing", DataModificationException.DataMissingException.class },
-                { "/containerTest_createContainerActualPresent", DataModificationException.DataExistsException.class },
-                { "/containerTest_deleteContainerActualMissing", DataModificationException.DataMissingException.class },
-                // List
-                { "/listTest_createListActualPresent", DataModificationException.DataExistsException.class },
-                { "/listTest_deleteListActualMissing", DataModificationException.DataMissingException.class },
-                { "/listTest_noneListActualMissing", DataModificationException.DataMissingException.class },
-                // Leaf
-                { "/leafTest_createLeafActualPresent", DataModificationException.DataExistsException.class },
-                { "/leafTest_deleteLeafActualMissing", DataModificationException.DataMissingException.class },
-                // Leaf list
-                { "/leafListTest_createLeafActualPresent", DataModificationException.DataExistsException.class },
-                { "/leafListTest_deleteLeafActualMissing", DataModificationException.DataMissingException.class },
-        });
-    }
-
-    public YangDataOperationsNegativeTest(String testDir, Class<? extends DataModificationException> e) throws Exception {
-        super(testDir);
-        this.expected = e;
-    }
-
-    @Override
-    protected String getXmlFolderName() {
-        return XML_NEG_FOLDER_NAME;
-    }
-
-    @Test
-    public void testModification() throws Exception {
-        try {
-            DataOperations.modify(containerNode,
-                    currentConfig.orNull(), modification.orNull(), modifyAction);
-            fail("Negative test for " + testDirName + " should have failed");
-        } catch (Exception e) {
-            assertEquals(e.getClass(), expected);
-        }
-    }
-}
diff --git a/yang/yang-data-operations/src/test/java/org/opendaylight/yangtools/yang/data/operations/YangDataOperationsTest.java b/yang/yang-data-operations/src/test/java/org/opendaylight/yangtools/yang/data/operations/YangDataOperationsTest.java
deleted file mode 100644 (file)
index 2fd5694..0000000
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.yangtools.yang.data.operations;
-
-import static org.junit.Assert.assertNull;
-
-import com.google.common.base.Charsets;
-import com.google.common.base.Function;
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Collections2;
-import com.google.common.collect.Lists;
-import com.google.common.io.Files;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringWriter;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-import javax.activation.UnsupportedDataTypeException;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.TransformerFactoryConfigurationError;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.opendaylight.yangtools.yang.data.api.ModifyAction;
-import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
-import org.opendaylight.yangtools.yang.data.impl.schema.transform.dom.DomUtils;
-import org.opendaylight.yangtools.yang.data.impl.schema.transform.dom.parser.DomToNormalizedNodeParserFactory;
-import org.opendaylight.yangtools.yang.data.impl.schema.transform.dom.serializer.DomFromNormalizedNodeSerializerFactory;
-import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
-import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
-import org.opendaylight.yangtools.yang.model.api.Module;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.SAXException;
-
-@RunWith(Parameterized.class)
-public class YangDataOperationsTest {
-
-    public static final String CURRENT_XML_NAME = "/current.xml";
-    public static final String MODIFICATION_XML_NAME = "/merge.xml";
-    private static final String XML_FOLDER_NAME = "/xmls";
-    public static final String RESULT_XML_NAME = "/result.xml";
-    private static final Object OPERATION_XML_NAME = "/defaultOperation.txt";
-
-    protected final ContainerSchemaNode containerNode;
-    protected final String testDirName;
-    protected final Optional<ContainerNode> currentConfig;
-    protected final Optional<ContainerNode> modification;
-    protected final ModifyAction modifyAction;
-    private final SchemaContext schema;
-
-    @Parameterized.Parameters()
-    public static Collection<Object[]> data() {
-        return Arrays.asList(new Object[][] {
-                // Container
-                { "/containerTest_createContainer" },
-                { "/containerTest_deleteContainer" },
-                { "/containerTest_innerContainerContainer" },
-                { "/containerTest_innerLeavesBaseOperationsContainer" },
-                { "/containerTest_noneContainer" },
-                { "/containerTest_removeContainer"},
-                { "/containerTest_replaceContainer"},
-                { "/containerTest_choiceActualModificationSameCase"},
-                { "/containerTest_choiceActualModificationDifferentCases"},
-                { "/containerTest_choiceActualOneCaseModificationOtherCase"},
-                //            LeafList
-                { "/leafListTest" },
-                // List
-                { "/listTest" },
-                // Additional
-                {"/none_NoChange"},
-                {"/listTest_alterInnerValue"}
-        });
-    }
-
-    public YangDataOperationsTest(final String testDir) throws Exception {
-        schema = parseTestSchema();
-        containerNode = (ContainerSchemaNode) getSchemaNode(schema, "test", "container");
-        this.testDirName = testDir;
-
-        currentConfig = loadXmlToCompositeNode(getXmlFolderName() + testDirName + CURRENT_XML_NAME);
-        modification = loadXmlToCompositeNode(getXmlFolderName() + testDirName + MODIFICATION_XML_NAME);
-        Preconditions.checkState(modification.isPresent(), "Modification xml has to be present under "
-                + getXmlFolderName() + testDirName + MODIFICATION_XML_NAME);
-
-        modifyAction = loadModifyAction(getXmlFolderName() + testDirName + OPERATION_XML_NAME);
-    }
-
-    protected String getXmlFolderName() {
-        return XML_FOLDER_NAME;
-    }
-
-    // TODO unite testing resources e.g. schemas with yang-data-impl
-    // TODO create extract common testing infrastructure from this and yang-data-impl e.g. xml dom handling
-
-    @Test
-    public void testModification() throws Exception {
-
-        Optional<ContainerNode> result = DataOperations.modify(containerNode,
-                currentConfig.orNull(), modification.orNull(), modifyAction);
-
-        String expectedResultXmlPath = getXmlFolderName() + testDirName + RESULT_XML_NAME;
-        Optional<ContainerNode> expectedResult = loadXmlToCompositeNode(expectedResultXmlPath);
-
-        if (result.isPresent()) {
-            verifyModificationResult(result, expectedResult);
-        } else {
-            assertNull("Result of modification is empty node, result xml should not be present "
-                    + expectedResultXmlPath, getClass().getResourceAsStream(expectedResultXmlPath));
-        }
-
-    }
-
-    private ModifyAction loadModifyAction(final String path) throws Exception {
-        URL resource = getClass().getResource(path);
-        if (resource == null) {
-            return ModifyAction.MERGE;
-        }
-
-        return ModifyAction.fromXmlValue(Files.toString(new File(resource.toURI()), Charsets.UTF_8).trim());
-    }
-
-    private void verifyModificationResult(final Optional<ContainerNode> result, final Optional<ContainerNode> expectedResult)
-            throws UnsupportedDataTypeException {
-        Assert.assertEquals(
-                String.format(
-                        "Test result %n %s %n Expected %n %s %n",
-                        toString(toDom(result.get())),
-                        toString(toDom(expectedResult.get()))), expectedResult.get(), result.get());
-    }
-
-    private Element toDom(final ContainerNode container) {
-        Iterable<Element> a =
-                DomFromNormalizedNodeSerializerFactory.getInstance(newDocument(), DomUtils.defaultValueCodecProvider())
-                .getContainerNodeSerializer().serialize(containerNode, container);
-        return a.iterator().next();
-    }
-
-    private Document newDocument() {
-        try {
-            return BUILDERFACTORY.newDocumentBuilder().newDocument();
-        } catch (ParserConfigurationException e) {
-            throw new RuntimeException("Failed to parse XML document", e);
-        }
-    }
-
-    private Optional<ContainerNode> loadXmlToCompositeNode(final String xmlPath) throws IOException, SAXException {
-        InputStream resourceAsStream = getClass().getResourceAsStream(xmlPath);
-        if (resourceAsStream == null) {
-            return Optional.absent();
-        }
-
-        Document currentConfigElement = readXmlToDocument(resourceAsStream);
-        Preconditions.checkNotNull(currentConfigElement);
-
-        return Optional.fromNullable(DomToNormalizedNodeParserFactory.getInstance(DomUtils.defaultValueCodecProvider(), schema).getContainerNodeParser().parse(
-                Collections.singletonList(currentConfigElement.getDocumentElement()), containerNode));
-    }
-
-    SchemaContext parseTestSchema() {
-        YangParserImpl yangParserImpl = new YangParserImpl();
-        Set<Module> modules = yangParserImpl.parseYangModelsFromStreams(getTestYangs());
-        return yangParserImpl.resolveSchemaContext(modules);
-    }
-
-    List<InputStream> getTestYangs() {
-
-        return Lists.newArrayList(Collections2.transform(Lists.newArrayList("/schemas/test.yang"),
-                new Function<String, InputStream>() {
-            @Override
-            public InputStream apply(final String input) {
-                InputStream resourceAsStream = getClass().getResourceAsStream(input);
-                Preconditions.checkNotNull(resourceAsStream, "File %s was null", resourceAsStream);
-                return resourceAsStream;
-            }
-        }));
-    }
-
-    DataSchemaNode getSchemaNode(final SchemaContext context, final String moduleName, final String childNodeName) {
-        for (Module module : context.getModules()) {
-            if (module.getName().equals(moduleName)) {
-                for (DataSchemaNode dataSchemaNode : module.getChildNodes()) {
-                    if (dataSchemaNode.getQName().getLocalName().equals(childNodeName)) {
-                        return dataSchemaNode;
-                    }
-                }
-            }
-        }
-
-        throw new IllegalStateException("Unable to find child node " + childNodeName);
-    }
-
-    private static final DocumentBuilderFactory BUILDERFACTORY;
-
-    static {
-        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-        factory.setNamespaceAware(true);
-        factory.setCoalescing(true);
-        factory.setIgnoringElementContentWhitespace(true);
-        factory.setIgnoringComments(true);
-        BUILDERFACTORY = factory;
-    }
-
-    private Document readXmlToDocument(final InputStream xmlContent) throws IOException, SAXException {
-        DocumentBuilder dBuilder;
-        try {
-            dBuilder = BUILDERFACTORY.newDocumentBuilder();
-        } catch (ParserConfigurationException e) {
-            throw new RuntimeException("Failed to parse XML document", e);
-        }
-        Document doc = dBuilder.parse(xmlContent);
-
-        doc.getDocumentElement().normalize();
-        return doc;
-    }
-
-    public static String toString(final Element xml) {
-        try {
-            Transformer transformer = TransformerFactory.newInstance().newTransformer();
-            transformer.setOutputProperty(OutputKeys.INDENT, "yes");
-
-            StreamResult result = new StreamResult(new StringWriter());
-            DOMSource source = new DOMSource(xml);
-            transformer.transform(source, result);
-
-            return result.getWriter().toString();
-        } catch (IllegalArgumentException | TransformerFactoryConfigurationError | TransformerException e) {
-            throw new RuntimeException("Unable to serialize xml element " + xml, e);
-        }
-    }
-
-}
diff --git a/yang/yang-data-operations/src/test/resources/schemas/test.yang b/yang/yang-data-operations/src/test/resources/schemas/test.yang
deleted file mode 100644 (file)
index 96d2ef6..0000000
+++ /dev/null
@@ -1,152 +0,0 @@
-// vi: set smarttab et sw=4 tabstop=4:
-module test {
-    yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:controller:test";
-    prefix "test";
-
-    organization "Cisco Systems, Inc.";
-
-    revision "2013-2-21" {
-        description
-            "Initial revision";
-    }
-
-    grouping listGroup {
-        list list {
-            key "uint32";
-
-            leaf uint32 {
-                type uint32;
-            }
-
-               container containerInList{
-                   leaf uint32 {
-                    type uint32;
-                }
-                leaf uint16 {
-                    type uint16;
-                }
-            }
-        }
-     }
-
-     grouping innerContainerGrouping {
-        container innerContainer {
-            leaf uint16 {
-                type uint16;
-            }
-
-            container innerInnerContainer {
-
-                leaf uint16 {
-                    type uint16;
-                }
-
-                leaf uint32 {
-                    type uint32;
-                }
-            }
-        }
-     }
-
-    container container {
-        leaf uint32 {
-            type uint32;
-        }
-
-        leaf decimal64 {
-            type decimal64 {
-                fraction-digits 2;
-            }
-        }
-
-        leaf boolean {
-            type boolean;
-        }
-
-        leaf binary {
-            type binary;
-        }
-
-        leaf string {
-            type string;
-        }
-
-        uses listGroup;
-        uses innerContainerGrouping;
-
-        choice choice{}
-        choice choice2{}
-
-        leaf-list leafList {
-            type string;
-        }
-
-        leaf identityRef {
-            type identityref {
-                base test-identity;
-            }
-        }
-
-        /* TODO test modification with empty type
-        leaf empty {
-             type empty;
-         }
-         */
-    }
-
-    augment "/container/" {
-        leaf augumentUint32 {
-            type uint32;
-        }
-    }
-
-    augment "/container/choice/" {
-        case test-identity-augument {
-            when "/container/identityRef = 'test-identity'";
-            leaf augumentString1 {
-                type string;
-            }
-
-            leaf augumentInt1 {
-                type uint32;
-            }
-        }
-        case test-identity-augument2 {
-            when "/container/identityRef = 'test-identity2'";
-            leaf augumentString2 {
-                type string;
-            }
-
-            leaf augumentInt2 {
-                type uint32;
-            }
-        }
-    }
-
-    augment "/container/choice2/" {
-        case test-identity-augument {
-            when "/container/identityRef = 'test-identity'";
-            container augumentContainer {
-                leaf augumentStringInAugumentContainer {
-                    type string;
-                }
-            }
-        }
-        case test-identity-augument2 {
-            when "/container/identityRef = 'test-identity2'";
-            list augumentedList {
-                leaf augumentStringInAugumentList {
-                    type string;
-                }
-            }
-        }
-    }
-
-
-    identity test-identity {}
-    identity test-identity2 {
-        base test-identity;
-    }
-
-}
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls-negative/containerTest_choiceModificationMultipleCasesReferenced/current.xml b/yang/yang-data-operations/src/test/resources/xmls-negative/containerTest_choiceModificationMultipleCasesReferenced/current.xml
deleted file mode 100644 (file)
index 83bf5ac..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test">
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls-negative/containerTest_choiceModificationMultipleCasesReferenced/merge.xml b/yang/yang-data-operations/src/test/resources/xmls-negative/containerTest_choiceModificationMultipleCasesReferenced/merge.xml
deleted file mode 100644 (file)
index 10580b2..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test"
-           xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0">
-    <identityRef>test-identity2</identityRef>
-
-    <augumentedList>
-        <augumentStringInAugumentList>str1</augumentStringInAugumentList>
-    </augumentedList>
-
-    <augumentContainer>
-    </augumentContainer>
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls-negative/containerTest_createContainerActualPresent/current.xml b/yang/yang-data-operations/src/test/resources/xmls-negative/containerTest_createContainerActualPresent/current.xml
deleted file mode 100644 (file)
index d55c195..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test">
-
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls-negative/containerTest_createContainerActualPresent/merge.xml b/yang/yang-data-operations/src/test/resources/xmls-negative/containerTest_createContainerActualPresent/merge.xml
deleted file mode 100644 (file)
index 79e1306..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test"
-           xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0"
-           nc:operation="create">
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls-negative/containerTest_deleteContainerActualMissing/merge.xml b/yang/yang-data-operations/src/test/resources/xmls-negative/containerTest_deleteContainerActualMissing/merge.xml
deleted file mode 100644 (file)
index 41c6caa..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test"
-           xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0"
-           nc:operation="delete">
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls-negative/containerTest_noneContainerActualMissing/defaultOperation.txt b/yang/yang-data-operations/src/test/resources/xmls-negative/containerTest_noneContainerActualMissing/defaultOperation.txt
deleted file mode 100644 (file)
index c86c3f3..0000000
+++ /dev/null
@@ -1 +0,0 @@
-none
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls-negative/containerTest_noneContainerActualMissing/merge.xml b/yang/yang-data-operations/src/test/resources/xmls-negative/containerTest_noneContainerActualMissing/merge.xml
deleted file mode 100644 (file)
index 2915070..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test"
-           xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0">
-
-    <!--container is not present and default value is NONE-->
-    <uint32 nc:operation="replace">88</uint32>
-
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls-negative/leafListTest_createLeafActualPresent/current.xml b/yang/yang-data-operations/src/test/resources/xmls-negative/leafListTest_createLeafActualPresent/current.xml
deleted file mode 100644 (file)
index 860fdb4..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test">
-    <leafList>currentLeafList1</leafList>
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls-negative/leafListTest_createLeafActualPresent/merge.xml b/yang/yang-data-operations/src/test/resources/xmls-negative/leafListTest_createLeafActualPresent/merge.xml
deleted file mode 100644 (file)
index c5440f0..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test"
-           xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0"
-           nc:operation="merge">
-    <leafList nc:operation="create">currentLeafList1</leafList>
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls-negative/leafListTest_deleteLeafActualMissing/current.xml b/yang/yang-data-operations/src/test/resources/xmls-negative/leafListTest_deleteLeafActualMissing/current.xml
deleted file mode 100644 (file)
index 83bf5ac..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test">
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls-negative/leafListTest_deleteLeafActualMissing/merge.xml b/yang/yang-data-operations/src/test/resources/xmls-negative/leafListTest_deleteLeafActualMissing/merge.xml
deleted file mode 100644 (file)
index ae24aca..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test"
-           xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0"
-           nc:operation="merge">
-    <leafList nc:operation="delete">currentLeafList1</leafList>
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls-negative/leafTest_createLeafActualPresent/current.xml b/yang/yang-data-operations/src/test/resources/xmls-negative/leafTest_createLeafActualPresent/current.xml
deleted file mode 100644 (file)
index f78d3ff..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test">
-    <uint32>44</uint32>
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls-negative/leafTest_createLeafActualPresent/merge.xml b/yang/yang-data-operations/src/test/resources/xmls-negative/leafTest_createLeafActualPresent/merge.xml
deleted file mode 100644 (file)
index 1f0dacf..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test"
-           xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0"
-           nc:operation="merge">
-
-    <uint32 nc:operation="create">88</uint32>
-
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls-negative/leafTest_deleteLeafActualMissing/current.xml b/yang/yang-data-operations/src/test/resources/xmls-negative/leafTest_deleteLeafActualMissing/current.xml
deleted file mode 100644 (file)
index 83bf5ac..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test">
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls-negative/leafTest_deleteLeafActualMissing/merge.xml b/yang/yang-data-operations/src/test/resources/xmls-negative/leafTest_deleteLeafActualMissing/merge.xml
deleted file mode 100644 (file)
index f78f610..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test"
-           xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0"
-           nc:operation="merge">
-
-    <uint32 nc:operation="delete">88</uint32>
-
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls-negative/listTest_createListActualPresent/current.xml b/yang/yang-data-operations/src/test/resources/xmls-negative/listTest_createListActualPresent/current.xml
deleted file mode 100644 (file)
index 012271a..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test">
-    <list>
-        <uint32>1</uint32>
-    </list>
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls-negative/listTest_createListActualPresent/merge.xml b/yang/yang-data-operations/src/test/resources/xmls-negative/listTest_createListActualPresent/merge.xml
deleted file mode 100644 (file)
index 99f9d2e..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test"
-           xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0">
-
-    <list nc:operation="create">
-        <uint32>1</uint32>
-    </list>
-
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls-negative/listTest_deleteListActualMissing/current.xml b/yang/yang-data-operations/src/test/resources/xmls-negative/listTest_deleteListActualMissing/current.xml
deleted file mode 100644 (file)
index 012271a..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test">
-    <list>
-        <uint32>1</uint32>
-    </list>
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls-negative/listTest_deleteListActualMissing/merge.xml b/yang/yang-data-operations/src/test/resources/xmls-negative/listTest_deleteListActualMissing/merge.xml
deleted file mode 100644 (file)
index 8b72242..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test"
-           xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0">
-
-    <list nc:operation="delete">
-        <uint32>2</uint32>
-    </list>
-
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls-negative/listTest_noneListActualMissing/current.xml b/yang/yang-data-operations/src/test/resources/xmls-negative/listTest_noneListActualMissing/current.xml
deleted file mode 100644 (file)
index 012271a..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test">
-    <list>
-        <uint32>1</uint32>
-    </list>
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls-negative/listTest_noneListActualMissing/defaultOperation.txt b/yang/yang-data-operations/src/test/resources/xmls-negative/listTest_noneListActualMissing/defaultOperation.txt
deleted file mode 100644 (file)
index c86c3f3..0000000
+++ /dev/null
@@ -1 +0,0 @@
-none
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls-negative/listTest_noneListActualMissing/merge.xml b/yang/yang-data-operations/src/test/resources/xmls-negative/listTest_noneListActualMissing/merge.xml
deleted file mode 100644 (file)
index dc90cc2..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test"
-           xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0">
-
-    <list>
-        <uint32>2</uint32>
-        <containerInList nc:operation="create">
-            <uint32>88</uint32>
-        </containerInList>
-    </list>
-
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/containerTest_choiceActualModificationDifferentCases/current.xml b/yang/yang-data-operations/src/test/resources/xmls/containerTest_choiceActualModificationDifferentCases/current.xml
deleted file mode 100644 (file)
index c5c0159..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test">
-    <identityRef>test-identity2</identityRef>
-    <augumentString2>augumentString2</augumentString2>
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/containerTest_choiceActualModificationDifferentCases/merge.xml b/yang/yang-data-operations/src/test/resources/xmls/containerTest_choiceActualModificationDifferentCases/merge.xml
deleted file mode 100644 (file)
index 6b3a009..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test"
-           xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0">
-    <augumentedList nc:operation="create">
-        <augumentStringInAugumentList>str1</augumentStringInAugumentList>
-    </augumentedList>
-
-    <augumentedList nc:operation="replace">
-        <augumentStringInAugumentList>str2</augumentStringInAugumentList>
-    </augumentedList>
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/containerTest_choiceActualModificationDifferentCases/result.xml b/yang/yang-data-operations/src/test/resources/xmls/containerTest_choiceActualModificationDifferentCases/result.xml
deleted file mode 100644 (file)
index fcacf89..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test">
-    <identityRef>test-identity2</identityRef>
-
-    <augumentedList>
-        <augumentStringInAugumentList>str1</augumentStringInAugumentList>
-    </augumentedList>
-
-    <augumentedList>
-        <augumentStringInAugumentList>str2</augumentStringInAugumentList>
-    </augumentedList>
-
-    <augumentString2>augumentString2</augumentString2>
-
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/containerTest_choiceActualModificationSameCase/current.xml b/yang/yang-data-operations/src/test/resources/xmls/containerTest_choiceActualModificationSameCase/current.xml
deleted file mode 100644 (file)
index b9d3c36..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test">
-    <identityRef>test-identity</identityRef>
-    <augumentString1>augumentString1</augumentString1>
-    <augumentContainer>
-        <augumentStringInAugumentContainer>
-            case1
-        </augumentStringInAugumentContainer>
-    </augumentContainer>
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/containerTest_choiceActualModificationSameCase/merge.xml b/yang/yang-data-operations/src/test/resources/xmls/containerTest_choiceActualModificationSameCase/merge.xml
deleted file mode 100644 (file)
index afc17f8..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test"
-           xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0">
-    <augumentString1>augumentString1</augumentString1>
-
-    <augumentContainer>
-        <augumentStringInAugumentContainer nc:operation="delete">
-        </augumentStringInAugumentContainer>
-    </augumentContainer>
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/containerTest_choiceActualModificationSameCase/result.xml b/yang/yang-data-operations/src/test/resources/xmls/containerTest_choiceActualModificationSameCase/result.xml
deleted file mode 100644 (file)
index 3019b6e..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test">
-    <identityRef>test-identity</identityRef>
-
-    <augumentString1>augumentString1</augumentString1>
-
-    <augumentContainer>
-    </augumentContainer>
-
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/containerTest_choiceActualOneCaseModificationOtherCase/current.xml b/yang/yang-data-operations/src/test/resources/xmls/containerTest_choiceActualOneCaseModificationOtherCase/current.xml
deleted file mode 100644 (file)
index fd57674..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test">
-    <identityRef>test-identity</identityRef>
-    <augumentContainer>
-        <augumentStringInAugumentContainer>
-            case1
-        </augumentStringInAugumentContainer>
-    </augumentContainer>
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/containerTest_choiceActualOneCaseModificationOtherCase/merge.xml b/yang/yang-data-operations/src/test/resources/xmls/containerTest_choiceActualOneCaseModificationOtherCase/merge.xml
deleted file mode 100644 (file)
index 0e68281..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test"
-           xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0">
-    <identityRef>test-identity2</identityRef>
-    <augumentedList nc:operation="create">
-        <augumentStringInAugumentList>str1</augumentStringInAugumentList>
-    </augumentedList>
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/containerTest_choiceActualOneCaseModificationOtherCase/result.xml b/yang/yang-data-operations/src/test/resources/xmls/containerTest_choiceActualOneCaseModificationOtherCase/result.xml
deleted file mode 100644 (file)
index 47eae32..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test">
-    <identityRef>test-identity2</identityRef>
-    <augumentedList>
-        <augumentStringInAugumentList>str1</augumentStringInAugumentList>
-    </augumentedList>
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/containerTest_createContainer/merge.xml b/yang/yang-data-operations/src/test/resources/xmls/containerTest_createContainer/merge.xml
deleted file mode 100644 (file)
index 79aad42..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test"
-           xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0"
-           nc:operation="create">
-
-    <!--Inner operations under create are ignored-->
-    <uint32 nc:operation="replace">88</uint32>
-
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/containerTest_createContainer/result.xml b/yang/yang-data-operations/src/test/resources/xmls/containerTest_createContainer/result.xml
deleted file mode 100644 (file)
index 7e29bf0..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test">
-    <uint32>88</uint32>
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/containerTest_deleteContainer/current.xml b/yang/yang-data-operations/src/test/resources/xmls/containerTest_deleteContainer/current.xml
deleted file mode 100644 (file)
index 36530ed..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test">
-    <uint32>1</uint32>
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/containerTest_deleteContainer/merge.xml b/yang/yang-data-operations/src/test/resources/xmls/containerTest_deleteContainer/merge.xml
deleted file mode 100644 (file)
index 9c38da8..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test"
-           xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0" nc:operation="delete">
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/containerTest_innerContainerContainer/current.xml b/yang/yang-data-operations/src/test/resources/xmls/containerTest_innerContainerContainer/current.xml
deleted file mode 100644 (file)
index b0959d1..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test">
-    <innerContainer>
-           <uint16>11</uint16>
-        <innerInnerContainer>
-               <uint32>11</uint32>
-               <uint16>11</uint16>
-        </innerInnerContainer>
-    </innerContainer>
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/containerTest_innerContainerContainer/merge.xml b/yang/yang-data-operations/src/test/resources/xmls/containerTest_innerContainerContainer/merge.xml
deleted file mode 100644 (file)
index 52f8ef0..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test"
-           xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0">
-
-    <innerContainer nc:operation="merge">
-         <!--TODO integer element has to contain value in order to be parsed even if its being removed-->
-        <uint16 nc:operation="remove">1</uint16>
-        <innerInnerContainer nc:operation="replace">
-            <uint16>22</uint16>
-        </innerInnerContainer>
-    </innerContainer>
-
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/containerTest_innerContainerContainer/result.xml b/yang/yang-data-operations/src/test/resources/xmls/containerTest_innerContainerContainer/result.xml
deleted file mode 100644 (file)
index 247caf7..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test">
-    <innerContainer>
-        <innerInnerContainer>
-            <uint16>22</uint16>
-        </innerInnerContainer>
-    </innerContainer>
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/containerTest_innerLeavesBaseOperationsContainer/current.xml b/yang/yang-data-operations/src/test/resources/xmls/containerTest_innerLeavesBaseOperationsContainer/current.xml
deleted file mode 100644 (file)
index 97cd725..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test">
-    <uint32>1</uint32>
-    <augumentUint32>1</augumentUint32>
-    <string>currentString</string>
-    <decimal64>45.1</decimal64>
-    <binary>abcd</binary>
-
-    <identityRef>test-identity</identityRef>
-    <augumentString1>augumentString1</augumentString1>
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/containerTest_innerLeavesBaseOperationsContainer/merge.xml b/yang/yang-data-operations/src/test/resources/xmls/containerTest_innerLeavesBaseOperationsContainer/merge.xml
deleted file mode 100644 (file)
index 943836a..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test"
-           xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0">
-    <uint32 nc:operation="replace">88</uint32>
-    <augumentUint32>88</augumentUint32>
-    <decimal64 nc:operation="merge">88.1</decimal64>
-    <string nc:operation="delete"></string>
-    <binary nc:operation="remove"></binary>
-    <boolean nc:operation="create">false</boolean>
-
-    <identityRef>test-identity2</identityRef>
-    <augumentString2 nc:operation="create">augumentString2</augumentString2>
-
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/containerTest_innerLeavesBaseOperationsContainer/result.xml b/yang/yang-data-operations/src/test/resources/xmls/containerTest_innerLeavesBaseOperationsContainer/result.xml
deleted file mode 100644 (file)
index 618d721..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test">
-    <uint32>88</uint32>
-    <augumentUint32>88</augumentUint32>
-    <decimal64>88.1</decimal64>
-    <identityRef>test-identity2</identityRef>
-    <boolean>false</boolean>
-    <augumentString2>augumentString2</augumentString2>
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/containerTest_noneContainer/current.xml b/yang/yang-data-operations/src/test/resources/xmls/containerTest_noneContainer/current.xml
deleted file mode 100644 (file)
index 1044367..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test">
-       <uint32>1</uint32>
-       <string>currentString</string>
-    <decimal64>45.1</decimal64>
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/containerTest_noneContainer/defaultOperation.txt b/yang/yang-data-operations/src/test/resources/xmls/containerTest_noneContainer/defaultOperation.txt
deleted file mode 100644 (file)
index c86c3f3..0000000
+++ /dev/null
@@ -1 +0,0 @@
-none
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/containerTest_noneContainer/merge.xml b/yang/yang-data-operations/src/test/resources/xmls/containerTest_noneContainer/merge.xml
deleted file mode 100644 (file)
index 7f047ee..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test"
-           xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0">
-
-    <uint32 nc:operation="replace">88</uint32>
-    <decimal64 nc:operation="merge">88.1</decimal64>
-    <string>newString</string>
-    <binary >aaa</binary>
-
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/containerTest_noneContainer/result.xml b/yang/yang-data-operations/src/test/resources/xmls/containerTest_noneContainer/result.xml
deleted file mode 100644 (file)
index e5b4866..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test">
-    <uint32>88</uint32>
-    <string>currentString</string>
-    <decimal64>88.1</decimal64>
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/containerTest_removeContainer/current.xml b/yang/yang-data-operations/src/test/resources/xmls/containerTest_removeContainer/current.xml
deleted file mode 100644 (file)
index 36530ed..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test">
-    <uint32>1</uint32>
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/containerTest_removeContainer/merge.xml b/yang/yang-data-operations/src/test/resources/xmls/containerTest_removeContainer/merge.xml
deleted file mode 100644 (file)
index 8a03228..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test"
-           xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0"
-           nc:operation="remove"
-           >
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/containerTest_replaceContainer/current.xml b/yang/yang-data-operations/src/test/resources/xmls/containerTest_replaceContainer/current.xml
deleted file mode 100644 (file)
index 510f5ee..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test">
-       <uint32>1</uint32>
-       <string>currentString</string>
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/containerTest_replaceContainer/merge.xml b/yang/yang-data-operations/src/test/resources/xmls/containerTest_replaceContainer/merge.xml
deleted file mode 100644 (file)
index 33421a6..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test"
-           xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0"
-           nc:operation="replace">
-    <!--Inner strategies under replace are ignored-->
-    <uint32 nc:operation="remove">88</uint32>
-    <string nc:operation="delete">string</string>
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/containerTest_replaceContainer/result.xml b/yang/yang-data-operations/src/test/resources/xmls/containerTest_replaceContainer/result.xml
deleted file mode 100644 (file)
index 1cea85f..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test">
-    <uint32>88</uint32>
-    <string>string</string>
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/leafListTest/current.xml b/yang/yang-data-operations/src/test/resources/xmls/leafListTest/current.xml
deleted file mode 100644 (file)
index 581faf9..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test">
-
-       <leafList>currentLeafList1</leafList>
-       <leafList>currentLeafList2</leafList>
-
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/leafListTest/merge.xml b/yang/yang-data-operations/src/test/resources/xmls/leafListTest/merge.xml
deleted file mode 100644 (file)
index 39a9d22..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test"
-           xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0">
-
-    <leafList nc:operation="delete">currentLeafList1</leafList>
-    <leafList nc:operation="remove">random</leafList>
-    <leafList nc:operation="create">currentLeafList3</leafList>
-    <leafList nc:operation="replace">currentLeafList4</leafList>
-    <leafList nc:operation="merge">currentLeafList5</leafList>
-
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/leafListTest/result.xml b/yang/yang-data-operations/src/test/resources/xmls/leafListTest/result.xml
deleted file mode 100644 (file)
index 5a7e98c..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test">
-
-    <leafList>currentLeafList2</leafList>
-    <leafList>currentLeafList3</leafList>
-    <leafList>currentLeafList4</leafList>
-    <leafList>currentLeafList5</leafList>
-
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/listTest/current.xml b/yang/yang-data-operations/src/test/resources/xmls/listTest/current.xml
deleted file mode 100644 (file)
index 15334b8..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test">
-
-       <list>
-        <uint32>1</uint32>
-        <containerInList>
-            <uint32>32</uint32>
-        </containerInList>
-       </list>
-       <list>
-        <uint32>2</uint32>
-        <containerInList>
-            <uint32>32</uint32>
-        </containerInList>
-       </list>
-       <list>
-        <uint32>6</uint32>
-        <containerInList>
-            <uint32>32</uint32>
-        </containerInList>
-       </list>
-       <list>
-        <uint32>3</uint32>
-       </list>
-       <list>
-        <uint32>4</uint32>
-       </list>
-       <list>
-        <uint32>5</uint32>
-       </list>
-
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/listTest/merge.xml b/yang/yang-data-operations/src/test/resources/xmls/listTest/merge.xml
deleted file mode 100644 (file)
index d8e9c20..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test"
-           xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0">
-
-    <list nc:operation="merge">
-        <uint32>1</uint32>
-        <containerInList>
-            <uint32>88</uint32>
-        </containerInList>
-    </list>
-    <list nc:operation="merge">
-        <uint32>2</uint32>
-        <containerInList nc:operation="replace">
-        </containerInList>
-    </list>
-    <list nc:operation="delete">
-        <uint32>3</uint32>
-    </list>
-    <list nc:operation="remove">
-        <uint32>4</uint32>
-    </list>
-    <list>
-        <uint32>5</uint32>
-        <containerInList nc:operation="create">
-            <uint32>88</uint32>
-        </containerInList>
-    </list>
-    <list>
-        <uint32>6</uint32>
-        <containerInList>
-            <uint32 nc:operation="delete">1</uint32>
-        </containerInList>
-    </list>
-
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/listTest/result.xml b/yang/yang-data-operations/src/test/resources/xmls/listTest/result.xml
deleted file mode 100644 (file)
index f2e39f3..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test">
-    <list>
-        <uint32>1</uint32>
-        <containerInList>
-            <uint32>88</uint32>
-        </containerInList>
-    </list>
-    <list>
-        <uint32>2</uint32>
-        <containerInList>
-        </containerInList>
-    </list>
-    <list>
-        <uint32>6</uint32>
-        <containerInList>
-        </containerInList>
-    </list>
-    <list>
-        <uint32>5</uint32>
-        <containerInList>
-            <uint32>88</uint32>
-        </containerInList>
-    </list>
-
-</container>
diff --git a/yang/yang-data-operations/src/test/resources/xmls/listTest_alterInnerValue/current.xml b/yang/yang-data-operations/src/test/resources/xmls/listTest_alterInnerValue/current.xml
deleted file mode 100644 (file)
index c2aac04..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test">
-       <list>
-        <uint32>1</uint32>
-        <containerInList>
-            <uint32>32</uint32>
-            <uint16>32</uint16>
-        </containerInList>
-       </list>
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/listTest_alterInnerValue/defaultOperation.txt b/yang/yang-data-operations/src/test/resources/xmls/listTest_alterInnerValue/defaultOperation.txt
deleted file mode 100644 (file)
index c86c3f3..0000000
+++ /dev/null
@@ -1 +0,0 @@
-none
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/listTest_alterInnerValue/merge.xml b/yang/yang-data-operations/src/test/resources/xmls/listTest_alterInnerValue/merge.xml
deleted file mode 100644 (file)
index 8bf933d..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test"
-           xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0">
-
-    <list>
-        <uint32>1</uint32>
-        <containerInList>
-            <uint16 nc:operation="delete">88</uint16>
-        </containerInList>
-    </list>
-
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/listTest_alterInnerValue/result.xml b/yang/yang-data-operations/src/test/resources/xmls/listTest_alterInnerValue/result.xml
deleted file mode 100644 (file)
index 31bd961..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test">
-    <list>
-        <uint32>1</uint32>
-        <containerInList>
-            <uint32>32</uint32>
-        </containerInList>
-    </list>
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/none_NoChange/current.xml b/yang/yang-data-operations/src/test/resources/xmls/none_NoChange/current.xml
deleted file mode 100644 (file)
index 1044367..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test">
-       <uint32>1</uint32>
-       <string>currentString</string>
-    <decimal64>45.1</decimal64>
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/none_NoChange/defaultOperation.txt b/yang/yang-data-operations/src/test/resources/xmls/none_NoChange/defaultOperation.txt
deleted file mode 100644 (file)
index c86c3f3..0000000
+++ /dev/null
@@ -1 +0,0 @@
-none
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/none_NoChange/merge.xml b/yang/yang-data-operations/src/test/resources/xmls/none_NoChange/merge.xml
deleted file mode 100644 (file)
index 9836290..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test"
-           xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0">
-
-    <uint32>88</uint32>
-    <decimal64>88.1</decimal64>
-    <string>newString</string>
-    <binary >aaa</binary>
-
-</container>
\ No newline at end of file
diff --git a/yang/yang-data-operations/src/test/resources/xmls/none_NoChange/result.xml b/yang/yang-data-operations/src/test/resources/xmls/none_NoChange/result.xml
deleted file mode 100644 (file)
index fb0e5f7..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<container xmlns="urn:opendaylight:params:xml:ns:yang:controller:test">
-    <uint32>1</uint32>
-    <string>currentString</string>
-    <decimal64>45.1</decimal64>
-</container>
\ No newline at end of file