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=ff1c026a344d74efa5aa1f1b57e05e60775cd1a4;hp=941eb74019b4adf35656a35d0d629ff4bf53244b;hb=d9de6c2ddfb30eb2eee782c229f6e03cef352bbd;hpb=9d4d57f87ec22ad258f39daa84a015fb53d190d0 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 941eb74019..ff1c026a34 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 @@ -36,7 +36,9 @@ import org.opendaylight.controller.clustering.services.CacheExistException; import org.opendaylight.controller.clustering.services.ICacheUpdateAware; import org.opendaylight.controller.clustering.services.IClusterContainerServices; import org.opendaylight.controller.clustering.services.IClusterServices; +import org.opendaylight.controller.configuration.ConfigurationObject; import org.opendaylight.controller.configuration.IConfigurationContainerAware; +import org.opendaylight.controller.configuration.IConfigurationContainerService; import org.opendaylight.controller.sal.core.Edge; import org.opendaylight.controller.sal.core.Host; import org.opendaylight.controller.sal.core.Node; @@ -47,10 +49,8 @@ import org.opendaylight.controller.sal.core.UpdateType; import org.opendaylight.controller.sal.topology.IListenTopoUpdates; 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.ObjectReader; -import org.opendaylight.controller.sal.utils.ObjectWriter; +import org.opendaylight.controller.sal.utils.NodeConnectorCreator; import org.opendaylight.controller.sal.utils.Status; import org.opendaylight.controller.sal.utils.StatusCode; import org.opendaylight.controller.switchmanager.ISwitchManager; @@ -75,13 +75,15 @@ public class TopologyManagerImpl implements 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 String USER_LINKS_FILE_NAME = "userTopology.conf"; private static final Logger log = LoggerFactory.getLogger(TopologyManagerImpl.class); private ITopologyService topoService; private IClusterContainerServices clusterContainerService; + private IConfigurationContainerService configurationService; private ISwitchManager switchManager; // DB of all the Edges with properties which constitute our topology private ConcurrentMap> edgesDB; @@ -96,8 +98,6 @@ public class TopologyManagerImpl implements // Topology Manager Aware listeners - for clusterwide updates private Set topologyManagerClusterWideAware = new CopyOnWriteArraySet(); - private static String ROOT = GlobalConstants.STARTUPHOME.toString(); - private String userLinksFileName; private ConcurrentMap userLinksDB; private BlockingQueue notifyQ = new LinkedBlockingQueue(); private volatile Boolean shuttingDown = false; @@ -163,6 +163,16 @@ public class TopologyManagerImpl implements } } + public void setConfigurationContainerService(IConfigurationContainerService service) { + log.trace("Got configuration service set request {}", service); + this.configurationService = service; + } + + public void unsetConfigurationContainerService(IConfigurationContainerService service) { + log.trace("Got configuration service UNset request"); + this.configurationService = null; + } + void setSwitchManager(ISwitchManager s) { log.debug("Adding ISwitchManager: {}", s); this.switchManager = s; @@ -192,9 +202,9 @@ public class TopologyManagerImpl implements containerName = "UNKNOWN"; } - userLinksFileName = ROOT + "userTopology_" + containerName + ".conf"; registerWithOSGIConsole(); loadConfiguration(); + // Restore the shuttingDown status on init of the component shuttingDown = false; notifyThread = new Thread(new TopologyNotify(notifyQ)); @@ -289,16 +299,9 @@ public class TopologyManagerImpl implements notifyThread = null; } - @SuppressWarnings("unchecked") private void loadConfiguration() { - ObjectReader objReader = new ObjectReader(); - ConcurrentMap confList = - (ConcurrentMap) objReader.read(this, userLinksFileName); - - if (confList != null) { - for (TopologyUserLinkConfig conf : confList.values()) { - addUserLink(conf); - } + for (ConfigurationObject conf : configurationService.retrieveConfiguration(this, USER_LINKS_FILE_NAME)) { + addUserLink((TopologyUserLinkConfig) conf); } } @@ -308,12 +311,10 @@ public class TopologyManagerImpl implements } public Status saveConfigInternal() { - ObjectWriter objWriter = new ObjectWriter(); - - Status saveStatus = objWriter.write( - new ConcurrentHashMap(userLinksDB), userLinksFileName); + Status saveStatus = configurationService.persistConfiguration( + new ArrayList(userLinksDB.values()), USER_LINKS_FILE_NAME); - if (! saveStatus.isSuccess()) { + if (!saveStatus.isSuccess()) { return new Status(StatusCode.INTERNALERROR, "Topology save failed: " + saveStatus.getDescription()); } return saveStatus; @@ -383,6 +384,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 @@ -471,7 +522,7 @@ public class TopologyManagerImpl implements } @Override - public void updateHostLink(NodeConnector port, Host h, UpdateType t, Set props) { + public synchronized void updateHostLink(NodeConnector port, Host h, UpdateType t, Set props) { // Clone the property set in case non null else just // create an empty one. Caches allocated via infinispan @@ -521,32 +572,32 @@ public class TopologyManagerImpl implements 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); + + if (this.edgesDB.containsKey(e)) { + // Avoid redundant updates (e.g. cluster switch-over) as notifications trigger expensive tasks + log.trace("Skipping redundant edge addition: {}", e); return null; } - // Make sure the props are non-null + // Make sure the props are non-null or create a copy if (props == null) { props = new HashSet(); } else { props = new HashSet(props); } - //in case of node switch-over to a different cluster controller, - //let's retain edge props - Set currentProps = this.edgesDB.get(e); - if (currentProps != null){ - props.addAll(currentProps); + + // 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 protocol plugin + crossCheckNodeConnectors(e); + // Now make sure there is the creation timestamp for the // edge, if not there, stamp with the first update boolean found_create = false; @@ -597,10 +648,9 @@ public class TopologyManagerImpl implements case CHANGED: Set oldProps = this.edgesDB.get(e); - // When property changes lets make sure we can change it + // When property(s) changes lets make sure we can change it // all except the creation time stamp because that should - // be changed only when the edge is destroyed and created - // again + // be set only when the edge is created TimeStamp timeStamp = null; for (Property prop : oldProps) { if (prop instanceof TimeStamp) {