perfsonar development work

Author: gijs
Date: 2008-05-08 09:11:47 -0400 (Thu, 08 May 2008)
New Revision: 3829

Removed:
   trunk/surfnet_java-flowsubscription-mp/conf/service.properties.flowmp
Modified:
   trunk/surfnet_java-flowsubscription-mp/.project
   trunk/surfnet_java-flowsubscription-mp/conf/log4j.properties
   trunk/surfnet_java-flowsubscription-mp/conf/service.properties
   trunk/surfnet_java-flowsubscription-mp/conf/servlet.properties
   trunk/surfnet_java-flowsubscription-mp/contrib/client/config.py
   trunk/surfnet_java-flowsubscription-mp/contrib/manager/config.py
   trunk/surfnet_java-flowsubscription-mp/pom.xml
Log:


Modified: trunk/surfnet_java-flowsubscription-mp/.project
===================================================================
--- trunk/surfnet_java-flowsubscription-mp/.project     2008-05-08 09:01:43 
UTC (rev 3828)
+++ trunk/surfnet_java-flowsubscription-mp/.project     2008-05-08 13:11:47 
UTC (rev 3829)
@@ -6,6 +6,11 @@
        </projects>
        <buildSpec>
                <buildCommand>
+                       <name>org.python.pydev.PyDevBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
                        <name>org.eclipse.jdt.core.javabuilder</name>
                        <arguments>
                        </arguments>
@@ -19,5 +24,6 @@
        <natures>
                <nature>org.devzuz.q.maven.jdt.core.mavenNature</nature>
                <nature>org.eclipse.jdt.core.javanature</nature>
+               <nature>org.python.pydev.pythonNature</nature>
        </natures>
 </projectDescription>

Modified: trunk/surfnet_java-flowsubscription-mp/conf/log4j.properties
===================================================================
--- trunk/surfnet_java-flowsubscription-mp/conf/log4j.properties        
2008-05-08 09:01:43 UTC (rev 3828)
+++ trunk/surfnet_java-flowsubscription-mp/conf/log4j.properties        
2008-05-08 13:11:47 UTC (rev 3829)
@@ -2,14 +2,14 @@
 log4j.threshhold=DEBUG
 
 log4j.appender.rootAppender.MaxBackupIndex=10
-log4j.appender.rootAppender.File=${catalina.home}/logs/surfnet_java-flowsa-ma-root.log
+log4j.appender.rootAppender.File=${catalina.home}/logs/surfnet_java-flowsubscription-mp-root.log
 log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
 log4j.appender.rootAppender.layout.ConversionPattern=%d %5p - %m%n
 log4j.appender.rootAppender.MaxFileSize=500KB
 log4j.appender.rootAppender=org.apache.log4j.RollingFileAppender
 
 log4j.appender.FILE=org.apache.log4j.RollingFileAppender 
-log4j.appender.FILE.File=${catalina.home}/logs/surfnet_java-flowsa-ma.log 
+log4j.appender.FILE.File=${catalina.home}/logs/surfnet_java-flowsubscription-mp.log
 
 log4j.appender.FILE.MaxFileSize=10MB 
 log4j.appender.FILE.MaxBackupIndex=10 
 log4j.appender.FILE.layout=org.apache.log4j.PatternLayout 

Modified: trunk/surfnet_java-flowsubscription-mp/conf/service.properties
===================================================================
--- trunk/surfnet_java-flowsubscription-mp/conf/service.properties      
2008-05-08 09:01:43 UTC (rev 3828)
+++ trunk/surfnet_java-flowsubscription-mp/conf/service.properties      
2008-05-08 13:11:47 UTC (rev 3829)
@@ -12,7 +12,7 @@
 #Group=ServiceType
 service.r.ls_url=http://localhost:8080/XML-LS-1.1.2/services/LookupService
 #Group=ServiceType
-service.r.access_point=http://sonar1.amsterdam.surfnet.nl:8080/flowsa-ma-0.9.1/services/FlowsaMeasurementArchiveService
+service.r.access_point=http://sonar1.amsterdam.surfnet.nl:8080/flowsubscription-mp/services/flowsubscriptionMeasurementArchiveService
 
 # === Measurement Archive general properties ===
 #Group=MaGeneral
@@ -38,3 +38,65 @@
 service.as.authn_for_msg_types=SetupDataRequest
 
service.as.point=http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService
 
+
+
+#=== Flow subscription specific config shizzle ===
+
+# port (and up) that the zebedee client should receive data at
+service.mp.flow.inPort=11110
+
+# port (and up) that the zebedee client should use for sending
+# data (and listen for reverse connection setup from server)
+service.mp.flow.betweenPort=22220
+
+# which versions of netflow can we export
+service.mp.flow.netflow_versions = netflow_v9,netflow_v5,sflow
+
+# what t.p. for netflow data do we support
+service.mp.flow.transport_protocols = udp,tcp,sctp,pr-sctp
+
+# at what rate is the netflow data sampled
+service.mp.flow.sample_rate = 100
+
+# in what directory does FlowFork life
+service.mp.flow.base_dir=/home/gijs/flowfork
+
+# where are the client xml files with connection data
+service.mp.flow.client_dir=/home/lingo/clients/
+
+# maximum client netflow subscriptions
+service.mp.flow.max_conn = 20
+
+### network layout
+
+service.mp.flow.router.0.name=arthur
+service.mp.flow.router.0.enabled=true
+service.mp.flow.router.0.address=145.145.127.1
+service.mp.flow.router.0.flowport=29001
+service.mp.flow.router.0.interfaces=1,2,3,4,5,6
+
+service.mp.flow.router.1.name=ford
+service.mp.flow.router.1.enabled=true,
+service.mp.flow.router.1.address=145.145.127.2
+service.mp.flow.router.1.flowport=29002
+service.mp.flow.router.1.interfaces=1,2,3,4,5,6
+
+service.mp.flow.router.2.name=trillian
+service.mp.flow.router.2.enabled=true
+service.mp.flow.router.2.address=145.145.127.3
+service.mp.flow.router.2.flowport=29003
+service.mp.flow.router.2.interfaces=1,2,3,4,5,6
+
+service.mp.flow.router.3.name=zaphod
+service.mp.flow.router.3.enabled=true
+service.mp.flow.router.3.address=145.145.127.4
+service.mp.flow.router.3.flowport=29004
+service.mp.flow.router.3.interfaces=1,2,3,4,5,6
+
+### application locations
+service.mp.flow.zebedee=/usr/bin/zebedee
+service.mp.flow.nfdump=/usr/local/bin/nfdump
+service.mp.flow.nfcapd=/usr/local/bin/nfcapd
+service.mp.flow.nfreplay=/usr/local/bin/nfreplay
+
+

Deleted: trunk/surfnet_java-flowsubscription-mp/conf/service.properties.flowmp

Modified: trunk/surfnet_java-flowsubscription-mp/conf/servlet.properties
===================================================================
--- trunk/surfnet_java-flowsubscription-mp/conf/servlet.properties      
2008-05-08 09:01:43 UTC (rev 3828)
+++ trunk/surfnet_java-flowsubscription-mp/conf/servlet.properties      
2008-05-08 13:11:47 UTC (rev 3829)
@@ -1,5 +1,5 @@
 #The type of the service
-servlet.service_type=flowsama 
+servlet.service_type=flowsubscription
 #The ConfigurationHandler interface implementation used by the Wizard Servlet
 
servlet.wizard.external_handler=perfSONARWebAdmin.admin.wizard.services.RRDMAHandler
  
 #The username used for authentication reasons when accessing properties 
configuration and Wizard servlets

Modified: trunk/surfnet_java-flowsubscription-mp/contrib/client/config.py
===================================================================
--- trunk/surfnet_java-flowsubscription-mp/contrib/client/config.py     
2008-05-08 09:01:43 UTC (rev 3828)
+++ trunk/surfnet_java-flowsubscription-mp/contrib/client/config.py     
2008-05-08 13:11:47 UTC (rev 3829)
@@ -1,9 +1,9 @@
 
 # where to connect to
-serveraddress="sonar1.amsterdam.surfnet.nl"
+serveraddress="localhost"
 #serveraddress="192.168.1.99"
 serverport="8180"
-servicepath="/perfSONAR-FLOWMP-1.1-beta/services/MeasurementPointService"
+servicepath="/flowsubscription-mp/services/MeasurementPointService"
 
 # don't change this
 serviceurl="http://%s:%s%s"; % (serveraddress, serverport, servicepath)

Modified: trunk/surfnet_java-flowsubscription-mp/contrib/manager/config.py
===================================================================
--- trunk/surfnet_java-flowsubscription-mp/contrib/manager/config.py    
2008-05-08 09:01:43 UTC (rev 3828)
+++ trunk/surfnet_java-flowsubscription-mp/contrib/manager/config.py    
2008-05-08 13:11:47 UTC (rev 3829)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-propFile = 
"/usr/local/FlowSubscriptionMP/tomcat/webapps/perfSONAR-FLOWMP-1.1-beta/WEB-INF/classes/perfsonar/conf/service.properties"
+propFile = 
"/usr/share/tomcat5.5/webapps/flowsubscriptionma/WEB-INF/classes/perfsonar/conf/service.properties"
 
 import re
 import sys

Modified: trunk/surfnet_java-flowsubscription-mp/pom.xml
===================================================================
--- trunk/surfnet_java-flowsubscription-mp/pom.xml      2008-05-08 09:01:43 
UTC (rev 3828)
+++ trunk/surfnet_java-flowsubscription-mp/pom.xml      2008-05-08 13:11:47 
UTC (rev 3829)
@@ -45,7 +45,7 @@
     <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
     <outputDirectory>${basedir}/bin</outputDirectory>
     <directory>${basedir}/build</directory>
-    <finalName>flowsubscriptionma</finalName>
+    <finalName>flowsubscription-mp</finalName>
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>