From d355b8dd3a3d9bbf7a854dfc2088d67165fe3b5b Mon Sep 17 00:00:00 2001
From: Loi Pan <mr.loipan@gmail.com>
Date: Tue, 1 Jul 2014 20:24:05 +0100
Subject: [PATCH] Re-commit flow, port statistics per code review

Change-Id: I26cd057e33ec37791cf58321b1e6921017e98bc8
Signed-off-by: Loi Pan <mr.loipan@gmail.com>
---
 src/app/node/flow-stat.tpl.html   | 51 +++++++++++++++++++++++
 src/app/node/index.tpl.html       |  7 ++++
 src/app/node/nodes.js             | 41 ++++++++++++++++++-
 src/app/node/port-stat.tpl.html   | 68 +++++++++++++++++++++++++++++++
 src/assets/data/locale-en_US.json | 25 +++++++++++-
 5 files changed, 189 insertions(+), 3 deletions(-)
 create mode 100644 src/app/node/flow-stat.tpl.html
 create mode 100644 src/app/node/port-stat.tpl.html

diff --git a/src/app/node/flow-stat.tpl.html b/src/app/node/flow-stat.tpl.html
new file mode 100644
index 00000000..ee3e64a0
--- /dev/null
+++ b/src/app/node/flow-stat.tpl.html
@@ -0,0 +1,51 @@
+<!--<h3>Ports</h3>
+<table class="table table-stripped">
+  <thead>
+    <tr>
+      <th class="col-md-8">Name</th>
+      <th class="col-md-2">Type</th>
+      <th class="col-md-2">State</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr class="table table-striped" ng-repeat="ncp in data.nodeConnectorProperties | noRootPorts | orderBy:'properties.name.value'">
+      <td>{{ncp.properties.name.value}}</td>
+      <td>{{ncp.nodeconnector.type}}</td>
+      <td>
+        <i class="icon-ok-sign"></i>
+        <port-state value="{{ncp.properties.state.value}}"></port-state>
+      </td>
+    </tr>
+  </tbody>
+</table>-->
+
+<h4>{{ 'FLOW_TABLE_STATISTICS_FOR_NODE_ID' | translate }} - {{data.id}}</h4>
+<label class="white-detail-page"><input type="checkbox" ng-model="checked">&nbsp;{{ 'SHOW_ALL_TABLES' | translate }}</label>
+<table class="footable table">
+  <thead>
+    <tr>
+      <th>{{ 'TABLE_ID' | translate }}</th>
+      <th>{{ 'ACTIVE_FLOW' | translate }}</th>
+      <th>{{ 'PKTS_MATCHED' | translate }}</th>
+      <th>{{ 'PKTS_LOOKED_UP' | translate }}</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr ng-hide="data['flow-node-inventory:table'].length"><td colspan="4" class="centerAlign">{{ 'NO_DATA_FOUND' | translate }}</td></tr>
+    <tr data-ng-repeat="ncp in data['flow-node-inventory:table']" ng-show="checked || checkActiveFlow($index)">
+        <!--<td><input type="checkbox" name="select-node-{{item.node.id}}" ng-click="unselect($event)" id="select-node-{{item.node.id}}" /></td>-->
+        <td>{{ncp['flow-node-inventory:id']}}</td>
+        <td>{{ncp['opendaylight-flow-table-statistics:flow-table-statistics']['opendaylight-flow-table-statistics:active-flows']}}</td>
+        <td>{{ncp['opendaylight-flow-table-statistics:flow-table-statistics']['opendaylight-flow-table-statistics:packets-matched']}}</td>
+        <td>{{ncp['opendaylight-flow-table-statistics:flow-table-statistics']['opendaylight-flow-table-statistics:packets-looked-up']}}</td>
+        <!--td>
+          <i class="icon-ok-sign"></i>
+          <port-state value="{{ncp.properties.state.value}}"></port-state>
+        </td-->
+      </tr>
+  </tbody>
+</table>
+
+<script type="text/javascript">
+    $('.footable').footable();
+</script>
\ No newline at end of file
diff --git a/src/app/node/index.tpl.html b/src/app/node/index.tpl.html
index d96a3994..82468d5c 100644
--- a/src/app/node/index.tpl.html
+++ b/src/app/node/index.tpl.html
@@ -15,6 +15,7 @@
         <th>{{ 'NODE_ID' | translate }}</th>
         <th data-hide="phone">{{ 'NODE_NAME' | translate }}</th>
         <th>{{ 'NODE_CONNECTORS' | translate }}</th>
+        <th>{{ 'STATISTICS' | translate }}</th>
       </tr>
 	</thead>
 	<tbody>
@@ -23,6 +24,12 @@
         <td tooltip="{{item['flow-node-inventory:description']}}">{{item.id}}</td>
         <td>{{item['flow-node-inventory:description']}}</td>
         <td><a href="index.html#/node/{{item.id}}/detail">{{item['node-connector'].length}}</a></td>
+        <td>
+          <span ng-show="item.id!='controller-config'">
+            <a href="index.html#/node/{{item.id}}/flow-stat">{{ 'FLOWS' | translate }}</a>
+            <a href="index.html#/node/{{item.id}}/port-stat">{{ 'NODE_CONNECTORS' | translate }}</a>
+          </span>
+        </td>
         <!--<td>
         	<a class="row-delete" href="#">
     			<i class="icon-remove"></i>
diff --git a/src/app/node/nodes.js b/src/app/node/nodes.js
index 566e8e79..8e25fa04 100644
--- a/src/app/node/nodes.js
+++ b/src/app/node/nodes.js
@@ -29,7 +29,7 @@ angular.module('console.node', [])
   });
 })
 
-.controller('nodeConnectorCtrl', function($scope, $stateParams, NodeInventorySvc, $timeout) {
+.controller('nodeConnectorCtrl', function($scope, $stateParams, NodeInventorySvc, $timeout, nodeConnectorFactory) {
    var currentData = NodeInventorySvc.getCurrentData();
    if(currentData != null) {
      currentData.then(function(data) {
@@ -58,7 +58,24 @@ angular.module('console.node', [])
         tableRendered = true;
       }
     });
+
+  $scope.checkActiveFlow = function(index) {
+    return nodeConnectorFactory.getActiveFlow($scope.data['flow-node-inventory:table'], index);
+  };
+})
+
+.factory('nodeConnectorFactory', function() {
+  var factory = {};
+
+  factory.getActiveFlow = function(flowTable, index) {
+    var flow = flowTable[index];
+    var activeFlow = flow['opendaylight-flow-table-statistics:flow-table-statistics']['opendaylight-flow-table-statistics:active-flows'];
+
+    return (activeFlow > 0);
+  };
+  return factory;
 })
+
 .config(function ($stateProvider) {
   var access = routingConfig.accessLevels;
   $stateProvider.state('node', {
@@ -88,4 +105,26 @@ angular.module('console.node', [])
       }
     }
   });
+
+  $stateProvider.state('node.flow-stat', {
+    url: '/:nodeId/flow-stat',
+    access: access.admin,
+    views: {
+      '': {
+        templateUrl: 'node/flow-stat.tpl.html',
+        controller: 'nodeConnectorCtrl'
+      }
+    }
+  });
+
+  $stateProvider.state('node.port-stat', {
+    url: '/:nodeId/port-stat',
+    access: access.admin,
+    views: {
+      '': {
+        templateUrl: 'node/port-stat.tpl.html',
+        controller: 'nodeConnectorCtrl'
+      }
+    }
+  });
 });
diff --git a/src/app/node/port-stat.tpl.html b/src/app/node/port-stat.tpl.html
new file mode 100644
index 00000000..855241f9
--- /dev/null
+++ b/src/app/node/port-stat.tpl.html
@@ -0,0 +1,68 @@
+<!--<h3>Ports</h3>
+<table class="table table-stripped">
+  <thead>
+    <tr>
+      <th class="col-md-8">Name</th>
+      <th class="col-md-2">Type</th>
+      <th class="col-md-2">State</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr class="table table-striped" ng-repeat="ncp in data.nodeConnectorProperties | noRootPorts | orderBy:'properties.name.value'">
+      <td>{{ncp.properties.name.value}}</td>
+      <td>{{ncp.nodeconnector.type}}</td>
+      <td>
+        <i class="icon-ok-sign"></i>
+        <port-state value="{{ncp.properties.state.value}}"></port-state>
+      </td>
+    </tr>
+  </tbody>
+</table>-->
+
+<h4>{{ 'NODE_CONNECTOR_STATISTICS_FOR_NODE_ID' | translate }} - {{data.id}}</h4>
+<table class="footable table">
+  <thead>
+    <tr>
+      <th>{{ 'NODE_CONNECTOR_ID' | translate }}</th>
+      <th>{{ 'RX_PKTS' | translate }}</th>
+      <th>{{ 'TX_PKTS' | translate }}</th>
+      <th>{{ 'RX_BYTES' | translate }}</th>
+      <th>{{ 'TX_BYTES' | translate }}</th>
+      <th>{{ 'RX_DROPS' | translate }}</th>
+      <th>{{ 'TX_DROPS' | translate }}</th>
+      <th>{{ 'RX_ERRS' | translate }}</th>
+      <th>{{ 'TX_ERRS' | translate }}</th>
+      <th>{{ 'RX_FRAME_ERRS' | translate }}</th>
+      <th>{{ 'RX_OVERRUN_ERRS' | translate }}</th>
+      <th>{{ 'RX_CRC_ERRS' | translate }}</th>
+      <th>{{ 'Collisions' | translate }}</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr ng-hide="data['node-connector'].length"><td colspan="4" class="centerAlign">{{ 'NO_DATA_FOUND' | translate }}</td></tr>
+    <tr ng-repeat="ncp in data['node-connector']">
+        <!--<td><input type="checkbox" name="select-node-{{item.node.id}}" ng-click="unselect($event)" id="select-node-{{item.node.id}}" /></td>-->
+        <td>{{ncp.id}}</td>
+        <td>{{ncp['opendaylight-port-statistics:flow-capable-node-connector-statistics']['opendaylight-port-statistics:packets']['opendaylight-port-statistics:received']}}</td>
+        <td>{{ncp['opendaylight-port-statistics:flow-capable-node-connector-statistics']['opendaylight-port-statistics:packets']['opendaylight-port-statistics:transmitted']}}</td>
+        <td>{{ncp['opendaylight-port-statistics:flow-capable-node-connector-statistics']['opendaylight-port-statistics:bytes']['opendaylight-port-statistics:received']}}</td>
+        <td>{{ncp['opendaylight-port-statistics:flow-capable-node-connector-statistics']['opendaylight-port-statistics:bytes']['opendaylight-port-statistics:transmitted']}}</td>
+        <td>{{ncp['opendaylight-port-statistics:flow-capable-node-connector-statistics']['opendaylight-port-statistics:receive-drops']}}</td>
+        <td>{{ncp['opendaylight-port-statistics:flow-capable-node-connector-statistics']['opendaylight-port-statistics:transmit-drops']}}</td>
+        <td>{{ncp['opendaylight-port-statistics:flow-capable-node-connector-statistics']['opendaylight-port-statistics:receive-errors']}}</td>
+        <td>{{ncp['opendaylight-port-statistics:flow-capable-node-connector-statistics']['opendaylight-port-statistics:transmit-errors']}}</td>
+        <td>{{ncp['opendaylight-port-statistics:flow-capable-node-connector-statistics']['opendaylight-port-statistics:receive-frame-error']}}</td>
+        <td>{{ncp['opendaylight-port-statistics:flow-capable-node-connector-statistics']['opendaylight-port-statistics:receive-over-run-error']}}</td>
+        <td>{{ncp['opendaylight-port-statistics:flow-capable-node-connector-statistics']['opendaylight-port-statistics:receive-crc-error']}}</td>
+        <td>{{ncp['opendaylight-port-statistics:flow-capable-node-connector-statistics']['opendaylight-port-statistics:collision-count']}}</td>
+        <!--td>
+          <i class="icon-ok-sign"></i>
+          <port-state value="{{ncp.properties.state.value}}"></port-state>
+        </td-->
+      </tr>
+  </tbody>
+</table>
+
+<script type="text/javascript">
+    $('.footable').footable();
+</script>
diff --git a/src/assets/data/locale-en_US.json b/src/assets/data/locale-en_US.json
index 92570b12..2216e775 100644
--- a/src/assets/data/locale-en_US.json
+++ b/src/assets/data/locale-en_US.json
@@ -19,5 +19,26 @@
     "FLOW_STATISTICS":"Flow Statistics",
     "NODE_CONNECTOR_STATISTICS": "Node Connector Statistics",
     "SEARCH_NODES":"Search Nodes",
-    "SEARCH_NODE_CONNECTORS":"Search Node Connectors"
-}
\ No newline at end of file
+    "SEARCH_NODE_CONNECTORS":"Search Node Connectors",
+        
+    "FLOW_TABLE_STATISTICS_FOR_NODE_ID":"Flow Table Statistics for Node Id",
+    "TABLE_ID":"Table Id",
+    "ACTIVE_FLOW":"Active Flow",
+    "PKTS_MATCHED":"Pkts Matched",
+    "PKTS_LOOKED_UP":"Pkts Looked-up",
+    "SHOW_ALL_TABLES":"Show all tables",
+    
+    "NODE_CONNECTOR_STATISTICS_FOR_NODE_ID":"Node Connector Statistics for Node Id",
+    "RX_PKTS":"Rx Pkts",
+    "TX_PKTS":"Tx Pkts",
+    "RX_BYTES":"Rx Bytes",
+    "TX_BYTES":"Tx Bytes",
+    "RX_DROPS":"Rx Drops",
+    "TX_DROPS":"Tx Drops",
+    "RX_ERRS":"Rx Errs",
+    "TX_ERRS":"Tx Errs",
+    "RX_FRAME_ERRS":"Rx Frame Errs",
+    "RX_OVERRUN_ERRS":"Rx OverRun Errs",
+    "RX_CRC_ERRS":"Rx CRC Errs",
+    "Collisions":"Collisions"
+}
-- 
2.36.6