perfsonar development work

Author: mac
Date: 2006-09-07 10:13:01 -0400 (Thu, 07 Sep 2006)
New Revision: 1618

Modified:
   trunk/perfsonar/contrib/benchmarking/ls/generateDB.pl
Log:
Added -t (message|store) parameter for generating LSRegisterRequest message 
OR LSStore storage XML



Modified: trunk/perfsonar/contrib/benchmarking/ls/generateDB.pl
===================================================================
--- trunk/perfsonar/contrib/benchmarking/ls/generateDB.pl       2006-09-07 
09:46:28 UTC (rev 1617)
+++ trunk/perfsonar/contrib/benchmarking/ls/generateDB.pl       2006-09-07 
14:13:01 UTC (rev 1618)
@@ -14,10 +14,10 @@
 #
 #    File:          generateDB.pl
 #
-#    Author:        Jeff W. Boote
-#                   Internet2
+#    Author:        Jeff W. Boote, Internet2 
 #                   Jason Zurawski (I stole some tricks from another
-#                   script of his and put them in here.)
+#                                   script of his and put them in here.)
+#                   Maciej Glowiak, PSNC (switch: message/store)
 #
 #    Date:          Wed Sep 06 11:10:14 MDT 2006
 #
@@ -30,13 +30,15 @@
 #           hosted by that service.)
 #
 #    Usage:
-#           ./generateDB.pl -s nservices -i ninterfaces
+#           ./generateDB.pl -s nservices -i ninterfaces -t (message|store)
 #
 #    Environment:
 #
 #    Files:
 #
 #    Options:
+
+
 package genLSDB;
 use strict;
 use Getopt::Std;
@@ -47,12 +49,14 @@
     NUMSERVICES =>  "s:",       # number of services in 'store'
     NUMINTERFACES =>  "i:",     # avg number of interfaces per/service
                                 # (assuming rand() returns even distribution)
+    TYPE =>  "t:",              # type, valid types are message or store     
                                                          
 );
 
 # Provide defaults
 my %defaults = (
-    NUMSERVICES =>  10,
-    NUMINTERFACES =>    100,
+    NUMSERVICES =>  1,
+    NUMINTERFACES => 100,
+    TYPE => "message",
 );
 
 # reverse mapping of command-line hash
@@ -87,6 +91,11 @@
     die "$0: Current IP algorithm only supports max avg of $max_inter 
interfaces";
 }
 
+#Check type
+if(($defaults{'TYPE'} ne "message") && ($defaults{'TYPE'} ne "store")){
+    die "$0: Type must be message or store";
+}
+
 # just some default values for elements
 my @ifName = (
     "test-0",
@@ -168,10 +177,22 @@
 my $wl = new Data::Random::WordList( wordlist => '/usr/share/dict/words');
 my @hnames = $wl->get_words($defaults{'NUMSERVICES'});
 
+if($defaults{'TYPE'} eq "store"){
 print << 'HEADER';
-<?xml version=1.0 encoding=UTF-8?>
+<?xml version="1.0" encoding="UTF-8"?>
 <nmwg:store xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/"; 
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/"; 
xmlns:psservice="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/"; 
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/"; 
xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/"; 
type="LSStore">
 HEADER
+} else {
+print << 'HEADER';
+<nmwg:message type="LSRegisterRequest"
+              id="registration-message"
+              
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
+              xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+              
xmlns:psservice="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";
+              xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
+              
xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";>
+HEADER
+}
 
 my $servi;  # service index
 for($servi = 0; $servi < $defaults{'NUMSERVICES'}; $servi++){
@@ -189,9 +210,9 @@
         <perfsonar:subject id="subj.$subj_id">
             <psservice:service id="$serv_ip.$serv_id">
                 <psservice:serviceName>Java RRD MA</psservice:serviceName>
-                
<psservice:accessPoint>http://$serv_ip:8080/axis/services/MeasurementArchiveService</psservice:accessPoint>
-                <psservice:serviceType>RRD MA</psservice:serviceType>
-                <psservice:serviceDescription>Java RRD MA, perfSONAR 
project</psservice:serviceDescription>
+                
<psservice:accessPoint>http://$serv_hname.$serv_domain:8080/axis/services/MeasurementArchiveService</psservice:accessPoint>
+                <psservice:serviceType>MA</psservice:serviceType>
+                <psservice:serviceDescription>Java RRD MA, perfSONAR 
project, $serv_ip</psservice:serviceDescription>
             </psservice:service>
         </perfsonar:subject>
     </nmwg:metadata>
@@ -250,8 +271,14 @@
     }
 }
 
+if($defaults{'TYPE'} eq "store"){
 print << 'FOOTER';
 </nmwg:store>
 FOOTER
+} else {
+print << 'FOOTER';
+</nmwg:message>
+FOOTER
+}
 
-exit 0;
+exit 0;
\ No newline at end of file