perfsonar development work

Author: trzaszcz
Date: 2009-10-15 10:31:02 -0400 (Thu, 15 Oct 2009)
New Revision: 5314

Added:
   
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/inputs/LSRegistrationRequest2.xml
Modified:
   
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/DeregistrationTest.py
   
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/QueryTest.py
   
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/RegistrationTest.py
Log:
performance test improvement

Added: 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/inputs/LSRegistrationRequest2.xml


Property changes on: 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/inputs/LSRegistrationRequest2.xml
___________________________________________________________________
Name: svn:executable
   + *

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/DeregistrationTest.py
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/DeregistrationTest.py
   2009-10-15 11:45:13 UTC (rev 5313)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/DeregistrationTest.py
   2009-10-15 14:31:02 UTC (rev 5314)
@@ -20,7 +20,7 @@
         access_points.append("http://localhost:8180/"+str(c)+"")
     pass
     
-    sender=Sender("127.0.0.1:8080")
+    sender=Sender("127.0.0.1:8180")
     sender.connect()
 
     result_list=[]
@@ -28,7 +28,7 @@
     for access_point in access_points :
         
soap_message=soap_template_content.replace("ACCESS_POINT",access_point)
         before=time.time()
-        
sender.send("/perfsonar-java-xml-ls/services/LookupService",soap_message)
+        
sender.send("/geant2-java-xml-ls/services/LookupService",soap_message)
         result_list.append((time.time()-before)*1000)
 
     strResult="";

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/QueryTest.py
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/QueryTest.py
    2009-10-15 11:45:13 UTC (rev 5313)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/QueryTest.py
    2009-10-15 14:31:02 UTC (rev 5314)
@@ -14,13 +14,13 @@
     soap_template_content=f.read()
     access_points=[]
     
-    urlPostfixes=["1","1000","2","999","3","998","500","501","X"]
+    
urlPostfixes=["1","1000","2","999","3","998","500","501","X","700","200","333","345","900","A","b","c"]
     
     for c in urlPostfixes :
         
access_points.append("data(/nmwg:store[@type='LSStore']/nmwg:metadata[@id='http://localhost:8180/"+str(c)+"'])")
     pass
     
-    sender=Sender("127.0.0.1:8080")
+    sender=Sender("127.0.0.1:8180")
     sender.connect()
 
     result_list=[]
@@ -28,14 +28,14 @@
     for access_point in access_points :
         soap_message=soap_template_content.replace("QUERY",access_point)
         before=time.time()
-        print 
sender.send("/perfsonar-java-xml-ls/services/LookupService",soap_message)
+        
sender.send("/geant2-java-xml-ls/services/LookupService",soap_message)
         result_list.append((time.time()-before)*1000)
 
     strResult="";
     sum=0;
     for t in range(0,len(result_list)) :
         sum=sum+result_list[t]
-        strResult=strResult+'%(iteration)d;%(time)f \n' % 
{"iteration":t+1,"time":result_list[t]}
+        strResult+'%(iteration)d;%(time)f \n' % 
{"iteration":t+1,"time":result_list[t]}
     strResult=strResult+'avg;%(time)f \n' % {"time":(sum/len(result_list))}
     
     f=open("../../../results/queryX.txt","w")

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/RegistrationTest.py
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/RegistrationTest.py
     2009-10-15 11:45:13 UTC (rev 5313)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/RegistrationTest.py
     2009-10-15 14:31:02 UTC (rev 5314)
@@ -17,28 +17,32 @@
     for c in range(1,1000) :
         access_points.append("http://localhost:8180/"+str(c))
     
-    sender=Sender("127.0.0.1:8080")
+    sender=Sender("127.0.0.1:8180")
     sender.connect()
     
     result_list=[]
     c=0
+    bt=time.time()
     for access_point in access_points :
         
soap_message=soap_template_content.replace("LS_REGISTRATION_ACCESS_POINT",access_point)
         before=time.time()
-        
sender.send("/perfsonar-java-xml-ls/services/LookupService",soap_message)
+        
sender.send("/geant2-java-xml-ls/services/LookupService",soap_message)
         result_list.append((time.time()-before)*1000)
         print c
         c=c+1
     
     strResult="";
     sum=0;
+    print "summary time "+str(((time.time()-bt)*1000000))
+    
+    
     for t in range(0,len(result_list)) :
         sum=sum+result_list[t]
         strResult=strResult+'%(iteration)d;%(time)f \n' % 
{"iteration":t,"time":result_list[t]}
     strResult=strResult+'avg;%(time)f \n' % {"time":(sum/len(result_list))}
     
-#    f=open("../../../results/result-ls1.txt","w")
-#    f.write(strResult)
+    f=open("../../../results/result-ls1-2.txt","w")
+    f.write(strResult)
     
     print "--------------------------"
     print strResult