Further rework of base schemas

[netconf.git] / netconf / netconf-topology-singleton / src / test / java / org / opendaylight / netconf / topology / singleton / impl / RemoteDeviceConnectorImplTest.java

diff --git a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/RemoteDeviceConnectorImplTest.java b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/RemoteDeviceConnectorImplTest.java
index 8fa8ee6357b426a603bdb81fcc8e69a856dce29f..5039b65dc9d16dff0094aa116cd107f848ceb437 100644 (file)
--- a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/RemoteDeviceConnectorImplTest.java
+++ b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/RemoteDeviceConnectorImplTest.java
@@ -44,13 +44,13 @@ import org.opendaylight.netconf.client.conf.NetconfClientConfiguration;
 import org.opendaylight.netconf.client.conf.NetconfReconnectingClientConfiguration;
 import org.opendaylight.netconf.sal.connect.api.DeviceActionFactory;
 import org.opendaylight.netconf.sal.connect.api.RemoteDeviceHandler;
+import org.opendaylight.netconf.sal.connect.impl.DefaultSchemaResourceManager;
 import org.opendaylight.netconf.sal.connect.netconf.listener.NetconfDeviceCommunicator;
 import org.opendaylight.netconf.sal.connect.netconf.listener.NetconfSessionPreferences;
 import org.opendaylight.netconf.sal.connect.netconf.sal.KeepaliveSalFacade;
 import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId;
 import org.opendaylight.netconf.topology.singleton.impl.utils.NetconfConnectorDTO;
 import org.opendaylight.netconf.topology.singleton.impl.utils.NetconfTopologySetup;
-import org.opendaylight.netconf.topology.singleton.impl.utils.NetconfTopologyUtils;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Host;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
@@ -64,9 +64,10 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeBuilder;
 import org.opendaylight.yangtools.yang.common.Uint16;
 import org.opendaylight.yangtools.yang.common.Uint32;
+import org.opendaylight.yangtools.yang.parser.impl.YangParserFactoryImpl;
 import scala.concurrent.duration.Duration;
 
-public class RemoteDeviceConnectorImplTest {
+public class RemoteDeviceConnectorImplTest extends AbstractBaseSchemasTest {
 
     private static final NodeId NODE_ID = new NodeId("testing-node");
     private static final String TOPOLOGY_ID = "testing-topology";
@@ -123,24 +124,24 @@ public class RemoteDeviceConnectorImplTest {
         doNothing().when(writeTx).merge(eq(LogicalDatastoreType.OPERATIONAL), any(), any());
         doReturn("Some object").when(writeTx).getIdentifier();
         doReturn(emptyFluentFuture()).when(writeTx).commit();
-        builder = new NetconfTopologySetup.NetconfTopologySetupBuilder();
-        builder.setDataBroker(dataBroker);
-        builder.setRpcProviderRegistry(rpcProviderRegistry);
-        builder.setClusterSingletonServiceProvider(clusterSingletonServiceProvider);
-        builder.setKeepaliveExecutor(keepaliveExecutor);
-        builder.setProcessingExecutor(processingExecutor);
-        builder.setActorSystem(actorSystem);
-        builder.setEventExecutor(eventExecutor);
-        builder.setNetconfClientDispatcher(clientDispatcher);
-        builder.setTopologyId(TOPOLOGY_ID);
+        builder = new NetconfTopologySetup.NetconfTopologySetupBuilder()
+                .setBaseSchemas(BASE_SCHEMAS)
+                .setDataBroker(dataBroker)
+                .setRpcProviderRegistry(rpcProviderRegistry)
+                .setClusterSingletonServiceProvider(clusterSingletonServiceProvider)
+                .setKeepaliveExecutor(keepaliveExecutor)
+                .setProcessingExecutor(processingExecutor)
+                .setActorSystem(actorSystem)
+                .setEventExecutor(eventExecutor)
+                .setNetconfClientDispatcher(clientDispatcher)
+                .setTopologyId(TOPOLOGY_ID);
     }
 
     @SuppressWarnings("unchecked")
     @Test
     public void testStopRemoteDeviceConnection() {
-        final Credentials credentials = new LoginPasswordBuilder()
-                .setPassword("admin").setUsername("admin").build();
-        final NetconfNode netconfNode = new NetconfNodeBuilder()
+        builder.setNode(new NodeBuilder().setNodeId(NODE_ID)
+            .addAugmentation(new NetconfNodeBuilder()
                 .setHost(new Host(new IpAddress(new Ipv4Address("127.0.0.1"))))
                 .setPort(new PortNumber(Uint16.valueOf(9999)))
                 .setReconnectOnChangedSchema(true)
@@ -148,12 +149,11 @@ public class RemoteDeviceConnectorImplTest {
                 .setBetweenAttemptsTimeoutMillis(Uint16.valueOf(100))
                 .setSchemaless(false)
                 .setTcpOnly(false)
-                .setCredentials(credentials)
-                .build();
-        final Node node = new NodeBuilder().setNodeId(NODE_ID).addAugmentation(NetconfNode.class, netconfNode).build();
-
-        builder.setNode(node);
-
+                .setCredentials(new LoginPasswordBuilder()
+                    .setPassword("admin").setUsername("admin")
+                    .build())
+                .build())
+            .build());
 
         final NetconfDeviceCommunicator communicator = mock(NetconfDeviceCommunicator.class);
         final RemoteDeviceHandler<NetconfSessionPreferences> salFacade = mock(RemoteDeviceHandler.class);
@@ -167,7 +167,6 @@ public class RemoteDeviceConnectorImplTest {
 
         verify(communicator, times(1)).close();
         verify(salFacade, times(1)).close();
-
     }
 
     @SuppressWarnings("unchecked")
@@ -187,8 +186,10 @@ public class RemoteDeviceConnectorImplTest {
                 .setKeepaliveDelay(Uint32.ONE)
                 .build();
 
-        final Node node = new NodeBuilder().setNodeId(NODE_ID).addAugmentation(NetconfNode.class, netconfNode).build();
-        builder.setSchemaResourceDTO(NetconfTopologyUtils.setupSchemaCacheDTO(node));
+        final Node node = new NodeBuilder().setNodeId(NODE_ID).addAugmentation(netconfNode).build();
+
+        builder.setSchemaResourceDTO(new DefaultSchemaResourceManager(new YangParserFactoryImpl())
+            .getSchemaResources(netconfNode, "foo"));
 
         final RemoteDeviceConnectorImpl remoteDeviceConnection =
                 new RemoteDeviceConnectorImpl(builder.build(), remoteDeviceId, deviceActionFactory);