import static org.opendaylight.ovsdb.lib.operations.Operations.op;
+import com.google.common.collect.Lists;
+import com.google.common.util.concurrent.ListenableFuture;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ExecutionException;
-
import javax.annotation.Nonnull;
-
+import org.opendaylight.controller.md.sal.binding.api.DataTreeModification;
import org.opendaylight.controller.md.sal.common.api.clustering.Entity;
import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipCandidateRegistration;
+import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
import org.opendaylight.ovsdb.lib.EchoServiceCallbackFilters;
import org.opendaylight.ovsdb.lib.LockAquisitionCallback;
import org.opendaylight.ovsdb.lib.LockStolenCallback;
import org.opendaylight.ovsdb.lib.schema.typed.TypedBaseTable;
import org.opendaylight.ovsdb.lib.schema.typed.TyperUtils;
import org.opendaylight.ovsdb.schema.openvswitch.OpenVSwitch;
+import org.opendaylight.ovsdb.southbound.ovsdb.transact.BridgeOperationalState;
import org.opendaylight.ovsdb.southbound.ovsdb.transact.TransactCommand;
import org.opendaylight.ovsdb.southbound.ovsdb.transact.TransactInvoker;
import org.opendaylight.ovsdb.southbound.ovsdb.transact.TransactInvokerImpl;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeKey;
+import org.opendaylight.yangtools.yang.binding.DataObject;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.collect.Lists;
-import com.google.common.util.concurrent.ListenableFuture;
-
public class OvsdbConnectionInstance implements OvsdbClient {
private static final Logger LOG = LoggerFactory.getLogger(OvsdbConnectionInstance.class);
private OvsdbClient client;
this.instanceIdentifier = iid;
}
- public void transact(TransactCommand command) {
- for (TransactInvoker transactInvoker: transactInvokers.values()) {
- transactInvoker.invoke(command);
+ /**
+ * Apply the given command to the given events, based on the given bridge state.
+ *
+ * @param command The command to run.
+ * @param state The current bridge state.
+ * @param events The events to process.
+ */
+ public void transact(TransactCommand command, BridgeOperationalState state,
+ AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> events) {
+ for (TransactInvoker transactInvoker : transactInvokers.values()) {
+ transactInvoker.invoke(command, state, events);
}
}
+ /**
+ * Apply the given command to the given modifications, based on the given bridge state.
+ *
+ * @param command The command to run.
+ * @param state The current bridge state.
+ * @param modifications The modifications to process.
+ */
+ public void transact(TransactCommand command, BridgeOperationalState state,
+ Collection<DataTreeModification<Node>> modifications) {
+ for (TransactInvoker transactInvoker : transactInvokers.values()) {
+ transactInvoker.invoke(command, state, modifications);
+ }
+ }
+
+ public ListenableFuture<List<OperationResult>> transact(
+ DatabaseSchema dbSchema, List<Operation> operations) {
+ return client.transact(dbSchema, operations);
+ }
+
public void registerCallbacks() {
- if ( this.callback == null) {
+ if (this.callback == null) {
if (this.initialCreateData != null ) {
this.updateConnectionAttributes();
}
if (transactInvokers == null) {
try {
transactInvokers = new HashMap<>();
- List<String> databases = getDatabases().get();
- for (String database : databases) {
- DatabaseSchema dbSchema = getSchema(database).get();
- if (dbSchema != null) {
- transactInvokers.put(dbSchema, new TransactInvokerImpl(this,dbSchema));
- }
+ DatabaseSchema dbSchema = getSchema(SouthboundConstants.OPEN_V_SWITCH).get();
+ if (dbSchema != null) {
+ transactInvokers.put(dbSchema, new TransactInvokerImpl(this,dbSchema));
}
} catch (InterruptedException | ExecutionException e) {
LOG.warn("Exception attempting to createTransactionInvokers {}", connectionInfo, e);
}
monitorRequests.add(monitorBuilder.with(new MonitorSelect(true, true, true, true)).build());
}
- this.callback.update(monitor(dbSchema, monitorRequests, callback),dbSchema);
+ this.callback.update(monitor(dbSchema, monitorRequests, callback), dbSchema);
} else {
LOG.warn("No tables for schema {} for database {} for key {}",dbSchema,database,connectionInfo);
}
try {
List<OperationResult> got = result.get();
LOG.debug("OVSDB transaction result: {}", got);
- } catch (Exception e) {
+ } catch (InterruptedException | ExecutionException e) {
LOG.warn("Transact execution exception: ", e);
}
LOG.trace("invoke exit tb: {}", txBuilder);
return client.transactBuilder(dbSchema);
}
- public ListenableFuture<List<OperationResult>> transact(
- DatabaseSchema dbSchema, List<Operation> operations) {
- return client.transact(dbSchema, operations);
+ @Override
+ public <E extends TableSchema<E>> TableUpdates monitor(
+ DatabaseSchema schema, List<MonitorRequest> monitorRequests,
+ MonitorHandle monitorHandle, MonitorCallBack callbackArgument) {
+ return null;
}
public <E extends TableSchema<E>> TableUpdates monitor(
DatabaseSchema schema, List<MonitorRequest> monitorRequests,
- MonitorCallBack callback) {
- return client.monitor(schema, monitorRequests, callback);
+ MonitorCallBack callbackArgument) {
+ return client.monitor(schema, monitorRequests, callbackArgument);
}
public void cancelMonitor(MonitorHandle handler) {
this.instanceIdentifier = iid;
}
- @Override
- public <E extends TableSchema<E>> TableUpdates monitor(
- DatabaseSchema schema, List<MonitorRequest> monitorRequests,
- MonitorHandle monitorHandle, MonitorCallBack callback) {
- return null;
- }
-
public Entity getConnectedEntity() {
return this.connectedEntity;
}
public OvsdbNodeAugmentation getOvsdbNodeAugmentation() {
return this.initialCreateData;
}
+
public void setOvsdbNodeAugmentation(OvsdbNodeAugmentation ovsdbNodeCreateData) {
this.initialCreateData = ovsdbNodeCreateData;
}
+
+ @Override
+ public ListenableFuture<List<String>> echo() {
+ return client.echo();
+ }
}