X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fweb%2Ftroubleshoot%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Ftroubleshoot%2Fweb%2FTroubleshoot.java;h=71ba687f2d4b16e22c43de7586f6d75c7119b7ac;hp=bde4152f5bdfd59c3631a5a80fbaccfd5011343a;hb=144cfa4b4a926b7d0c3d5f60ada050c609762699;hpb=39e1d43dc8f41f682fb818469a3aeb542e76ea8e 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 bde4152f5b..71ba687f2d 100644 --- 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 @@ -14,6 +14,7 @@ import java.util.Arrays; import java.util.Date; import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Set; import javax.servlet.http.HttpServletRequest; @@ -21,7 +22,9 @@ import javax.servlet.http.HttpServletRequest; import org.opendaylight.controller.sal.action.Action; import org.opendaylight.controller.sal.action.Output; import org.opendaylight.controller.sal.action.SetVlanId; +import org.opendaylight.controller.sal.authorization.Privilege; import org.opendaylight.controller.sal.authorization.UserLevel; +import org.opendaylight.controller.sal.core.Description; import org.opendaylight.controller.sal.core.Node; import org.opendaylight.controller.sal.core.NodeConnector; import org.opendaylight.controller.sal.core.TimeStamp; @@ -50,10 +53,22 @@ import org.springframework.web.bind.annotation.ResponseBody; @RequestMapping("/") public class Troubleshoot implements IDaylightWeb { private static final UserLevel AUTH_LEVEL = UserLevel.CONTAINERUSER; + private static final List flowStatsColumnNames = Arrays.asList("Node", "In Port", + "DL Src", "DL Dst", "DL Type", "DL Vlan", "NW Src", "NW Dst", + "NW Proto", "TP Src", "TP Dst", "Actions", "Bytes", "Packets", + "Time (s)", "Timeout (s)", "Out Port(s)", "Out Vlan", + "Priority"); + private static final List portStatsColumnNames = Arrays.asList("Node Connector", + "Rx Pkts", "Tx Pkts", "Rx Bytes", "Tx Bytes", "Rx Drops", + "Tx Drops", "Rx Errs", "Tx Errs", "Rx Frame Errs", + "Rx OverRun Errs", "Rx CRC Errs", "Collisions"); + private static final List nodesColumnNames = Arrays.asList("Node", "Node ID", "Statistics"); + private static final List nodeStatsColumnNames = Arrays.asList("Node", "Node ID", "Statistics"); private final String WEB_NAME = "Troubleshoot"; private final String WEB_ID = "troubleshoot"; private final short WEB_ORDER = 4; + public Troubleshoot() { ServiceHelper.registerGlobalService(IDaylightWeb.class, this, null); } @@ -81,30 +96,29 @@ public class Troubleshoot implements IDaylightWeb { @RequestMapping(value = "/existingNodes", method = RequestMethod.GET) @ResponseBody public TroubleshootingJsonBean getExistingNodes(HttpServletRequest request, @RequestParam(required = false) String container) { - String containerName = DaylightWebUtil.getAuthorizedContainer(request, container, this); - ISwitchManager switchManager = (ISwitchManager) ServiceHelper - .getInstance(ISwitchManager.class, containerName, this); - List> lines = new ArrayList>(); - Set nodeSet = null; - if (switchManager != null) { - nodeSet = switchManager.getNodes(); - } - if (nodeSet != null) { - for (Node node : nodeSet) { - HashMap device = new HashMap(); - device.put("nodeName", switchManager.getNodeDescription(node)); - device.put("nodeId", node.toString()); - lines.add(device); + List> lines = new ArrayList>(); + String containerName = (container == null) ? GlobalConstants.DEFAULT.toString() : container; + + // Derive the privilege this user has on the current container + String userName = request.getUserPrincipal().getName(); + Privilege privilege = DaylightWebUtil.getContainerPrivilege(userName, containerName, this); + + if (privilege != Privilege.NONE) { + ISwitchManager switchManager = (ISwitchManager) ServiceHelper + .getInstance(ISwitchManager.class, containerName, this); + Set nodeSet = (switchManager != null) ? switchManager.getNodes() : null; + if (nodeSet != null) { + for (Node node : nodeSet) { + Map device = new HashMap(); + device.put("nodeName", getNodeDesc(node, switchManager)); + device.put("nodeId", node.toString()); + lines.add(device); + } } } - TroubleshootingJsonBean result = new TroubleshootingJsonBean(); - - List guiFieldNames = new ArrayList(); - guiFieldNames.add("Node"); - guiFieldNames.add("Node ID"); - guiFieldNames.add("Statistics"); - result.setColumnNames(guiFieldNames); + TroubleshootingJsonBean result = new TroubleshootingJsonBean(); + result.setColumnNames(nodesColumnNames); result.setNodeData(lines); return result; } @@ -112,35 +126,34 @@ public class Troubleshoot implements IDaylightWeb { @RequestMapping(value = "/uptime", method = RequestMethod.GET) @ResponseBody public TroubleshootingJsonBean getUptime(HttpServletRequest request, @RequestParam(required = false) String container) { - String containerName = DaylightWebUtil.getAuthorizedContainer(request, container, this); - ISwitchManager switchManager = (ISwitchManager) ServiceHelper - .getInstance(ISwitchManager.class, containerName, this); - List> lines = new ArrayList>(); - Set nodeSet = null; - if (switchManager != null) { - nodeSet = switchManager.getNodes(); - } - if (nodeSet != null) { - for (Node node : nodeSet) { - HashMap device = new HashMap(); - device.put("nodeName", switchManager.getNodeDescription(node)); - device.put("nodeId", node.toString()); - TimeStamp timeStamp = (TimeStamp) switchManager.getNodeProp( - node, TimeStamp.TimeStampPropName); - Long time = (timeStamp == null) ? 0 : timeStamp.getValue(); - String date = (time == 0) ? "" : (new Date(time)).toString(); - device.put("connectedSince", date); - lines.add(device); + List> lines = new ArrayList>(); + String containerName = (container == null) ? GlobalConstants.DEFAULT.toString() : container; + + // Derive the privilege this user has on the current container + String userName = request.getUserPrincipal().getName(); + Privilege privilege = DaylightWebUtil.getContainerPrivilege(userName, containerName, this); + + if (privilege != Privilege.NONE) { + ISwitchManager switchManager = (ISwitchManager) ServiceHelper + .getInstance(ISwitchManager.class, containerName, this); + Set nodeSet = (switchManager != null) ? switchManager.getNodes() : null; + if (nodeSet != null) { + for (Node node : nodeSet) { + Map device = new HashMap(); + device.put("nodeName", getNodeDesc(node, switchManager)); + device.put("nodeId", node.toString()); + TimeStamp timeStamp = (TimeStamp) switchManager.getNodeProp( + node, TimeStamp.TimeStampPropName); + Long time = (timeStamp == null) ? 0 : timeStamp.getValue(); + String date = (time == 0) ? "" : (new Date(time)).toString(); + device.put("connectedSince", date); + lines.add(device); + } } } - TroubleshootingJsonBean result = new TroubleshootingJsonBean(); - List guiFieldNames = new ArrayList(); - guiFieldNames.add("Node"); - guiFieldNames.add("Node ID"); - guiFieldNames.add("Connected"); - - result.setColumnNames(guiFieldNames); + TroubleshootingJsonBean result = new TroubleshootingJsonBean(); + result.setColumnNames(nodeStatsColumnNames); result.setNodeData(lines); return result; } @@ -150,24 +163,27 @@ public class Troubleshoot implements IDaylightWeb { public TroubleshootingJsonBean getFlowStats( @RequestParam("nodeId") String nodeId, HttpServletRequest request, @RequestParam(required = false) String container) { - Node node = Node.fromString(nodeId); - List> cells = new ArrayList>(); - String containerName = DaylightWebUtil.getAuthorizedContainer(request, container, this); - IStatisticsManager statisticsManager = (IStatisticsManager) ServiceHelper - .getInstance(IStatisticsManager.class, containerName, this); - - List statistics = statisticsManager.getFlows(node); - for (FlowOnNode stats : statistics) { - cells.add(this.convertFlowStatistics(node, stats, containerName)); + List> cells = new ArrayList>(); + String containerName = (container == null) ? GlobalConstants.DEFAULT.toString() : container; + + // Derive the privilege this user has on the current container + String userName = request.getUserPrincipal().getName(); + Privilege privilege = DaylightWebUtil.getContainerPrivilege(userName, containerName, this); + + if (privilege != Privilege.NONE) { + IStatisticsManager statisticsManager = (IStatisticsManager) ServiceHelper + .getInstance(IStatisticsManager.class, containerName, this); + if (statisticsManager != null) { + Node node = Node.fromString(nodeId); + List statistics = statisticsManager.getFlows(node); + for (FlowOnNode stats : statistics) { + cells.add(this.convertFlowStatistics(node, stats, containerName)); + } + } } - List columnNames = new ArrayList(); - columnNames.addAll(Arrays.asList(new String[] { "Node", "In Port", - "DL Src", "DL Dst", "DL Type", "DL Vlan", "NW Src", "NW Dst", - "NW Proto", "TP Src", "TP Dst", "Actions", "Bytes", "Packets", - "Time (s)", "Timeout (s)", "Out Port(s)", "Out Vlan", - "Priority" })); + TroubleshootingJsonBean result = new TroubleshootingJsonBean(); - result.setColumnNames(columnNames); + result.setColumnNames(flowStatsColumnNames); result.setNodeData(cells); return result; } @@ -177,33 +193,46 @@ public class Troubleshoot implements IDaylightWeb { public TroubleshootingJsonBean getPortStats( @RequestParam("nodeId") String nodeId, HttpServletRequest request, @RequestParam(required = false) String container) { - Node node = Node.fromString(nodeId); - List> cells = new ArrayList>(); - String containerName = DaylightWebUtil.getAuthorizedContainer(request, container, this); - IStatisticsManager statisticsManager = (IStatisticsManager) ServiceHelper - .getInstance(IStatisticsManager.class, containerName, this); - List statistics = statisticsManager - .getNodeConnectorStatistics(node); - for (NodeConnectorStatistics stats : statistics) { - cells.add(this.convertPortsStatistics(stats)); + List> cells = new ArrayList>(); + String containerName = (container == null) ? GlobalConstants.DEFAULT.toString() : container; + + // Derive the privilege this user has on the current container + String userName = request.getUserPrincipal().getName(); + Privilege privilege = DaylightWebUtil.getContainerPrivilege(userName, containerName, this); + + if (privilege != Privilege.NONE) { + IStatisticsManager statisticsManager = (IStatisticsManager) ServiceHelper + .getInstance(IStatisticsManager.class, containerName, this); + if (statisticsManager != null) { + Node node = Node.fromString(nodeId); + List statistics = statisticsManager + .getNodeConnectorStatistics(node); + for (NodeConnectorStatistics stats : statistics) { + cells.add(this.convertPortsStatistics(stats, containerName)); + } + } } + TroubleshootingJsonBean result = new TroubleshootingJsonBean(); - List columnNames = new ArrayList(); - columnNames.addAll(Arrays.asList(new String[] { "Node Connector", - "Rx Pkts", "Tx Pkts", "Rx Bytes", "Tx Bytes", "Rx Drops", - "Tx Drops", "Rx Errs", "Tx Errs", "Rx Frame Errs", - "Rx OverRun Errs", "Rx CRC Errs", "Collisions" })); - result.setColumnNames(columnNames); + result.setColumnNames(portStatsColumnNames); result.setNodeData(cells); return result; } - private HashMap convertPortsStatistics( - NodeConnectorStatistics ncStats) { - HashMap row = new HashMap(); + private Map convertPortsStatistics( + NodeConnectorStatistics ncStats, String containerName) { + Map row = new HashMap(); + ISwitchManager switchManager = (ISwitchManager) ServiceHelper + .getInstance(ISwitchManager.class, containerName, this); + NodeConnector nodeConnector = ncStats.getNodeConnector(); + Description description = (Description) switchManager.getNodeProp(nodeConnector.getNode(), Description.propertyName); + String desc = (description == null) ? "" : description.getValue(); + String nodeName = desc.equalsIgnoreCase("none") ? nodeConnector.getNode().getNodeIDString() : desc; + String nodeConnectorDisplayName = nodeConnector.getType() + "|" + nodeConnector.getID() + "@" + nodeName; row.put("nodeConnector", - String.valueOf(ncStats.getNodeConnector().toString())); + String.valueOf(nodeConnectorDisplayName)); + row.put("rxPkts", String.valueOf(ncStats.getReceivePacketCount())); row.put("txPkts", String.valueOf(ncStats.getTransmitPacketCount())); row.put("rxBytes", String.valueOf(ncStats.getReceiveByteCount())); @@ -223,18 +252,17 @@ public class Troubleshoot implements IDaylightWeb { return row; } - private HashMap convertFlowStatistics(Node node, + private Map convertFlowStatistics(Node node, FlowOnNode flowOnNode, String containerName) { - HashMap row = new HashMap(); + Map row = new HashMap(); Flow flow = flowOnNode.getFlow(); Match match = flow.getMatch(); ISwitchManager switchManager = (ISwitchManager) ServiceHelper .getInstance(ISwitchManager.class, containerName, this); - String desc = (switchManager == null)? - "" : switchManager.getNodeDescription(node); - desc = (desc.isEmpty() || desc.equalsIgnoreCase("none"))? - node.toString(): desc; + String desc = getNodeDesc(node, switchManager); + desc = (desc == null || desc.isEmpty() || desc.equalsIgnoreCase("none"))? + node.toString() : desc; row.put("nodeName", desc); if (match.isPresent(MatchType.IN_PORT)) { row.put(MatchType.IN_PORT.id(), ((NodeConnector) flow.getMatch() @@ -348,4 +376,11 @@ public class Troubleshoot implements IDaylightWeb { return row; } + private String getNodeDesc(Node node, ISwitchManager switchManager) { + if (switchManager == null) { + return null; + } + Description desc = (Description) switchManager.getNodeProp(node, Description.propertyName); + return (desc == null) ? "" : desc.getValue(); + } }