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=49cdabfeb3055a3f8a3a35237ec1e6168f84d09e;hb=b2b9f320d79eac0253f2417b11eb74bdbc095c66;hpb=efa48be30a4054e7cfce114e66c5b5667b1c4a5c 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 49cdabfeb3..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; @@ -414,9 +412,8 @@ 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); @@ -434,7 +431,7 @@ public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa // 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 = semanticCheck(conf); @@ -1185,8 +1182,46 @@ public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa @Override public Set getNodes() { - return (nodeProps != null) ? new HashSet(nodeProps.keySet()) - : new HashSet(); + 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); } /* @@ -1386,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) { @@ -1844,15 +1869,18 @@ 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 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(); } @@ -1935,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, @@ -2094,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 @@ -2126,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) { @@ -2136,6 +2108,7 @@ public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa return null; } + @SuppressWarnings("deprecation") @Override public String getNodeDescription(Node node) {