Updated Google Analytics Manager for regression

Signed-off-by: itraviv <[email protected]>

diff --git a/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/GAObjClass.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/GAObjClass.py
index 3993ad5..1699ab8 100755 (executable)
--- a/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/GAObjClass.py
+++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/GAObjClass.py
@@ -85,27 +85,24 @@ class GA_EXCEPTION_ObjClass(GA_ObjClass):
 \r
 #..................................................................class GA_TESTING_ObjClass................................................................\r
 class GA_TESTING_ObjClass(GA_ObjClass):\r
-    def __init__(self,cid,uuid,trackerID,TRexMode,test_name,setup_name,appName,appVer,commitID,bandwidthPerCore,goldenBPC):\r
+    def __init__(self,cid,trackerID,TRexMode,TestName,SetupName,appName,appVer,TestType,Mppspc):\r
         GA_ObjClass.__init__(self,cid,trackerID,appName,appVer)\r
-        self.uid = uuid\r
         self.TRexMode = TRexMode\r
-        self.test_name = test_name\r
-        self.setup_name = setup_name\r
-        self.commitID = commitID\r
-        self.bandwidthPerCore = bandwidthPerCore\r
-        self.goldenBPC = goldenBPC\r
+        self.TestName = TestName\r
+        self.SetupName = SetupName\r
+        self.TestType = TestType\r
+        self.Mppspc = Mppspc\r
         self.payload = self.generate_payload()\r
         self.size = sys.getsizeof(self.payload)\r
 \r
     def generate_payload(self):\r
-        self.payload+='&ec='+str(self.TRexMode)\r
+        self.payload+='&ec=TRexTests'\r
         self.payload+='&ea=RegressionReport'\r
-        self.payload+='&cd5='+str(self.uid)\r
-        self.payload+='&cd1='+str(self.test_name)\r
-        self.payload+='&cd2='+str(self.setup_name)\r
-        self.payload+='&cd3='+str(self.commitID)\r
-        self.payload+='&cm1='+str(self.bandwidthPerCore)\r
-        self.payload+='&cm2='+str(self.goldenBPC)\r
+        self.payload+='&cd2='+str(self.TRexMode)\r
+        self.payload+='&cd1='+str(self.TestName)\r
+        self.payload+='&cd3='+str(self.SetupName)\r
+        self.payload+='&cd4='+str(self.TestType)\r
+        self.payload+='&cm1='+str(self.Mppspc)\r
         return self.payload        \r
 #.....................................................................class ga_Thread.................................................................\r
 """\r
@@ -265,7 +262,6 @@ class GAmanager:
             attributes:\r
 GoogleID - the tracker ID that Google uses in order to track the activity of a property. for regression use: 'UA-75220362-4'\r
 AnalyticsUserID - text value  - used by Google to differ between 2 users sending data. (will not be presented on reports). use only as a way to differ between different users\r
-UUID - text  - will be presented on analysis. put here UUID\r
 TRexMode - text - will be presented on analysis. put here TRexMode\r
 appName - text - will be presented on analysis. put here appName as string describing app name\r
 appVer - text - will be presented on analysis. put here the appVer\r
@@ -274,83 +270,21 @@ Timeout - integer (seconds) - the timeout in seconds between automated reports w
 UserPermission - boolean (1/0) - required in order to send packets, should be 1.\r
 BlockingMode - boolean (1/0) - required when each tracked event is critical and program should halt until the event is reported\r
 SetupName - text - will be presented on analysis. put here setup name as string.\r
-CommitID - text - will be presented on analysis. put here CommitID \r
 """\r
 class GAmanager_Regression(GAmanager):\r
-    def __init__(self,GoogleID,AnalyticsUserID,UUID,TRexMode,appName,appVer,\r
-                 QueueSize,Timeout,UserPermission,BlockingMode,SetupName,CommitID):\r
+    def __init__(self,GoogleID,AnalyticsUserID,appName,appVer,\r
+                 QueueSize,Timeout,UserPermission,BlockingMode):\r
         GAmanager.__init__(self,GoogleID,AnalyticsUserID,appName,appVer,\r
                            QueueSize,Timeout,UserPermission,BlockingMode)\r
-        self.UUID = UUID\r
-        self.TRexMode = TRexMode\r
-        self.SetupName = SetupName\r
-        self.CommitID = CommitID\r
-\r
-    def gaAddTestQuery(self,TestName,BandwidthPerCore,GoldenBPC):\r
-        self.gaAddObject(GA_TESTING_ObjClass(self.UserID,self.UUID,self.GoogleID,\r
-                                             self.TRexMode,TestName,self.SetupName,\r
-                                             self.appName,self.appVer,self.CommitID,\r
-                                             BandwidthPerCore,GoldenBPC))\r
-\r
-\r
-\r
-\r
-#***************************************------TEST--------------**************************************\r
-\r
-\r
-#if __name__ == '__main__':\r
-\r
-#g= GAmanager_Regression(GoogleID='UA-75220362-4',AnalyticsUserID=3845,UUID='trex18UUID_GA_TEST',TRexMode='stateFull_GA_TEST',\r
-#             appName='TRex_GA_TEST',appVer='1.1_GA_TEST',QueueSize=20,Timeout=11,UserPermission=1,BlockingMode=0,SetupName='setup1_GA_TEST',CommitID='commitID1_GA_TEST')\r
-#for j in range(1,3,1):\r
-#for i in range(100,118,1):\r
-#    g.gaAddTestQuery('test_name_GA_TEST',i+0.5,150)\r
-#   sleep(11)\r
-#   print "finished batch"\r
-#g.emptyAndReportQ()\r
-\r
-#g.printSelf()\r
-#g.emptyAndReportQ()\r
-\r
-#g = GAmanager(GoogleID='UA-75220362-4',UserID=1,QueueSize=100,Timeout=5,UserPermission=1,BlockingMode=0,appName='TRex',appVer='1.11.232') #timeout in seconds\r
-#for i in range(0,35,1):\r
-#   g.gaAddAction(Event='test',action='start',label='1',value=i)\r
-#g.gaAddException('MEMFAULT',1)\r
-#g.emptyAndReportQ()\r
-#g.printSelf()\r
-#print g.payload\r
-#print g.size\r
-\r
-\r
-\r
-\r
-#g.activate()\r
-#g.gaAddAction(Event='test',action='start',label='1',value='1')\r
-#sys.stdout.write('element added \n')\r
-#sys.stdout.flush()\r
-#g.gaAddAction(Event='test',action='start',label='2',value='1')\r
-#sys.stdout.write('element added \n')\r
-#sys.stdout.flush()\r
-#g.gaAddAction(Event='test',action='start',label='3',value='1')\r
-#sys.stdout.write('element added \n')\r
-#sys.stdout.flush()\r
-\r
-#testdata = "v=1&t=event&tid=UA-75220362-4&cid=2&ec=test&ea=testing&el=testpacket&ev=2"\r
-#r = requests.post(url_debug,data=testdata)\r
-#print r\r
-\r
-#thread1 = ga_Thread(1,g)\r
-#thread1.start()\r
-#thread1.join()\r
-#for i in range(1,10,1):\r
-#    sys.stdout.write('yesh %d'% (i))\r
-#    sys.stdout.flush()\r
+        self.GoogleID = GoogleID\r
+        self.AnalyticsUserID = AnalyticsUserID\r
+        \r
+    def gaAddTestQuery(self,TestName,TRexMode,SetupName,TestType,Mppspc):\r
+        self.gaAddObject(GA_TESTING_ObjClass(self.AnalyticsUserID,self.GoogleID,TRexMode,TestName,SetupName,self.appName,self.appVer,TestType,Mppspc))\r
 \r
 \r
 \r
 \r
-   \r
-        \r
 \r
 \r
 \r