Merge "Renaming ovsdb-managed-node-augmentation to ovsdb-bridge-augmentation."

[ovsdb.git] / southbound / southbound-impl / src / main / java / org / opendaylight / ovsdb / southbound / OvsdbConnectionManager.java

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 3860d4180121822a377b0070ffd9e750562541f9..7946d03404e09851d3afa2395b1ecbd5c0a6cac0 100644 (file)
--- 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
@@ -14,15 +14,16 @@ import java.util.concurrent.ConcurrentHashMap;
 
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
-import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 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.OvsdbManagedNodeAugmentation;
+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.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbNodeRef;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
@@ -36,24 +37,21 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos
     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
@@ -61,10 +59,7 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos
         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);
     }
 
@@ -73,9 +68,6 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos
         // 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
         return client;
     }
@@ -95,16 +87,16 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos
         }
     }
 
-    public OvsdbClient getClient(OvsdbClientKey key) {
+    public OvsdbConnectionInstance getConnectionInstance(OvsdbClientKey key) {
         return clients.get(key);
     }
 
-    public OvsdbClient getClient(IpPortLocator loc) {
+    public OvsdbConnectionInstance getConnectionInstance(IpPortLocator loc) {
         Preconditions.checkNotNull(loc);
-        return getClient(new OvsdbClientKey(loc));
+        return getConnectionInstance(new OvsdbClientKey(loc));
     }
 
-    public OvsdbClient getClient(OvsdbBridgeAttributes mn) {
+    public OvsdbConnectionInstance getConnectionInstance(OvsdbBridgeAttributes mn) {
         Preconditions.checkNotNull(mn);
         try {
             OvsdbNodeRef ref = mn.getManagedBy();
@@ -116,7 +108,7 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos
                 if(obj instanceof Node) {
                     OvsdbNodeAugmentation ovsdbNode = ((Node)obj).getAugmentation(OvsdbNodeAugmentation.class);
                     if(ovsdbNode !=null) {
-                        return getClient(ovsdbNode);
+                        return getConnectionInstance(ovsdbNode);
                     } else {
                         LOG.warn("OvsdbManagedNode {} claims to be managed by {} but that OvsdbNode does not exist",mn,ref.getValue());
                         return null;
@@ -135,17 +127,33 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos
          }
     }
 
-    public OvsdbClient getClient(Node node) {
+    public OvsdbConnectionInstance getConnectionInstance(Node node) {
         Preconditions.checkNotNull(node);
         OvsdbNodeAugmentation ovsdbNode = node.getAugmentation(OvsdbNodeAugmentation.class);
-        OvsdbManagedNodeAugmentation ovsdbManagedNode = node.getAugmentation(OvsdbManagedNodeAugmentation.class);
+        OvsdbBridgeAugmentation ovsdbManagedNode = node.getAugmentation(OvsdbBridgeAugmentation.class);
         if(ovsdbNode != null) {
-            return getClient(ovsdbNode);
+            return getConnectionInstance(ovsdbNode);
         } else if (ovsdbManagedNode != null) {
-            return getClient(ovsdbManagedNode);
+            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 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);
+    }
 }