Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Minor fixes in md-sal and config."
[controller.git]
/
opendaylight
/
switchmanager
/
implementation
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
switchmanager
/
internal
/
SwitchManager.java
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 f895ca0c85bd4583405453d65fcd4195dcb8b5ce..674da37afb5676a971905aefc3caf2a84eb2c761 100644
(file)
--- 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
@@
-175,16
+175,11
@@
public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa
retrieveCaches();
/*
retrieveCaches();
/*
- * Read startup and build database if we have not already gotten the
- * configurations synced from another node
+ * Read startup and build database if we are the coordinator
*/
*/
- if (
subnetsConfigList.isEmpty(
)) {
+ if (
(clusterContainerService != null) && (clusterContainerService.amICoordinator()
)) {
loadSubnetConfiguration();
loadSubnetConfiguration();
- }
- if (spanConfigList.isEmpty()) {
loadSpanConfiguration();
loadSpanConfiguration();
- }
- if (nodeConfigList.isEmpty()) {
loadSwitchConfiguration();
}
loadSwitchConfiguration();
}
@@
-242,7
+237,7
@@
public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa
@SuppressWarnings({ "unchecked" })
private void retrieveCaches() {
if (this.clusterContainerService == null) {
@SuppressWarnings({ "unchecked" })
private void retrieveCaches() {
if (this.clusterContainerService == null) {
- log.
info
("un-initialized clusterContainerService, can't create cache");
+ log.
warn
("un-initialized clusterContainerService, can't create cache");
return;
}
return;
}
@@
-319,7
+314,7
@@
public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa
@Override
public SubnetConfig getSubnetConfig(String subnet) {
// if there are no subnets, return the default subnet
@Override
public SubnetConfig getSubnetConfig(String subnet) {
// if there are no subnets, return the default subnet
- if(subnetsConfigList.
size() == 0 && subnet == DEFAULT_SUBNET_NAME
){
+ if(subnetsConfigList.
isEmpty() && subnet.equalsIgnoreCase(DEFAULT_SUBNET_NAME)
){
return DEFAULT_SUBNETCONFIG;
}else{
return subnetsConfigList.get(subnet);
return DEFAULT_SUBNETCONFIG;
}else{
return subnetsConfigList.get(subnet);
@@
-428,11
+423,11
@@
public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa
}
private Status semanticCheck(SubnetConfig conf) {
}
private Status semanticCheck(SubnetConfig conf) {
- Subnet newSubnet = new Subnet(conf);
Set<InetAddress> IPs = subnets.keySet();
if (IPs == null) {
return new Status(StatusCode.SUCCESS);
}
Set<InetAddress> IPs = subnets.keySet();
if (IPs == null) {
return new Status(StatusCode.SUCCESS);
}
+ Subnet newSubnet = new Subnet(conf);
for (InetAddress i : IPs) {
Subnet existingSubnet = subnets.get(i);
if ((existingSubnet != null) && !existingSubnet.isMutualExclusive(newSubnet)) {
for (InetAddress i : IPs) {
Subnet existingSubnet = subnets.get(i);
if ((existingSubnet != null) && !existingSubnet.isMutualExclusive(newSubnet)) {
@@
-462,7
+457,7
@@
public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa
return status;
}
} else {
return status;
}
} else {
- if (conf.getName().equals(DEFAULT_SUBNET_NAME)) {
+ if (conf.getName().equals
IgnoreCase
(DEFAULT_SUBNET_NAME)) {
return new Status(StatusCode.NOTALLOWED, "The specified subnet gateway cannot be removed");
}
}
return new Status(StatusCode.NOTALLOWED, "The specified subnet gateway cannot be removed");
}
}
@@
-506,7
+501,7
@@
public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa
@Override
public Status removeSubnet(String name) {
@Override
public Status removeSubnet(String name) {
- if (name.equals(DEFAULT_SUBNET_NAME)) {
+ if (name.equals
IgnoreCase
(DEFAULT_SUBNET_NAME)) {
return new Status(StatusCode.NOTALLOWED, "The specified subnet gateway cannot be removed");
}
SubnetConfig conf = subnetsConfigList.get(name);
return new Status(StatusCode.NOTALLOWED, "The specified subnet gateway cannot be removed");
}
SubnetConfig conf = subnetsConfigList.get(name);
@@
-794,7
+789,7
@@
public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa
return;
}
return;
}
- log.
info
("Set Node {}'s Mode to {}", nodeId, cfgObject.getMode());
+ log.
trace
("Set Node {}'s Mode to {}", nodeId, cfgObject.getMode());
if (modeChange) {
notifyModeChange(node, cfgObject.isProactive());
if (modeChange) {
notifyModeChange(node, cfgObject.isProactive());
@@
-1108,8
+1103,7
@@
public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa
private void updateNode(Node node, Set<Property> props) {
log.trace("{} updated, props: {}", node, props);
private void updateNode(Node node, Set<Property> props) {
log.trace("{} updated, props: {}", node, props);
- if (nodeProps == null || !nodeProps.containsKey(node) ||
- props == null || props.isEmpty()) {
+ if (nodeProps == null || props == null) {
return;
}
return;
}
@@
-1310,10
+1304,6
@@
public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa
if (nodeProps.replace(node, propMapCurr, propMap)) {
return;
}
if (nodeProps.replace(node, propMapCurr, propMap)) {
return;
}
- if (!propMapCurr.get(prop.getName()).equals(nodeProps.get(node).get(prop.getName()))) {
- log.debug("Cluster conflict: Unable to add property {} to node {}.", prop.getName(), node.getID());
- return;
- }
}
log.warn("Cluster conflict: Unable to add property {} to node {}.", prop.getName(), node.getID());
}
}
log.warn("Cluster conflict: Unable to add property {} to node {}.", prop.getName(), node.getID());
}
@@
-1331,12
+1321,6
@@
public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa
if (nodeProps.replace(node, propMapCurr, propMap)) {
return new Status(StatusCode.SUCCESS);
}
if (nodeProps.replace(node, propMapCurr, propMap)) {
return new Status(StatusCode.SUCCESS);
}
- if (!propMapCurr.get(propName).equals(nodeProps.get(node).get(propName))) {
- String msg = "Cluster conflict: Unable to remove property " + propName + " for node "
- + node.getID();
- return new Status(StatusCode.CONFLICT, msg);
- }
-
} else {
return new Status(StatusCode.SUCCESS);
}
} else {
return new Status(StatusCode.SUCCESS);
}