merging with latest master

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

Conflicts:
	src/main_dpdk.cpp

1 files changed, 73 insertions, 63 deletions

diff --git a/doc/AnalyticsConnect.py b/doc/AnalyticsConnect.py
index 2b603ab1..90818c1c 100755
--- a/doc/AnalyticsConnect.py
+++ b/doc/AnalyticsConnect.py
@@ -38,7 +38,7 @@ def initialize_analyticsreporting():
   return analytics
 
 
-def get_report(analytics,start_date='2016-11-06',end_date='2016-11-13'):
+def get_report(analytics,start_date='2016-11-27',end_date='2016-11-27'):
   # Use the Analytics Service Object to query the Analytics Reporting API V4.
   return analytics.reports().batchGet(
       body={
@@ -50,10 +50,11 @@ def get_report(analytics,start_date='2016-11-06',end_date='2016-11-13'):
 					  {'expression': 'ga:metric2','formattingType':'CURRENCY'},
 					  {'expression': 'ga:metric3','formattingType':'CURRENCY'},
 					  {'expression': 'ga:totalEvents'}],
-          'dimensions': [{"name":"ga:eventAction"},{"name": "ga:dimension1"},{"name": "ga:dimension2"},{"name": "ga:dimension3"},{"name": "ga:dimension4"}]
+          'dimensions': [{"name":"ga:eventAction"},{"name": "ga:dimension1"},{"name": "ga:dimension2"},{"name": "ga:dimension3"},{"name": "ga:dimension4"}],
+		  'pageSize': 10000
         }
         ]
-      }
+		}
   ).execute()
 
 
@@ -79,30 +80,9 @@ def print_response(response):
           print metricHeader.get('name') + ': ' + value
 
 
-def export_to_dict(response):
-	df = {'Test_name':[],'State':[],'Setup':[],'Test_type':[],'MPPS':[],'MPPS-Golden min':[],'MPPS-Golden max':[]}
-	for report in response.get('reports', []):
-		rows = report.get('data', {}).get('rows', [])
-		for row in rows:
-			dimensions = row.get('dimensions', [])
-			# print 'this is dimensions'
-			# print dimensions
-			df['Test_name'].append(dimensions[1])
-			df['State'].append(dimensions[2])
-			df['Setup'].append(dimensions[3])
-			df['Test_type'].append(dimensions[4])
-			dateRangeValues = row.get('metrics', [])
-		 	value = dateRangeValues[0].get('values',[])[0]
-			golden_min = dateRangeValues[0].get('values',[])[1]
-			golden_max = dateRangeValues[0].get('values',[])[2]
-			# print value
-			df['MPPS'].append(value)
-			df['MPPS-Golden min'].append(golden_min)
-			df['MPPS-Golden max'].append(golden_max)
-	return df
-
 
 def export_to_tuples(response):
+	# counter = 0
 	setups = set()
 	df = {}
 	for report in response.get('reports', []):
@@ -123,6 +103,7 @@ def export_to_tuples(response):
 			data.append(value)
 			data.append(golden_min)
 			data.append(golden_max)
+			counter+=1
 			if dimensions[3] in setups:
 				if dimensions[1] in df[dimensions[3]]:
 					df[dimensions[3]][dimensions[1]].append(tuple(data))
@@ -132,51 +113,80 @@ def export_to_tuples(response):
 				df[dimensions[3]] = {}
 				df[dimensions[3]][dimensions[1]] = [tuple(data)]
 				setups.add(dimensions[3])
+	# print 'counter is: %d' % counter
 	return df, setups
 
 
 def main():
 	analytics = initialize_analyticsreporting()
 	response = get_report(analytics)
-	print_response(response)
-	g_dict = export_to_dict(response)
-	print g_dict
-	pprint(g_dict)
+	df, setups = export_to_tuples(response)
+	# pprint(df)
+	return df,setups
 
-    #pprint(response)
 if __name__ == '__main__':
-  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
+response structure (when fetched with "export to tuples"):
+
+{ 'setup1': {'test_name1': [(test_res1),(test_res2),...],
+			 'test_name2': [(test_res1),(test_res2),...]
+			},
+  'setup2': {'test_name1': [(test_res1),(test_res2),...],
+			 'test_name2': [(test_res1),(test_res2),...]
+			},
+	.
+	.
+	.
+	.
+}
+
+{u'kiwi02': {u'VM - 64 bytes, multi CPU, cache size 1024': [(u'VM - 64 bytes, multi CPU, cache size 1024',
+                                                             u'stl',
+                                                             u'performance',
+                                                             u'19.711146',
+                                                             u'19.0',
+                                                             u'22.0'),
+                                                            (u'VM - 64 bytes, multi CPU, cache size 1024',
+                                                             u'stl',
+                                                             u'performance',
+                                                             u'19.581567',
+                                                             u'19.0',
+                                                             u'22.0')],
+             u'VM - 64 bytes, multi CPUs': [(u'VM - 64 bytes, multi CPUs',
+                                             u'stl',
+                                             u'performance',
+                                             u'10.398847',
+                                             u'9.7',
+                                             u'12.5'),
+                                            (u'VM - 64 bytes, multi CPUs',
+                                             u'stl',
+                                             u'performance',
+                                             u'10.925308',
+                                             u'9.7',
+                                             u'12.5')
+                                            ]
+            }
+ u'trex07': {u'VM - 64 bytes, multi CPU, cache size 1024': [(u'VM - 64 bytes, multi CPU, cache size 1024',
+                                                             u'stl',
+                                                             u'performance',
+                                                             u'25.078212',
+                                                             u'9.0',
+                                                             u'15.0')
+                                                            ]
+             u'VM - 64 bytes, multi CPUs': [(u'VM - 64 bytes, multi CPUs',
+                                             u'stl',
+                                             u'performance',
+                                             u'9.469138',
+                                             u'8.5',
+                                             u'12.0')
+                                            ]
+            }
+}
+
+
+
+"""
+