Convert netconf-util, netconf-ssh, netconf-tcp to blueprint 18/61718/9
authorRyan Goulding <ryandgoulding@gmail.com>
Tue, 24 Oct 2017 21:23:10 +0000 (17:23 -0400)
committerRobert Varga <robert.varga@pantheon.tech>
Sun, 25 Feb 2018 22:17:40 +0000 (23:17 +0100)
commit7072e63a98485bbbfa686a639d28002377972aa0
treea63bd3d77be43637acea0fa2a9212dbd4028e98c
parent59cfc16131c9eed2a706f59db527db0f47c735f0
Convert netconf-util, netconf-ssh, netconf-tcp to blueprint

netconf-util, netconf-ssh, and netconf-tcp still used a BundleActivator
and accompanying ServiceTracker for service instantiation.  netconf-ssh
and netconf-tcp depend on netconf-util for NetconfConfiguration, so it
was decided to do the conversion of all three bundles in one patch.

netconf-util utilizes blueprint-cm to instantiate NetconfConfiguration
based on the ManagedService identified by the "netconf" PID.

Tests that were aimed at testing bespoke Activator logic were removed,
since the accompanying Activators were removed.  ServiceTrackers were
removed in favor of bean references.  Scaffolding used to locate the
NetconfConfiguration ManagedService was also removed since it is now
directly referenced using blueprint.

JIRA: NETCONF-510
Change-Id: I27452ea509bc50333ffc00c6d1d8de3133e8b850
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
24 files changed:
features/netconf/odl-netconf-ssh/pom.xml
netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfImplActivator.java
netconf/netconf-ssh/pom.xml
netconf/netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/NetconfSSHProvider.java [moved from netconf/netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/osgi/NetconfSSHActivator.java with 73% similarity]
netconf/netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/osgi/AuthProviderTracker.java [deleted file]
netconf/netconf-ssh/src/main/resources/org/opendaylight/blueprint/netconf-ssh-blueprint.xml [new file with mode: 0644]
netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/EchoServer.java
netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/ProxyServer.java
netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/SSHTest.java
netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/ssh/authentication/SSHServerTest.java
netconf/netconf-tcp/pom.xml
netconf/netconf-tcp/src/main/java/org/opendaylight/netconf/tcp/NetconfTCPProvider.java [moved from netconf/netconf-tcp/src/main/java/org/opendaylight/netconf/tcp/osgi/NetconfTCPActivator.java with 61% similarity]
netconf/netconf-tcp/src/main/resources/org/opendaylight/blueprint/netconf-tcp-blueprint.xml [new file with mode: 0644]
netconf/netconf-util/pom.xml
netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/NetconfConfiguration.java [new file with mode: 0644]
netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/NetconfConfigurationHolder.java [moved from netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/osgi/NetconfConfigurationHolder.java with 96% similarity]
netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/NetconfConfigurationImpl.java [moved from netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/osgi/NetconfConfiguration.java with 66% similarity]
netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/osgi/NetconfConfigUtil.java [deleted file]
netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/osgi/NetconfConfigurationActivator.java [deleted file]
netconf/netconf-util/src/main/resources/netconf.cfg
netconf/netconf-util/src/main/resources/org/opendaylight/blueprint/netconf-util-blueprint.xml [new file with mode: 0644]
netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/NetconfConfigurationImplTest.java [moved from netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/osgi/NetconfConfigurationTest.java with 84% similarity]
netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/osgi/NetconfConfigUtilTest.java [deleted file]
netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/osgi/NetconfConfigurationActivatorTest.java [deleted file]