Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
TS GUI does not show ToS field in flow stats
[controller.git]
/
opendaylight
/
web
/
troubleshoot
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
troubleshoot
/
web
/
Troubleshoot.java
diff --git
a/opendaylight/web/troubleshoot/src/main/java/org/opendaylight/controller/troubleshoot/web/Troubleshoot.java
b/opendaylight/web/troubleshoot/src/main/java/org/opendaylight/controller/troubleshoot/web/Troubleshoot.java
index e46b89ac2afe3fa2f46604f5a7f3fde2298181b3..6d79f3cb05cc7faf2469e3144fb6be44d9d21e81 100644
(file)
--- a/
opendaylight/web/troubleshoot/src/main/java/org/opendaylight/controller/troubleshoot/web/Troubleshoot.java
+++ b/
opendaylight/web/troubleshoot/src/main/java/org/opendaylight/controller/troubleshoot/web/Troubleshoot.java
@@
-62,7
+62,7
@@
import org.springframework.web.bind.annotation.ResponseBody;
public class Troubleshoot implements IDaylightWeb {
private static final UserLevel AUTH_LEVEL = UserLevel.CONTAINERUSER;
private static final List<String> flowStatsColumnNames = Arrays.asList("Node", "In Port",
public class Troubleshoot implements IDaylightWeb {
private static final UserLevel AUTH_LEVEL = UserLevel.CONTAINERUSER;
private static final List<String> flowStatsColumnNames = Arrays.asList("Node", "In Port",
- "DL Src", "DL Dst", "DL Type", "DL Vlan", "NW Src", "NW Dst",
+ "DL Src", "DL Dst", "DL Type", "DL Vlan", "NW Src", "NW Dst",
"ToS Bits",
"NW Proto", "TP Src", "TP Dst", "Actions", "Bytes", "Packets",
"Time (s)", "Timeout (s)",
"Priority");
"NW Proto", "TP Src", "TP Dst", "Actions", "Bytes", "Packets",
"Time (s)", "Timeout (s)",
"Priority");
@@
-229,6
+229,7
@@
public class Troubleshoot implements IDaylightWeb {
private Map<String, String> convertPortsStatistics(
NodeConnectorStatistics ncStats, String containerName) {
private Map<String, String> convertPortsStatistics(
NodeConnectorStatistics ncStats, String containerName) {
+
Map<String, String> row = new HashMap<String, String>();
ISwitchManager switchManager = (ISwitchManager) ServiceHelper
Map<String, String> row = new HashMap<String, String>();
ISwitchManager switchManager = (ISwitchManager) ServiceHelper
@@
-325,6
+326,12
@@
public class Troubleshoot implements IDaylightWeb {
} else {
row.put(MatchType.NW_DST.id(), "*");
}
} else {
row.put(MatchType.NW_DST.id(), "*");
}
+ if (match.isPresent(MatchType.NW_TOS)) {
+ row.put(MatchType.NW_TOS.id(), ((Byte) flow.getMatch()
+ .getField(MatchType.NW_TOS).getValue()).toString());
+ } else {
+ row.put(MatchType.NW_TOS.id(), "*");
+ }
if (match.isPresent(MatchType.NW_PROTO)) {
row.put(MatchType.NW_PROTO.id(),
IPProtocols.getProtocolName(((Byte) flow.getMatch()
if (match.isPresent(MatchType.NW_PROTO)) {
row.put(MatchType.NW_PROTO.id(),
IPProtocols.getProtocolName(((Byte) flow.getMatch()