Merge "Changed NetconfDeviceDatastoreAdapter and NetconfDeviceTopologyAdapter to...

[controller.git] / opendaylight / md-sal / sal-rest-connector / src / test / java / org / opendaylight / controller / sal / restconf / impl / test / TestUtils.java

diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/TestUtils.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/TestUtils.java
index bfd14834d2ce13a7f98d615fcbc15b17bbca2e60..f89e2ccb60cac8ff9fda0caff166bc6d66842f65 100644 (file)
--- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/TestUtils.java
+++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/TestUtils.java
@@ -182,8 +182,8 @@ public final class TestUtils {
 
         final InstanceIdentifierContext iiContext = ControllerContext.getInstance().toInstanceIdentifier(schemaNodePath);
         final DOMMountPoint mountPoint = iiContext.getMountPoint();
-        final CompositeNode value = RestconfImpl.getInstance().normalizeNode(node, iiContext.getSchemaNode(), mountPoint);
-        final NormalizedNode<?, ?> normNodePayload = compositeNodeToDatastoreNormalizedNode(value, iiContext.getSchemaNode());
+        final CompositeNode value = RestconfImpl.getInstance().normalizeNode(node, (DataSchemaNode) iiContext.getSchemaNode(), mountPoint);
+        final NormalizedNode<?, ?> normNodePayload = compositeNodeToDatastoreNormalizedNode(value, (DataSchemaNode) iiContext.getSchemaNode());
         final NormalizedNodeContext normlNodeContext = new NormalizedNodeContext(iiContext, normNodePayload);
 
         restconf.updateConfigurationData(schemaNodePath, normlNodeContext);
@@ -404,6 +404,11 @@ public final class TestUtils {
                 predicate);
     }
 
+    /**
+     * @deprecated method has to be removed for Lithium release
+     *          so please use prepareNormalizedNodeWithIetfInterfacesInterfacesData method
+     */
+    @Deprecated
     public static CompositeNode prepareCompositeNodeWithIetfInterfacesInterfacesData() {
         final CompositeNodeBuilder<ImmutableCompositeNode> interfaceBuilder = ImmutableCompositeNode.builder();
         interfaceBuilder.addLeaf(buildQName("name", "dummy", "2014-07-29"), "eth0");