X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fweb%2Ftroubleshoot%2Fsrc%2Fmain%2Fresources%2Fjs%2Fpage.js;h=4bc4c76fc4c7edadf6f8e4994890a162044d76b7;hb=c61d22e4dc73fdaba09aa8c0b189ea7459679e03;hp=bcf911f0a5583a46bf14b5150ff20a01c1096bfc;hpb=e383b2e0b9072b7b5b3e3903b8a42ab3917b7f63;p=controller.git
diff --git a/opendaylight/web/troubleshoot/src/main/resources/js/page.js b/opendaylight/web/troubleshoot/src/main/resources/js/page.js
index bcf911f0a5..4bc4c76fc4 100644
--- a/opendaylight/web/troubleshoot/src/main/resources/js/page.js
+++ b/opendaylight/web/troubleshoot/src/main/resources/js/page.js
@@ -90,13 +90,10 @@ one.f.troubleshooting.existingNodes = {
modal: "one_f_troubleshooting_existingNodes_id_modal",
existingNodesDataGrid: "one_f_troubleshooting_existingNodes_id_datagrid",
portsDataGrid: "one_f_troubleshooting_existingNodes_id_portsDataGrid",
- flowsDataGrid: "one_f_troubleshooting_existingNodes_id_flowsDataGrid"
- },
- // TODO: Make these values configurable.
- autoRefreshInterval: {
- flows: 10000,
- ports: 10000,
- refreshRateInterval: 5000
+ flowsDataGrid: "one_f_troubleshooting_existingNodes_id_flowsDataGrid",
+ refreshFlowsButton:"one_f_troubleshooting_existingNodes_id_refreshFlowsButton",
+ refreshPortsButton:"one_f_troubleshooting_existingNodes_id_refreshPortsButton"
+
},
load: {
main: function($dashlet) {
@@ -122,13 +119,18 @@ one.f.troubleshooting.existingNodes = {
if(one.f.troubleshooting === undefined){
return;
}
- clearTimeout(one.f.troubleshooting.existingNodes.registry.refreshTimer);
$.getJSON(one.main.constants.address.prefix + "/troubleshoot/flowStats?nodeId=" + nodeId, function(content) {
$rightBottomDashlet = one.f.troubleshooting.rightBottomDashlet.get();
one.f.troubleshooting.rightBottomDashlet.setDashletHeader("Flows");
one.lib.dashlet.empty($rightBottomDashlet);
$rightBottomDashlet.append(one.lib.dashlet.header("Flow Details"));
-
+ var button = one.lib.dashlet.button.single("Refresh",
+ one.f.troubleshooting.existingNodes.id.refreshFlowsButton, "btn-primary", "btn-mini");
+ var $button = one.lib.dashlet.button.button(button);
+ $button.click(function() {
+ one.f.troubleshooting.existingNodes.load.flows(nodeId);
+ });
+ $rightBottomDashlet.append($button);
var $gridHTML = one.lib.dashlet.datagrid.init(one.f.troubleshooting.existingNodes.id.flowsDataGrid, {
searchable: true,
filterable: false,
@@ -138,16 +140,6 @@ one.f.troubleshooting.existingNodes = {
$rightBottomDashlet.append($gridHTML);
var dataSource = one.f.troubleshooting.existingNodes.data.flowsGrid(content);
$("#" + one.f.troubleshooting.existingNodes.id.flowsDataGrid).datagrid({dataSource: dataSource});
-
- var numberOfFlows = content.nodeData.length;
- var refreshRate = one.f.troubleshooting.existingNodes.autoRefreshInterval.flows;
- if (numberOfFlows > 0) {
- refreshRate += Math.floor(numberOfFlows / 500) *
- one.f.troubleshooting.existingNodes.autoRefreshInterval.refreshRateInterval;
- }
- one.f.troubleshooting.existingNodes.registry.refreshTimer = setTimeout(
- one.f.troubleshooting.existingNodes.load.flows,
- refreshRate, nodeId);
});
} catch(e) {}
},
@@ -156,13 +148,18 @@ one.f.troubleshooting.existingNodes = {
if(one.f.troubleshooting === undefined){
return;
}
- clearTimeout(one.f.troubleshooting.existingNodes.registry.refreshTimer);
$.getJSON(one.main.constants.address.prefix + "/troubleshoot/portStats?nodeId=" + nodeId, function(content) {
$rightBottomDashlet = one.f.troubleshooting.rightBottomDashlet.get();
one.f.troubleshooting.rightBottomDashlet.setDashletHeader("Ports");
one.lib.dashlet.empty($rightBottomDashlet);
$rightBottomDashlet.append(one.lib.dashlet.header("Port Details"));
-
+ var button = one.lib.dashlet.button.single("Refresh",
+ one.f.troubleshooting.existingNodes.id.refreshPortsButton, "btn-primary", "btn-mini");
+ var $button = one.lib.dashlet.button.button(button);
+ $button.click(function() {
+ one.f.troubleshooting.existingNodes.load.ports(nodeId);
+ });
+ $rightBottomDashlet.append($button);
var $gridHTML = one.lib.dashlet.datagrid.init(one.f.troubleshooting.existingNodes.id.portsDataGrid, {
searchable: true,
filterable: false,
@@ -172,16 +169,6 @@ one.f.troubleshooting.existingNodes = {
$rightBottomDashlet.append($gridHTML);
var dataSource = one.f.troubleshooting.existingNodes.data.portsGrid(content);
$("#" + one.f.troubleshooting.existingNodes.id.portsDataGrid).datagrid({dataSource: dataSource});
-
- var numberOfPorts = content.nodeData.length;
- var refreshRate = one.f.troubleshooting.existingNodes.autoRefreshInterval.ports;
- if (numberOfPorts > 0) {
- refreshRate += Math.floor(numberOfPorts / 500) *
- one.f.troubleshooting.existingNodes.autoRefreshInterval.refreshRateInterval;
- }
- one.f.troubleshooting.existingNodes.registry.refreshTimer = setTimeout(
- one.f.troubleshooting.existingNodes.load.ports,
- refreshRate, nodeId);
});
} catch(e) {}
}
@@ -205,7 +192,7 @@ one.f.troubleshooting.existingNodes = {
},
{
property: 'nodeId',
- label: 'Static Route',
+ label: 'Node ID',
sortable: true
},
{
@@ -220,13 +207,26 @@ one.f.troubleshooting.existingNodes = {
item["statistics"] = "Flows" +
" Ports";
});
-
},
delay: 0
});
return source;
},
portsGrid: function(data) {
+ $.each(data.nodeData, function(index, item) {
+ item.rxPkts = one.lib.helper.parseInt(item.rxPkts);
+ item.txPkts = one.lib.helper.parseInt(item.txPkts);
+ item.rxBytes = one.lib.helper.parseInt(item.rxBytes);
+ item.txBytes = one.lib.helper.parseInt(item.txBytes);
+ item.rxDrops = one.lib.helper.parseInt(item.rxDrops);
+ item.txDrops = one.lib.helper.parseInt(item.txDrops);
+ item.rxErrors = one.lib.helper.parseInt(item.rxErrors);
+ item.txErrors = one.lib.helper.parseInt(item.txErrors);
+ item.rxFrameErrors = one.lib.helper.parseInt(item.rxFrameErrors);
+ item.rxOverRunErrors = one.lib.helper.parseInt(item.rxOverRunErrors);
+ item.rxCRCErrors = one.lib.helper.parseInt(item.rxCRCErrors);
+ item.collisions = one.lib.helper.parseInt(item.collisions);
+ });
var source = new StaticDataSource({
columns: [
{
@@ -296,7 +296,7 @@ one.f.troubleshooting.existingNodes = {
}
],
data: data.nodeData,
- delay: 200
+ delay: 0
});
return source;
},
@@ -324,6 +324,13 @@ one.f.troubleshooting.existingNodes = {
return result;
},
flowsGrid: function(data) {
+ $.each(data.nodeData, function(index, item) {
+ item.byteCount = one.lib.helper.parseInt(item.byteCount);
+ item.packetCount = one.lib.helper.parseInt(item.packetCount);
+ item.durationSeconds = one.lib.helper.parseInt(item.durationSeconds);
+ item.idleTimeout = one.lib.helper.parseInt(item.idleTimeout);
+ item.priority = one.lib.helper.parseInt(item.priority);
+ });
var source = new StaticDataSource({
columns: [
{
@@ -356,6 +363,11 @@ one.f.troubleshooting.existingNodes = {
label: 'DL Vlan',
sortable: true
},
+ {
+ property: 'dlVlanPriority',
+ label: 'Vlan PCP',
+ sortable: true
+ },
{
property: 'nwSrc',
label: 'NW Src',
@@ -366,6 +378,11 @@ one.f.troubleshooting.existingNodes = {
label: 'NW Dst',
sortable: true
},
+ {
+ property: 'nwTOS',
+ label: 'ToS Bits',
+ sortable: true
+ },
{
property: 'nwProto',
label: 'NW Proto',
@@ -430,6 +447,7 @@ one.f.troubleshooting.existingNodes = {
entry.push(value["dlVlan"]);
entry.push(value["nwSrc"]);
entry.push(value["nwDst"]);
+ entry.push(value["nwTOS"]);
entry.push(value["nwProto"]);
entry.push(value["tpSrc"]);
entry.push(value["tpDst"]);