Use Felix DM for OVSDB Neutron Services
authorDave Tucker <djt@redhat.com>
Tue, 1 Apr 2014 15:52:21 +0000 (16:52 +0100)
committerDave Tucker <djt@redhat.com>
Sun, 18 May 2014 18:31:28 +0000 (20:31 +0200)
commit80addf74834d98e859707a90fc0d6f3152c68f2c
treed0af76c33b1f0d5f2aef341bedf821b0e30cd819
parenta0614c415fc7ee70e29e4885e498dd1bbe8d6a62
Use Felix DM for OVSDB Neutron Services

The ovsdb.neutron bundle has serveral services currently implemented as
singletons. This makes these classes difficult to test and also creates
a hard coded dependency. We can use the Felix DM provided by the OSGi
container to implement dependency injection for these services.
Fixes bug 1030

Change-Id: Ia0dca98302e3f0b6745c1687db9f0717c2b6b558
Signed-off-by: Dave Tucker <djt@redhat.com>
17 files changed:
neutron/src/main/java/org/opendaylight/ovsdb/neutron/Activator.java
neutron/src/main/java/org/opendaylight/ovsdb/neutron/AdminConfigManager.java
neutron/src/main/java/org/opendaylight/ovsdb/neutron/IAdminConfigManager.java [new file with mode: 0644]
neutron/src/main/java/org/opendaylight/ovsdb/neutron/IInternalNetworkManager.java [new file with mode: 0644]
neutron/src/main/java/org/opendaylight/ovsdb/neutron/ITenantNetworkManager.java [new file with mode: 0644]
neutron/src/main/java/org/opendaylight/ovsdb/neutron/InternalNetworkManager.java
neutron/src/main/java/org/opendaylight/ovsdb/neutron/NetworkHandler.java
neutron/src/main/java/org/opendaylight/ovsdb/neutron/NodeConfiguration.java
neutron/src/main/java/org/opendaylight/ovsdb/neutron/SouthboundHandler.java
neutron/src/main/java/org/opendaylight/ovsdb/neutron/TenantNetworkManager.java
neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/IProviderNetworkManager.java [new file with mode: 0644]
neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/NetworkProvider.java [new file with mode: 0644]
neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/OF10Provider.java [moved from neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/OF10ProviderManager.java with 91% similarity]
neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/OF13Provider.java [moved from neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/OF13ProviderManager.java with 97% similarity]
neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/ProviderNetworkManager.java
neutron/src/test/java/org/opendaylight/ovsdb/neutron/AdminConfigManagerTest.java
neutron/src/test/java/org/opendaylight/ovsdb/neutron/NetworkHandlerTest.java