fixed errors of ploting for single test query (trex11), added template in asciidoc for trex 7,8,11 with hardware description

Signed-off-by: itraviv <itraviv@cisco.com>

3 files changed, 43 insertions, 57 deletions

diff --git a/doc/AnalyticsConnect.py b/doc/AnalyticsConnect.py
index 2b603ab1..1725ee6a 100755
--- a/doc/AnalyticsConnect.py
+++ b/doc/AnalyticsConnect.py
@@ -147,36 +147,3 @@ def main():
 if __name__ == '__main__':
   main()
 
-"""
-    response = {u'reports': [{u'columnHeader': {u'dimensions': [u'ga:dimension1',
-                                                 u'ga:dimension2',
-                                                 u'ga:dimension3',
-                                                 u'ga:dimension4'],
-                                 u'metricHeader': {u'metricHeaderEntries': [{u'name': u'ga:metric1',
-                                                                             u'type': u'CURRENCY'}]}},
-               u'data': {u'isDataGolden': True,
-                         u'maximums': [{u'values': [u'8532.0']}],
-                         u'minimums': [{u'values': [u'2133.0']}],
-                         u'rowCount': 4,
-                         u'rows': [{u'dimensions': [u'test_name_to_date_9-10-161',
-                                                    u'State_Less',
-                                                    u'Setup_Name1',
-                                                    u'Test_Type'],
-                                    u'metrics': [{u'values': [u'2133.0']}]},
-                                   {u'dimensions': [u'test_name_to_date_9-10-162',
-                                                    u'State_Less',
-                                                    u'Setup_Name2',
-                                                    u'Test_Type'],
-                                    u'metrics': [{u'values': [u'4266.0']}]},
-                                   {u'dimensions': [u'test_name_to_date_9-10-163',
-                                                    u'State_Less',
-                                                    u'Setup_Name3',
-                                                    u'Test_Type'],
-                                    u'metrics': [{u'values': [u'6399.0']}]},
-                                   {u'dimensions': [u'test_name_to_date_9-10-164',
-                                                    u'State_Less',
-                                                    u'Setup_Name4',
-                                                    u'Test_Type'],
-                                    u'metrics': [{u'values': [u'8532.0']}]}],
-                         u'totals': [{u'values': [u'21330.0']}]}}]}
-	"""
\ No newline at end of file
diff --git a/doc/TRexDataAnalysis.py b/doc/TRexDataAnalysis.py
index 3155f16c..f8cefc19 100755
--- a/doc/TRexDataAnalysis.py
+++ b/doc/TRexDataAnalysis.py
@@ -91,5 +91,7 @@ def create_all_data_per_setup(setup_dict, setup_name, start_date, end_date, show
 

 def create_all_data(ga_data, setup_names, start_date, end_date, save_path='', add_stats=''):

     for setup_name in setup_names:

+        if setup_name == 'trex11':

+            continue

         create_all_data_per_setup(ga_data[setup_name], setup_name, start_date, end_date, show='no', save_path=save_path,

                                   add_stats=add_stats)

diff --git a/doc/trex_analytics.asciidoc b/doc/trex_analytics.asciidoc
index bfe0d4fc..195babbc 100755
--- a/doc/trex_analytics.asciidoc
+++ b/doc/trex_analytics.asciidoc
@@ -22,13 +22,17 @@ endif::backend-xhtml11[]
 
 
 = Analytics
+/////////////////////////////////////////////////////////////////////////////////
 == Setup: TRex07
 .Setup Details
-[options='header',halign='center']
-|====================================================================================================================
-|Name |OS |NICs |Routers 
-| trex07 | Fedora 18| 2x10G (X710) (8 interfaces), 1x10G (2 interfaces), 1x1G (4 interfaces) | Loopback on X710 + ASA 5520 + ASA 5512 + ASA 5585-ssp10
-|====================================================================================================================
+[options='header',halign='center',cols="1,5"]
+|=================
+| Server: | UCSC-C240-M4SX
+| CPU:    | 2 x Intel(R) Xeon(R) CPU E5-2667 v3 @ 3.20GHz
+| RAM:    | 65536 @ 2133 MHz
+| NICs:   | 2 x Intel Corporation Ethernet Controller X710 
+| OS:     | Fedora 18
+|=================
 
 image:images/trex07_latest_test_runs.png[title="trex07 test runs",align="left",width={p_width}, link="images/trex07_latest_test_runs.png"]
  
@@ -45,14 +49,18 @@ image:images/trex07trend_graph.png[title="trex07trend_graph",align="left",width=
 |===
 include::build/images/trex07_trend_stats.csv[]
 |===
-
+////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////
 == Setup: TRex08
 .Setup Details
-[options='header',halign='center']
-|====================================================================================================================
-|Name |OS |NICs |Routers 
-| trex08 | Fedora 18| 2x10G (X710) (8 interfaces), 1x10G (2 interfaces), 1x1G (4 interfaces) | Loopback on X710 + ASA 5520 + ASA 5512 + ASA 5585-ssp10
-|====================================================================================================================
+[options='header',halign='center',cols="1,5"]
+|=================
+| Server: | UCSC-C240-M4SX
+| CPU:    | 2 x Intel(R) Xeon(R) CPU E5-2667 v3 @ 3.20GHz
+| RAM:    | 65536 @ 2133 MHz
+| NICs:   | 2 x Intel Corporation Ethernet Controller X710 
+| OS:     | Fedora 18
+|=================
 
 image:images/trex08_latest_test_runs.png[title="trex08 test runs",align="left",width={p_width}, link="images/trex08_latest_test_runs.png"]
  
@@ -69,15 +77,19 @@ image:images/trex08trend_graph.png[title="trex08trend_graph",align="left",width=
 |===
 include::build/images/trex08_trend_stats.csv[]
 |===
-
+//////////////////////////////////////////////////////////////////////
 
 == Setup: TRex09
 .Setup Details
-[options='header',halign='center']
-|====================================================================================================================
-|Name |OS |NICs |Routers 
-| trex09 | Fedora 18| 2x10G (X710) (8 interfaces), 1x10G (2 interfaces), 1x1G (4 interfaces) | Loopback on X710 + ASA 5520 + ASA 5512 + ASA 5585-ssp10
-|====================================================================================================================
+[options='header',halign='center',cols="1,5"]
+|=================
+| Server: | UCSC-C240-M4SX
+| CPU:    | 2 x Intel(R) Xeon(R) CPU E5-2667 v3 @ 3.20GHz
+| RAM:    | 65536 @ 2133 MHz
+| NICs:   | 2x10G (X710) (8 interfaces) 
+| OS:     | Fedora 18
+|=================
+
 
 image:images/trex09_latest_test_runs.png[title="trex09 test runs",align="left",width={p_width}, link="images/trex09_latest_test_runs.png"]
  
@@ -94,7 +106,7 @@ image:images/trex09trend_graph.png[title="trex09trend_graph",align="left",width=
 |===
 include::build/images/trex09_trend_stats.csv[]
 |===
-
+//////////////////////////////////////////////////////////
 == Setup: TRex11
 .Setup Details
 [options='header',halign='center']
@@ -118,14 +130,19 @@ image:images/trex11trend_graph.png[title="trex11trend_graph",align="left",width=
 |===
 include::build/images/trex11_trend_stats.csv[]
 |===
-
+//////////////////////////////////////////////////////////////
 == Setup: Kiwi02
 .Setup Details
-[options='header',halign='center']
-|================================================================================================
-|Name |OS |NICs |Routers 
-|kiwi02| Fedora 18| 2x10G (4 interfaces)| ESP100
-|================================================================================================
+[options='header',halign='center',cols="1,5"]
+|=================
+| CPU:    | 2 x Intel(R) Xeon(R) CPU E5-2650 0 @ 2.00GHz
+| RAM:    | 31 Gib
+| NICs:   | 2x10G (X710) (4 interfaces) 
+| OS:     | Fedora 18
+|=================
+
+
+
 image:images/kiwi02_latest_test_runs.png[title="trex09 test runs",align="left",width={p_width}, link="images/kiwi02_latest_test_runs.png"]
 
 [format="csv", options="header",halign='center']