perfsonar development work

Author: trzaszcz
Date: 2009-11-27 09:49:19 -0500 (Fri, 27 Nov 2009)
New Revision: 5358

Added:
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/DomainSummarizator.java
Removed:
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/Axis2PerfsonarServiceConnPoint.java
Modified:
   
branches/new-structure-with-base2/ps-mdm-ls/conf/axis2/META-INF/services.xml
   
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/Main.py
   
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/auxiliary/TestService.py
   
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/functionalTests/DeregistrationTest.py
   
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/functionalTests/QueryTest.py
   
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/functionalTests/RegistrationTest.py
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/LSSummarySynchronizationAction.java
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/ModificationCounterComponent.java
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/ServiceSummary.java
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/SummarizationBuilder.java
Log:
refactoring 



Modified: 
branches/new-structure-with-base2/ps-mdm-ls/conf/axis2/META-INF/services.xml
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/conf/axis2/META-INF/services.xml  
      2009-11-25 11:41:14 UTC (rev 5357)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/conf/axis2/META-INF/services.xml  
      2009-11-27 14:49:19 UTC (rev 5358)
@@ -5,5 +5,5 @@
   <operation name="message">
     <messageReceiver 
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
   </operation>
-  <parameter 
name="ServiceClass">org.perfsonar.service.Axis2PerfsonarServiceConnPoint</parameter>
+  <parameter 
name="ServiceClass">org.perfsonar.base2.service.axis2interface.PerfsonarService</parameter>
 </service>

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/Main.py
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/Main.py
 2009-11-25 11:41:14 UTC (rev 5357)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/Main.py
 2009-11-27 14:49:19 UTC (rev 5358)
@@ -11,8 +11,8 @@
 if __name__ == '__main__':
     
     xmlGenerator=XMLGenerator()
-    
content=xmlGenerator.generateMessage("../../../inputs/LSRegistrationCore.xml",
 "metaId", "192.168.132", "man.poznan.pl", 500);
-    f=file("LSRegistrationRequest500.xml","w")
+    
content=xmlGenerator.generateMessage("../../../inputs/LSRegistrationCore.xml",
 "metaId", "192.168", "man.poznan.pl", 1000);
+    f=file("LSRegistrationRequest1000.xml","w")
     f.write(content)
 #    print content;
 #    print xmlGenerator.generateIP("192")

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/auxiliary/TestService.py
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/auxiliary/TestService.py
     2009-11-25 11:41:14 UTC (rev 5357)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/auxiliary/TestService.py
     2009-11-27 14:49:19 UTC (rev 5358)
@@ -33,8 +33,9 @@
         c=0
         for message in messagesList :
             before=time.time()
-            sender.send(self.url,message)
+            resp=sender.send(self.url,message)
             result_list.append((time.time()-before)*1000)
+            print resp
             print c
             c=c+1
         

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/functionalTests/DeregistrationTest.py
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/functionalTests/DeregistrationTest.py
        2009-11-25 11:41:14 UTC (rev 5357)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/functionalTests/DeregistrationTest.py
        2009-11-27 14:49:19 UTC (rev 5358)
@@ -11,7 +11,8 @@
     f=open("../../../../../inputs/LSDeregisterRequest.xml","r")
     soap_template_content=f.read()
     
-    
urlPostfixes=["1","149","2","148","3","146","145","11","78","65","100","129","141","25","15","133","18","25","74","101","123","112","100","77","49","94","17","X"]
+#    
urlPostfixes=["1","149","2","148","3","146","145","11","78","65","100","129","141","25","15","133","18","25","74","101","123","112","100","77","49","94","17","X"]
+    
urlPostfixes=["1","99","2","97","3","98","95","11","78","65","70","82","92","25","15","73","18","25","74","69","44","81","81","52","27","49","17","X"]
     
     messages=[]
     
@@ -19,7 +20,7 @@
         
message=soap_template_content.replace("ACCESS_POINT","http://localhost:8180/"+str(c)+"")
         messages.append(message)
     
-    testService=TestService("127.0.0.1:8080", 
"/perfsonar-java-xml-ls/services/LookupService", 
"../../../../../results/dr-ls2.txt")
+    testService=TestService("127.0.0.1:8080", 
"/geant2-java-xml-ls/services/LookupService", 
"../../../../../results/dr-ls2.txt")
     strResult=testService.runTest(messages)
     
     print "--------------------------"

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/functionalTests/QueryTest.py
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/functionalTests/QueryTest.py
 2009-11-25 11:41:14 UTC (rev 5357)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/functionalTests/QueryTest.py
 2009-11-27 14:49:19 UTC (rev 5358)
@@ -12,7 +12,8 @@
     soap_template_content=f.read()
     access_points=[]
     
-    
urlPostfixes=["1","150","2","149","3","148","68","55","X","100","81","15","47","131","A","b","c"]
+#    
urlPostfixes=["1","150","2","149","3","148","68","55","X","100","81","15","47","131","A","b","c"]
+    
urlPostfixes=["1","99","2","98","3","97","68","55","X","73","81","15","47","26","A","b","c"]
     
     messages=[]
     

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/functionalTests/RegistrationTest.py
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/functionalTests/RegistrationTest.py
  2009-11-25 11:41:14 UTC (rev 5357)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/trzaszczka/functionalTests/RegistrationTest.py
  2009-11-27 14:49:19 UTC (rev 5358)
@@ -8,15 +8,16 @@
 
 if __name__ == '__main__':
     
-    f=open("../../../../../inputs/LSRegistrationRequest100.xml","r")
+    f=open("../../../../../inputs/LSRegistrationRequest1000.xml","r")
     soap_template_content=f.read()
     messages=[]
     
-    for c in range(1,151) :
+#    for c in range(1,151) :
+    for c in range(1,101) :
         
message=soap_template_content.replace("LS_REGISTRATION_ACCESS_POINT","http://localhost:8180/"+str(c))
         messages.append(message)
     
-    testService=TestService("127.0.0.1:8080", 
"/perfsonar-java-xml-ls/services/LookupService", 
"../../../../../results/result-ls2-exist.txt")
+    testService=TestService("127.0.0.1:8080", 
"/geant2-java-xml-ls/services/LookupService", 
"../../../../../results/result-ls2-exist.txt")
     strResult=testService.runTest(messages)
     
     print "--------------------------"

Deleted: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/Axis2PerfsonarServiceConnPoint.java

Added: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/DomainSummarizator.java

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/LSSummarySynchronizationAction.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/LSSummarySynchronizationAction.java
     2009-11-25 11:41:14 UTC (rev 5357)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/LSSummarySynchronizationAction.java
     2009-11-27 14:49:19 UTC (rev 5358)
@@ -38,7 +38,12 @@
        public LSSummarySynchronizationAction() throws PerfSONARException {
                super();
        }
-
+       
+       /**
+        * 
+        * initializes Action variables which are used in execution of this 
action 
+        * 
+        */
        private void initializeElement() {
                try {
                        summarizationDao = 
LookupServiceDAOFactory.getSumarizationDAO();
@@ -105,7 +110,13 @@
                        }
                }               
        }
-
+       
+       /**
+        * 
+        * invokes summarization process
+        * 
+        * @throws PerfSONARException
+        */
        private void synchronizeSummarizationCollection() throws 
PerfSONARException {
                summarizationDao.removeSummaryData();
                List<Element> datas = builder.build();

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/ModificationCounterComponent.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/ModificationCounterComponent.java
       2009-11-25 11:41:14 UTC (rev 5357)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/ModificationCounterComponent.java
       2009-11-27 14:49:19 UTC (rev 5358)
@@ -12,8 +12,9 @@
  *
  */
 public class ModificationCounterComponent extends Component{
-
+       
        private int counter=0;
+       
        private Logger 
logger=Logger.getLogger(ModificationCounterComponent.class);
        
        @Override
@@ -26,7 +27,6 @@
                //do nothing
        }
        
-       
 
        @Override
        public void init() throws PerfSONARException {
@@ -34,7 +34,7 @@
        }
        
        /**
-        * invoked when element want to notify that something was changed in 
db :
+        * invoked when element wants to notify that something was changed in 
db :
         * - registration
         * - deregistration
         * - cleanup 
@@ -43,7 +43,10 @@
                counter++;
                logger.debug("Counter increased "+counter);
        }
-       
+       /**
+        * resets counter. This method is invoked after summarization process
+        * 
+        */
        public void resetCounter(){
                counter=0;
        }

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/ServiceSummary.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/ServiceSummary.java
     2009-11-25 11:41:14 UTC (rev 5357)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/ServiceSummary.java
     2009-11-27 14:49:19 UTC (rev 5358)
@@ -5,6 +5,12 @@
 /**
  * Contains summary from a single service
  * 
+ * Consists of set of:
+ *  - eventTypes
+ *  - domains
+ *  - ipAddresses
+ *  - keywords
+ * 
  * @author Maciej Glowiak
  * 
  */

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/SummarizationBuilder.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/SummarizationBuilder.java
       2009-11-25 11:41:14 UTC (rev 5357)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/SummarizationBuilder.java
       2009-11-27 14:49:19 UTC (rev 5358)
@@ -1,8 +1,6 @@
 package org.perfsonar.service.lookupservice.summarization;
 
-import java.util.Collection;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -14,22 +12,30 @@
 import org.perfsonar.base2.xml.Element;
 import org.perfsonar.base2.xml.nmwg.Message;
 import 
org.perfsonar.service.lookupservice.registration.DiscoveryRequestGenerator;
+import 
org.perfsonar.service.lookupservice.registration.summarization.DomainSummarizator;
 import 
org.perfsonar.service.lookupservice.registration.summarization.SummarizeIpAddrs;
 import org.perfsonar.service.lookupservice.storage.SummarizationDAO;
 
-public class SummarizationBuilder {
 
-       protected static final Logger logger = Logger
-                       .getLogger(SummarizationBuilder.class);
 
-       private static final int IP = 100;
-       private static final int DOMAIN = 200;
-       private static final int EVENT_TYPE = 300;
-       private static final int KEYWORD = 400;
+/**
+ *
+ * Builds summarization message
+ * 
+ * @author Slawomir Trzaszczka
+ */
+public class SummarizationBuilder {
 
-       protected SummarizationDAO dao;
+       private final Logger logger = Logger
+                       .getLogger(SummarizationBuilder.class);
        
+       private enum SummarizationVariableType{
+               IP,DOMAIN,EVENT_TYPE,KEYWORD;
+       };
        
+       private SummarizationDAO dao;
+       
+       
        public SummarizationBuilder(SummarizationDAO dao){
                this.dao = dao;
        }
@@ -51,25 +57,18 @@
                // now having all data in "summaries" structure and need to 
summarize
                // IPs, domains separately. EventTypes will remain the same.
 
-               // So, summarize information
-               logger.debug("Summarize...");
 
                // boolean doIPSummarization =
                // config.getProperty("service.ls.do_ip_summarization");
-               int i = 0;
                // work on the same data - summarize and store in "summaries" 
structure
                for (ServiceSummary s : summaries.values()) {
-                       i++; // increase counter
 
                        // summarize IPs
-//                     logger.debug("Summarize IP addresses for service #[" 
+ i + "]");
                        
s.setIpAddresses(summarizeIPAddresses(s.getIpAddresses()));
 
                        // summarize domains
-//                     logger.debug("Summarize domains for service #[" + i + 
"]");
                        s.setDomains(summarizeDomains(s.getDomains()));
 
-//                     logger.debug("Summarize eventTypes and keywords...");
                        // summarize eventTypes
                        // no summarization, just store
 
@@ -78,9 +77,6 @@
 
                }
 
-               // TODO: TEMPORARY:
-//             showSummary(summaries);
-
                DiscoveryRequestGenerator gen = new 
DiscoveryRequestGenerator();
                Message msg = gen.createMessageElement();
 
@@ -134,7 +130,7 @@
         * Get topology data and eventTypes from all services store it in
         * Map<String, ServiceSummary>
         * 
-        * @return
+        * @return - map - key - metadataId, value is a set of 
Ip/keyword/domain sets
         */
        private Map<String, ServiceSummary> getAllServicesSummaries()
                        throws PerfSONARException {
@@ -155,52 +151,16 @@
                } catch (Exception ex) {
                }
 
-               populateSummary(summaries, ipResults, IP);
-               populateSummary(summaries, domainResults, DOMAIN);
-               populateSummary(summaries, eventTypeResults, EVENT_TYPE);
-               populateSummary(summaries, keywordResults, KEYWORD);
+               populateSummary(summaries, ipResults, 
SummarizationVariableType.IP);
+               populateSummary(summaries, domainResults, 
SummarizationVariableType.DOMAIN);
+               populateSummary(summaries, eventTypeResults, 
SummarizationVariableType.EVENT_TYPE);
+               populateSummary(summaries, keywordResults, 
SummarizationVariableType.KEYWORD);
 
                return summaries;
 
        }
 
        /**
-        * Get subdomains for domain. For example for input string
-        * "www.man.poznan.pl" and limit=3 it will return collection of "pl",
-        * "poznan.pl" and "man.poznan.pl"
-        * 
-        * @param domain
-        *            input domain e.g. "www.man.poznan.pl"
-        * @param limit
-        *            number of subdomains to be returned. Value -1 means 
"all"
-        * @param list
-        *            collection where results are to be added
-        * @return updated Collection
-        */
-       public Collection<String> getSubDomains(String domain, int limit,
-                       Collection<String> list) {
-
-               if (domain == null)
-                       return null;
-
-               int last = domain.length();
-
-               for (int current = last - 1; current >= 0; current--) {
-
-                       if (limit == 0)
-                               break;
-
-                       if (domain.charAt(current) == '.') {
-                               String subdomain = domain.substring(current + 
1);
-                               if (!"".equals(subdomain))
-                                       list.add(subdomain);
-                               limit--;
-                       }
-               }
-               return list;
-       }
-
-       /**
         * Do IPs summarization. Returns new, summarized set of data Input 
data is
         * not changed.
         * 
@@ -214,7 +174,7 @@
                try {
                        result = SummarizeIpAddrs.getSummary(ipAddresses);
                } catch (Exception ex) {
-                       logger.error("IP summarization failed. " + 
"Exception: " + ex
+                       logger.warn("IP summarization failed. " + "Exception: 
" + ex
                                        + " : " + ex.getMessage());
                        result = ipAddresses;
                }
@@ -231,12 +191,7 @@
         */
        private Set<String> summarizeDomains(Set<String> data) {
 
-               HashSet<String> summarizedData = new HashSet<String>();
-               for (String s : data) {
-                       getSubDomains(s, 3, summarizedData);
-               }
-               return summarizedData;
-
+               return DomainSummarizator.summarizeDomains(data);
        }
 
        /**
@@ -250,12 +205,12 @@
         *            type of field to be populated
         */
        private void populateSummary(Map<String, ServiceSummary> summaries,
-                       String[] lines, int type) {
+                       String[] lines, SummarizationVariableType type) {
 
                // split and store results
                for (String line : lines) {
 
-                       // split result
+                       // split result [METADATA_ID,VALUE]
                        String[] params = line.split(",", 2);
 
                        if (params.length != 2) {
@@ -264,15 +219,14 @@
                                break;
                        }
 
-                       String key = params[0];
+                       String metadataId = params[0];
                        String content = params[1];
-                       // System.out.println(" -- parse results: "+key+" : 
"+content);
 
                        // get or create summary for the service
-                       ServiceSummary summary = summaries.get(key);
+                       ServiceSummary summary = summaries.get(metadataId);
                        if (summary == null) {
                                summary = new ServiceSummary();
-                               summaries.put(key, summary);
+                               summaries.put(metadataId, summary);
                        }
 
                        // fill the right field