perfsonar development work

Author: gijs
Date: 2008-05-29 05:55:08 -0400 (Thu, 29 May 2008)
New Revision: 3900

Added:
   trunk/surfnet_java-flowsubscription-mp/doc/examples/keepalive-request.xml
   trunk/surfnet_java-flowsubscription-mp/doc/examples/keepalive-response.xml
   trunk/surfnet_java-flowsubscription-mp/doc/examples/subscribe-request.xml
   trunk/surfnet_java-flowsubscription-mp/doc/examples/subscribe-response.xml
   trunk/surfnet_java-flowsubscription-mp/doc/examples/unsubscribe-request.xml
   
trunk/surfnet_java-flowsubscription-mp/doc/examples/unsubscribe-response.xml
Removed:
   trunk/surfnet_java-flowsubscription-mp/doc/examples/keepalive.xml
   trunk/surfnet_java-flowsubscription-mp/doc/examples/subscribe.xml
   
trunk/surfnet_java-flowsubscription-mp/doc/examples/subscriptionResponse.xml
   trunk/surfnet_java-flowsubscription-mp/doc/examples/unsubscribe.xml
Modified:
   trunk/surfnet_java-flowsubscription-mp/.project
   trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/WEB-INF/web.xml
   trunk/surfnet_java-flowsubscription-mp/contrib/client/config.py
   trunk/surfnet_java-flowsubscription-mp/contrib/client/flowmpclient.py
Log:


Modified: trunk/surfnet_java-flowsubscription-mp/.project
===================================================================
--- trunk/surfnet_java-flowsubscription-mp/.project     2008-05-29 09:53:52 
UTC (rev 3899)
+++ trunk/surfnet_java-flowsubscription-mp/.project     2008-05-29 09:55:08 
UTC (rev 3900)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-       <name>surfnet_java-flowsubscription-mp</name>
+       <name>flowsubscription-mp</name>
        <comment></comment>
        <projects>
        </projects>

Modified: trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/WEB-INF/web.xml
===================================================================
--- trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/WEB-INF/web.xml      
  2008-05-29 09:53:52 UTC (rev 3899)
+++ trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/WEB-INF/web.xml      
  2008-05-29 09:55:08 UTC (rev 3900)
@@ -4,7 +4,7 @@
 Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
 
 <web-app>
-       <display-name>perfSONAR - Flow Selection &amp; Aggregation 
MA</display-name>
+       <display-name>perfSONAR - Flow Subscription MP</display-name>
 
        <filter>
                <filter-name>ipfilter</filter-name>

Modified: trunk/surfnet_java-flowsubscription-mp/contrib/client/config.py
===================================================================
--- trunk/surfnet_java-flowsubscription-mp/contrib/client/config.py     
2008-05-29 09:53:52 UTC (rev 3899)
+++ trunk/surfnet_java-flowsubscription-mp/contrib/client/config.py     
2008-05-29 09:55:08 UTC (rev 3900)
@@ -1,15 +1,17 @@
 
 # where to connect to
-serveraddress="localhost"
+#serveraddress="localhost"
+serveraddress="sonar1.amsterdam.surfnet.nl"
 #serveraddress="192.168.1.99"
 serverport="8080"
-servicepath="/flowsubscription-mp/services/FlowsubscriptionMeasurementPointService"
+#servicepath="/surfnet_java-flowsubscription-mp/services/FlowsubscriptionMeasurementPointService"
+servicepath="/surfnet_java-flowsubscription-mp/services/FlowsubscriptionMeasurementPointService"
 
 # don't change this
 serviceurl="http://%s:%s%s"; % (serveraddress, serverport, servicepath)
 
 # where do you want to receive your data
-clientaddress="192.87.102.208"
+clientaddress="192.87.109.227"
 clientport="7777"
 
 # where is your zebedee binary
@@ -23,7 +25,7 @@
 router="ford"
 
 # string to filter flow data
-filter="i'm a evil string"
+filter=""
 
 # not yet implemented
 # flow version (netflow_v9 / netflow_v5 / sflow)
@@ -31,5 +33,5 @@
 
 
 # loglevel (info, debug, warning or error)
-loglevel="debug"
+loglevel="info"
 

Modified: 
trunk/surfnet_java-flowsubscription-mp/contrib/client/flowmpclient.py
===================================================================
--- trunk/surfnet_java-flowsubscription-mp/contrib/client/flowmpclient.py     
  2008-05-29 09:53:52 UTC (rev 3899)
+++ trunk/surfnet_java-flowsubscription-mp/contrib/client/flowmpclient.py     
  2008-05-29 09:55:08 UTC (rev 3900)
@@ -100,6 +100,7 @@
                  '-c', config.serveraddress, \
                  '-T', str(common.betweenPort + int(self.clientID)), \
                  '-x', 'udptimeout 60' ]
+        logging.info(" ".join( [config.zebedee] + zargs[1:]))
         self.zPid =  os.spawnvp(os.P_NOWAIT, config.zebedee, zargs)
         return True
 

Copied: 
trunk/surfnet_java-flowsubscription-mp/doc/examples/keepalive-request.xml 
(from rev 3874, 
trunk/surfnet_java-flowsubscription-mp/doc/examples/keepalive.xml)

Added: 
trunk/surfnet_java-flowsubscription-mp/doc/examples/keepalive-response.xml

Deleted: trunk/surfnet_java-flowsubscription-mp/doc/examples/keepalive.xml

Added: 
trunk/surfnet_java-flowsubscription-mp/doc/examples/subscribe-request.xml

Added: 
trunk/surfnet_java-flowsubscription-mp/doc/examples/subscribe-response.xml

Deleted: trunk/surfnet_java-flowsubscription-mp/doc/examples/subscribe.xml

Deleted: 
trunk/surfnet_java-flowsubscription-mp/doc/examples/subscriptionResponse.xml

Copied: 
trunk/surfnet_java-flowsubscription-mp/doc/examples/unsubscribe-request.xml 
(from rev 3874, 
trunk/surfnet_java-flowsubscription-mp/doc/examples/unsubscribe.xml)

Added: 
trunk/surfnet_java-flowsubscription-mp/doc/examples/unsubscribe-response.xml

Deleted: trunk/surfnet_java-flowsubscription-mp/doc/examples/unsubscribe.xml