X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fswitchmanager%2Fimplementation%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fswitchmanager%2Finternal%2FSwitchManager.java;h=99482debd6d7e51c84415d3064ed38d05b5ca77e;hp=78c78f55429980466e42d5074e07e133c9cfa0bb;hb=87246fdb069fad43135b623971bdf6ebe7df828a;hpb=8c9a1cf398348546e6e5ba74a2012ed942a2fddb diff --git a/opendaylight/switchmanager/implementation/src/main/java/org/opendaylight/controller/switchmanager/internal/SwitchManager.java b/opendaylight/switchmanager/implementation/src/main/java/org/opendaylight/controller/switchmanager/internal/SwitchManager.java index 78c78f5542..99482debd6 100644 --- a/opendaylight/switchmanager/implementation/src/main/java/org/opendaylight/controller/switchmanager/internal/SwitchManager.java +++ b/opendaylight/switchmanager/implementation/src/main/java/org/opendaylight/controller/switchmanager/internal/SwitchManager.java @@ -106,8 +106,6 @@ public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa private final Set inventoryListeners = Collections .synchronizedSet(new HashSet()); private final Set spanAware = Collections.synchronizedSet(new HashSet()); - private static boolean hostRefresh = true; - private int hostRetryCount = 5; private IClusterContainerServices clusterContainerService = null; private String containerName = null; private boolean isDefaultContainer = true; @@ -193,7 +191,6 @@ public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa public void shutDown() { } - @SuppressWarnings("deprecation") private void allocateCaches() { if (this.clusterContainerService == null) { this.nonClusterObjectCreate(); @@ -211,9 +208,6 @@ public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa EnumSet.of(IClusterServices.cacheMode.TRANSACTIONAL)); clusterContainerService.createCache("switchmanager.subnets", EnumSet.of(IClusterServices.cacheMode.TRANSACTIONAL)); - clusterContainerService.createCache( - "switchmanager.configSaveEvent", - EnumSet.of(IClusterServices.cacheMode.TRANSACTIONAL)); clusterContainerService.createCache("switchmanager.nodeProps", EnumSet.of(IClusterServices.cacheMode.TRANSACTIONAL)); clusterContainerService.createCache( @@ -232,7 +226,7 @@ public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa } } - @SuppressWarnings({ "unchecked", "deprecation" }) + @SuppressWarnings({ "unchecked" }) private void retrieveCaches() { if (this.clusterContainerService == null) { log.info("un-initialized clusterContainerService, can't create cache"); @@ -378,7 +372,7 @@ public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa private Status updateDatabase(SubnetConfig conf, boolean add) { if (add) { - Subnet subnetCurr = subnets.get(conf.getIPnum()); + Subnet subnetCurr = subnets.get(conf.getIPAddress()); Subnet subnet; if (subnetCurr == null) { subnet = new Subnet(conf); @@ -388,25 +382,24 @@ public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa // In case of API3 call we may receive the ports along with the // subnet creation if (!conf.isGlobal()) { - Set sp = conf.getSubnetNodeConnectors(); - subnet.addNodeConnectors(sp); + subnet.addNodeConnectors(conf.getNodeConnectors()); } boolean putNewSubnet = false; if(subnetCurr == null) { - if(subnets.putIfAbsent(conf.getIPnum(), subnet) == null) { + if(subnets.putIfAbsent(conf.getIPAddress(), subnet) == null) { putNewSubnet = true; } } else { - putNewSubnet = subnets.replace(conf.getIPnum(), subnetCurr, subnet); + putNewSubnet = subnets.replace(conf.getIPAddress(), subnetCurr, subnet); } if(!putNewSubnet) { - String msg = "Cluster conflict: Conflict while adding the subnet " + conf.getIPnum(); + String msg = "Cluster conflict: Conflict while adding the subnet " + conf.getIPAddress(); return new Status(StatusCode.CONFLICT, msg); } // Subnet removal case } else { - subnets.remove(conf.getIPnum()); + subnets.remove(conf.getIPAddress()); } return new Status(StatusCode.SUCCESS); } @@ -419,47 +412,46 @@ public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa } for (InetAddress i : IPs) { Subnet existingSubnet = subnets.get(i); - if ((existingSubnet != null) - && !existingSubnet.isMutualExclusive(newSubnet)) { - return new Status(StatusCode.CONFLICT); + if ((existingSubnet != null) && !existingSubnet.isMutualExclusive(newSubnet)) { + return new Status(StatusCode.CONFLICT, "This subnet conflicts with an existing one."); } } return new Status(StatusCode.SUCCESS); } private Status addRemoveSubnet(SubnetConfig conf, boolean isAdding) { - // Valid config check - if (!conf.isValidConfig()) { - String msg = "Invalid Subnet configuration"; - log.warn(msg); - return new Status(StatusCode.BADREQUEST, msg); + // Valid configuration check + Status status = conf.validate(); + if (!status.isSuccess()) { + log.warn(status.getDescription()); + return status; } if (isAdding) { // Presence check if (subnetsConfigList.containsKey(conf.getName())) { return new Status(StatusCode.CONFLICT, - "Subnet with the specified name already configured."); + "Subnet with the specified name already exists."); } // Semantic check - Status rc = semanticCheck(conf); - if (!rc.isSuccess()) { - return rc; + status = semanticCheck(conf); + if (!status.isSuccess()) { + return status; } } // Update Database - Status rc = updateDatabase(conf, isAdding); + status = updateDatabase(conf, isAdding); - if (rc.isSuccess()) { + if (status.isSuccess()) { // Update Configuration - rc = updateConfig(conf, isAdding); - if(!rc.isSuccess()) { + status = updateConfig(conf, isAdding); + if(!status.isSuccess()) { updateDatabase(conf, (!isAdding)); } } - return rc; + return status; } /** @@ -485,26 +477,100 @@ public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa } @Override - public Status addPortsToSubnet(String name, String switchPorts) { + public Status modifySubnet(SubnetConfig conf) { + // Sanity check + if (conf == null) { + return new Status(StatusCode.BADREQUEST, "Invalid Subnet configuration: null"); + } + + // Valid configuration check + Status status = conf.validate(); + if (!status.isSuccess()) { + log.warn(status.getDescription()); + return status; + } + + // If a subnet configuration with this name does not exist, consider this is a creation + SubnetConfig target = subnetsConfigList.get(conf.getName()); + if (target == null) { + return this.addSubnet(conf); + } + + // No change + if (target.equals(conf)) { + return new Status(StatusCode.SUCCESS); + } + + // Check not allowed modifications + if (!target.getSubnet().equals(conf.getSubnet())) { + return new Status(StatusCode.BADREQUEST, "IP address change is not allowed"); + } + + // Derive the set of node connectors that are being removed + Set toRemove = target.getNodeConnectors(); + toRemove.removeAll(conf.getNodeConnectors()); + List nodeConnectorStrings = null; + if (!toRemove.isEmpty()) { + nodeConnectorStrings = new ArrayList(); + for (NodeConnector nc : toRemove) { + nodeConnectorStrings.add(nc.toString()); + } + status = this.removePortsFromSubnet(conf.getName(), nodeConnectorStrings); + if (!status.isSuccess()) { + return status; + } + } + + // Derive the set of node connectors that are being added + Set toAdd = conf.getNodeConnectors(); + toAdd.removeAll(target.getNodeConnectors()); + if (!toAdd.isEmpty()) { + List nodeConnectorStringRemoved = nodeConnectorStrings; + nodeConnectorStrings = new ArrayList(); + for (NodeConnector nc : toAdd) { + nodeConnectorStrings.add(nc.toString()); + } + status = this.addPortsToSubnet(conf.getName(), nodeConnectorStrings); + if (!status.isSuccess()) { + // If any port was removed, add it back as a best recovery effort + if (!toRemove.isEmpty()) { + this.addPortsToSubnet(conf.getName(), nodeConnectorStringRemoved); + } + return status; + } + } + + // Update Configuration + subnetsConfigList.put(conf.getName(), conf); + + return new Status(StatusCode.SUCCESS); + } + + @Override + public Status addPortsToSubnet(String name, List switchPorts) { + if (name == null) { + return new Status(StatusCode.BADREQUEST, "Null subnet name"); + } SubnetConfig confCurr = subnetsConfigList.get(name); if (confCurr == null) { return new Status(StatusCode.NOTFOUND, "Subnet does not exist"); } - if (!confCurr.isValidSwitchPort(switchPorts)) { - return new Status(StatusCode.BADREQUEST, "Invalid switchports"); + + if (switchPorts == null || switchPorts.isEmpty()) { + return new Status(StatusCode.BADREQUEST, "Null or empty port set"); } - Subnet subCurr = subnets.get(confCurr.getIPnum()); + Subnet subCurr = subnets.get(confCurr.getIPAddress()); if (subCurr == null) { - log.debug("Cluster conflict: Subnet entry {} is not present in the subnets cache.", confCurr.getIPnum()); + log.debug("Cluster conflict: Subnet entry {} is not present in the subnets cache.", confCurr.getIPAddress()); return new Status(StatusCode.NOTFOUND, "Subnet does not exist"); } // Update Database Subnet sub = subCurr.clone(); - Set sp = confCurr.getNodeConnectors(switchPorts); + Set sp = NodeConnector.fromString(switchPorts); sub.addNodeConnectors(sp); - boolean subnetsReplaced = subnets.replace(confCurr.getIPnum(), subCurr, sub); + boolean subnetsReplaced = subnets.replace(confCurr.getIPAddress(), subCurr, sub); if (!subnetsReplaced) { String msg = "Cluster conflict: Conflict while adding ports to the subnet " + name; return new Status(StatusCode.CONFLICT, msg); @@ -524,23 +590,35 @@ public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa } @Override - public Status removePortsFromSubnet(String name, String switchPorts) { + public Status removePortsFromSubnet(String name, List switchPorts) { + if (name == null) { + return new Status(StatusCode.BADREQUEST, "Null subnet name"); + } SubnetConfig confCurr = subnetsConfigList.get(name); if (confCurr == null) { return new Status(StatusCode.NOTFOUND, "Subnet does not exist"); } - Subnet subCurr = subnets.get(confCurr.getIPnum()); + if (switchPorts == null || switchPorts.isEmpty()) { + return new Status(StatusCode.BADREQUEST, "Null or empty port set"); + } + + Subnet subCurr = subnets.get(confCurr.getIPAddress()); if (subCurr == null) { - log.debug("Cluster conflict: Subnet entry {} is not present in the subnets cache.", confCurr.getIPnum()); + log.debug("Cluster conflict: Subnet entry {} is not present in the subnets cache.", confCurr.getIPAddress()); return new Status(StatusCode.NOTFOUND, "Subnet does not exist"); } + // Validation check + Status status = SubnetConfig.validatePorts(switchPorts); + if (!status.isSuccess()) { + return status; + } // Update Database Subnet sub = subCurr.clone(); - Set sp = confCurr.getNodeConnectors(switchPorts); + Set sp = NodeConnector.fromString(switchPorts); sub.deleteNodeConnectors(sp); - boolean subnetsReplace = subnets.replace(confCurr.getIPnum(), subCurr, sub); + boolean subnetsReplace = subnets.replace(confCurr.getIPAddress(), subCurr, sub); if (!subnetsReplace) { String msg = "Cluster conflict: Conflict while removing ports from the subnet " + name; return new Status(StatusCode.CONFLICT, msg); @@ -632,6 +710,7 @@ public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa } } + @SuppressWarnings("deprecation") @Override public void updateSwitchConfig(SwitchConfig cfgObject) { // update default container only @@ -772,6 +851,10 @@ public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa propMap.put(Description.propertyName, desc); } continue; + } else if (prop.equals(ForwardingMode.name)) { + Property defaultMode = new ForwardingMode(ForwardingMode.REACTIVE_FORWARDING); + propMap.put(ForwardingMode.name, defaultMode); + continue; } propMap.remove(prop); } @@ -911,8 +994,8 @@ public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa } } - // copy node properties from config boolean proactiveForwarding = false; + // copy node properties from config if (nodeConfigList != null) { String nodeId = node.toString(); SwitchConfig conf = nodeConfigList.get(nodeId); @@ -926,6 +1009,10 @@ public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa } } + if (!propMap.containsKey(ForwardingMode.name)) { + Property defaultMode = new ForwardingMode(ForwardingMode.REACTIVE_FORWARDING); + propMap.put(ForwardingMode.name, defaultMode); + } boolean result = false; if (propMapCurr == null) { if (nodeProps.putIfAbsent(node, propMap) == null) { @@ -1042,6 +1129,7 @@ public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa public void updateNodeConnector(NodeConnector nodeConnector, UpdateType type, Set props) { Map propMap = new HashMap(); + boolean update = true; log.debug("updateNodeConnector: {} type {} props {} for container {}", new Object[] { nodeConnector, type, props, containerName }); @@ -1052,7 +1140,6 @@ public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa switch (type) { case ADDED: - case CHANGED: if (props != null) { for (Property prop : props) { addNodeConnectorProp(nodeConnector, prop); @@ -1064,23 +1151,77 @@ public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa addSpanPort(nodeConnector); break; + case CHANGED: + if (!nodeConnectorProps.containsKey(nodeConnector) || (props == null)) { + update = false; + } else { + for (Property prop : props) { + addNodeConnectorProp(nodeConnector, prop); + propMap.put(prop.getName(), prop); + } + } + break; case REMOVED: + if (!nodeConnectorProps.containsKey(nodeConnector)) { + update = false; + } removeNodeConnectorAllProps(nodeConnector); // clean up span config removeSpanPort(nodeConnector); break; default: + update = false; break; } - notifyNodeConnector(nodeConnector, type, propMap); + if (update) { + notifyNodeConnector(nodeConnector, type, propMap); + } } @Override public Set getNodes() { - return (nodeProps != null) ? new HashSet(nodeProps.keySet()) - : null; + return (nodeProps != null) ? new HashSet(nodeProps.keySet()) : new HashSet(); + } + + @Override + public Map getControllerProperties() { + return new HashMap(this.controllerProps); + } + + @Override + public Property getControllerProperty(String propertyName) { + if (propertyName != null) { + HashMap propertyMap = new HashMap(this.controllerProps); + return propertyMap.get(propertyName); + } + return null; + } + + @Override + public Status setControllerProperty(Property property) { + if (property != null) { + this.controllerProps.put(property.getName(), property); + return new Status(StatusCode.SUCCESS); + } + return new Status(StatusCode.BADREQUEST, "Invalid property provided when setting property"); + } + + @Override + public Status removeControllerProperty(String propertyName) { + if (propertyName != null) { + if (this.controllerProps.containsKey(propertyName)) { + this.controllerProps.remove(propertyName); + if (!this.controllerProps.containsKey(propertyName)) { + return new Status(StatusCode.SUCCESS); + } + } + String msg = "Unable to remove property " + propertyName + " from Controller"; + return new Status(StatusCode.BADREQUEST, msg); + } + String msg = "Invalid property provided when removing property from Controller"; + return new Status(StatusCode.BADREQUEST, msg); } /* @@ -1280,16 +1421,6 @@ public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa return (macProperty == null) ? null : macProperty.getMacAddress(); } - @Override - public boolean isHostRefreshEnabled() { - return hostRefresh; - } - - @Override - public int getHostRetryCount() { - return hostRetryCount; - } - @Override public NodeConnector getNodeConnector(Node node, String nodeConnectorName) { if (nodeConnectorNames == null) { @@ -1358,7 +1489,7 @@ public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa try { map.put(s, new NodeConnector(entry.getValue())); } catch (ConstructionException e) { - e.printStackTrace(); + log.error("An error occured",e); } } } @@ -1420,7 +1551,7 @@ public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa try { map.put(s, new NodeConnector(entry.getValue())); } catch (ConstructionException e) { - e.printStackTrace(); + log.error("An error occured",e); } } map.remove(name.getValue()); @@ -1457,7 +1588,7 @@ public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa try { map.put(s, new NodeConnector(entry.getValue())); } catch (ConstructionException e) { - e.printStackTrace(); + log.error("An error occured",e); } } map.remove(name.getValue()); @@ -1738,51 +1869,21 @@ public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa && (state != null) && (state.getValue() == State.EDGE_UP)); } + @Override + public boolean doesNodeConnectorExist(NodeConnector nc) { + return (nc != null && nodeConnectorProps != null + && nodeConnectorProps.containsKey(nc)); + } + @Override public String getHelp() { StringBuffer help = new StringBuffer(); help.append("---Switch Manager---\n"); - help.append("\t pns - Print connected nodes\n"); - help.append("\t pncs - Print node connectors for a given node\n"); help.append("\t pencs - Print enabled node connectors for a given node\n"); help.append("\t pdm - Print switch ports in device map\n"); - help.append("\t snt - Set node tier number\n"); - help.append("\t hostRefresh - Enable/Disable/Query host refresh\n"); - help.append("\t hostRetry - Set host retry count\n"); return help.toString(); } - public void _pns(CommandInterpreter ci) { - ci.println(" Node Type MAC Name Tier"); - if (nodeProps == null) { - return; - } - Set nodeSet = nodeProps.keySet(); - if (nodeSet == null) { - return; - } - List nodeArray = new ArrayList(); - for (Node node : nodeSet) { - nodeArray.add(node.toString()); - } - Collections.sort(nodeArray); - for (String str: nodeArray) { - Node node = Node.fromString(str); - Description desc = ((Description) getNodeProp(node, - Description.propertyName)); - Tier tier = ((Tier) getNodeProp(node, Tier.TierPropName)); - String nodeName = (desc == null) ? "" : desc.getValue(); - MacAddress mac = (MacAddress) getNodeProp(node, - MacAddress.name); - String macAddr = (mac == null) ? "" : HexEncode - .bytesToHexStringFormat(mac.getMacAddress()); - int tierNum = (tier == null) ? 0 : tier.getValue(); - ci.println(node + " " + node.getType() + " " + macAddr - + " " + nodeName + " " + tierNum); - } - ci.println("Total number of Nodes: " + nodeSet.size()); - } - public void _pencs(CommandInterpreter ci) { String st = ci.nextArgument(); if (st == null) { @@ -1809,43 +1910,6 @@ public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa ci.println("Total number of NodeConnectors: " + nodeConnectorSet.size()); } - public void _pncs(CommandInterpreter ci) { - String st = ci.nextArgument(); - if (st == null) { - ci.println("Please enter node id"); - return; - } - - Node node = Node.fromString(st); - if (node == null) { - ci.println("Please enter node id"); - return; - } - - ci.println(" NodeConnector BandWidth(Gbps) Admin State"); - Set nodeConnectorSet = getNodeConnectors(node); - if (nodeConnectorSet == null) { - return; - } - for (NodeConnector nodeConnector : nodeConnectorSet) { - if (nodeConnector == null) { - continue; - } - Map propMap = getNodeConnectorProps(nodeConnector); - Bandwidth bw = (Bandwidth) propMap.get(Bandwidth.BandwidthPropName); - Config config = (Config) propMap.get(Config.ConfigPropName); - State state = (State) propMap.get(State.StatePropName); - String out = nodeConnector + " "; - out += (bw != null) ? bw.getValue() / Math.pow(10, 9) : " "; - out += " "; - out += (config != null) ? config.getValue() : " "; - out += " "; - out += (state != null) ? state.getValue() : " "; - ci.println(out); - } - ci.println("Total number of NodeConnectors: " + nodeConnectorSet.size()); - } - public void _pdm(CommandInterpreter ci) { String st = ci.nextArgument(); if (st == null) { @@ -1862,9 +1926,7 @@ public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa Switch sw = getSwitchByNode(node); ci.println(" NodeConnector Name"); - if (sw == null) { - return; - } + Set nodeConnectorSet = sw.getNodeConnectors(); String nodeConnectorName; if (nodeConnectorSet != null && nodeConnectorSet.size() > 0) { @@ -1901,66 +1963,6 @@ public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa } } - public void _snt(CommandInterpreter ci) { - String st = ci.nextArgument(); - if (st == null) { - ci.println("Please enter node id"); - return; - } - - Node node = Node.fromString(st); - if (node == null) { - ci.println("Please enter node id"); - return; - } - - st = ci.nextArgument(); - if (st == null) { - ci.println("Please enter tier number"); - return; - } - Integer tid = Integer.decode(st); - Tier tier = new Tier(tid); - setNodeProp(node, tier); - } - - public void _hostRefresh(CommandInterpreter ci) { - String mode = ci.nextArgument(); - if (mode == null) { - ci.println("expecting on/off/?"); - return; - } - if (mode.toLowerCase().equals("on")) { - hostRefresh = true; - } else if (mode.toLowerCase().equals("off")) { - hostRefresh = false; - } else if (mode.equals("?")) { - if (hostRefresh) { - ci.println("host refresh is ON"); - } else { - ci.println("host refresh is OFF"); - } - } else { - ci.println("expecting on/off/?"); - } - return; - } - - public void _hostRetry(CommandInterpreter ci) { - String retry = ci.nextArgument(); - if (retry == null) { - ci.println("Please enter a valid number. Current retry count is " - + hostRetryCount); - return; - } - try { - hostRetryCount = Integer.parseInt(retry); - } catch (Exception e) { - ci.println("Please enter a valid number"); - } - return; - } - @Override public byte[] getNodeMAC(Node node) { MacAddress mac = (MacAddress) this.getNodeProp(node, @@ -2060,8 +2062,9 @@ public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa } /** - * Creates a Name/Tier/Bandwidth Property object based on given property - * name and value. Other property types are not supported yet. + * Creates a Name/Tier/Bandwidth/MacAddress(controller property) Property + * object based on given property name and value. Other property types are + * not supported yet. * * @param propName * Name of the Property @@ -2092,7 +2095,10 @@ public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa } else if (propName.equalsIgnoreCase(ForwardingMode.name)) { int mode = Integer.parseInt(propValue); return new ForwardingMode(mode); - } else { + } else if (propName.equalsIgnoreCase(MacAddress.name)){ + return new MacAddress(propValue); + } + else { log.debug("Not able to create {} property", propName); } } catch (Exception e) { @@ -2102,6 +2108,8 @@ public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa return null; } + + @SuppressWarnings("deprecation") @Override public String getNodeDescription(Node node) { // Check first if user configured a name