/*
- * Copyright (c) 2015, 2016 Cisco Systems, Inc. and others. All rights reserved.
+ * Copyright © 2015, 2017 Cisco Systems, 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,
import static org.opendaylight.ovsdb.lib.operations.Operations.op;
-import com.google.common.collect.Lists;
+import com.google.common.annotations.VisibleForTesting;
import com.google.common.util.concurrent.ListenableFuture;
-
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ExecutionException;
-
-import javax.annotation.Nonnull;
-
+import org.eclipse.jdt.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.mdsal.eos.binding.api.Entity;
+import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipCandidateRegistration;
import org.opendaylight.ovsdb.lib.LockAquisitionCallback;
import org.opendaylight.ovsdb.lib.LockStolenCallback;
import org.opendaylight.ovsdb.lib.MonitorCallBack;
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.DataChangeEvent;
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;
public class OvsdbConnectionInstance {
private static final Logger LOG = LoggerFactory.getLogger(OvsdbConnectionInstance.class);
- private OvsdbClient client;
+ private final OvsdbClient client;
private ConnectionInfo connectionInfo;
- private TransactionInvoker txInvoker;
+ private final TransactionInvoker txInvoker;
private Map<DatabaseSchema,TransactInvoker> transactInvokers;
private MonitorCallBack callback;
private InstanceIdentifier<Node> instanceIdentifier;
* @param command The command to run.
* @param state The current bridge state.
* @param events The events to process.
+ * @param instanceIdentifierCodec The instance identifier codec to use.
*/
public void transact(TransactCommand command, BridgeOperationalState state,
- AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> events) {
+ DataChangeEvent events, InstanceIdentifierCodec instanceIdentifierCodec) {
for (TransactInvoker transactInvoker : transactInvokers.values()) {
- transactInvoker.invoke(command, state, events);
+ transactInvoker.invoke(command, state, events, instanceIdentifierCodec);
}
}
* @param command The command to run.
* @param state The current bridge state.
* @param modifications The modifications to process.
+ * @param instanceIdentifierCodec The instance identifier codec to use.
*/
public void transact(TransactCommand command, BridgeOperationalState state,
- Collection<DataTreeModification<Node>> modifications) {
+ Collection<DataTreeModification<Node>> modifications, InstanceIdentifierCodec instanceIdentifierCodec) {
for (TransactInvoker transactInvoker : transactInvokers.values()) {
- transactInvoker.invoke(command, state, modifications);
+ transactInvoker.invoke(command, state, modifications, instanceIdentifierCodec);
}
}
return client.transact(dbSchema, operations);
}
- public void registerCallbacks() {
+ public void registerCallbacks(InstanceIdentifierCodec instanceIdentifierCodec) {
if (this.callback == null) {
- if (this.initialCreateData != null ) {
- this.updateConnectionAttributes();
+ if (this.initialCreateData != null) {
+ this.updateConnectionAttributes(instanceIdentifierCodec);
}
try {
DatabaseSchema dbSchema = getSchema(database).get();
if (dbSchema != null) {
LOG.info("Monitoring database: {}", database);
- callback = new OvsdbMonitorCallback(this, txInvoker);
+ callback = new OvsdbMonitorCallback(instanceIdentifierCodec, this, txInvoker);
monitorTables(database, dbSchema);
} else {
LOG.info("No database {} found on {}", database, connectionInfo);
}
}
- private void monitorTables(String database, DatabaseSchema dbSchema) {
+ @VisibleForTesting
+ void monitorTables(String database, DatabaseSchema dbSchema) {
Set<String> tables = dbSchema.getTables();
if (tables != null) {
- List<MonitorRequest> monitorRequests = Lists.newArrayList();
+ List<MonitorRequest> monitorRequests = new ArrayList<>();
for (String tableName : tables) {
if (!SouthboundConstants.SKIP_OVSDB_TABLE.contains(tableName)) {
LOG.info("Southbound monitoring OVSDB schema table {}", tableName);
GenericTableSchema tableSchema = dbSchema.table(tableName, GenericTableSchema.class);
- Set<String> columns = tableSchema.getColumns();
- MonitorRequestBuilder<GenericTableSchema> monitorBuilder
- = MonitorRequestBuilder.builder(tableSchema);
+ // We copy the columns so we can clean the set up later
+ Set<String> columns = new HashSet<>(tableSchema.getColumns());
List<String> skipColumns = SouthboundConstants.SKIP_COLUMN_FROM_TABLE.get(tableName);
- for (String column : columns) {
- if ( skipColumns == null || !skipColumns.contains(column)) {
- monitorBuilder.addColumn(column);
- } else {
- LOG.info("Southbound NOT monitoring column {} in table {}", column, tableName);
- }
+ if (skipColumns != null) {
+ LOG.info("Southbound NOT monitoring columns {} in table {}", skipColumns, tableName);
+ columns.removeAll(skipColumns);
}
- monitorRequests.add(monitorBuilder.with(new MonitorSelect(true, true, true, true)).build());
+ monitorRequests.add(new MonitorRequestBuilder<>(tableSchema)
+ .addColumns(columns)
+ .with(new MonitorSelect(true, true, true, true)).build());
}
}
this.callback.update(monitor(dbSchema, monitorRequests, callback), dbSchema);
}
}
- private void updateConnectionAttributes() {
+ private void updateConnectionAttributes(InstanceIdentifierCodec instanceIdentifierCodec) {
LOG.debug("Update attributes of ovsdb node ip: {} port: {}",
this.initialCreateData.getConnectionInfo().getRemoteIp(),
this.initialCreateData.getConnectionInfo().getRemotePort());
- for ( Map.Entry<DatabaseSchema,TransactInvoker> entry: transactInvokers.entrySet()) {
+ for (Map.Entry<DatabaseSchema,TransactInvoker> entry: transactInvokers.entrySet()) {
TransactionBuilder transaction = new TransactionBuilder(this.client, entry.getKey());
List<OpenvswitchExternalIds> externalIds = this.initialCreateData.getOpenvswitchExternalIds();
- stampInstanceIdentifier(transaction,this.instanceIdentifier.firstIdentifierOf(Node.class));
+ stampInstanceIdentifier(transaction, this.instanceIdentifier.firstIdentifierOf(Node.class),
+ instanceIdentifierCodec);
try {
ovs.setExternalIds(
}
}
- private void stampInstanceIdentifier(TransactionBuilder transaction,InstanceIdentifier<Node> iid) {
+ private void stampInstanceIdentifier(TransactionBuilder transaction,InstanceIdentifier<Node> iid,
+ InstanceIdentifierCodec instanceIdentifierCodec) {
OpenVSwitch ovs = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), OpenVSwitch.class);
- ovs.setExternalIds(Collections.<String,String>emptyMap());
- TransactUtils.stampInstanceIdentifier(transaction,
- iid,
- ovs.getSchema(),
- ovs.getExternalIdsColumn().getSchema());
+ ovs.setExternalIds(Collections.emptyMap());
+ TransactUtils.stampInstanceIdentifier(transaction, iid, ovs.getSchema(), ovs.getExternalIdsColumn().getSchema(),
+ instanceIdentifierCodec);
}
private void invoke(TransactionBuilder txBuilder) {
}
public NodeKey getNodeKey() {
- return getInstanceIdentifier().firstKeyOf(Node.class, NodeKey.class);
+ return getInstanceIdentifier().firstKeyOf(Node.class);
}
public NodeId getNodeId() {
return this.connectedEntity;
}
- public void setConnectedEntity(Entity entity ) {
+ public void setConnectedEntity(Entity entity) {
this.connectedEntity = entity;
}
public void setHasDeviceOwnership(Boolean hasDeviceOwnership) {
if (hasDeviceOwnership != null) {
+ LOG.debug("Ownership status for {} old {} new {}",
+ instanceIdentifier, this.hasDeviceOwnership, hasDeviceOwnership);
this.hasDeviceOwnership = hasDeviceOwnership;
}
}
- public void setDeviceOwnershipCandidateRegistration(@Nonnull EntityOwnershipCandidateRegistration registration) {
+ public void setDeviceOwnershipCandidateRegistration(@NonNull EntityOwnershipCandidateRegistration registration) {
this.deviceOwnershipCandidateRegistration = registration;
}
Code Review / ovsdb.git / blobdiff