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 "Fix bulk sync in SwitchMananger."
[controller.git]
/
opendaylight
/
samples
/
simpleforwarding
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
samples
/
simpleforwarding
/
internal
/
SimpleForwardingImpl.java
diff --git
a/opendaylight/samples/simpleforwarding/src/main/java/org/opendaylight/controller/samples/simpleforwarding/internal/SimpleForwardingImpl.java
b/opendaylight/samples/simpleforwarding/src/main/java/org/opendaylight/controller/samples/simpleforwarding/internal/SimpleForwardingImpl.java
index c2fee970ac00c8354140de8318786cd0bfcac7c4..11056478dbf1742ec48e5cc6bbf9ec3bf01ad56a 100644
(file)
--- a/
opendaylight/samples/simpleforwarding/src/main/java/org/opendaylight/controller/samples/simpleforwarding/internal/SimpleForwardingImpl.java
+++ b/
opendaylight/samples/simpleforwarding/src/main/java/org/opendaylight/controller/samples/simpleforwarding/internal/SimpleForwardingImpl.java
@@
-147,7
+147,7
@@
public class SimpleForwardingImpl implements IfNewHostNotify,
}
@SuppressWarnings("deprecation")
}
@SuppressWarnings("deprecation")
- private void allocateCaches() {
+
private void allocateCaches() {
if (this.clusterContainerService == null) {
log.info("un-initialized clusterContainerService, can't create cache");
return;
if (this.clusterContainerService == null) {
log.info("un-initialized clusterContainerService, can't create cache");
return;
@@
-178,7
+178,7
@@
public class SimpleForwardingImpl implements IfNewHostNotify,
}
@SuppressWarnings("deprecation")
}
@SuppressWarnings("deprecation")
- private void destroyCaches() {
+
private void destroyCaches() {
if (this.clusterContainerService == null) {
log.info("un-initialized clusterContainerService, can't destroy cache");
return;
if (this.clusterContainerService == null) {
log.info("un-initialized clusterContainerService, can't destroy cache");
return;
@@
-367,7
+367,7
@@
public class SimpleForwardingImpl implements IfNewHostNotify,
}
} else {
}
} else {
- log.debug("Adding policyMatch(DIP = {}) Action(outPort= {}) " +
+ log.debug("Adding policyMatch(DIP = {}) Action(outPort= {}) " +
"to node {}", new Object[] {
host.getNetworkAddress().getHostAddress(), outPort,
currNode});
"to node {}", new Object[] {
host.getNetworkAddress().getHostAddress(), outPort,
currNode});
@@
-482,7
+482,7
@@
public class SimpleForwardingImpl implements IfNewHostNotify,
updatePerHostRuleInSW(host, rootNode, rootNode, null, new HostNodePair(
host, rootNode), ports);
updatePerHostRuleInSW(host, rootNode, rootNode, null, new HostNodePair(
host, rootNode), ports);
- //
log.debug("Getting out at the end!");
+ // log.debug("Getting out at the end!");
return switchesToProgram;
}
return switchesToProgram;
}
@@
-575,10
+575,10
@@
public class SimpleForwardingImpl implements IfNewHostNotify,
// rest of the world
// switchesToProgram.add(rootNode);
//updatePerHostRuleInSW(host, rootNode,
// rest of the world
// switchesToProgram.add(rootNode);
//updatePerHostRuleInSW(host, rootNode,
- // rootNode, null,
- // new HostNodePair(host, rootNode),ports);
+ //
rootNode, null,
+ //
new HostNodePair(host, rootNode),ports);
- //
log.debug("Getting out at the end!");
+ // log.debug("Getting out at the end!");
return switchesToProgram;
}
return switchesToProgram;
}
@@
-617,7
+617,7
@@
public class SimpleForwardingImpl implements IfNewHostNotify,
Status poStatus = this.frm.installFlowEntry(po);
if (!poStatus.isSuccess()) {
log.error("Failed to install policy: "
Status poStatus = this.frm.installFlowEntry(po);
if (!poStatus.isSuccess()) {
log.error("Failed to install policy: "
- + po.getGroupName() + " ("
+ + po.getGroupName() + " ("
+ poStatus.getDescription() + ")");
retCode = RulesProgrammingReturnCode.FAILED_FEW_SWITCHES;
+ poStatus.getDescription() + ")");
retCode = RulesProgrammingReturnCode.FAILED_FEW_SWITCHES;
@@
-632,8
+632,8
@@
public class SimpleForwardingImpl implements IfNewHostNotify,
swId, host);
/* // Now dump every single rule */
/* for (HostNodePair dumpkey : this.rulesDB.keySet()) { */
swId, host);
/* // Now dump every single rule */
/* for (HostNodePair dumpkey : this.rulesDB.keySet()) { */
- /*
po = this.rulesDB.get(dumpkey); */
- /*
log.debug("Dumping entry H{" + dumpkey.getHost() + "} S{" + dumpkey.getSwitchId() + "} = {" + (po == null ? "null policy" : po)); */
+ /* po = this.rulesDB.get(dumpkey); */
+ /* log.debug("Dumping entry H{" + dumpkey.getHost() + "} S{" + dumpkey.getSwitchId() + "} = {" + (po == null ? "null policy" : po)); */
/* } */
}
}
/* } */
}
}