import java.util.concurrent.ConcurrentHashMap;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
+import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
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.OvsdbConnectionListener;
import org.opendaylight.ovsdb.lib.impl.OvsdbConnectionService;
+import org.opendaylight.ovsdb.southbound.transactions.md.OvsdbNodeRemoveCommand;
+import org.opendaylight.ovsdb.southbound.transactions.md.TransactionInvoker;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.overlay.rev150105.IpPortLocator;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeAttributes;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeAugmentation;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbNodeAugmentation;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
+import com.google.common.util.concurrent.CheckedFuture;
+
public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoCloseable {
- Map<OvsdbClientKey,OvsdbConnectionInstance> clients = new ConcurrentHashMap<OvsdbClientKey,OvsdbConnectionInstance>();
+ Map<OvsdbClientKey,OvsdbConnectionInstance> clients
+ = new ConcurrentHashMap<OvsdbClientKey,OvsdbConnectionInstance>();
private static final Logger LOG = LoggerFactory.getLogger(OvsdbConnectionManager.class);
- DataBroker db;
+ private DataBroker db;
+ private TransactionInvoker txInvoker;
- public OvsdbConnectionManager(DataBroker db) {
+ public OvsdbConnectionManager(DataBroker db,TransactionInvoker txInvoker) {
this.db = db;
+ this.txInvoker = txInvoker;
}
@Override
- public void connected(OvsdbClient externalClient) {
+ public void connected(final OvsdbClient externalClient) {
LOG.info("OVSDB Connection from {}:{}",externalClient.getConnectionInfo().getRemoteAddress(),
externalClient.getConnectionInfo().getRemotePort());
OvsdbClientKey key = new OvsdbClientKey(externalClient);
- OvsdbConnectionInstance client = new OvsdbConnectionInstance(key,externalClient);
+ OvsdbConnectionInstance client = new OvsdbConnectionInstance(key,externalClient,txInvoker);
clients.put(key, client);
- WriteTransaction transaction = db.newWriteOnlyTransaction();
- transaction.put(LogicalDatastoreType.OPERATIONAL, key.toInstanceIndentifier(),
- SouthboundMapper.createNode(client));
- // TODO - Check the future and retry if needed
- transaction.submit();
}
@Override
LOG.info("OVSDB Disconnect from {}:{}",client.getConnectionInfo().getRemoteAddress(),
client.getConnectionInfo().getRemotePort());
OvsdbClientKey key = new OvsdbClientKey(client);
- WriteTransaction transaction = db.newWriteOnlyTransaction();
- transaction.delete(LogicalDatastoreType.OPERATIONAL, key.toInstanceIndentifier());
- // TODO - Check the future and retry if needed
- transaction.submit();
+ txInvoker.invoke(new OvsdbNodeRemoveCommand(key,null,null));
clients.remove(key);
}
public OvsdbClient connect(OvsdbNodeAugmentation ovsdbNode) throws UnknownHostException {
// TODO handle case where we already have a connection
- // TODO use transaction chains to handle ordering issues between disconnected and connected when writing to the operational store
+ // TODO use transaction chains to handle ordering issues between disconnected
+ // and connected when writing to the operational store
InetAddress ip = SouthboundMapper.createInetAddress(ovsdbNode.getIp());
- OvsdbClient client = OvsdbConnectionService.getService().connect(ip, ovsdbNode.getPort().getValue().intValue());
- OvsdbClientKey key = new OvsdbClientKey(client);
- OvsdbConnectionInstance instance = new OvsdbConnectionInstance(key,client);
- clients.put(key, instance);
- connected(client); // For connections from the controller to the ovs instance, the library doesn't call this method for us
+ OvsdbClient client = OvsdbConnectionService.getService().connect(ip,
+ ovsdbNode.getPort().getValue().intValue());
+ // For connections from the controller to the ovs instance, the library doesn't call
+ // this method for us
+ connected(client);
return client;
}
OvsdbClient client = clients.get(key);
if (client != null) {
client.disconnect();
- disconnected(client);
}
}
@Override
public void close() throws Exception {
- for(OvsdbClient client: clients.values()) {
+ for (OvsdbClient client: clients.values()) {
client.disconnect();
}
}
+ public OvsdbConnectionInstance getConnectionInstance(OvsdbClientKey key) {
+ return clients.get(key);
+ }
+
+ public OvsdbConnectionInstance getConnectionInstance(IpPortLocator loc) {
+ Preconditions.checkNotNull(loc);
+ return getConnectionInstance(new OvsdbClientKey(loc));
+ }
+
+ public OvsdbConnectionInstance getConnectionInstance(OvsdbBridgeAttributes mn) {
+ Optional<OvsdbNodeAugmentation> optional = SouthboundUtil.getManagingNode(db, mn);
+ if (optional.isPresent()) {
+ return getConnectionInstance(optional.get());
+ } else {
+ return null;
+ }
+ }
+
+ public OvsdbConnectionInstance getConnectionInstance(Node node) {
+ Preconditions.checkNotNull(node);
+ OvsdbNodeAugmentation ovsdbNode = node.getAugmentation(OvsdbNodeAugmentation.class);
+ OvsdbBridgeAugmentation ovsdbManagedNode = node.getAugmentation(OvsdbBridgeAugmentation.class);
+ if (ovsdbNode != null) {
+ return getConnectionInstance(ovsdbNode);
+ } else if (ovsdbManagedNode != null) {
+ return getConnectionInstance(ovsdbManagedNode);
+ } else {
+ LOG.warn("This is not a node that gives any hint how to find its OVSDB Manager: {}",node);
+ return null;
+ }
+ }
+ public OvsdbConnectionInstance getConnectionInstance(InstanceIdentifier<Node> nodePath) {
+ try {
+ ReadOnlyTransaction transaction = db.newReadOnlyTransaction();
+ CheckedFuture<Optional<Node>, ReadFailedException> nodeFuture = transaction.read(
+ LogicalDatastoreType.OPERATIONAL, nodePath);
+ transaction.close();
+ Optional<Node> optional = nodeFuture.get();
+ if (optional != null && optional.isPresent() && optional.get() instanceof Node) {
+ return this.getConnectionInstance(optional.get());
+ } else {
+ LOG.warn("Found non-topological node {} on path {}",optional);
+ return null;
+ }
+ } catch (Exception e) {
+ LOG.warn("Failed to get Ovsdb Node {}",nodePath, e);
+ return null;
+ }
+ }
+
+ public OvsdbClient getClient(OvsdbClientKey key) {
+ return getConnectionInstance(key);
+ }
+
+ public OvsdbClient getClient(IpPortLocator loc) {
+ return getConnectionInstance(loc);
+ }
+
+ public OvsdbClient getClient(OvsdbBridgeAttributes mn) {
+ return getConnectionInstance(mn);
+ }
+
+ public OvsdbClient getClient(Node node) {
+ return getConnectionInstance(node);
+ }
}
Code Review / ovsdb.git / blobdiff