Merge "BUG-1018 Implement BackwardsCompatible BI broker data notifications"
authorTony Tkacik <ttkacik@cisco.com>
Tue, 20 May 2014 13:11:24 +0000 (13:11 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Tue, 20 May 2014 13:11:24 +0000 (13:11 +0000)
1  2 
opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/config/yang/md/sal/connector/netconf/NetconfConnectorModule.java

index 89274c9ad5e356a3532e0639a5c5c1b2fbf04ebd,feeab1a4b79b01d51ec5070474718e858fbedee7..1839de15975f381ebc8d32980050cfb16ace72ad
@@@ -17,18 -17,22 +17,22 @@@ import java.io.File
  import java.io.InputStream;
  import java.net.InetAddress;
  import java.net.InetSocketAddress;
+ import java.net.URI;
  import java.util.concurrent.ExecutorService;
  import java.util.concurrent.Executors;
+ import org.opendaylight.controller.md.sal.common.api.data.DataChangeEvent;
  import org.opendaylight.controller.netconf.client.NetconfClientDispatcher;
  import org.opendaylight.controller.netconf.client.NetconfClientDispatcherImpl;
  import org.opendaylight.controller.netconf.client.conf.NetconfClientConfiguration;
  import org.opendaylight.controller.netconf.client.conf.NetconfClientConfigurationBuilder;
  import org.opendaylight.controller.netconf.client.conf.NetconfReconnectingClientConfiguration;
  import org.opendaylight.controller.netconf.client.conf.NetconfReconnectingClientConfigurationBuilder;
 -import org.opendaylight.controller.netconf.util.handler.ssh.authentication.LoginPassword;
 +import org.opendaylight.controller.netconf.nettyutil.handler.ssh.authentication.LoginPassword;
  import org.opendaylight.controller.sal.binding.api.data.DataProviderService;
+ import org.opendaylight.controller.sal.connect.netconf.InventoryUtils;
  import org.opendaylight.controller.sal.connect.netconf.NetconfDevice;
  import org.opendaylight.controller.sal.connect.netconf.NetconfDeviceListener;
+ import org.opendaylight.controller.sal.core.api.data.DataChangeListener;
  import org.opendaylight.protocol.framework.ReconnectStrategy;
  import org.opendaylight.protocol.framework.ReconnectStrategyFactory;
  import org.opendaylight.protocol.framework.TimedReconnectStrategy;
@@@ -36,6 -40,8 +40,8 @@@ import org.opendaylight.yang.gen.v1.urn
  import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.inventory.rev140108.NetconfNode;
  import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+ import org.opendaylight.yangtools.yang.common.QName;
+ import org.opendaylight.yangtools.yang.data.api.CompositeNode;
  import org.opendaylight.yangtools.yang.model.util.repo.AbstractCachingSchemaSourceProvider;
  import org.opendaylight.yangtools.yang.model.util.repo.FilesystemSchemaCachingProvider;
  import org.opendaylight.yangtools.yang.model.util.repo.SchemaSourceProvider;