/*
- * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2015, 2016 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,
*/
package org.opendaylight.ovsdb.southbound;
+import static org.opendaylight.ovsdb.lib.operations.Operations.op;
+
+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.common.api.clustering.Entity;
import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipCandidateRegistration;
import org.opendaylight.ovsdb.lib.EchoServiceCallbackFilters;
import org.opendaylight.ovsdb.lib.message.MonitorRequestBuilder;
import org.opendaylight.ovsdb.lib.message.MonitorSelect;
import org.opendaylight.ovsdb.lib.message.TableUpdates;
+import org.opendaylight.ovsdb.lib.notation.Mutator;
import org.opendaylight.ovsdb.lib.notation.Row;
+import org.opendaylight.ovsdb.lib.operations.Mutate;
import org.opendaylight.ovsdb.lib.operations.Operation;
import org.opendaylight.ovsdb.lib.operations.OperationResult;
import org.opendaylight.ovsdb.lib.operations.TransactionBuilder;
import org.opendaylight.ovsdb.lib.schema.GenericTableSchema;
import org.opendaylight.ovsdb.lib.schema.TableSchema;
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.TransactCommand;
import org.opendaylight.ovsdb.southbound.ovsdb.transact.TransactInvoker;
import org.opendaylight.ovsdb.southbound.ovsdb.transact.TransactInvokerImpl;
+import org.opendaylight.ovsdb.southbound.ovsdb.transact.TransactUtils;
import org.opendaylight.ovsdb.southbound.transactions.md.TransactionInvoker;
+import org.opendaylight.ovsdb.utils.yang.YangUtils;
+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.ovsdb.node.attributes.ConnectionInfo;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.node.attributes.OpenvswitchExternalIds;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.node.attributes.OpenvswitchOtherConfigs;
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 com.google.common.collect.Lists;
import com.google.common.util.concurrent.ListenableFuture;
-import javax.annotation.Nonnull;
-
public class OvsdbConnectionInstance implements OvsdbClient {
private static final Logger LOG = LoggerFactory.getLogger(OvsdbConnectionInstance.class);
private OvsdbClient client;
private TransactionInvoker txInvoker;
private Map<DatabaseSchema,TransactInvoker> transactInvokers;
private MonitorCallBack callback;
- // private ConnectionInfo key;
private InstanceIdentifier<Node> instanceIdentifier;
private volatile boolean hasDeviceOwnership = false;
private Entity connectedEntity;
private EntityOwnershipCandidateRegistration deviceOwnershipCandidateRegistration;
+ private OvsdbNodeAugmentation initialCreateData = null;
OvsdbConnectionInstance(ConnectionInfo key,OvsdbClient client,TransactionInvoker txInvoker,
InstanceIdentifier<Node> iid) {
public void registerCallbacks() {
if ( this.callback == null) {
+ if (this.initialCreateData != null ) {
+ this.updateConnectionAttributes();
+ }
+
try {
- List<String> databases = getDatabases().get();
- this.callback = new OvsdbMonitorCallback(this,txInvoker);
- for (String database : databases) {
- DatabaseSchema dbSchema = getSchema(database).get();
- if (dbSchema != null) {
- monitorAllTables(database, dbSchema);
- } else {
- LOG.warn("No schema reported for database {} for key {}",database,connectionInfo);
- }
+ String database = SouthboundConstants.OPEN_V_SWITCH;
+ DatabaseSchema dbSchema = getSchema(database).get();
+ if (dbSchema != null) {
+ LOG.info("Monitoring database: {}", database);
+ callback = new OvsdbMonitorCallback(this, txInvoker);
+ monitorAllTables(database, dbSchema);
+ } else {
+ LOG.info("No database {} found on {}", database, connectionInfo);
}
} catch (InterruptedException | ExecutionException e) {
- LOG.warn("Exception attempting to registerCallbacks {}: {}",connectionInfo,e);
+ LOG.warn("Exception attempting to registerCallbacks {}: ", connectionInfo, e);
}
}
}
public void createTransactInvokers() {
if (transactInvokers == null) {
try {
- transactInvokers = new HashMap<DatabaseSchema,TransactInvoker>();
+ transactInvokers = new HashMap<>();
List<String> databases = getDatabases().get();
for (String database : databases) {
DatabaseSchema dbSchema = getSchema(database).get();
}
}
} catch (InterruptedException | ExecutionException e) {
- LOG.warn("Exception attempting to createTransactionInvokers {}: {}",connectionInfo,e);
+ LOG.warn("Exception attempting to createTransactionInvokers {}", connectionInfo, e);
}
}
}
-
-
private void monitorAllTables(String database, DatabaseSchema dbSchema) {
Set<String> tables = dbSchema.getTables();
if (tables != null) {
- List<MonitorRequest<GenericTableSchema>> monitorRequests = Lists.newArrayList();
+ List<MonitorRequest> monitorRequests = Lists.newArrayList();
for (String tableName : tables) {
+ LOG.info("Southbound monitoring table {} in {}", tableName, dbSchema.getName());
GenericTableSchema tableSchema = dbSchema.table(tableName, GenericTableSchema.class);
Set<String> columns = tableSchema.getColumns();
MonitorRequestBuilder<GenericTableSchema> monitorBuilder = MonitorRequestBuilder.builder(tableSchema);
}
}
+ private void updateConnectionAttributes() {
+ 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()) {
+
+ TransactionBuilder transaction = new TransactionBuilder(this, entry.getKey());
+
+ // OpenVSwitchPart
+ OpenVSwitch ovs = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), OpenVSwitch.class);
+
+ List<OpenvswitchExternalIds> externalIds = this.initialCreateData.getOpenvswitchExternalIds();
+
+ stampInstanceIdentifier(transaction,this.instanceIdentifier.firstIdentifierOf(Node.class));
+
+ try {
+ ovs.setExternalIds(
+ YangUtils.convertYangKeyValueListToMap(externalIds, OpenvswitchExternalIds::getExternalIdKey,
+ OpenvswitchExternalIds::getExternalIdValue));
+ Mutate<GenericTableSchema> mutate = op.mutate(ovs)
+ .addMutation(ovs.getExternalIdsColumn().getSchema(),
+ Mutator.INSERT,
+ ovs.getExternalIdsColumn().getData());
+ transaction.add(mutate);
+ } catch (NullPointerException e) {
+ LOG.warn("Incomplete OVSDB Node external IDs", e);
+ }
+
+
+
+ List<OpenvswitchOtherConfigs> otherConfigs = this.initialCreateData.getOpenvswitchOtherConfigs();
+ if (otherConfigs != null) {
+ try {
+ ovs.setOtherConfig(YangUtils.convertYangKeyValueListToMap(otherConfigs,
+ OpenvswitchOtherConfigs::getOtherConfigKey,
+ OpenvswitchOtherConfigs::getOtherConfigValue));
+ transaction.add(op.mutate(ovs).addMutation(ovs.getOtherConfigColumn().getSchema(),
+ Mutator.INSERT,
+ ovs.getOtherConfigColumn().getData()));
+ } catch (NullPointerException e) {
+ LOG.warn("Incomplete OVSDB Node other_config", e);
+ }
+ }
+
+ invoke(transaction);
+ }
+ }
+
+ private void stampInstanceIdentifier(TransactionBuilder transaction,InstanceIdentifier<Node> iid) {
+ OpenVSwitch ovs = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), OpenVSwitch.class);
+ ovs.setExternalIds(Collections.<String,String>emptyMap());
+ TransactUtils.stampInstanceIdentifier(transaction,
+ iid,
+ ovs.getSchema(),
+ ovs.getExternalIdsColumn().getSchema());
+ }
+
+ private void invoke(TransactionBuilder txBuilder) {
+ ListenableFuture<List<OperationResult>> result = txBuilder.execute();
+ LOG.debug("invoke: tb: {}", txBuilder);
+ if (txBuilder.getOperations().size() > 0) {
+ try {
+ List<OperationResult> got = result.get();
+ LOG.debug("OVSDB transaction result: {}", got);
+ } catch (Exception e) {
+ LOG.warn("Transact execution exception: ", e);
+ }
+ LOG.trace("invoke exit tb: {}", txBuilder);
+ }
+ }
+
+
public ListenableFuture<List<String>> getDatabases() {
return client.getDatabases();
}
}
public <E extends TableSchema<E>> TableUpdates monitor(
- DatabaseSchema schema, List<MonitorRequest<E>> monitorRequests,
+ DatabaseSchema schema, List<MonitorRequest> monitorRequests,
MonitorCallBack callback) {
return client.monitor(schema, monitorRequests, callback);
}
@Override
public <E extends TableSchema<E>> TableUpdates monitor(
- DatabaseSchema schema, List<MonitorRequest<E>> monitorRequests,
+ DatabaseSchema schema, List<MonitorRequest> monitorRequests,
MonitorHandle monitorHandle, MonitorCallBack callback) {
return null;
}
}
public Boolean getHasDeviceOwnership() {
- return Boolean.valueOf(hasDeviceOwnership);
+ return hasDeviceOwnership;
}
public void setHasDeviceOwnership(Boolean hasDeviceOwnership) {
if (hasDeviceOwnership != null) {
- this.hasDeviceOwnership = hasDeviceOwnership.booleanValue();
+ this.hasDeviceOwnership = hasDeviceOwnership;
}
}
setHasDeviceOwnership(Boolean.FALSE);
}
}
+
+ public OvsdbNodeAugmentation getOvsdbNodeAugmentation() {
+ return this.initialCreateData;
+ }
+ public void setOvsdbNodeAugmentation(OvsdbNodeAugmentation ovsdbNodeCreateData) {
+ this.initialCreateData = ovsdbNodeCreateData;
+ }
}
Code Review / ovsdb.git / blobdiff