X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Ftopologymanager%2Fimplementation%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Ftopologymanager%2Finternal%2FTopologyManagerImpl.java;h=45a8a5880b70982d83748a3e3d2392dd3e93de1f;hp=5ecddcfc88bd501e65164303e946a29ef36ec46e;hb=b29204146ca6957b5f968e07d9e7e2052ba70ef1;hpb=00f23bc9b50a286c324ae9caf7d59c11ec216497 diff --git a/opendaylight/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/internal/TopologyManagerImpl.java b/opendaylight/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/internal/TopologyManagerImpl.java index 5ecddcfc88..45a8a5880b 100644 --- a/opendaylight/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/internal/TopologyManagerImpl.java +++ b/opendaylight/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/internal/TopologyManagerImpl.java @@ -49,10 +49,12 @@ import org.opendaylight.controller.sal.topology.ITopologyService; import org.opendaylight.controller.sal.topology.TopoEdgeUpdate; import org.opendaylight.controller.sal.utils.GlobalConstants; import org.opendaylight.controller.sal.utils.IObjectReader; +import org.opendaylight.controller.sal.utils.NodeConnectorCreator; import org.opendaylight.controller.sal.utils.ObjectReader; import org.opendaylight.controller.sal.utils.ObjectWriter; import org.opendaylight.controller.sal.utils.Status; import org.opendaylight.controller.sal.utils.StatusCode; +import org.opendaylight.controller.switchmanager.ISwitchManager; import org.opendaylight.controller.topologymanager.ITopologyManager; import org.opendaylight.controller.topologymanager.ITopologyManagerAware; import org.opendaylight.controller.topologymanager.ITopologyManagerClusterWideAware; @@ -68,19 +70,20 @@ import org.slf4j.LoggerFactory; * topology database and notifies all the listeners of topology changes. */ public class TopologyManagerImpl implements - ICacheUpdateAware, + ICacheUpdateAware, ITopologyManager, IConfigurationContainerAware, IListenTopoUpdates, IObjectReader, CommandProvider { - static final String TOPOEDGESDB = "topologymanager.edgesDB"; - static final String TOPOHOSTSDB = "topologymanager.hostsDB"; - static final String TOPONODECONNECTORDB = "topologymanager.nodeConnectorDB"; - static final String TOPOUSERLINKSDB = "topologymanager.userLinksDB"; + protected static final String TOPOEDGESDB = "topologymanager.edgesDB"; + protected static final String TOPOHOSTSDB = "topologymanager.hostsDB"; + protected static final String TOPONODECONNECTORDB = "topologymanager.nodeConnectorDB"; + protected static final String TOPOUSERLINKSDB = "topologymanager.userLinksDB"; private static final Logger log = LoggerFactory.getLogger(TopologyManagerImpl.class); private ITopologyService topoService; private IClusterContainerServices clusterContainerService; + private ISwitchManager switchManager; // DB of all the Edges with properties which constitute our topology private ConcurrentMap> edgesDB; // DB of all NodeConnector which are part of ISL Edges, meaning they @@ -161,6 +164,18 @@ public class TopologyManagerImpl implements } } + void setSwitchManager(ISwitchManager s) { + log.debug("Adding ISwitchManager: {}", s); + this.switchManager = s; + } + + void unsetSwitchManager(ISwitchManager s) { + if (this.switchManager == s) { + log.debug("Removing ISwitchManager: {}", s); + this.switchManager = null; + } + } + /** * Function called by the dependency manager when all the required * dependencies are satisfied @@ -180,56 +195,43 @@ public class TopologyManagerImpl implements userLinksFileName = ROOT + "userTopology_" + containerName + ".conf"; registerWithOSGIConsole(); - loadConfiguration(); + if ((clusterContainerService != null) && (clusterContainerService.amICoordinator())) { + loadConfiguration(); + } // Restore the shuttingDown status on init of the component shuttingDown = false; notifyThread = new Thread(new TopologyNotify(notifyQ)); } - @SuppressWarnings({ "unchecked", "deprecation" }) + @SuppressWarnings({ "unchecked" }) private void allocateCaches() { - try { this.edgesDB = - (ConcurrentMap>) this.clusterContainerService.createCache(TOPOEDGESDB, - EnumSet.of(IClusterServices.cacheMode.TRANSACTIONAL)); - } catch (CacheExistException cee) { - log.debug(TOPOEDGESDB + " Cache already exists - destroy and recreate if needed"); - } catch (CacheConfigException cce) { - log.error(TOPOEDGESDB + " Cache configuration invalid - check cache mode"); - } + (ConcurrentMap>) allocateCache(TOPOEDGESDB,EnumSet.of(IClusterServices.cacheMode.TRANSACTIONAL)); - try { this.hostsDB = - (ConcurrentMap>>>) this.clusterContainerService.createCache( - TOPOHOSTSDB, EnumSet.of(IClusterServices.cacheMode.TRANSACTIONAL)); - } catch (CacheExistException cee) { - log.debug(TOPOHOSTSDB + " Cache already exists - destroy and recreate if needed"); - } catch (CacheConfigException cce) { - log.error(TOPOHOSTSDB + " Cache configuration invalid - check cache mode"); - } + (ConcurrentMap>>>) allocateCache(TOPOHOSTSDB, EnumSet.of(IClusterServices.cacheMode.TRANSACTIONAL)); - try { this.nodeConnectorsDB = - (ConcurrentMap>) this.clusterContainerService.createCache( + (ConcurrentMap>) allocateCache( TOPONODECONNECTORDB, EnumSet.of(IClusterServices.cacheMode.TRANSACTIONAL)); - } catch (CacheExistException cee) { - log.debug(TOPONODECONNECTORDB + " Cache already exists - destroy and recreate if needed"); - } catch (CacheConfigException cce) { - log.error(TOPONODECONNECTORDB + " Cache configuration invalid - check cache mode"); - } - - try { this.userLinksDB = - (ConcurrentMap) this.clusterContainerService.createCache( + (ConcurrentMap) allocateCache( TOPOUSERLINKSDB, EnumSet.of(IClusterServices.cacheMode.TRANSACTIONAL)); - } catch (CacheExistException cee) { - log.debug(TOPOUSERLINKSDB + " Cache already exists - destroy and recreate if needed"); - } catch (CacheConfigException cce) { - log.error(TOPOUSERLINKSDB + " Cache configuration invalid - check cache mode"); + } + + private ConcurrentMap allocateCache(String cacheName, Set cacheModes) { + ConcurrentMap cache = null; + try { + cache = this.clusterContainerService.createCache(cacheName, cacheModes); + } catch (CacheExistException e) { + log.debug(cacheName + " cache already exists - destroy and recreate if needed"); + } catch (CacheConfigException e) { + log.error(cacheName + " cache configuration invalid - check cache mode"); } + return cache; } - @SuppressWarnings({ "unchecked", "deprecation" }) + @SuppressWarnings({ "unchecked" }) private void retrieveCaches() { if (this.clusterContainerService == null) { log.error("Cluster Services is null, can't retrieve caches."); @@ -384,6 +386,56 @@ public class TopologyManagerImpl implements || e.getTailNodeConnector().getType().equals(NodeConnector.NodeConnectorIDType.PRODUCTION)); } + /** + * This method cross checks the determination of nodeConnector type by Discovery Service + * against the information in SwitchManager and updates it accordingly. + * @param e + * The edge + */ + private void crossCheckNodeConnectors(Edge e) { + NodeConnector nc; + if (e.getHeadNodeConnector().getType().equals(NodeConnector.NodeConnectorIDType.PRODUCTION)) { + nc = updateNCTypeFromSwitchMgr(e.getHeadNodeConnector()); + if (nc != null) { + e.setHeadNodeConnector(nc); + } + } + if (e.getTailNodeConnector().getType().equals(NodeConnector.NodeConnectorIDType.PRODUCTION)) { + nc = updateNCTypeFromSwitchMgr(e.getTailNodeConnector()); + if (nc != null) { + e.setTailNodeConnector(nc); + } + } + } + + /** + * A NodeConnector may have been categorized as of type Production by Discovery Service. + * But at the time when this determination was made, only OF nodes were known to Discovery + * Service. This method checks if the node of nodeConnector is known to SwitchManager. If + * so, then it returns a new NodeConnector with correct type. + * + * @param nc + * NodeConnector as passed on in the edge + * @return + * If Node of the NodeConnector is in SwitchManager, then return a new NodeConnector + * with correct type, null otherwise + */ + + private NodeConnector updateNCTypeFromSwitchMgr(NodeConnector nc) { + + for (Node node : switchManager.getNodes()) { + String nodeName = node.getNodeIDString(); + log.trace("Switch Manager Node Name: {}, NodeConnector Node Name: {}", nodeName, + nc.getNode().getNodeIDString()); + if (nodeName.equals(nc.getNode().getNodeIDString())) { + NodeConnector nodeConnector = NodeConnectorCreator + .createNodeConnector(node.getType(), nc.getID(), node); + return nodeConnector; + } + } + return null; + } + /** * The Map returned is a copy of the current topology hence if the topology * changes the copy doesn't @@ -507,9 +559,37 @@ public class TopologyManagerImpl implements } } + private boolean headNodeConnectorExist(Edge e) { + /* + * Only check the head end point which is supposed to be part of a + * network node we control (present in our inventory). If we checked the + * tail end point as well, we would not store the edges that connect to + * a non sdn enable port on a non sdn capable production switch. We want + * to be able to see these switches on the topology. + */ + NodeConnector head = e.getHeadNodeConnector(); + return (switchManager.doesNodeConnectorExist(head)); + } + private TopoEdgeUpdate edgeUpdate(Edge e, UpdateType type, Set props) { switch (type) { case ADDED: + // Avoid redundant update as notifications trigger expensive tasks + if (edgesDB.containsKey(e)) { + log.trace("Skipping redundant edge addition: {}", e); + return null; + } + + // Ensure that head node connector exists + if (!headNodeConnectorExist(e)) { + log.warn("Ignore edge that contains invalid node connector: {}", e); + return null; + } + + // Check if nodeConnectors of the edge were correctly categorized + // by OF plugin + crossCheckNodeConnectors(e); + // Make sure the props are non-null if (props == null) { props = new HashSet(); @@ -631,18 +711,21 @@ public class TopologyManagerImpl implements Set p = topoedgeupdateList.get(i).getProperty(); UpdateType type = topoedgeupdateList.get(i).getUpdateType(); TopoEdgeUpdate teu = edgeUpdate(e, type, p); - teuList.add(teu); + if (teu != null) { + teuList.add(teu); + } } - // Now update the listeners - for (ITopologyManagerAware s : this.topologyManagerAware) { - try { - s.edgeUpdate(teuList); - } catch (Exception exc) { - log.error("Exception on edge update:", exc); + if (!teuList.isEmpty()) { + // Now update the listeners + for (ITopologyManagerAware s : this.topologyManagerAware) { + try { + s.edgeUpdate(teuList); + } catch (Exception exc) { + log.error("Exception on edge update:", exc); + } } } - } private Edge getReverseLinkTuple(TopologyUserLinkConfig link) { @@ -692,7 +775,14 @@ public class TopologyManagerImpl implements Edge linkTuple = getLinkTuple(userLink); if (linkTuple != null) { if (!isProductionLink(linkTuple)) { - edgeUpdate(linkTuple, UpdateType.ADDED, new HashSet()); + TopoEdgeUpdate teu = edgeUpdate(linkTuple, UpdateType.ADDED, + new HashSet()); + if (teu == null) { + userLinksDB.remove(userLink.getName()); + return new Status(StatusCode.NOTFOUND, + "Link configuration contains invalid node connector: " + + userLink); + } } linkTuple = getReverseLinkTuple(userLink); @@ -859,7 +949,7 @@ public class TopologyManagerImpl implements public void entryUpdated(final Object key, final Object new_value, final String cacheName, final boolean originLocal) { if (cacheName.equals(TOPOEDGESDB)) { final Edge e = (Edge) key; - log.trace("Edge {} CHANGED isLocal:{}", e, originLocal); + log.trace("Edge {} UPDATED isLocal:{}", e, originLocal); final Set props = (Set) new_value; edgeUpdateClusterWide(e, UpdateType.CHANGED, props, originLocal); }