X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fprotocol_plugins%2Fopenflow%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fprotocol_plugin%2Fopenflow%2Finternal%2FInventoryService.java;h=8af9b3ea058d894bf544c960bedf019256924721;hb=a3a28e8138fa25170b01e6b51a44490f002f6e91;hp=d00cd58c59b952b4c711ba9d215f745839e5e532;hpb=11837100975c9ad113e12668c09ecd78f9433f73;p=controller.git diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/InventoryService.java b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/InventoryService.java index d00cd58c59..8af9b3ea05 100644 --- a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/InventoryService.java +++ b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/InventoryService.java @@ -1,4 +1,3 @@ - /* * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. * @@ -21,14 +20,12 @@ import java.util.concurrent.ConcurrentMap; import org.apache.felix.dm.Component; import org.opendaylight.controller.protocol_plugin.openflow.IInventoryShimInternalListener; -import org.opendaylight.controller.protocol_plugin.openflow.IStatisticsListener; import org.opendaylight.controller.protocol_plugin.openflow.core.IController; import org.opendaylight.controller.protocol_plugin.openflow.core.ISwitch; import org.opendaylight.controller.sal.core.Actions; import org.opendaylight.controller.sal.core.Buffers; import org.opendaylight.controller.sal.core.Capabilities; import org.opendaylight.controller.sal.core.ConstructionException; -import org.opendaylight.controller.sal.core.Description; import org.opendaylight.controller.sal.core.Node; import org.opendaylight.controller.sal.core.Node.NodeIDType; import org.opendaylight.controller.sal.core.NodeConnector; @@ -39,7 +36,6 @@ import org.opendaylight.controller.sal.core.UpdateType; import org.opendaylight.controller.sal.inventory.IPluginInInventoryService; import org.opendaylight.controller.sal.inventory.IPluginOutInventoryService; import org.opendaylight.controller.sal.utils.GlobalConstants; -import org.openflow.protocol.statistics.OFDescriptionStatistics; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -48,18 +44,18 @@ import org.slf4j.LoggerFactory; * container of the network. Each instance gets container specific inventory * events from InventoryServiceShim. It interacts with SAL to pass inventory * data to the upper application. - * - * + * + * */ public class InventoryService implements IInventoryShimInternalListener, - IPluginInInventoryService, IStatisticsListener { + IPluginInInventoryService { protected static final Logger logger = LoggerFactory .getLogger(InventoryService.class); private Set pluginOutInventoryServices = Collections .synchronizedSet(new HashSet()); private IController controller = null; - private ConcurrentMap> nodeProps; // properties are maintained in default container only - private ConcurrentMap> nodeConnectorProps; // properties are maintained in default container only + private ConcurrentMap> nodeProps; // properties are maintained in global container only + private ConcurrentMap> nodeConnectorProps; // properties are maintained in global container only private boolean isDefaultContainer = false; void setController(IController s) { @@ -75,7 +71,7 @@ public class InventoryService implements IInventoryShimInternalListener, /** * Function called by the dependency manager when all the required * dependencies are satisfied - * + * */ @SuppressWarnings("rawtypes") void init(Component c) { @@ -96,7 +92,7 @@ public class InventoryService implements IInventoryShimInternalListener, * Function called by the dependency manager when at least one dependency * become unsatisfied or when the component is shutting down because for * example bundle is being stopped. - * + * */ void destroy() { logger.trace("DESTROY called!"); @@ -105,7 +101,7 @@ public class InventoryService implements IInventoryShimInternalListener, /** * Function called by dependency manager after "init ()" is called and after * the services provided by the class are registered in the service registry - * + * */ void start() { logger.trace("START called!"); @@ -115,7 +111,7 @@ public class InventoryService implements IInventoryShimInternalListener, * Function called by the dependency manager before the services exported by * the component are unregistered, this will be followed by a "destroy ()" * calls - * + * */ void stop() { logger.trace("STOP called!"); @@ -143,7 +139,7 @@ public class InventoryService implements IInventoryShimInternalListener, try { node = new Node(NodeIDType.OPENFLOW, id); } catch (ConstructionException e) { - logger.error("",e); + logger.error("", e); } return node; @@ -158,7 +154,7 @@ public class InventoryService implements IInventoryShimInternalListener, return null; Map switches = controller.getSwitches(); for (Map.Entry entry : switches.entrySet()) { - ISwitch sw = entry.getValue(); + ISwitch sw = entry.getValue(); Node node = OFSwitchToNode(sw); Map propMap = null; if (isDefaultContainer) { @@ -166,22 +162,22 @@ public class InventoryService implements IInventoryShimInternalListener, byte tables = sw.getTables(); Tables t = new Tables(tables); if (t != null) { - propMap.put(Tables.TablesPropName,t); + propMap.put(Tables.TablesPropName, t); } int cap = sw.getCapabilities(); Capabilities c = new Capabilities(cap); if (c != null) { - propMap.put(Capabilities.CapabilitiesPropName, c); + propMap.put(Capabilities.CapabilitiesPropName, c); } int act = sw.getActions(); Actions a = new Actions(act); if (a != null) { - propMap.put(Actions.ActionsPropName,a); + propMap.put(Actions.ActionsPropName, a); } int buffers = sw.getBuffers(); Buffers b = new Buffers(buffers); if (b != null) { - propMap.put(Buffers.BuffersPropName,b); + propMap.put(Buffers.BuffersPropName, b); } Date connectedSince = sw.getConnectedDate(); Long connectedSinceTime = (connectedSince == null) ? 0 @@ -198,8 +194,9 @@ public class InventoryService implements IInventoryShimInternalListener, @Override public ConcurrentMap> getNodeConnectorProps( Boolean refresh) { - if (nodeConnectorProps == null) + if (nodeConnectorProps == null) { return null; + } if (isDefaultContainer && refresh) { Map switches = controller.getSwitches(); @@ -208,8 +205,8 @@ public class InventoryService implements IInventoryShimInternalListener, .OFSwitchToProps(sw); for (Map.Entry> entry : ncProps .entrySet()) { - updateNodeConnector(entry.getKey(), UpdateType.ADDED, entry - .getValue()); + updateNodeConnector(entry.getKey(), UpdateType.ADDED, + entry.getValue()); } } } @@ -220,24 +217,20 @@ public class InventoryService implements IInventoryShimInternalListener, @Override public void updateNodeConnector(NodeConnector nodeConnector, UpdateType type, Set props) { - logger.trace("NodeConnector id " + nodeConnector.getID() - + " type " + nodeConnector.getType() + " " - + type.getName() + " for Node id " - + nodeConnector.getNode().getID()); - + logger.trace("updateNodeConnector {} type {}", nodeConnector, + type.getName()); if (nodeConnectorProps == null) { + logger.trace("nodeConnectorProps is null"); return; } - - Map propMap = nodeConnectorProps - .get(nodeConnector); + Map propMap = nodeConnectorProps.get(nodeConnector); switch (type) { case ADDED: case CHANGED: - if (propMap == null) + if (propMap == null) { propMap = new HashMap(); - + } if (props != null) { for (Property prop : props) { propMap.put(prop.getName(), prop); @@ -261,9 +254,10 @@ public class InventoryService implements IInventoryShimInternalListener, } private void addNode(Node node, Set props) { - logger.trace("{} added", node); - if (nodeProps == null) + logger.trace("{} added, props: {}", node, props); + if (nodeProps == null) { return; + } // update local cache Map propMap = new HashMap(); @@ -305,34 +299,33 @@ public class InventoryService implements IInventoryShimInternalListener, } } } - - - private void updateSwitchProperty(Long switchId, Set propSet) { - // update local cache - Node node = OFSwitchToNode(controller.getSwitch(switchId)); - Map propMap = nodeProps.get(node); - if (propMap == null) { - propMap = new HashMap(); + + private void updateNode(Node node, Set properties) { + logger.trace("{} updated, props: {}", node, properties); + if (nodeProps == null || !nodeProps.containsKey(node) || + properties == null || properties.isEmpty()) { + return; } - - boolean change = false; - for (Property prop : propSet) { - String propertyName = prop.getName(); - Property currentProp = propMap.get(propertyName); - if (!prop.equals(currentProp)) { - change = true; - propMap.put(propertyName, prop); - } + + // Update local cache with new properties + Set newProperties = new HashSet(properties.size()); + Map propertyMap = nodeProps.get(node); + for (Property property : properties) { + String name = property.getName(); + Property currentProperty = propertyMap.get(name); + if (!property.equals(currentProperty)) { + propertyMap.put(name, property); + newProperties.add(property); + } } - nodeProps.put(node, propMap); - // Update sal if any of the properties has changed - if (change) { - synchronized (pluginOutInventoryServices) { - for (IPluginOutInventoryService service : pluginOutInventoryServices) { - service.updateNode(node, UpdateType.CHANGED, propSet); - } - } + // Update SAL if we got new properties + if (!newProperties.isEmpty()) { + synchronized (pluginOutInventoryServices) { + for (IPluginOutInventoryService service : pluginOutInventoryServices) { + service.updateNode(node, UpdateType.CHANGED, newProperties); + } + } } } @@ -345,19 +338,12 @@ public class InventoryService implements IInventoryShimInternalListener, case REMOVED: removeNode(node); break; + case CHANGED: + updateNode(node, props); + break; default: break; } } - @Override - public void descriptionRefreshed(Long switchId, - OFDescriptionStatistics descriptionStats) { - - Set propSet = new HashSet(1); - Description desc = - new Description(descriptionStats.getDatapathDescription()); - propSet.add(desc); - this.updateSwitchProperty(switchId, propSet); - } }