Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fixed a bug in removeSpanPorts
[controller.git]
/
opendaylight
/
switchmanager
/
implementation
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
switchmanager
/
internal
/
SwitchManagerImpl.java
diff --git
a/opendaylight/switchmanager/implementation/src/main/java/org/opendaylight/controller/switchmanager/internal/SwitchManagerImpl.java
b/opendaylight/switchmanager/implementation/src/main/java/org/opendaylight/controller/switchmanager/internal/SwitchManagerImpl.java
index 2937fe7e14710c3655cf99e954bcc6cd4aefa05c..971213e483e567b4d4a6d0336ee613b85ceb25a8 100644
(file)
--- a/
opendaylight/switchmanager/implementation/src/main/java/org/opendaylight/controller/switchmanager/internal/SwitchManagerImpl.java
+++ b/
opendaylight/switchmanager/implementation/src/main/java/org/opendaylight/controller/switchmanager/internal/SwitchManagerImpl.java
@@
-1457,10
+1457,11
@@
CommandProvider {
String nodeName = (desc == null) ? "" : desc.getValue();
MacAddress mac = (MacAddress) getNodeProp(node,
MacAddress.name);
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();
int tierNum = (tier == null) ? 0 : tier.getValue();
- ci.println(node + " " + node.getType() + " "
- + HexEncode.bytesToHexStringFormat(mac.getMacAddress())
- + " " + nodeName + " " + tierNum );
+ ci.println(node + " " + node.getType() + " " + macAddr
+ + " " + nodeName + " " + tierNum);
}
ci.println("Total number of Nodes: " + nodeSet.size());
}
}
ci.println("Total number of Nodes: " + nodeSet.size());
}
@@
-1645,7
+1646,8
@@
CommandProvider {
@Override
public byte[] getNodeMAC(Node node) {
@Override
public byte[] getNodeMAC(Node node) {
- MacAddress mac = (MacAddress) nodeProps.get(MacAddress.name);
+ MacAddress mac = (MacAddress) this.getNodeProp(node,
+ MacAddress.name);
return (mac != null) ? mac.getMacAddress() : null;
}
return (mac != null) ? mac.getMacAddress() : null;
}
@@
-1697,7
+1699,7
@@
CommandProvider {
List<NodeConnector> ncLists = new ArrayList<NodeConnector>();
for (NodeConnector nodeConnector : nodeConncetors) {
List<NodeConnector> ncLists = new ArrayList<NodeConnector>();
for (NodeConnector nodeConnector : nodeConncetors) {
- if (
!
spanNodeConnectors.contains(nodeConnector)) {
+ if (spanNodeConnectors.contains(nodeConnector)) {
ncLists.add(nodeConnector);
}
}
ncLists.add(nodeConnector);
}
}