+/*
+ * Copyright (c) 2015 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,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
package org.opendaylight.ovsdb.southbound;
import java.net.UnknownHostException;
-import java.util.HashSet;
+import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
+import org.opendaylight.controller.md.sal.binding.api.ClusteredDataChangeListener;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.md.sal.binding.api.DataChangeListener;
import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope;
import org.opendaylight.ovsdb.southbound.ovsdb.transact.TransactCommandAggregator;
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.ovsdb.node.attributes.ConnectionInfo;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.TopologyKey;
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.node.TerminationPoint;
import org.opendaylight.yangtools.concepts.ListenerRegistration;
import org.opendaylight.yangtools.yang.binding.DataObject;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import com.google.common.base.Predicates;
import com.google.common.collect.Maps;
-public class OvsdbDataChangeListener implements DataChangeListener, AutoCloseable {
+public class OvsdbDataChangeListener implements ClusteredDataChangeListener, AutoCloseable {
private ListenerRegistration<DataChangeListener> registration;
private OvsdbConnectionManager cm;
public void onDataChanged(
AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> changes) {
LOG.trace("onDataChanged: {}", changes);
+ for (Entry<InstanceIdentifier<?>, DataObject> created : changes.getCreatedData().entrySet()) {
+ // TODO validate we have the correct kind of InstanceIdentifier
+ if (created.getValue() instanceof OvsdbNodeAugmentation) {
+ OvsdbNodeAugmentation ovsdbNode = (OvsdbNodeAugmentation)created.getValue();
+ ConnectionInfo key = ovsdbNode.getConnectionInfo();
+ InstanceIdentifier<Node> iid = cm.getInstanceIdentifier(key);
+ if ( iid != null) {
+ LOG.warn("Connection to device {} already exists. Plugin does not allow multiple connections "
+ + "to same device, hence dropping the request {}", key, ovsdbNode);
+ return;
+ }
+ }
+ }
// Connect first if we have to:
connect(changes);
// Finally disconnect if we need to
disconnect(changes);
+ init(changes);
+
+ LOG.trace("onDataChanged: exit");
}
private void updateData(
AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> changes) {
- for (OvsdbConnectionInstance connectionInstance : connectionInstancesFromChanges(changes)) {
+ for (Entry<InstanceIdentifier<Node>, OvsdbConnectionInstance> connectionInstanceEntry :
+ connectionInstancesFromChanges(changes).entrySet()) {
+ OvsdbConnectionInstance connectionInstance = connectionInstanceEntry.getValue();
connectionInstance.transact(new TransactCommandAggregator(
new BridgeOperationalState(db, changes),
new DataChangesManagedByOvsdbNodeEvent(
- SouthboundMapper.createInstanceIdentifier(connectionInstance.getMDConnectionInfo()),
+ connectionInstance.getInstanceIdentifier(),
changes)));
}
}
if (original.getValue() instanceof OvsdbNodeAugmentation) {
try {
cm.disconnect((OvsdbNodeAugmentation) original.getValue());
- cm.connect(value);
+ cm.connect((InstanceIdentifier<Node>) original.getKey(),value);
} catch (UnknownHostException e) {
LOG.warn("Failed to disconnect to ovsdbNode", e);
}
// TODO validate we have the correct kind of InstanceIdentifier
if (created.getValue() instanceof OvsdbNodeAugmentation) {
try {
- cm.connect((OvsdbNodeAugmentation) created.getValue());
+ cm.connect((InstanceIdentifier<Node>) created.getKey(),
+ (OvsdbNodeAugmentation) created.getValue());
} catch (UnknownHostException e) {
LOG.warn("Failed to connect to ovsdbNode", e);
}
}
}
- public Set<OvsdbConnectionInstance> connectionInstancesFromChanges(
+ private void init(
AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> changes) {
- Set<OvsdbConnectionInstance> result = new HashSet<OvsdbConnectionInstance>();
- result.addAll(connectionInstancesFromMap(changes.getCreatedData()));
- result.addAll(connectionInstancesFromMap(changes.getUpdatedData()));
- result.addAll(connectionInstancesFromMap(
+ for (Entry<InstanceIdentifier<?>, DataObject> created : changes.getCreatedData().entrySet()) {
+ if (created.getValue() instanceof OvsdbNodeAugmentation) {
+ OvsdbNodeAugmentation ovsdbNode = (OvsdbNodeAugmentation)created.getValue();
+ cm.init(ovsdbNode.getConnectionInfo());
+ }
+ }
+
+ }
+
+ public Map<InstanceIdentifier<Node>,OvsdbConnectionInstance> connectionInstancesFromChanges(
+ AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> changes) {
+ Map<InstanceIdentifier<Node>,OvsdbConnectionInstance> result =
+ new HashMap<InstanceIdentifier<Node>,OvsdbConnectionInstance>();
+ result.putAll(connectionInstancesFromMap(changes.getCreatedData()));
+ result.putAll(connectionInstancesFromMap(changes.getUpdatedData()));
+ result.putAll(connectionInstancesFromMap(
Maps.filterKeys(changes.getOriginalData(), Predicates.in(changes.getRemovedPaths()))));
return result;
}
- public Set<OvsdbConnectionInstance> connectionInstancesFromMap(Map<InstanceIdentifier<?>, DataObject> map) {
+ public Map<InstanceIdentifier<Node>,OvsdbConnectionInstance> connectionInstancesFromMap(Map<InstanceIdentifier<?>,
+ DataObject> map) {
Preconditions.checkNotNull(map);
- Set<OvsdbConnectionInstance> result = new HashSet<OvsdbConnectionInstance>();
+ Map<InstanceIdentifier<Node>,OvsdbConnectionInstance> result =
+ new HashMap<InstanceIdentifier<Node>,OvsdbConnectionInstance>();
for ( Entry<InstanceIdentifier<?>, DataObject> created : map.entrySet()) {
if (created.getValue() instanceof Node) {
+ OvsdbConnectionInstance client = null;
LOG.debug("Received request for {}",created.getValue());
OvsdbBridgeAugmentation bridge =
((Node)created.getValue()).getAugmentation(OvsdbBridgeAugmentation.class);
if (bridge != null) {
- OvsdbConnectionInstance client = cm.getConnectionInstance(bridge);
- if (client != null) {
- LOG.debug("Found client for {}", created.getValue());
- result.add(client);
- } else {
- LOG.debug("Did not find client for {}",created.getValue());
- }
+ client = cm.getConnectionInstance(bridge);
} else {
OvsdbNodeAugmentation ovsNode =
((Node)created.getValue()).getAugmentation(OvsdbNodeAugmentation.class);
if (ovsNode != null && ovsNode.getConnectionInfo() != null) {
- OvsdbConnectionInstance client = cm.getConnectionInstance(ovsNode.getConnectionInfo());
- if (client != null) {
- LOG.debug("Found client for {}", created.getValue());
- result.add(client);
- } else {
- LOG.debug("Did not find client for {}",created.getValue());
+ client = cm.getConnectionInstance(ovsNode.getConnectionInfo());
+ } else {
+ List<TerminationPoint> terminationPoint = ((Node)created.getValue()).getTerminationPoint();
+ if (!terminationPoint.isEmpty()) {
+ InstanceIdentifier<Node> nodeIid = SouthboundMapper.
+ createInstanceIdentifier(((Node)created.getValue()).getNodeId());
+ client = cm.getConnectionInstance(nodeIid);
}
}
}
+ if (client != null) {
+ LOG.debug("Found client for {}", created.getValue());
+ result.put((InstanceIdentifier<Node>) created.getKey(), client);
+ } else {
+ LOG.debug("Did not find client for {}",created.getValue());
+ }
}
}
return result;
Code Review / ovsdb.git / blobdiff