From: Sam Hague Date: Fri, 23 Oct 2015 19:43:02 +0000 (-0400) Subject: Remove unused LibraryProvider X-Git-Tag: release/beryllium~254 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=01ea0c0a68d902a492317b0276635db335b5f78f;p=ovsdb.git Remove unused LibraryProvider Change-Id: I83ce77556a2c8e587278ec713f08a5d4fa4ba795 Signed-off-by: Sam Hague --- diff --git a/library/impl/pom.xml b/library/impl/pom.xml index 0dac7dd79..381de3a9b 100644 --- a/library/impl/pom.xml +++ b/library/impl/pom.xml @@ -101,8 +101,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html + org.opendaylight.ovsdb.lib, org.opendaylight.ovsdb.lib.*, - org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.library.impl.rev141210.* + org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.library.impl.rev141210 diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/LibraryProvider.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/LibraryProvider.java deleted file mode 100644 index 30cd81198..000000000 --- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/LibraryProvider.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright © 2015 Red Hat, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * 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.ovsdb.lib.impl; - -import java.net.InetAddress; -import java.util.Collection; - -import javax.net.ssl.SSLContext; - -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext; -import org.opendaylight.controller.sal.binding.api.BindingAwareProvider; -import org.opendaylight.ovsdb.lib.OvsdbClient; -import org.opendaylight.ovsdb.lib.OvsdbConnection; -import org.opendaylight.ovsdb.lib.OvsdbConnectionListener; -import org.osgi.framework.BundleContext; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class LibraryProvider implements BindingAwareProvider, AutoCloseable, OvsdbConnection { - - private static final Logger LOG = LoggerFactory.getLogger(LibraryProvider.class); - - public LibraryProvider(BundleContext bundleContext) { - LOG.info("LibraryProvider: bundleContext: {}", bundleContext); - } - - @Override - public void onSessionInitiated(ProviderContext providerContext) { - LOG.info("LibraryProvider Session Initiated"); - } - - @Override - public void close() throws Exception { - LOG.info("LibraryProvider Closed"); - } - - @Override - public OvsdbClient connect(InetAddress address, int port) { - return OvsdbConnectionService.getService().connect(address, port); - } - - @Override - public OvsdbClient connectWithSsl( - InetAddress address, int port, SSLContext sslContext) { - return OvsdbConnectionService.getService().connectWithSsl(address, port, sslContext); - } - - @Override - public void disconnect(OvsdbClient client) { - OvsdbConnectionService.getService().disconnect(client); - } - - @Override - public boolean startOvsdbManager(int ovsdbListenPort) { - return OvsdbConnectionService.getService().startOvsdbManager(ovsdbListenPort); - } - - @Override - public boolean startOvsdbManagerWithSsl(int ovsdbListenPort, SSLContext sslContext) { - return OvsdbConnectionService.getService().startOvsdbManagerWithSsl(ovsdbListenPort, sslContext); - } - - @Override - public void registerConnectionListener(OvsdbConnectionListener listener) { - OvsdbConnectionService.getService().registerConnectionListener(listener); - } - - @Override - public void unregisterConnectionListener(OvsdbConnectionListener listener) { - OvsdbConnectionService.getService().unregisterConnectionListener(listener); - } - - @Override - public Collection getConnections() { - return OvsdbConnectionService.getService().getConnections(); - } -} diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/OvsdbConnectionService.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/OvsdbConnectionService.java index ef2af7530..872603359 100644 --- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/OvsdbConnectionService.java +++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/OvsdbConnectionService.java @@ -74,7 +74,7 @@ import com.google.common.collect.Sets; * environment. Hence a single instance of the service will be active (via Service Registry in OSGi) * and a Singleton object in a non-OSGi environment. */ -public class OvsdbConnectionService implements OvsdbConnection { +public class OvsdbConnectionService implements AutoCloseable, OvsdbConnection { private static final Logger LOG = LoggerFactory.getLogger(OvsdbConnectionService.class); private static final int NUM_THREADS = 3; @@ -389,4 +389,9 @@ public class OvsdbConnectionService implements OvsdbConnection { public Collection getConnections() { return connections.keySet(); } + + @Override + public void close() throws Exception { + LOG.info("OvsdbConnectionService closed"); + } } diff --git a/library/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/library/impl/rev141210/LibraryModule.java b/library/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/library/impl/rev141210/LibraryModule.java index 8fc903994..ea200147d 100644 --- a/library/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/library/impl/rev141210/LibraryModule.java +++ b/library/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/library/impl/rev141210/LibraryModule.java @@ -9,7 +9,7 @@ package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.library import org.opendaylight.controller.config.api.DependencyResolver; import org.opendaylight.controller.config.api.ModuleIdentifier; -import org.opendaylight.ovsdb.lib.impl.LibraryProvider; +import org.opendaylight.ovsdb.lib.impl.OvsdbConnectionService; import org.osgi.framework.BundleContext; import com.google.common.base.Preconditions; @@ -33,8 +33,7 @@ public class LibraryModule extends org.opendaylight.yang.gen.v1.urn.opendaylight @Override public java.lang.AutoCloseable createInstance() { - LibraryProvider provider = new LibraryProvider(bundleContext); - getBrokerDependency().registerProvider(provider); + OvsdbConnectionService provider = new OvsdbConnectionService(); return provider; } diff --git a/library/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/library/impl/rev141210/LibraryModuleTest.java b/library/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/library/impl/rev141210/LibraryModuleTest.java index fe4d00754..ede3e6d0d 100644 --- a/library/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/library/impl/rev141210/LibraryModuleTest.java +++ b/library/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/library/impl/rev141210/LibraryModuleTest.java @@ -12,7 +12,6 @@ import org.opendaylight.controller.config.api.DependencyResolver; import org.opendaylight.controller.config.api.JmxAttribute; import org.opendaylight.controller.config.api.ModuleIdentifier; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; -import org.opendaylight.ovsdb.lib.impl.LibraryProvider; import org.osgi.framework.BundleContext; import javax.management.ObjectName; @@ -20,7 +19,6 @@ import javax.management.ObjectName; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; public class LibraryModuleTest { @@ -49,9 +47,6 @@ public class LibraryModuleTest { // getInstance calls resolveInstance to get the broker dependency and then calls createInstance AutoCloseable closeable = module.getInstance(); - // verify that the module registered the returned provider with the broker - verify(broker).registerProvider((LibraryProvider)closeable); - // ensure no exceptions on close closeable.close(); } diff --git a/southbound/southbound-api/pom.xml b/southbound/southbound-api/pom.xml index fa167a8da..e5f90fb32 100644 --- a/southbound/southbound-api/pom.xml +++ b/southbound/southbound-api/pom.xml @@ -103,6 +103,19 @@ and is available at http://www.eclipse.org/legal/epl-v10.html true + + org.apache.felix + maven-bundle-plugin + true + + + + org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105, + org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.* + + + + diff --git a/southbound/southbound-impl/pom.xml b/southbound/southbound-impl/pom.xml index 4d94cb192..13d215cf9 100644 --- a/southbound/southbound-impl/pom.xml +++ b/southbound/southbound-impl/pom.xml @@ -76,6 +76,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html junit test + + org.slf4j + slf4j-simple + test + org.powermock powermock-api-mockito @@ -102,8 +107,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html maven-bundle-plugin - - org.opendaylight.ovsdb.southbound.*,org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.southbound.impl.rev141210.* + + org.opendaylight.ovsdb.southbound.*, + org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.southbound.impl.rev141210.* diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java index 3599644c3..d0d9493a6 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java @@ -33,8 +33,8 @@ import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipS import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException; import org.opendaylight.ovsdb.lib.OvsdbClient; +import org.opendaylight.ovsdb.lib.OvsdbConnection; import org.opendaylight.ovsdb.lib.OvsdbConnectionListener; -import org.opendaylight.ovsdb.lib.impl.OvsdbConnectionService; import org.opendaylight.ovsdb.lib.operations.Operation; import org.opendaylight.ovsdb.lib.operations.OperationResult; import org.opendaylight.ovsdb.lib.operations.Select; @@ -72,13 +72,16 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos new ConcurrentHashMap<>(); private EntityOwnershipService entityOwnershipService; private OvsdbDeviceEntityOwnershipListener ovsdbDeviceEntityOwnershipListener; + private OvsdbConnection ovsdbConnection; public OvsdbConnectionManager(DataBroker db,TransactionInvoker txInvoker, - EntityOwnershipService entityOwnershipService) { + EntityOwnershipService entityOwnershipService, + OvsdbConnection ovsdbConnection) { this.db = db; this.txInvoker = txInvoker; this.entityOwnershipService = entityOwnershipService; this.ovsdbDeviceEntityOwnershipListener = new OvsdbDeviceEntityOwnershipListener(this, entityOwnershipService); + this.ovsdbConnection = ovsdbConnection; } @Override @@ -144,7 +147,7 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos // TODO use transaction chains to handle ordering issues between disconnected // TODO and connected when writing to the operational store InetAddress ip = SouthboundMapper.createInetAddress(ovsdbNode.getConnectionInfo().getRemoteIp()); - OvsdbClient client = OvsdbConnectionService.getService().connect(ip, + OvsdbClient client = ovsdbConnection.connect(ip, ovsdbNode.getConnectionInfo().getRemotePort().getValue()); // For connections from the controller to the ovs instance, the library doesn't call // this method for us diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundProvider.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundProvider.java index 008aafcd5..d41ff58a7 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundProvider.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundProvider.java @@ -70,7 +70,7 @@ public class SouthboundProvider implements BindingAwareProvider, AutoCloseable { LOG.info("SouthboundProvider Session Initiated"); db = session.getSALService(DataBroker.class); this.txInvoker = new TransactionInvokerImpl(db); - cm = new OvsdbConnectionManager(db,txInvoker,entityOwnershipService); + cm = new OvsdbConnectionManager(db,txInvoker,entityOwnershipService, ovsdbConnection); ovsdbDataChangeListener = new OvsdbDataChangeListener(db,cm); //Register listener for entityOnwership changes diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManagerTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManagerTest.java index 209301c58..7acfb62c7 100644 --- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManagerTest.java +++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManagerTest.java @@ -59,6 +59,7 @@ public class OvsdbConnectionManagerTest { @Mock private DataBroker db; @Mock private TransactionInvoker txInvoker; @Mock private EntityOwnershipService entityOwnershipService; + @Mock private OvsdbConnection ovsdbConnection; private Map clients; private Map> instanceIdentifiers; private Map entityConnectionMap; @@ -71,6 +72,8 @@ public class OvsdbConnectionManagerTest { MemberModifier.field(OvsdbConnectionManager.class, "db").set(ovsdbConnectionManager, db); MemberModifier.field(OvsdbConnectionManager.class, "txInvoker").set(ovsdbConnectionManager, txInvoker); MemberModifier.field(OvsdbConnectionManager.class, "entityOwnershipService").set(ovsdbConnectionManager, entityOwnershipService); + MemberModifier.field(OvsdbConnectionManager.class, "ovsdbConnection") + .set(ovsdbConnectionManager, ovsdbConnection); entityConnectionMap = new ConcurrentHashMap<>(); } @Test @@ -280,7 +283,6 @@ public class OvsdbConnectionManagerTest { when(SouthboundMapper.createInetAddress(any(IpAddress.class))).thenReturn(ip); OvsdbClient client = mock(OvsdbClient.class); - OvsdbConnection ovsdbConnection = mock(OvsdbConnection.class); PowerMockito.mockStatic(OvsdbConnectionService.class); when(OvsdbConnectionService.getService()).thenReturn(ovsdbConnection); PortNumber port = mock(PortNumber.class); diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/SouthboundProviderTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/SouthboundProviderTest.java index 662fbcd6e..d843359dd 100644 --- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/SouthboundProviderTest.java +++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/SouthboundProviderTest.java @@ -32,6 +32,7 @@ import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipS import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext; +import org.opendaylight.ovsdb.lib.OvsdbConnection; import org.opendaylight.ovsdb.southbound.transactions.md.TransactionInvoker; import org.opendaylight.ovsdb.southbound.transactions.md.TransactionInvokerImpl; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology; @@ -78,7 +79,7 @@ public class SouthboundProviderTest { when(session.getSALService(DataBroker.class)).thenReturn(db); TransactionInvokerImpl transactionInvokerImpl = mock(TransactionInvokerImpl.class); PowerMockito.whenNew(TransactionInvokerImpl.class).withArguments(any(DataBroker.class)).thenReturn(transactionInvokerImpl); - PowerMockito.whenNew(OvsdbConnectionManager.class).withArguments(any(DataBroker.class), any(TransactionInvoker.class), any(EntityOwnershipService.class)).thenReturn(cm); + PowerMockito.whenNew(OvsdbConnectionManager.class).withArguments(any(DataBroker.class), any(TransactionInvoker.class), any(EntityOwnershipService.class), any(OvsdbConnection.class)).thenReturn(cm); PowerMockito.whenNew(OvsdbDataChangeListener.class).withArguments(any(DataBroker.class), any(OvsdbConnectionManager.class)).thenReturn(ovsdbDataChangeListener); when(entityOwnershipService.registerListener(anyString(), any(EntityOwnershipListener.class))).thenReturn(mock(EntityOwnershipListenerRegistration.class));