From a510925ce7dd0f3e6a6fb735945f51500d619fe1 Mon Sep 17 00:00:00 2001
From: Manoj Naik <mnaik@juniper.net>
Date: Wed, 22 Jul 2015 15:16:58 +0530
Subject: [PATCH] Revert "Related-Bug:#1437577"

This reverts commit b2ada15d6ca3ad739e7398888c4eb40194f2ad4b.

Change-Id: I08019ff3f0087c4d26baa63bf69592bd3574ea57
---
 .../ui/js/monitor_infra_analyticsnode_details.js            | 6 +++---
 .../analyticsnode/ui/views/monitor_infra_analyticnode.view  | 6 +++---
 .../monitor/infra/common/ui/js/monitor_infra_constants.js   | 2 +-
 webroot/monitor/infra/common/ui/js/monitor_infra_utils.js   | 4 ----
 .../confignode/ui/js/monitor_infra_confignode_details.js    | 6 +++---
 .../infra/confignode/ui/views/monitor_infra_confignode.view | 6 +++---
 .../controlnode/ui/js/monitor_infra_controlnode_details.js  | 2 +-
 .../controlnode/ui/views/monitor_infra_controlnode.view     | 2 +-
 .../infra/vrouter/ui/js/monitor_infra_vrouter_details.js    | 2 +-
 .../infra/vrouter/ui/views/monitor_infra_vrouter.view       | 2 +-
 10 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/webroot/monitor/infra/analyticsnode/ui/js/monitor_infra_analyticsnode_details.js b/webroot/monitor/infra/analyticsnode/ui/js/monitor_infra_analyticsnode_details.js
index bdcd6ff23..ad55e204b 100644
--- a/webroot/monitor/infra/analyticsnode/ui/js/monitor_infra_analyticsnode_details.js
+++ b/webroot/monitor/infra/analyticsnode/ui/js/monitor_infra_analyticsnode_details.js
@@ -52,13 +52,13 @@ monitorInfraAnalyticsDetailsClass = (function() {
                     endWidgetLoading('analytics-sparklines');
                     $('#collector-chart').initMemCPULineChart($.extend({url:function() {
                         return contrail.format(monitorInfraUrls['FLOWSERIES_CPU'], 'contrail-collector', '30', '10', obj['name'], endTime);
-                    }, parser: "parseProcessMemCPUData", plotOnLoad: true, lineChartId: 'collector-sparklines', showWidgetIds: ['collector-chart-box'], hideWidgetIds: ['queryengine-chart-box', 'opServer-chart-box'], titles: {memTitle:'Memory',cpuTitle: infraDetailsPageCPUChartTitle}}),110);
+                    }, parser: "parseProcessMemCPUData", plotOnLoad: true, lineChartId: 'collector-sparklines', showWidgetIds: ['collector-chart-box'], hideWidgetIds: ['queryengine-chart-box', 'opServer-chart-box'], titles: {memTitle:'Memory',cpuTitle:'% CPU Utilization'}}),110);
                     $('#queryengine-chart').initMemCPULineChart($.extend({url:function() {
                         return contrail.format(monitorInfraUrls['FLOWSERIES_CPU'], 'contrail-query-engine', '30', '10', obj['name'], endTime);
-                    }, parser: "parseProcessMemCPUData", plotOnLoad: false, lineChartId: 'queryengine-sparklines', showWidgetIds: ['queryengine-chart-box'], hideWidgetIds: ['collector-chart-box', 'opServer-chart-box'], titles: {memTitle:'Memory',cpuTitle: infraDetailsPageCPUChartTitle}}),110);
+                    }, parser: "parseProcessMemCPUData", plotOnLoad: false, lineChartId: 'queryengine-sparklines', showWidgetIds: ['queryengine-chart-box'], hideWidgetIds: ['collector-chart-box', 'opServer-chart-box'], titles: {memTitle:'Memory',cpuTitle:'% CPU Utilization'}}),110);
                     $('#opServer-chart').initMemCPULineChart($.extend({url:function() {
                         return contrail.format(monitorInfraUrls['FLOWSERIES_CPU'], 'contrail-analytics-api', '30', '10', obj['name'], endTime);
-                    }, parser: "parseProcessMemCPUData", plotOnLoad: false, lineChartId: 'opServer-sparklines', showWidgetIds: ['opServer-chart-box'], hideWidgetIds: ['collector-chart-box', 'queryengine-chart-box'], titles: {memTitle:'Memory',cpuTitle: infraDetailsPageCPUChartTitle}}),110);
+                    }, parser: "parseProcessMemCPUData", plotOnLoad: false, lineChartId: 'opServer-sparklines', showWidgetIds: ['opServer-chart-box'], hideWidgetIds: ['collector-chart-box', 'queryengine-chart-box'], titles: {memTitle:'Memory',cpuTitle:'% CPU Utilization'}}),110);
                 });
                 var procStateList, overallStatus = noDataStr;
                 var analyticsProcessStatusList = [];
diff --git a/webroot/monitor/infra/analyticsnode/ui/views/monitor_infra_analyticnode.view b/webroot/monitor/infra/analyticsnode/ui/views/monitor_infra_analyticnode.view
index d55d37593..de9d87a9f 100644
--- a/webroot/monitor/infra/analyticsnode/ui/views/monitor_infra_analyticnode.view
+++ b/webroot/monitor/infra/analyticsnode/ui/views/monitor_infra_analyticnode.view
@@ -60,7 +60,7 @@
                                         <div id="collector-sparklines" class="span4 collector-chart-link sparklines-box">
                                             <p class="sparkline-title">Collector</p>
                                             <div class="row-fluid">
-                                               <span class="span6"><small>{{getInfraDetailsPageCPUChartTitle}}</small></span> <span id="collector_cpu_share_sparkline" class="span6 pull-right"></span>
+                                               <span class="span6"><small>CPU Utilization</small></span> <span id="collector_cpu_share_sparkline" class="span6 pull-right"></span>
                                              </div>
                                              <div class="row-fluid">
                                                <span class="span6"><small>Memory</small></span> <span id="collector_mem_virt_sparkline" class="span6 pull-right"></span>
@@ -69,7 +69,7 @@
                                         <div id="queryengine-sparklines" class="span4 queryengine-chart-link sparklines-box">
                                             <p class="sparkline-title">Query Engine</p>
                                             <div class="row-fluid">
-                                               <span class="span6"><small>{{getInfraDetailsPageCPUChartTitle}}</small></span> <span id="queryengine_cpu_share_sparkline" class="span6 pull-right"></span>
+                                               <span class="span6"><small>CPU Utilization</small></span> <span id="queryengine_cpu_share_sparkline" class="span6 pull-right"></span>
                                              </div>
                                              <div class="row-fluid">
                                                <span class="span6"><small>Memory</small></span> <span id="queryengine_mem_virt_sparkline" class="span6 pull-right"></span>
@@ -78,7 +78,7 @@
                                         <div id="opServer-sparklines" class="span4 opServer-chart-link sparklines-box">
                                             <p class="sparkline-title">OpServer</p>
                                             <div class="row-fluid">
-                                               <span class="span6"><small>{{getInfraDetailsPageCPUChartTitle}}</small></span> <span id="opserver_cpu_share_sparkline" class="span6 pull-right"></span>
+                                               <span class="span6"><small>CPU Utilization</small></span> <span id="opserver_cpu_share_sparkline" class="span6 pull-right"></span>
                                              </div>
                                              <div class="row-fluid">
                                                <span class="span6"><small>Memory</small></span> <span id="opserver_mem_virt_sparkline" class="span6 pull-right"></span>
diff --git a/webroot/monitor/infra/common/ui/js/monitor_infra_constants.js b/webroot/monitor/infra/common/ui/js/monitor_infra_constants.js
index 548f66493..f5aeffb91 100644
--- a/webroot/monitor/infra/common/ui/js/monitor_infra_constants.js
+++ b/webroot/monitor/infra/common/ui/js/monitor_infra_constants.js
@@ -21,7 +21,7 @@ var configNodeTabStrip = "config_tabstrip";
 var aNodeTabStrip = "analytics_tabstrip";
 var ctrlNodeTabStrip = "control_tabstrip";
 var dbNodeTabStrip = "db_tabstrip";
-var infraDetailsPageCPUChartTitle = 'CPU Share (%)';
+
 var CONSOLE_LOGS_REFRESH_INTERVAL = 90000;//Auto refresh interval in console tab (ms)
 
 
diff --git a/webroot/monitor/infra/common/ui/js/monitor_infra_utils.js b/webroot/monitor/infra/common/ui/js/monitor_infra_utils.js
index 8415a39e4..24c930ad5 100644
--- a/webroot/monitor/infra/common/ui/js/monitor_infra_utils.js
+++ b/webroot/monitor/infra/common/ui/js/monitor_infra_utils.js
@@ -2257,10 +2257,6 @@ Handlebars.registerHelper('renderStatusTemplate', function(sevLevel, options) {
     return new Handlebars.SafeString(html);
 });
 
-Handlebars.registerHelper('getInfraDetailsPageCPUChartTitle',function() {
-    return infraDetailsPageCPUChartTitle;
-})
-
 function getAllvRouters(defferedObj,dataSource,dsObj){
     var obj = {};
     if(dsObj['getFromCache'] == null || dsObj['getFromCache'] == true){
diff --git a/webroot/monitor/infra/confignode/ui/js/monitor_infra_confignode_details.js b/webroot/monitor/infra/confignode/ui/js/monitor_infra_confignode_details.js
index cde1adeed..8b142a7f7 100644
--- a/webroot/monitor/infra/confignode/ui/js/monitor_infra_confignode_details.js
+++ b/webroot/monitor/infra/confignode/ui/js/monitor_infra_confignode_details.js
@@ -47,13 +47,13 @@ monitorInfraConfigDetailsClass = (function() {
                     endWidgetLoading('config-sparklines');
                     $('#apiServer-chart').initMemCPULineChart($.extend({url:function() {
                         return contrail.format(monitorInfraUrls['FLOWSERIES_CPU'], 'contrail-api', '30', '10', obj['name'], endTime);
-                    }, parser: "parseProcessMemCPUData", parser: "parseProcessMemCPUData", plotOnLoad: true, lineChartId: 'apiServer-sparklines', showWidgetIds: ['apiServer-chart-box'], hideWidgetIds: ['serviceMonitor-chart-box', 'schema-chart-box'], titles: {memTitle:'Memory',cpuTitle: infraDetailsPageCPUChartTitle}}),110);
+                    }, parser: "parseProcessMemCPUData", parser: "parseProcessMemCPUData", plotOnLoad: true, lineChartId: 'apiServer-sparklines', showWidgetIds: ['apiServer-chart-box'], hideWidgetIds: ['serviceMonitor-chart-box', 'schema-chart-box'], titles: {memTitle:'Memory',cpuTitle:'% CPU Utilization'}}),110);
                     $('#serviceMonitor-chart').initMemCPULineChart($.extend({url:function() {
                         return contrail.format(monitorInfraUrls['FLOWSERIES_CPU'], 'contrail-svc-monitor', '30', '10', obj['name'], endTime);
-                    }, parser: "parseProcessMemCPUData", plotOnLoad: false, lineChartId: 'serviceMonitor-sparklines', showWidgetIds: ['serviceMonitor-chart-box'], hideWidgetIds: ['apiServer-chart-box', 'schema-chart-box'], titles: {memTitle:'Memory',cpuTitle: infraDetailsPageCPUChartTitle}}),110);
+                    }, parser: "parseProcessMemCPUData", plotOnLoad: false, lineChartId: 'serviceMonitor-sparklines', showWidgetIds: ['serviceMonitor-chart-box'], hideWidgetIds: ['apiServer-chart-box', 'schema-chart-box'], titles: {memTitle:'Memory',cpuTitle:'% CPU Utilization'}}),110);
                     $('#schema-chart').initMemCPULineChart($.extend({url:function() {
                         return contrail.format(monitorInfraUrls['FLOWSERIES_CPU'], 'contrail-schema', '30', '10', obj['name'], endTime);
-                    }, parser: "parseProcessMemCPUData", plotOnLoad: false, lineChartId: 'schema-sparklines', showWidgetIds: ['schema-chart-box'], hideWidgetIds: ['apiServer-chart-box', 'serviceMonitor-chart-box'], titles: {memTitle:'Memory',cpuTitle: infraDetailsPageCPUChartTitle}}),110);
+                    }, parser: "parseProcessMemCPUData", plotOnLoad: false, lineChartId: 'schema-sparklines', showWidgetIds: ['schema-chart-box'], hideWidgetIds: ['apiServer-chart-box', 'serviceMonitor-chart-box'], titles: {memTitle:'Memory',cpuTitle:'% CPU Utilization'}}),110);
                 });
                 confNodeData = result;
                 var parsedData = infraMonitorUtils.parseConfigNodesDashboardData([{name:obj['name'],value:confNodeData}])[0];
diff --git a/webroot/monitor/infra/confignode/ui/views/monitor_infra_confignode.view b/webroot/monitor/infra/confignode/ui/views/monitor_infra_confignode.view
index bc461714d..6824c05cf 100644
--- a/webroot/monitor/infra/confignode/ui/views/monitor_infra_confignode.view
+++ b/webroot/monitor/infra/confignode/ui/views/monitor_infra_confignode.view
@@ -55,7 +55,7 @@
                                     <div id="apiServer-sparklines" class="span4 apiServer-chart-link sparklines-box">
                                         <p class="sparkline-title">API Server</p>
                                         <div class="row-fluid">
-                                           <span class="span6"><small>{{getInfraDetailsPageCPUChartTitle}}</small></span>
+                                           <span class="span6"><small>CPU Utilization</small></span>
                                            <span id="api_server_cpu_share_sparkline" class="span6 pull-right"></span>
                                        </div>
                                        <div class="row-fluid">
@@ -66,7 +66,7 @@
                                     <div id="serviceMonitor-sparklines" class="span4 serviceMonitor-chart-link sparklines-box">
                                         <p class="sparkline-title">Service Monitor</p>
                                         <div class="row-fluid">
-                                           <span class="span6"><small>{{getInfraDetailsPageCPUChartTitle}}</small></span> <span id="service_monitor_cpu_share_sparkline" class="span6 pull-right"></span>
+                                           <span class="span6"><small>CPU Utilization</small></span> <span id="service_monitor_cpu_share_sparkline" class="span6 pull-right"></span>
                                         </div>
                                         <div class="row-fluid">
                                            <span class="span6"><small>Memory</small></span>
@@ -76,7 +76,7 @@
                                     <div id="schema-sparklines" class="span4 schema-chart-link sparklines-box">
                                         <p class="sparkline-title">Schema Transformer</p>
                                         <div class="row-fluid">
-                                           <span class="span6"><small>{{getInfraDetailsPageCPUChartTitle}}</small></span>
+                                           <span class="span6"><small>CPU Utilization</small></span>
                                            <span id="schema_xmer_cpu_share_sparkline" class="span6 pull-right"></span>
                                        </div>
                                        <div class="row-fluid">
diff --git a/webroot/monitor/infra/controlnode/ui/js/monitor_infra_controlnode_details.js b/webroot/monitor/infra/controlnode/ui/js/monitor_infra_controlnode_details.js
index f3ce78af8..ebb56d4be 100644
--- a/webroot/monitor/infra/controlnode/ui/js/monitor_infra_controlnode_details.js
+++ b/webroot/monitor/infra/controlnode/ui/js/monitor_infra_controlnode_details.js
@@ -42,7 +42,7 @@ monitorInfraControlDetailsClass = (function() {
                     endWidgetLoading('control-sparklines');
                     $('#control-chart').initMemCPULineChart($.extend({url:function() {
                         return  contrail.format(monitorInfraUrls['FLOWSERIES_CPU'], 'contrail-control', '30', '10', obj['name'], endTime);
-                    }, parser: "parseProcessMemCPUData", plotOnLoad: true, lineChartId: 'control-sparklines', showWidgetIds: [], hideWidgetIds: [], titles: {memTitle:'Memory',cpuTitle:infraDetailsPageCPUChartTitle}}),110);
+                    }, parser: "parseProcessMemCPUData", plotOnLoad: true, lineChartId: 'control-sparklines', showWidgetIds: [], hideWidgetIds: [], titles: {memTitle:'Memory',cpuTitle:'% CPU Utilization'}}),110);
                 });
                 var procStateList, overallStatus = noDataStr;
                 var controlProcessStatusList = [];
diff --git a/webroot/monitor/infra/controlnode/ui/views/monitor_infra_controlnode.view b/webroot/monitor/infra/controlnode/ui/views/monitor_infra_controlnode.view
index 705fbdea6..edb6eb657 100644
--- a/webroot/monitor/infra/controlnode/ui/views/monitor_infra_controlnode.view
+++ b/webroot/monitor/infra/controlnode/ui/views/monitor_infra_controlnode.view
@@ -60,7 +60,7 @@
                                         <div id="control-sparklines" class="span4 control-chart-link sparklines-box">
                                             <p class="sparkline-title">Control Node</p>
                                             <div class="row-fluid">
-                                               <span class="span6"><small>{{getInfraDetailsPageCPUChartTitle}}</small></span>
+                                               <span class="span6"><small>CPU Utilization</small></span>
                                                <span id="cpu_share_sparkline" class="span6 pull-right"></span>
                                             </div>
                                             <div class="row-fluid">
diff --git a/webroot/monitor/infra/vrouter/ui/js/monitor_infra_vrouter_details.js b/webroot/monitor/infra/vrouter/ui/js/monitor_infra_vrouter_details.js
index a7a8421fd..bef15733f 100644
--- a/webroot/monitor/infra/vrouter/ui/js/monitor_infra_vrouter_details.js
+++ b/webroot/monitor/infra/vrouter/ui/js/monitor_infra_vrouter_details.js
@@ -48,7 +48,7 @@ monitorInfraComputeDetailsClass = (function() {
                     endWidgetLoading('vrouter-sparklines');
                     $('#vrouter-chart').initMemCPULineChart($.extend({url:function() {
                         return contrail.format(monitorInfraUrls['FLOWSERIES_CPU'], 'contrail-vrouter-agent', '30', '10', obj['name'], endTime);
-                    }, parser: "parseProcessMemCPUData", plotOnLoad: true, lineChartId: 'vrouter-sparklines', showWidgetIds: ['vrouter-chart-box'], hideWidgetIds: ['system-chart-box'], titles: {memTitle:'Memory',cpuTitle: infraDetailsPageCPUChartTitle}}), 110);
+                    }, parser: "parseProcessMemCPUData", plotOnLoad: true, lineChartId: 'vrouter-sparklines', showWidgetIds: ['vrouter-chart-box'], hideWidgetIds: ['system-chart-box'], titles: {memTitle:'Memory',cpuTitle:'% CPU Utilization'}}), 110);
                     $('#system-chart').initMemCPULineChart($.extend({url:function() {
                         return  contrail.format(monitorInfraUrls['FLOWSERIES_CPU'], 'contrail-vrouter-agent', '30', '10', obj['name'], endTime);
                     }, parser: "parseSystemMemCPUData", plotOnLoad: false, lineChartId: 'system-sparklines', showWidgetIds: ['system-chart-box'], hideWidgetIds: ['vrouter-chart-box'], titles: {memTitle:'Memory',cpuTitle:'Avg CPU Load'}}),110);
diff --git a/webroot/monitor/infra/vrouter/ui/views/monitor_infra_vrouter.view b/webroot/monitor/infra/vrouter/ui/views/monitor_infra_vrouter.view
index e9d10ebef..bd37fdc34 100644
--- a/webroot/monitor/infra/vrouter/ui/views/monitor_infra_vrouter.view
+++ b/webroot/monitor/infra/vrouter/ui/views/monitor_infra_vrouter.view
@@ -80,7 +80,7 @@
                                         <div id="vrouter-sparklines" class="span4 vrouter-chart-link sparklines-box">
                                             <p class="sparkline-title">vRouter Agent</p>
                                             <div class="row-fluid">
-                                               <span class="span6"><small>{{getInfraDetailsPageCPUChartTitle}}</small></span> <span id="cpu_share_sparkline" class="span6 pull-right"></span>
+                                               <span class="span6"><small>CPU Utilization</small></span> <span id="cpu_share_sparkline" class="span6 pull-right"></span>
                                              </div>
                                              <div class="row-fluid">
                                                <span class="span6"><small>Memory</small></span> <span id="virt_mem_sparkline" class="span6 pull-right"></span>