/*
- * Copyright (C) 2015 Red Hat, Inc.
+ * Copyright (c) 2015 Red Hat, 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
- *
- * Authors : Flavio Fernandes
*/
package org.opendaylight.ovsdb.openstack.netvirt.impl;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
import org.opendaylight.ovsdb.openstack.netvirt.AbstractEvent;
import org.opendaylight.ovsdb.openstack.netvirt.AbstractHandler;
+import org.opendaylight.ovsdb.openstack.netvirt.ConfigInterface;
import org.opendaylight.ovsdb.openstack.netvirt.NodeCacheManagerEvent;
import org.opendaylight.ovsdb.openstack.netvirt.api.Action;
+import org.opendaylight.ovsdb.openstack.netvirt.api.EventDispatcher;
import org.opendaylight.ovsdb.openstack.netvirt.api.NodeCacheListener;
import org.opendaylight.ovsdb.openstack.netvirt.api.NodeCacheManager;
-import org.opendaylight.ovsdb.utils.mdsal.node.NodeUtils;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
+import org.opendaylight.ovsdb.openstack.netvirt.api.Southbound;
+import org.opendaylight.ovsdb.utils.servicehelper.ServiceHelper;
+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.osgi.framework.ServiceReference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.List;
-import java.util.Map;
-
-public class NodeCacheManagerImpl extends AbstractHandler
- implements NodeCacheManager {
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
- private static final Logger logger = LoggerFactory.getLogger(NodeCacheManagerImpl.class);
- private List<Node> nodeCache = Lists.newArrayList();
+/**
+ * @author Flavio Fernandes (ffernand@redhat.com)
+ * @author Sam Hague (shague@redhat.com)
+ */
+public class NodeCacheManagerImpl extends AbstractHandler implements NodeCacheManager, ConfigInterface {
+ private static final Logger LOG = LoggerFactory.getLogger(NodeCacheManagerImpl.class);
+ private Map<NodeId, Node> nodeCache = new ConcurrentHashMap<>();
private Map<Long, NodeCacheListener> handlers = Maps.newHashMap();
+ private volatile Southbound southbound;
@Override
- public void nodeAdded(String nodeIdentifier) {
- logger.debug(">>>>> enqueue: Node added : {}", nodeIdentifier);
- enqueueEvent(new NodeCacheManagerEvent(nodeIdentifier, Action.ADD));
- }
- @Override
- public void nodeRemoved(String nodeIdentifier) {
- logger.debug(">>>>> enqueue: Node removed : {}", nodeIdentifier);
- enqueueEvent(new NodeCacheManagerEvent(nodeIdentifier, Action.DELETE));
+ public void nodeAdded(Node node) {
+ LOG.debug("nodeAdded: {}", node);
+ enqueueEvent(new NodeCacheManagerEvent(node, Action.UPDATE));
}
+
@Override
- public List<Node> getNodes() {
- return nodeCache;
+ public void nodeRemoved(Node node) {
+ LOG.debug("nodeRemoved: {}", node);
+ enqueueEvent(new NodeCacheManagerEvent(node, Action.DELETE));
}
- private void _processNodeAdded(Node node) {
- nodeCache.add(node);
+ // TODO SB_MIGRATION
+ // might need to break this into two different events
+ // notifyOvsdbNode, notifyBridgeNode or just make sure the
+ // classes implementing the interface check for ovsdbNode or bridgeNode
+ private void processNodeUpdate(Node node) {
+ Action action = Action.UPDATE;
+
+ NodeId nodeId = node.getNodeId();
+ if (nodeCache.get(nodeId) == null) {
+ action = Action.ADD;
+ }
+ nodeCache.put(nodeId, node);
+
+ LOG.debug("processNodeUpdate: size= {}, Node type= {}, action= {}, node= {}",
+ nodeCache.size(),
+ southbound.getBridge(node) != null ? "BridgeNode" : "OvsdbNode",
+ action == Action.ADD ? "ADD" : "UPDATE",
+ node);
+
for (NodeCacheListener handler : handlers.values()) {
try {
- handler.notifyNode(node, Action.ADD);
+ handler.notifyNode(node, action);
} catch (Exception e) {
- logger.error("Failed notifying node add event", e);
+ LOG.error("Failed notifying node add event", e);
}
}
+ LOG.debug("processNodeUpdate returns");
}
- private void _processNodeRemoved(Node node) {
- nodeCache.remove(node);
+
+ private void processNodeRemoved(Node node) {
+ nodeCache.remove(node.getNodeId());
for (NodeCacheListener handler : handlers.values()) {
try {
handler.notifyNode(node, Action.DELETE);
} catch (Exception e) {
- logger.error("Failed notifying node remove event", e);
+ LOG.error("Failed notifying node remove event", e);
}
}
+ LOG.warn("processNodeRemoved returns");
}
/**
@Override
public void processEvent(AbstractEvent abstractEvent) {
if (!(abstractEvent instanceof NodeCacheManagerEvent)) {
- logger.error("Unable to process abstract event " + abstractEvent);
+ LOG.error("Unable to process abstract event {}", abstractEvent);
return;
}
NodeCacheManagerEvent ev = (NodeCacheManagerEvent) abstractEvent;
- logger.debug(">>>>> dequeue: {}", ev);
+ LOG.debug("NodeCacheManagerImpl: dequeue: {}", ev);
switch (ev.getAction()) {
- case ADD:
- _processNodeAdded(NodeUtils.getOpenFlowNode(ev.getNodeIdentifier()));
- break;
case DELETE:
- _processNodeRemoved(NodeUtils.getOpenFlowNode(ev.getNodeIdentifier()));
+ processNodeRemoved(ev.getNode());
break;
case UPDATE:
+ processNodeUpdate(ev.getNode());
break;
default:
- logger.warn("Unable to process event action " + ev.getAction());
+ LOG.warn("Unable to process event action {}", ev.getAction());
break;
}
}
public void cacheListenerAdded(final ServiceReference ref, NodeCacheListener handler){
Long pid = (Long) ref.getProperty(org.osgi.framework.Constants.SERVICE_ID);
handlers.put(pid, handler);
- logger.info("Node cache listener registered, pid {} {}", pid, handler.getClass().getName());
+ LOG.info("Node cache listener registered, pid {} {}", pid, handler.getClass().getName());
}
public void cacheListenerRemoved(final ServiceReference ref){
Long pid = (Long) ref.getProperty(org.osgi.framework.Constants.SERVICE_ID);
handlers.remove(pid);
- logger.debug("Node cache listener unregistered, pid {}", pid);
+ LOG.debug("Node cache listener unregistered, pid {}", pid);
}
+
+ @Override
+ public Map<NodeId,Node> getOvsdbNodes() {
+ Map<NodeId,Node> ovsdbNodesMap = new ConcurrentHashMap<>();
+ for (Map.Entry<NodeId, Node> ovsdbNodeEntry : nodeCache.entrySet()) {
+ if (southbound.extractOvsdbNode(ovsdbNodeEntry.getValue()) != null) {
+ ovsdbNodesMap.put(ovsdbNodeEntry.getKey(), ovsdbNodeEntry.getValue());
+ }
+ }
+ return ovsdbNodesMap;
+ }
+
+ @Override
+ public List<Node> getBridgeNodes() {
+ List<Node> nodes = Lists.newArrayList();
+ for (Node node : nodeCache.values()) {
+ if (southbound.getBridge(node) != null) {
+ nodes.add(node);
+ }
+ }
+ return nodes;
+ }
+
+ @Override
+ public List<Node> getNodes() {
+ List<Node> nodes = Lists.newArrayList();
+ for (Node node : nodeCache.values()) {
+ nodes.add(node);
+ }
+ return nodes;
+ }
+
+ private void populateNodeCache() {
+ LOG.debug("populateNodeCache : Populating the node cache");
+ List<Node> nodes = southbound.readOvsdbTopologyNodes();
+ for(Node ovsdbNode : nodes) {
+ this.nodeCache.put(ovsdbNode.getNodeId(), ovsdbNode);
+ }
+ nodes = southbound.readOvsdbTopologyBridgeNodes();
+ for(Node bridgeNode : nodes) {
+ this.nodeCache.put(bridgeNode.getNodeId(), bridgeNode);
+ }
+ LOG.debug("populateNodeCache : Node cache population is done. Total nodes : {}",this.nodeCache.size());
+ }
+
+ @Override
+ public void setDependencies(ServiceReference serviceReference) {
+ southbound =
+ (Southbound) ServiceHelper.getGlobalInstance(Southbound.class, this);
+ eventDispatcher =
+ (EventDispatcher) ServiceHelper.getGlobalInstance(EventDispatcher.class, this);
+ eventDispatcher.eventHandlerAdded(serviceReference, this);
+ populateNodeCache();
+ }
+
+ @Override
+ public void setDependencies(Object impl) {}
}
Code Review / ovsdb.git / blobdiff