Merge dev/fluorine work across to master

[unimgr.git] / cisco-xr-driver / src / test / java / org / opendaylight / unimgr / mef / nrp / cisco / xr / common / util / NodeTestUtils.java

diff --git a/impl/src/test/java/org/opendaylight/unimgr/utils/NodeTestUtils.java b/cisco-xr-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/common/util/NodeTestUtils.java
similarity index 95%
rename from impl/src/test/java/org/opendaylight/unimgr/utils/NodeTestUtils.java
rename to cisco-xr-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/common/util/NodeTestUtils.java
index bcb3e32460d0db450e5e956c65e39800acbcbc1b..51cb007736df5f8bc9bbb0f4dfc12ef1e442e430 100644 (file)
--- a/impl/src/test/java/org/opendaylight/unimgr/utils/NodeTestUtils.java
+++ b/cisco-xr-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/common/util/NodeTestUtils.java
@@ -5,7 +5,7 @@
  * 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.unimgr.utils;
+package org.opendaylight.unimgr.mef.nrp.cisco.xr.common.util;
 
 
 import com.google.common.base.Optional;
@@ -14,6 +14,7 @@ import org.mockito.Mockito;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.opendaylight.unimgr.utils.NetconfConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status.AvailableCapabilities;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status.available.capabilities.AvailableCapability;
@@ -76,7 +77,7 @@ public class NodeTestUtils {
         when(netconfNode.getAvailableCapabilities()).thenReturn(availableCapabilities);
 
         Node mockedNode = mockedNodeOptional.get();
-        when(mockedNode.getAugmentation(NetconfNode.class)).thenReturn(netconfNode);
+        when(mockedNode.augmentation(NetconfNode.class)).thenReturn(netconfNode);
 
         return mockedNodeOptional;
     }