perfsonar development work

Author: michael.bischoff
Date: 2008-05-20 09:32:05 -0400 (Tue, 20 May 2008)
New Revision: 3863

Removed:
   trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/tip_centerwindow.js
   trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/tip_followscroll.js
Modified:
   
trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/WEB-INF/server-config.wsdd
   trunk/surfnet_java-flowsubscription-mp/conf/service.properties
   trunk/surfnet_java-flowsubscription-mp/conf/wizard.properties
   trunk/surfnet_java-flowsubscription-mp/contrib/client/config.py
   trunk/surfnet_java-flowsubscription-mp/pom.xml
   
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/FlowMpRequest.java
   
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/NfReplayControll.java
Log:
wizzard update
base update

Modified: 
trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/WEB-INF/server-config.wsdd
===================================================================
--- 
trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/WEB-INF/server-config.wsdd
     2008-05-20 13:25:49 UTC (rev 3862)
+++ 
trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/WEB-INF/server-config.wsdd
     2008-05-20 13:32:05 UTC (rev 3863)
@@ -5,9 +5,9 @@
   <parameter name="enableNamespacePrefixOptimization" value="false"/>
   <parameter name="dotNetSoapEncFix" value="true"/>
   <parameter name="disablePrettyXML" value="true"/>
+  <parameter name="attachments.implementation" 
value="org.apache.axis.attachments.AttachmentsImpl"/>
+  <parameter name="sendXsiTypes" value="true"/>
   <parameter name="sendMultiRefs" value="true"/>
-  <parameter name="sendXsiTypes" value="true"/>
-  <parameter name="attachments.implementation" 
value="org.apache.axis.attachments.AttachmentsImpl"/>
   <parameter name="sendXMLDeclaration" value="true"/>
   <requestFlow>
    <handler type="java:org.apache.axis.handlers.JWSHandler">

Deleted: 
trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/tip_centerwindow.js

Deleted: 
trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/tip_followscroll.js

Modified: trunk/surfnet_java-flowsubscription-mp/conf/service.properties
===================================================================
--- trunk/surfnet_java-flowsubscription-mp/conf/service.properties      
2008-05-20 13:25:49 UTC (rev 3862)
+++ trunk/surfnet_java-flowsubscription-mp/conf/service.properties      
2008-05-20 13:32:05 UTC (rev 3863)
@@ -18,7 +18,6 @@
 #Group=MaGeneral
 
service.mp.class_name=org.perfsonar.service.measurementPoint.flowsubscription.FlowTypeMPServiceEngine
 #Group=MaGeneral
-#service.mp.message_types=SetupDataRequest
 
service.mp.message_types=SubscriptionRequest,UnSubscriptionRequest,SubscriptionKeepaliveRequest
 #Group=MaGeneral
 service.mp.conf_file=config.xml

Modified: trunk/surfnet_java-flowsubscription-mp/conf/wizard.properties
===================================================================
--- trunk/surfnet_java-flowsubscription-mp/conf/wizard.properties       
2008-05-20 13:25:49 UTC (rev 3862)
+++ trunk/surfnet_java-flowsubscription-mp/conf/wizard.properties       
2008-05-20 13:32:05 UTC (rev 3863)
@@ -34,32 +34,32 @@
   </property>
 
   <property>
-    <entry key="service.r.service_type" required="true">ma</entry>
+    <entry key="service.r.service_type" required="true">mp</entry>
     <Comment>Enter the type of the service</Comment>
-    <ProposedValue>ma</ProposedValue>
+    <ProposedValue>mp</ProposedValue>
     <Group order="1" check="false">LS</Group>
-    <AcceptedValue>ma</AcceptedValue>
+    <AcceptedValue>mp</AcceptedValue>
   </property>  
   <property>
-    <entry key="service.r.service_name" required="true">Cynet RRD MA</entry>
+    <entry key="service.r.service_name" required="true">Company X Flow 
Subscription MP</entry>
     <Comment>Enter the service name</Comment>
     <ProposedValue>Company X Flow Subscription MP</ProposedValue>
     <Group order="2">LS</Group>
   </property>
   <property>
-    <entry key="service.r.service_version">0.9.1</entry>
+    <entry key="service.r.service_version">0.1</entry>
     <Comment>Enter the version of the service</Comment>
-    <ProposedValue>0.9.1</ProposedValue>
+    <ProposedValue>0.1</ProposedValue>
     <Group order="3">LS</Group>
   </property>
   <property>
-    <entry key="service.r.service_description">RRD MA</entry>
+    <entry key="service.r.service_description">Flow Subscription MP</entry>
     <Comment>Give a description of the  service</Comment>
     <ProposedValue>Flow Subscription MP</ProposedValue>
     <Group order="4">LS</Group>
   </property>
   <property>
-    <entry 
key="service.r.contact_email"></entry>
+    <entry 
key="service.r.contact_email">admin@localhost</entry>
     <Comment>Enter the email address of the person administrating the 
service</Comment>
     
<ProposedValue>admin@localhost</ProposedValue>
     <Group order="5">LS</Group>
@@ -83,9 +83,9 @@
     <Group order="8">LS</Group>
   </property>
   <property>
-    <entry key="service.r.access_point" 
required="true">http://YOUR-HOST/flowsubscription-mp</entry>
+    <entry key="service.r.access_point" 
required="true">http://YOUR-HOST/flowsubscription-mp/services/flowsubscriptionMeasurementArchiveService</entry>
     <Comment>Give the service access point</Comment>
-    <ProposedValue>http://somewhere</ProposedValue>
+    
<ProposedValue>http://YOUR-HOST/flowsubscription-mp/services/flowsubscriptionMeasurementArchiveService</ProposedValue>
     <Group order="9">LS</Group>
   </property>
   <property>
@@ -97,36 +97,123 @@
   </property>
   
   <property>
-    <entry key="service.mp.flowsubscription.query.timeout">60</entry>
-    <Comment>timeout/max execution time of a query (value is in 
seconds)</Comment>
-    <ProposedValue>60</ProposedValue>
-    <Group order="1">Query</Group>
+    <entry key="service.mp.flow.inPort">11110</entry>
+    <Comment>port (and up) that the zebedee client should receive data 
at</Comment>
+    <ProposedValue>11110</ProposedValue>
+    <Group order="1">Tunnel</Group>
   </property>  
   <property>
-    <entry key="service.mp.flowsubscription.query.max-results">1000</entry>
-    <Comment>if more then &lt;value&gt; results are encountered stop 
processing</Comment>
-    <ProposedValue>1000</ProposedValue>
-    <Group order="2">Query</Group>
+    <entry key="service.mp.flow.betweenPort">22220</entry>
+    <Comment>port (and up) that the zebedee client should use for sending 
data (and listen for reverse connection setup from server</Comment>
+    <ProposedValue>22220</ProposedValue>
+    <Group order="2">Tunnel</Group>
   </property>
+  <property>
+    <entry key="service.mp.flow.max_conn">20</entry>
+    <Comment>maximum client netflow subscriptions</Comment>
+    <ProposedValue>22220</ProposedValue>
+    <Group order="2">Tunnel</Group>
+  </property>  
   
   <property>
-    <entry 
key="service.mp.flowsubscription.nfdump.source">/var/nfdump/flows</entry>
-    <Comment>location of nfcapd files</Comment>
-    <ProposedValue>/var/nfdump/flows</ProposedValue>
-    <Group order="1">nfdump</Group>
+    <entry key="service.mp.flow.router.0.name">router1</entry>
+    <Comment>name of the router</Comment>
+    <ProposedValue>router1</ProposedValue>
+    <Group order="1">router1</Group>
   </property>
   <property>
-    <entry 
key="service.mp.flowsubscription.nfdump.location">/usr/local/bin/nfdump</entry>
-    <Comment>the location of the nfdump executable (including nfdump 
filename)</Comment>
-    <ProposedValue>/usr/local/bin/nfdump</ProposedValue>
-    <Group order="2">nfdump</Group>
+    <entry key="service.mp.flow.router.0.enabled">false</entry>
+    <Comment>Is this router enabled</Comment>
+    <ProposedValue>false</ProposedValue>
+    <Group order="2">router1</Group>
   </property>
   <property>
-    <entry 
key="service.mp.flowsubscription.nfdump.ouputreader">org.perfsonar.service.measurementArchive.flowsa.nfdump.outputreaders.Nfdump1_5_5OutputReaderFactory</entry>
-    <Comment>fully qualified name of the class used for output reading 
(expects a class implementing NfdumpOutputReader)</Comment>
-    
<ProposedValue>org.perfsonar.service.measurementPoint.flowsubscription.nfdump.outputreaders.Nfdump1_5_5OutputReaderFactory</ProposedValue>
-    <Group order="3">nfdump</Group>
+    <entry key="service.mp.flow.router.0.address">127.0.0.1</entry>
+    <Comment>Address of the exporter</Comment>
+    <ProposedValue>127.0.0.1</ProposedValue>
+    <Group order="3">router1</Group>
   </property>
+  <property>
+    <entry key="service.mp.flow.router.0.flowport">6669</entry>
+    <Comment>Portnumber</Comment>
+    <ProposedValue>6669</ProposedValue>
+    <Group order="3">router1</Group>
+  </property>
   
+  <property>
+    <entry key="service.mp.flow.router.1.name">router1</entry>
+    <Comment>name of the router</Comment>
+    <ProposedValue>router1</ProposedValue>
+    <Group order="1">router2</Group>
+  </property>
+  <property>
+    <entry key="service.mp.flow.router.1.enabled">false</entry>
+    <Comment>Is this router enabled</Comment>
+    <ProposedValue>false</ProposedValue>
+    <Group order="2">router2</Group>
+  </property>
+  <property>
+    <entry key="service.mp.flow.router.1.address">127.0.0.1</entry>
+    <Comment>Address of the exporter</Comment>
+    <ProposedValue>127.0.0.1</ProposedValue>
+    <Group order="3">router2</Group>
+  </property>
+  <property>
+    <entry key="service.mp.flow.router.1.flowport">6669</entry>
+    <Comment>Portnumber</Comment>
+    <ProposedValue>6669</ProposedValue>
+    <Group order="3">router2</Group>
+  </property>
+  
+  <property>
+    <entry key="service.mp.flow.router.2.name">router1</entry>
+    <Comment>name of the router</Comment>
+    <ProposedValue>router1</ProposedValue>
+    <Group order="1">router3</Group>
+  </property>
+  <property>
+    <entry key="service.mp.flow.router.2.enabled">false</entry>
+    <Comment>Is this router enabled</Comment>
+    <ProposedValue>false</ProposedValue>
+    <Group order="2">router3</Group>
+  </property>
+  <property>
+    <entry key="service.mp.flow.router.2.address">127.0.0.1</entry>
+    <Comment>Address of the exporter</Comment>
+    <ProposedValue>127.0.0.1</ProposedValue>
+    <Group order="3">router3</Group>
+  </property>
+  <property>
+    <entry key="service.mp.flow.router.2.flowport">6669</entry>
+    <Comment>Portnumber</Comment>
+    <ProposedValue>6669</ProposedValue>
+    <Group order="3">router3</Group>
+  </property>
+  
+    <property>
+    <entry key="service.mp.flow.router.3.name">router1</entry>
+    <Comment>name of the router</Comment>
+    <ProposedValue>router1</ProposedValue>
+    <Group order="1">router4</Group>
+  </property>
+  <property>
+    <entry key="service.mp.flow.router.3.enabled">false</entry>
+    <Comment>Is this router enabled</Comment>
+    <ProposedValue>false</ProposedValue>
+    <Group order="2">router4</Group>
+  </property>
+  <property>
+    <entry key="service.mp.flow.router.3.address">127.0.0.1</entry>
+    <Comment>Address of the exporter</Comment>
+    <ProposedValue>127.0.0.1</ProposedValue>
+    <Group order="3">router4</Group>
+  </property>
+  <property>
+    <entry key="service.mp.flow.router.3.flowport">6669</entry>
+    <Comment>Portnumber</Comment>
+    <ProposedValue>6669</ProposedValue>
+    <Group order="3">router4</Group>
+  </property>
+    
 </properties>
 

Modified: trunk/surfnet_java-flowsubscription-mp/contrib/client/config.py
===================================================================
--- trunk/surfnet_java-flowsubscription-mp/contrib/client/config.py     
2008-05-20 13:25:49 UTC (rev 3862)
+++ trunk/surfnet_java-flowsubscription-mp/contrib/client/config.py     
2008-05-20 13:32:05 UTC (rev 3863)
@@ -2,7 +2,7 @@
 # where to connect to
 serveraddress="localhost"
 #serveraddress="192.168.1.99"
-serverport="8180"
+serverport="8080"
 
servicepath="/flowsubscription-mp/services/FlowsubscriptionMeasurementPointService"
 
 # don't change this
@@ -13,7 +13,7 @@
 clientport="7777"
 
 # where is your zebedee binary
-zebedee="/usr/local/bin/zebedee"
+zebedee="/usr/bin/zebedee"
 
 # keepalive interval
 keepalive=60

Modified: trunk/surfnet_java-flowsubscription-mp/pom.xml
===================================================================
--- trunk/surfnet_java-flowsubscription-mp/pom.xml      2008-05-20 13:25:49 
UTC (rev 3862)
+++ trunk/surfnet_java-flowsubscription-mp/pom.xml      2008-05-20 13:32:05 
UTC (rev 3863)
@@ -134,12 +134,12 @@
     <dependency>
       <groupId>perfsonar</groupId>
       <artifactId>perfsonar-base</artifactId>
-      <version>1.0.20080416</version>
+      <version>1.0.20080520</version>
     </dependency>
     <dependency>
       <groupId>perfsonar</groupId>
       <artifactId>perfsonar-web-admin</artifactId>
-      <version>0.8b</version>
+      <version>0.8.5b</version>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>

Modified: 
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/FlowMpRequest.java
===================================================================
--- 
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/FlowMpRequest.java
     2008-05-20 13:25:49 UTC (rev 3862)
+++ 
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/FlowMpRequest.java
     2008-05-20 13:32:05 UTC (rev 3863)
@@ -5,6 +5,7 @@
 import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
+import java.util.zip.DataFormatException;
 
 import org.ggf.ns.nmwg.base.v2_0.Data;
 import org.ggf.ns.nmwg.base.v2_0.Message;

Modified: 
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/NfReplayControll.java
===================================================================
--- 
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/NfReplayControll.java
  2008-05-20 13:25:49 UTC (rev 3862)
+++ 
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/NfReplayControll.java
  2008-05-20 13:32:05 UTC (rev 3863)
@@ -25,7 +25,7 @@
 
 public class NfReplayControll {
        
-       protected class ExportingRouter implements Runnable {
+       protected class Exporter implements Runnable {
                
                private final Set<Subscription> interestedSubscribers = new 
TreeSet<Subscription>();
                private final ConcurrentLinkedQueue<Subscription> entryQueue 
= new ConcurrentLinkedQueue<Subscription>();
@@ -35,7 +35,7 @@
                
                private long lastModified;
                                
-               public ExportingRouter(String routerName, int port) throws 
PerfSONARException {
+               public Exporter(String routerName, int port) throws 
PerfSONARException {
                        this.routerDirectory = getRouterDirectory(routerName);
                        this.port = port;
                }
@@ -211,7 +211,7 @@
        
        private final ExecutorService exporters = 
Executors.newCachedThreadPool(new 
NamedthreadFactory("Exporter-Workers","exporter-"));
        
-       private final ConcurrentMap<String,ExportingRouter> 
exportingRouterMap = new ConcurrentHashMap<String, 
ExportingRouter>(10,0.75f,1);
+       private final ConcurrentMap<String,Exporter> exportingRouterMap = new 
ConcurrentHashMap<String, Exporter>(10,0.75f,1);
        
        private final File nfcapTargetDirectory;
 
@@ -242,18 +242,16 @@
                }               
        }
        
-       
        private void initExportingRouter(int i) throws PerfSONARException {
                String enabled = 
configuration.getProperty("service.mp.flow.router."+i+".enabled");
                if(!enabled.equalsIgnoreCase("true")) return;
                String name = 
configuration.getProperty("service.mp.flow.router."+i+".name");
                int port = 
Integer.parseInt(configuration.getProperty("service.mp.flow.router."+i+".flowport"));
                logger.debug("loaded Router(name="+name+")");
-               ExportingRouter exporter = new ExportingRouter(name, port);
+               Exporter exporter = new Exporter(name, port);
                exporters.execute(exporter);
                exportingRouterMap.put(name, exporter);
        }
-       
        /**
         * Registers a subscription and unregisters it when the subscription 
ends
         * @param newSubscription
@@ -272,14 +270,14 @@
                tunnel.setListener(new Listener() {
                        public void tunnelClosed() {
                                for(String routerName : 
subscription.getRouters()) {
-                                       ExportingRouter router = 
exportingRouterMap.get(routerName);
+                                       Exporter router = 
exportingRouterMap.get(routerName);
                                        router.remove(subscription);
                                }
                                tunnel.setListener(null);
                        }                       
                });
                for(String routerName : subscription.getRouters()) {
-                       ExportingRouter router = 
exportingRouterMap.get(routerName);
+                       Exporter router = exportingRouterMap.get(routerName);
                        router.add(subscription);       
                }
        }