perfsonar development work

Author: dfn.calim
Date: 2013-07-08 10:59:24 +0100 (Mon, 08 Jul 2013)
New Revision: 816

Modified:
   branches/perfsonar-oppd-all-0.53/tools/perfSONAR-client/OWAMP-Scheduler.pl
Log:
fix path problem in owamp scheduler

Modified: 
branches/perfsonar-oppd-all-0.53/tools/perfSONAR-client/OWAMP-Scheduler.pl
===================================================================
--- 
branches/perfsonar-oppd-all-0.53/tools/perfSONAR-client/OWAMP-Scheduler.pl  
2013-07-08 08:02:26 UTC (rev 815)
+++ 
branches/perfsonar-oppd-all-0.53/tools/perfSONAR-client/OWAMP-Scheduler.pl  
2013-07-08 09:59:24 UTC (rev 816)
@@ -3,12 +3,17 @@
 use Getopt::Std;
 use strict;
 use Data::Dumper;
+use Cwd qw( abs_path );
+use File::Basename qw( dirname );
 
+my $path = dirname(abs_path($0));;
 my $port = 8090;
-my $tool = "perfsonar-client.pl";
-my $path = "./";
+my $tool = "$path/perfsonar-client.pl";
 my $stand_count=100;
 my $intermedia = 0;
+my $template = "$path/template-owamp-mp.xml";
+print "$path\n";
+
 sub usage{
        print "\tUsage: OWAMP-Scheduler.pl -f -s <source IP> -d <destination 
IP> -c <count> -i <intermedia>
               \t\t-s <source IP>\tSource IP of measueement point
@@ -25,15 +30,11 @@
 my %args;
 
 usage() if  (! getopts('s:d:c:i:f', \%args) );
-print Dumper(%args);
 #Check if values are set
 foreach my $arg ( keys %args ){
-       print "Key: $arg ";
        if ( $arg =~ /s/ ){
-               print "bin in s\n";
                $src = $args{$arg};
        } elsif ( $arg =~ /d/ ) {
-               print "bin in d\n";
                $dst = $args{$arg};
        } elsif ( $arg =~ /c/ ) {
                $count = $args{$arg};
@@ -67,7 +68,6 @@
        $direction = "to";
 }
 
-my $template = "./template-owamp-mp.xml";
 
 #read in template XML file, set src/dst/count paramters
 my $request;
@@ -91,6 +91,6 @@
 print REQUEST $request;
 close REQUEST; 
 
-my $status = `./$tool --reqfile=$req_file 
--uri=http://$src:$port/services/MP/OWAMP --host=$src`;
+my $status = `$tool --reqfile=$req_file 
--uri=http://$src:$port/services/MP/OWAMP --host=$src`;
 print "Status: $status\n";
 unlink $req_file;