perfsonar development work

Author: melis
Date: 2008-06-09 04:55:17 -0400 (Mon, 09 Jun 2008)
New Revision: 3977

Added:
   
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/sshtelnetmptemplate.csv
Modified:
   trunk/geant2_java-sshtelnet-mp/conf/CSVgenerator.pl
   
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/CSV_Generator_script/CSVgenerator.pl
Log:
fixed a small change in the CSVgenerator to be compatible with 3.0

Modified: trunk/geant2_java-sshtelnet-mp/conf/CSVgenerator.pl
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/CSVgenerator.pl 2008-06-09 05:43:28 
UTC (rev 3976)
+++ trunk/geant2_java-sshtelnet-mp/conf/CSVgenerator.pl 2008-06-09 08:55:17 
UTC (rev 3977)
@@ -41,6 +41,6 @@
 {
   chomp($line);
   ($device, $url, $prompt) = split(/,/, $line);
-  print 
"$device\@\@\@$type\@\@\@$url\@\@\@$port\@\@\@$prompt\@\@\@$rate\@\@\@$username\@\@\@$password\%\%\%";
+  print 
"$device\@\@\@$type\@\@\@$url\@\@\@$port\@\@\@$prompt\@\@\@$rate\@\@\@$username\@\@\@$password\@\@\@0\@\@\@0\%\%\%";
   print "$ciscoconfig\n";
 }

Modified: 
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/CSV_Generator_script/CSVgenerator.pl
===================================================================
--- 
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/CSV_Generator_script/CSVgenerator.pl
    2008-06-09 05:43:28 UTC (rev 3976)
+++ 
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/CSV_Generator_script/CSVgenerator.pl
    2008-06-09 08:55:17 UTC (rev 3977)
@@ -1,46 +1,46 @@
-#!/usr/bin/perl -w
-# CSV file generator for Perfsonar Telnet-MP 1.2.2
-
-$CISCOCONFIGFILE = "ciscominimumpackage.txt";
-# you can find appropriate command packages at 
.../perfsonar-bundle-2.2/JAVA-SSHTELNET-MP-1.2.2/perfsonar/conf/ 
-
-$ROUTERSFILE = "routers.csv";
-# each line must contain data for one device: devicename,url,prompt
-#
-# for example:
-#
-# c72.bogon,c72.bogon.vh.hbone.hu,c72.bogon>
-# c37-netadmin.vh,c37-netadmin.vh.hbone.hu,c37-netadmin.vh>
-#
-#
-
-
-#Defaults
-$type = "ciscotelnet";
-$port = "23";
-$rate = "2000";
-$username = "username";
-$password = "password";
-
-
-open(FILE, $ROUTERSFILE) || die("Could not open file  $ROUTERSFILE!");
-@routers
 = <FILE>;
-close(FILE);
-
-open(FILE, $CISCOCONFIGFILE) || die("Could not open file  
$CISCOCONFIGFILE!");
-local $/;
-$ciscoconfig = <FILE>;
-close(FILE);
-
-$ciscoconfig =~ s/\r//g;
-$ciscoconfig =~ s/\n//g;
-
-local $/="\n";
-
-foreach $line (@routers)
-{
-  chomp($line);
-  ($device, $url, $prompt) = split(/,/, $line);
-  print 
"$device\@\@\@$type\@\@\@$url\@\@\@$port\@\@\@$prompt\@\@\@$rate\@\@\@$username\@\@\@$password\%\%\%";
-  print "$ciscoconfig\n";
-}
+#!/usr/bin/perl -w
+# CSV file generator for Perfsonar Telnet-MP 1.2.2
+
+$CISCOCONFIGFILE = "ciscominimumpackage.txt";
+# you can find appropriate command packages at 
.../perfsonar-bundle-2.2/JAVA-SSHTELNET-MP-1.2.2/perfsonar/conf/ 
+
+$ROUTERSFILE = "routers.csv";
+# each line must contain data for one device: devicename,url,prompt
+#
+# for example:
+#
+# c72.bogon,c72.bogon.vh.hbone.hu,c72.bogon>
+# c37-netadmin.vh,c37-netadmin.vh.hbone.hu,c37-netadmin.vh>
+#
+#
+
+
+#Defaults
+$type = "ciscotelnet";
+$port = "23";
+$rate = "2000";
+$username = "username";
+$password = "password";
+
+
+open(FILE, $ROUTERSFILE) || die("Could not open file  $ROUTERSFILE!");
+@routers
 = <FILE>;
+close(FILE);
+
+open(FILE, $CISCOCONFIGFILE) || die("Could not open file  
$CISCOCONFIGFILE!");
+local $/;
+$ciscoconfig = <FILE>;
+close(FILE);
+
+$ciscoconfig =~ s/\r//g;
+$ciscoconfig =~ s/\n//g;
+
+local $/="\n";
+
+foreach $line (@routers)
+{
+  chomp($line);
+  ($device, $url, $prompt) = split(/,/, $line);
+  print 
"$device\@\@\@$type\@\@\@$url\@\@\@$port\@\@\@$prompt\@\@\@$rate\@\@\@$username\@\@\@$password\@\@\@0\@\@\@0\%\%\%";
+  print "$ciscoconfig\n";
+}
\ No newline at end of file

Added: 
trunk/geant2_java-sshtelnet-mp/contrib/metadata_configuration_tools/sshtelnetmptemplate.csv