X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fprotocol_plugins%2Fopenflow%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fprotocol_plugin%2Fopenflow%2Finternal%2FTopologyServiceShim.java;h=4e4e867fec637a30c3a0a26eedb128becbda84c7;hp=99501c280a97a04af2f181c003fdab6a5bb2e5df;hb=0ae12c54560ef14cb8c08beef4553f7523d41578;hpb=9822a34fdd144aeb9932492e1605715eb472ecad diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TopologyServiceShim.java b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TopologyServiceShim.java index 99501c280a..4e4e867fec 100644 --- a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TopologyServiceShim.java +++ b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TopologyServiceShim.java @@ -9,7 +9,9 @@ package org.opendaylight.controller.protocol_plugin.openflow.internal; import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -30,15 +32,11 @@ import org.opendaylight.controller.protocol_plugin.openflow.IInventoryShimExtern import org.opendaylight.controller.protocol_plugin.openflow.IOFStatisticsManager; import org.opendaylight.controller.protocol_plugin.openflow.IRefreshInternalProvider; import org.opendaylight.controller.protocol_plugin.openflow.ITopologyServiceShimListener; -import org.osgi.framework.BundleContext; -import org.osgi.framework.FrameworkUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.opendaylight.controller.sal.core.Bandwidth; import org.opendaylight.controller.sal.core.Config; import org.opendaylight.controller.sal.core.ContainerFlow; import org.opendaylight.controller.sal.core.Edge; +import org.opendaylight.controller.sal.core.IContainerAware; import org.opendaylight.controller.sal.core.IContainerListener; import org.opendaylight.controller.sal.core.Node; import org.opendaylight.controller.sal.core.NodeConnector; @@ -47,6 +45,10 @@ import org.opendaylight.controller.sal.core.State; import org.opendaylight.controller.sal.core.UpdateType; import org.opendaylight.controller.sal.topology.TopoEdgeUpdate; import org.opendaylight.controller.sal.utils.GlobalConstants; +import org.osgi.framework.BundleContext; +import org.osgi.framework.FrameworkUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * The class describes a shim layer that relays the topology events from @@ -55,7 +57,7 @@ import org.opendaylight.controller.sal.utils.GlobalConstants; */ public class TopologyServiceShim implements IDiscoveryListener, IContainerListener, CommandProvider, IRefreshInternalProvider, - IInventoryShimExternalListener { + IInventoryShimExternalListener, IContainerAware { protected static final Logger logger = LoggerFactory .getLogger(TopologyServiceShim.class); private ConcurrentMap topologyServiceShimListeners = new ConcurrentHashMap(); @@ -129,8 +131,11 @@ public class TopologyServiceShim implements IDiscoveryListener, if (notifyListeners) { for (String container : teuMap.keySet()) { // notify the listener - topologyServiceShimListeners.get(container) - .edgeUpdate(teuMap.get(container)); + ITopologyServiceShimListener l = topologyServiceShimListeners.get(container); + // container topology service may not have come up yet + if (l != null) { + l.edgeUpdate(teuMap.get(container)); + } } } @@ -293,18 +298,18 @@ public class TopologyServiceShim implements IDiscoveryListener, // Compare bandwidth usage Long switchId = (Long) connector.getNode().getID(); Short port = (Short) connector.getID(); - float rate = statsMgr.getTransmitRate(switchId, port); - if (rate > bwThresholdFactor * bw) { - if (!connectorsOverUtilized.contains(connector)) { - connectorsOverUtilized.add(connector); - this.bwUtilNotifyQ.add(new UtilizationUpdate(connector, - UpdateType.ADDED)); - } - } else { - if (connectorsOverUtilized.contains(connector)) { - connectorsOverUtilized.remove(connector); - this.bwUtilNotifyQ.add(new UtilizationUpdate(connector, - UpdateType.REMOVED)); + if (statsMgr != null) { + float rate = statsMgr.getTransmitRate(switchId, port); + if (rate > bwThresholdFactor * bw) { + if (!connectorsOverUtilized.contains(connector)) { + connectorsOverUtilized.add(connector); + this.bwUtilNotifyQ.add(new UtilizationUpdate(connector, UpdateType.ADDED)); + } + } else { + if (connectorsOverUtilized.contains(connector)) { + connectorsOverUtilized.remove(connector); + this.bwUtilNotifyQ.add(new UtilizationUpdate(connector, UpdateType.REMOVED)); + } } } } @@ -400,6 +405,92 @@ public class TopologyServiceShim implements IDiscoveryListener, } } + private void updateContainerMap(List containers, NodeConnector p) { + if (containers.isEmpty()) { + // Do cleanup to reduce memory footprint if no + // elements to be tracked + this.containerMap.remove(p); + } else { + this.containerMap.put(p, containers); + } + } + + /** + * From a given edge map, retrieve the edge sourced by the port and update + * the local cache in the container + * + * @param container + * the container name + * @param nodeConnector + * the node connector + * @param edges + * the given edge map + * @return the found edge + */ + private Edge addEdge(String container, NodeConnector nodeConnector, + Map>> edges) { + logger.debug("Search edge sourced by port {} in container {}", nodeConnector, container); + + // Retrieve the associated edge + Pair> edgeProps = edges.get(nodeConnector); + if (edgeProps == null) { + logger.debug("edgePros is null for port {} in container {}", nodeConnector, container); + return null; + } + + Edge edge = edgeProps.getLeft(); + if (edge == null) { + logger.debug("edge is null for port {} in container {}", nodeConnector, container); + return null; + } + + // Make sure the peer port is in the same container + NodeConnector peerConnector = edge.getHeadNodeConnector(); + List containers = this.containerMap.get(peerConnector); + if ((containers == null) || !containers.contains(container)) { + logger.debug("peer port {} of edge {} is not part of the container {}", new Object[] { peerConnector, edge, + container }); + return null; + } + + // Update the local cache + updateLocalEdgeMap(container, edge, UpdateType.ADDED, edgeProps.getRight()); + logger.debug("Added edge {} to local cache in container {}", edge, container); + + return edge; + } + + private void addNodeConnector(String container, + NodeConnector nodeConnector) { + // Use the global edge map for the newly added port in a container + Map>> globalEdgeMap = edgeMap.get(GlobalConstants.DEFAULT + .toString()); + if (globalEdgeMap == null) { + return; + } + + // Get the edge and update local cache in the container + Edge edge1, edge2; + edge1 = addEdge(container, nodeConnector, globalEdgeMap); + if (edge1 == null) { + return; + } + + // Get the edge in reverse direction and update local cache in the container + NodeConnector peerConnector = edge1.getHeadNodeConnector(); + edge2 = addEdge(container, peerConnector, globalEdgeMap); + + // Send notification upwards in one shot + List teuList = new ArrayList(); + teuList.add(new TopoEdgeUpdate(edge1, null, UpdateType.ADDED)); + logger.debug("Notify edge1: {} in container {}", edge1, container); + if (edge2 != null) { + teuList.add(new TopoEdgeUpdate(edge2, null, UpdateType.ADDED)); + logger.debug("Notify edge2: {} in container {}", edge2, container); + } + notifyEdge(container, teuList); + } + private void removeNodeConnector(String container, NodeConnector nodeConnector) { List teuList = new ArrayList(); @@ -613,33 +704,24 @@ public class TopologyServiceShim implements IDiscoveryListener, if (containers == null) { containers = new CopyOnWriteArrayList(); } - boolean updateMap = false; switch (t) { case ADDED: if (!containers.contains(containerName)) { containers.add(containerName); - updateMap = true; + updateContainerMap(containers, p); + addNodeConnector(containerName, p); } break; case REMOVED: if (containers.contains(containerName)) { containers.remove(containerName); - updateMap = true; + updateContainerMap(containers, p); removeNodeConnector(containerName, p); } break; case CHANGED: break; } - if (updateMap) { - if (containers.isEmpty()) { - // Do cleanup to reduce memory footprint if no - // elements to be tracked - this.containerMap.remove(p); - } else { - this.containerMap.put(p, containers); - } - } } @Override @@ -730,21 +812,19 @@ public class TopologyServiceShim implements IDiscoveryListener, } /** - * Retrieve/construct edge map for a given container + * Retrieve the edges for a given container * * @param containerName * the container name * @return the edges and their properties */ - private Map>> getEdgeMap(String containerName) { + private Collection>> getEdgeProps(String containerName) { Map>> edgePropMap = null; - - /* - * When container is freshly created, need to construct map based on global map. - */ edgePropMap = edgeMap.get(containerName); - - return edgePropMap; + if (edgePropMap == null) { + return null; + } + return edgePropMap.values(); } /** @@ -756,11 +836,11 @@ public class TopologyServiceShim implements IDiscoveryListener, * the container name */ private void TopologyBulkUpdate(String containerName) { - Map>> edgePropMap = null; + Collection>> edgeProps = null; logger.debug("Try bulk update for container:{}", containerName); - edgePropMap = getEdgeMap(containerName); - if (edgePropMap == null) { + edgeProps = getEdgeProps(containerName); + if (edgeProps == null) { logger.debug("No edges known for container:{}", containerName); return; } @@ -773,12 +853,12 @@ public class TopologyServiceShim implements IDiscoveryListener, } int i = 0; List teuList = new ArrayList(); - for (Pair> edgeProps : edgePropMap.values()) { - if (edgeProps != null) { + for (Pair> edgeProp : edgeProps) { + if (edgeProp != null) { i++; - teuList.add(new TopoEdgeUpdate(edgeProps.getLeft(), edgeProps + teuList.add(new TopoEdgeUpdate(edgeProp.getLeft(), edgeProp .getRight(), UpdateType.ADDED)); - logger.trace("Add edge {}", edgeProps.getLeft()); + logger.trace("Add edge {}", edgeProp.getLeft()); } } if (i > 0) { @@ -839,4 +919,29 @@ public class TopologyServiceShim implements IDiscoveryListener, break; } } + + @Override + public void containerCreate(String containerName) { + // do nothing + } + + @Override + public void containerDestroy(String containerName) { + Set removeNodeConnectorSet = new HashSet(); + for (Map.Entry> entry : containerMap.entrySet()) { + List ncContainers = entry.getValue(); + if (ncContainers.contains(containerName)) { + NodeConnector nodeConnector = entry.getKey(); + removeNodeConnectorSet.add(nodeConnector); + } + } + for (NodeConnector nodeConnector : removeNodeConnectorSet) { + List ncContainers = containerMap.get(nodeConnector); + ncContainers.remove(containerName); + if (ncContainers.isEmpty()) { + containerMap.remove(nodeConnector); + } + } + edgeMap.remove(containerName); + } }