X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=southbound%2Fsouthbound-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fovsdb%2Fsouthbound%2FOvsdbConnectionInstance.java;h=b3378861d71f673cde913f8ce60e08e4dfc417d0;hb=fcfb5e64040407dbc2c1682ebe081c13d048811c;hp=c477cb0ee6f0fc6a6c35c7b6a045a4ce0376ac6d;hpb=cfb6abf8d000ebca1f7585e1cda58cd82e21f329;p=ovsdb.git diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionInstance.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionInstance.java index c477cb0ee..b3378861d 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionInstance.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionInstance.java @@ -1,5 +1,5 @@ /* - * 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, @@ -9,17 +9,20 @@ package org.opendaylight.ovsdb.southbound; 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; @@ -43,11 +46,13 @@ 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.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.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; @@ -55,14 +60,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.re 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.ImmutableMap; -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; @@ -70,7 +72,6 @@ public class OvsdbConnectionInstance implements OvsdbClient { private TransactionInvoker txInvoker; private Map transactInvokers; private MonitorCallBack callback; - // private ConnectionInfo key; private InstanceIdentifier instanceIdentifier; private volatile boolean hasDeviceOwnership = false; private Entity connectedEntity; @@ -86,12 +87,39 @@ public class OvsdbConnectionInstance implements OvsdbClient { 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, 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> modifications) { + for (TransactInvoker transactInvoker : transactInvokers.values()) { + transactInvoker.invoke(command, state, modifications); } } + public ListenableFuture> transact( + DatabaseSchema dbSchema, List operations) { + return client.transact(dbSchema, operations); + } + public void registerCallbacks() { if ( this.callback == null) { if (this.initialCreateData != null ) { @@ -99,18 +127,17 @@ public class OvsdbConnectionInstance implements OvsdbClient { } try { - List 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); } } } @@ -118,16 +145,13 @@ public class OvsdbConnectionInstance implements OvsdbClient { public void createTransactInvokers() { if (transactInvokers == null) { try { - transactInvokers = new HashMap(); - List databases = getDatabases().get(); - for (String database : databases) { - DatabaseSchema dbSchema = getSchema(database).get(); - if (dbSchema != null) { - transactInvokers.put(dbSchema, new TransactInvokerImpl(this,dbSchema)); - } + transactInvokers = new HashMap<>(); + 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); + LOG.warn("Exception attempting to createTransactionInvokers {}", connectionInfo, e); } } } @@ -135,8 +159,9 @@ public class OvsdbConnectionInstance implements OvsdbClient { private void monitorAllTables(String database, DatabaseSchema dbSchema) { Set tables = dbSchema.getTables(); if (tables != null) { - List> monitorRequests = Lists.newArrayList(); + List monitorRequests = Lists.newArrayList(); for (String tableName : tables) { + LOG.info("Southbound monitoring table {} in {}", tableName, dbSchema.getName()); GenericTableSchema tableSchema = dbSchema.table(tableName, GenericTableSchema.class); Set columns = tableSchema.getColumns(); MonitorRequestBuilder monitorBuilder = MonitorRequestBuilder.builder(tableSchema); @@ -161,39 +186,32 @@ public class OvsdbConnectionInstance implements OvsdbClient { // OpenVSwitchPart OpenVSwitch ovs = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), OpenVSwitch.class); - Map externalIdsMap = new HashMap(); List externalIds = this.initialCreateData.getOpenvswitchExternalIds(); - if (externalIds != null) { - for (OpenvswitchExternalIds externalId : externalIds) { - externalIdsMap.put(externalId.getExternalIdKey(), externalId.getExternalIdValue()); - } - } - stampInstanceIdentifier(transaction,this.instanceIdentifier.firstIdentifierOf(Node.class)); try { - ovs.setExternalIds(ImmutableMap.copyOf(externalIdsMap)); + ovs.setExternalIds( + YangUtils.convertYangKeyValueListToMap(externalIds, OpenvswitchExternalIds::getExternalIdKey, + OpenvswitchExternalIds::getExternalIdValue)); Mutate 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"); + LOG.warn("Incomplete OVSDB Node external IDs", e); } List otherConfigs = this.initialCreateData.getOpenvswitchOtherConfigs(); if (otherConfigs != null) { - Map otherConfigsMap = new HashMap(); - for (OpenvswitchOtherConfigs otherConfig : otherConfigs) { - otherConfigsMap.put(otherConfig.getOtherConfigKey(), otherConfig.getOtherConfigValue()); - } try { - ovs.setOtherConfig(ImmutableMap.copyOf(otherConfigsMap)); + ovs.setOtherConfig(YangUtils.convertYangKeyValueListToMap(otherConfigs, + OpenvswitchOtherConfigs::getOtherConfigKey, + OpenvswitchOtherConfigs::getOtherConfigValue)); transaction.add(op.mutate(ovs).addMutation(ovs.getOtherConfigColumn().getSchema(), Mutator.INSERT, ovs.getOtherConfigColumn().getData())); @@ -242,13 +260,15 @@ public class OvsdbConnectionInstance implements OvsdbClient { return client.transactBuilder(dbSchema); } - public ListenableFuture> transact( - DatabaseSchema dbSchema, List operations) { - return client.transact(dbSchema, operations); + @Override + public > TableUpdates monitor( + DatabaseSchema schema, List monitorRequests, + MonitorHandle monitorHandle, MonitorCallBack callback) { + return null; } public > TableUpdates monitor( - DatabaseSchema schema, List> monitorRequests, + DatabaseSchema schema, List monitorRequests, MonitorCallBack callback) { return client.monitor(schema, monitorRequests, callback); } @@ -332,13 +352,6 @@ public class OvsdbConnectionInstance implements OvsdbClient { this.instanceIdentifier = iid; } - @Override - public > TableUpdates monitor( - DatabaseSchema schema, List> monitorRequests, - MonitorHandle monitorHandle, MonitorCallBack callback) { - return null; - } - public Entity getConnectedEntity() { return this.connectedEntity; } @@ -352,12 +365,12 @@ public class OvsdbConnectionInstance implements OvsdbClient { } public Boolean getHasDeviceOwnership() { - return Boolean.valueOf(hasDeviceOwnership); + return hasDeviceOwnership; } public void setHasDeviceOwnership(Boolean hasDeviceOwnership) { if (hasDeviceOwnership != null) { - this.hasDeviceOwnership = hasDeviceOwnership.booleanValue(); + this.hasDeviceOwnership = hasDeviceOwnership; } } @@ -375,7 +388,13 @@ public class OvsdbConnectionInstance implements OvsdbClient { public OvsdbNodeAugmentation getOvsdbNodeAugmentation() { return this.initialCreateData; } + public void setOvsdbNodeAugmentation(OvsdbNodeAugmentation ovsdbNodeCreateData) { this.initialCreateData = ovsdbNodeCreateData; } + + @Override + public void echo() { + client.echo(); + } }