perfsonar development work

Author: dfn.calim
Date: 2012-11-29 07:42:41 +0000 (Thu, 29 Nov 2012)
New Revision: 776

Modified:
   
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/changelog
   branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/control
   
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-mp-owamp-debian/changelog
   branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST
   branches/perfsonar-oppd-all-0.53/etc/oppd-dev/oppd.dev.conf
   branches/perfsonar-oppd-all-0.53/lib/perfSONAR.pm
   branches/perfsonar-oppd-all-0.53/lib/perfSONAR/DataStruct.pm
   branches/perfsonar-oppd-all-0.53/lib/perfSONAR/DataStruct/NMWG.pm
   branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP.pm
   branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP/OWAMP.pm
Log:
adding some scheduling code for OWAMP MP

Modified: 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/changelog
===================================================================
--- 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/changelog 
      2012-11-09 11:53:04 UTC (rev 775)
+++ 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/changelog 
      2012-11-29 07:42:41 UTC (rev 776)
@@ -1,3 +1,7 @@
+perfsonar-oppd (0.53-9) unstable; urgency=low
+  * Dependency problem solved to libdatetime-perl
+ -- DFN Labor 
<>
  Mon, 19 Nov 2012 10:10:49 +0200
+
 perfsonar-oppd (0.53-8) unstable; urgency=low
   * Added new eventtype select for HADES MA
  -- DFN Labor 
<>
  Fri, 08 Nov 2012 12:45:49 +0200

Modified: 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/control
===================================================================
--- 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/control 
2012-11-09 11:53:04 UTC (rev 775)
+++ 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/control 
2012-11-29 07:42:41 UTC (rev 776)
@@ -8,7 +8,7 @@
 
 Package: perfsonar-oppd
 Architecture: all
-Pre-Depends: 
${perl:Depends},libipc-run-perl,libconfig-general-perl,libhttp-daemon-ssl-perl,libsocket6-perl,libnmwg-perl
 (>= 0.03),debianutils,liblog-log4perl-perl
+Pre-Depends: 
${perl:Depends},libipc-run-perl,libconfig-general-perl,libhttp-daemon-ssl-perl,libsocket6-perl,libnmwg-perl
 (>= 0.03),debianutils,liblog-log4perl-perl,libdatetime-perl
 Conflicts: oppd,perfsonar-oppd (<= 0.52)
 Replaces: oppd,perfsonar-oppd (<= 0.52)
 Description: open PERL perfSONAR daemon

Modified: 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-mp-owamp-debian/changelog
===================================================================
--- 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-mp-owamp-debian/changelog
      2012-11-09 11:53:04 UTC (rev 775)
+++ 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-mp-owamp-debian/changelog
      2012-11-29 07:42:41 UTC (rev 776)
@@ -1,3 +1,7 @@
+perfsonar-oppd-mp-owamp (0.53-8) unstable; urgency=low
+  * New Scheduling mechanism implemented in OWAMP MP
+ -- DFN Labor 
<>
  Mon, 19 Nov 2012 10:10:49 +0200
+
 perfsonar-oppd-mp-owamp (0.53-7) unstable; urgency=low
   * Module OWAMP MP problem to send raw data fixed.
  -- DFN Labor 
<>
  Fri, 14 Sep 2012 14:06:49 +0200

Modified: branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST
===================================================================
--- branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST   2012-11-09 
11:53:04 UTC (rev 775)
+++ branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST   2012-11-29 
07:42:41 UTC (rev 776)
@@ -11,8 +11,8 @@
 etc/LS_register.xml
 etc/oppd-mdm.conf
 etc/oppd.conf.example
-etc/oppd.sysconfig.redhat
-etc/oppd.init.redhat
+etc/oppd.default.debian
+etc/oppd.init.debian
 lib/perfSONAR.pm
 lib/perfSONAR/Auth.pm
 lib/perfSONAR/Client/LS.pm

Modified: branches/perfsonar-oppd-all-0.53/etc/oppd-dev/oppd.dev.conf
===================================================================
--- branches/perfsonar-oppd-all-0.53/etc/oppd-dev/oppd.dev.conf 2012-11-09 
11:53:04 UTC (rev 775)
+++ branches/perfsonar-oppd-all-0.53/etc/oppd-dev/oppd.dev.conf 2012-11-29 
07:42:41 UTC (rev 776)
@@ -17,9 +17,9 @@
 # Default: on
 #
 # Example:
-detach         off
+#detach         off
 #
-#detach         on
+detach         on
 
 
 #
@@ -42,7 +42,7 @@
 # logfile        "/var/log/oppd.log"
 #
 #logfile        off
-#logfile        "/var/log/oppd.log"
+logfile        "oppd.log"
 
 
 #
@@ -201,7 +201,7 @@
 # Default: off
 #
 # Example:
-ls_register    on
+#ls_register    on
 #
 #ls_register    off
 
@@ -219,7 +219,7 @@
 # Example:
 # keepalive      7200
 #
-keepalive      3600
+#keepalive      3600
 
 
 #
@@ -245,8 +245,8 @@
 #
 #ls_url        
"http://ls.perfsonar.pionier.net.pl:8180/geant2-java-xml-ls/services/LookupService";
 #ls_url        "http://psmsu05.aglt2.org:9995/perfSONAR_PS/services/hLS";
-ls_url "http://ndb1.internet2.edu:9995/perfSONAR_PS/services/hLS";
-ls_url  "http://ps3.es.net:8095/perfSONAR_PS/services/hLS";
+#ls_url        "http://ndb1.internet2.edu:9995/perfSONAR_PS/services/hLS";
+#ls_url  "http://ps3.es.net:8095/perfSONAR_PS/services/hLS";
 
 #
 # hostname - Host name sent to the Lookup Service.

Modified: branches/perfsonar-oppd-all-0.53/lib/perfSONAR/DataStruct/NMWG.pm
===================================================================
--- branches/perfsonar-oppd-all-0.53/lib/perfSONAR/DataStruct/NMWG.pm   
2012-11-09 11:53:04 UTC (rev 775)
+++ branches/perfsonar-oppd-all-0.53/lib/perfSONAR/DataStruct/NMWG.pm   
2012-11-29 07:42:41 UTC (rev 776)
@@ -300,7 +300,7 @@
         my $error = $self->checkParams($ds, %parameters);
         if ($error){
             $self->{LOGGER}->error($error);
-            $ds->{REQUESTMSG}->return_result_code("ERROR", 
$ds->{SERVICE}->{NAME},$error, 
$ds->{REQUESTMSG}->{"dataIDs"}{$dataid}{"metaref"});
+            
$ds->{REQUESTMSG}->return_result_code("error.common.parse_error", 
$ds->{SERVICE}->{NAME} . " : " . $error, 
$ds->{REQUESTMSG}->{"dataIDs"}{$dataid}{"metaref"});
             $ds->{ERROROCCUR} = 1;
             return;
         }#Endf ($error)
@@ -433,6 +433,7 @@
         #more owamp
         if ($parameters{"output"} && !($parameters{"output"} eq "per_packet" 
||
                 $parameters{"output"} eq "machine_readable" ||
+               $parameters{"output"} eq "summary" ||
                 $parameters{"output"} eq "raw") ){
             $error = "Unknown output parameter: $parameters{output}";
             return $error;

Modified: branches/perfsonar-oppd-all-0.53/lib/perfSONAR/DataStruct.pm
===================================================================
--- branches/perfsonar-oppd-all-0.53/lib/perfSONAR/DataStruct.pm        
2012-11-09 11:53:04 UTC (rev 775)
+++ branches/perfsonar-oppd-all-0.53/lib/perfSONAR/DataStruct.pm        
2012-11-29 07:42:41 UTC (rev 776)
@@ -138,6 +138,7 @@
         output  => 1,
         port  => 1,
         portrange  => 1,
+       ppsts  => 1,
         individual => 1, #TODO check this parameter
         
         #store parameters

Modified: branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP/OWAMP.pm
===================================================================
--- branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP/OWAMP.pm  2012-11-09 
11:53:04 UTC (rev 775)
+++ branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP/OWAMP.pm  2012-11-29 
07:42:41 UTC (rev 776)
@@ -40,9 +40,9 @@
 
 use Log::Log4perl qw(get_logger);
 use base qw(perfSONAR::MP);
+use POSIX;
 
 
-
 =head2 run()
 
 The run method starts a OWAMP measurement and use the runMeasurement()
@@ -89,8 +89,22 @@
     push @commandline, "-E", $parameters{enddelay} if $parameters{enddelay};
     push @commandline, "-z", $parameters{startdelay} if 
$parameters{startdelay};
     push @commandline, "-b", $parameters{bucket_width} if 
$parameters{bucket_width};
-    push @commandline, "-N", $parameters{intermediates} if 
$parameters{intermediates};
-    
+    if ( $parameters{intermediates} ) { 
+        push @commandline, "-N", $parameters{intermediates};
+       if ($parameters{intermediates} >= $parameters{count} ){
+               $self->{intermediates} = 1;
+       }else{
+               my $mod_res = ceil( $parameters{count} / 
$parameters{intermediates});
+               $self->{intermediates} = $mod_res;
+               
+               #Let us calculate wait time to start measurement every minute
+               my $dt = DateTime->now;
+               my $waittime = 60 - $dt->second;
+               push @commandline, "-z", $waittime;
+       }
+    } else {
+        $self->{intermediates} = 1;
+    }
     #Look for the output type
     if ($parameters{"output"} && $parameters{"output"} eq "summary"){
        $self->{OUTPUTTYPE} =  "summary";
@@ -145,8 +159,8 @@
     #Check the command
     my $countlimit = 
$$ds->{SERVICES}->{$$ds->{SERVICE}->{NAME}}->{countlimit};
     if (int($parameters{"count"}) >int($countlimit)){
-       $errormsg = "count greater than $countlimit is not allowed. Please 
change it in your request.";
-       return "ERROR", $errormsg, "error.mp.owamp";
+       $errormsg = "count parameter greater than $countlimit is not allowed. 
Please change it in your request.";
+       return "ERROR", $errormsg;
     }
     #$self->{LOGGER}->info(Dumper($countlimit));
     
@@ -171,7 +185,9 @@
     my @result = split(/\n/, $result);
     my $time = time;
     my @datalines = ();
-    
+   
+    #$self->{LOGGER}->info("@result");    
+ 
     if ($self->{OUTPUTTYPE} eq  "raw"){
        foreach my $resultline (@result){
                if ($resultline =~
@@ -231,8 +247,13 @@
        }# End foreach
     }#End if
     elsif ($self->{OUTPUTTYPE} eq  "summary"){
+       my $count = 0;
+       while( $count < $self->{intermediates} ){
         my %data_hash;
-       foreach my $resultline (@result){            
+       $count += 1;
+       #foreach my $resultline (@result){           
+       while(@result){
+           my $resultline = shift(@result);
             next if $resultline =~ /Approximately/;
             next if $resultline =~ /owping: FILE=/;
             next if $resultline =~ s/^\s+//;
@@ -241,8 +262,7 @@
                 
/---\s+owping\s+statistics\s+from\s+\[(\S+)\]:(\S+)\s+to\s+\[(\S+)\]:(\S+)/){
                 $data_hash{"sender"} = $1;
                 $data_hash{"receiver"} = $3; 
-            }
-            if ($resultline =~
+            }elsif ($resultline =~
                 #10 sent, 0 lost (0.000%), 0 duplicates
                 
/(\d+)\s+sent,\s+(\d+)\s+lost\s+\((\S+)\),\s+(\d+)\s+duplicates/){
                 $data_hash{"sent"} = $1;
@@ -250,6 +270,12 @@
                 $data_hash{"lost_percent"} = $3;
                 $data_hash{"duplicates"} = $4;
                 #push @datalines, \%data_hash;
+           }elsif ($resultline =~
+           #first:  2012-10-17T11:45:00.601
+           /first:\s+(\d+-\d+-\d+T\d+:\d+:\d+.\d+)/){
+               my $starttime = $1;
+               $self->{LOGGER}->info("Starttime: $starttime");
+               $data_hash{"starttime"} = $starttime;
             } elsif ($resultline =~
                 #one-way delay min/median/max = 0.202/0.4/0.582 ms, 
(err=0.628 ms)
                 /one-way delay min\/median\/max = 
(\S+\/\S+\/\S+)\s+(\w+),\s+\(err=(.+)\s+(\w+)/){
@@ -271,11 +297,19 @@
             #Hops = 12 (consistently)
             /Hops =\s+(\d+)\s+\(consistently\)/){
                 $data_hash{"hops"} = $1;
+               #Hops is the last line which we use as the end of a summary
+               last;
+           }elsif ($resultline =~
+           #TTL not reported
+           /TTL not reported/){
+                last;
            }else { next; }
        }#End foreach
-       push @datalines, \%data_hash if (scalar keys %data_hash > 0)
+       # Add hash to data container after break from foreach
+       push @datalines, \%data_hash; # if (scalar keys %data_hash > 0)
+       } #End while ($count <
     }#elsif ($self->{OUTPUTTYPE} eq  "summary"
-    
+    #$self->{LOGGER}->info(Dumper(@datalines));
     if($#datalines < 0){
         #no data -> something wrong, write result as error description:
         $datalines[0]="OWAMP Error:";

Modified: branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP.pm
===================================================================
--- branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP.pm        2012-11-09 
11:53:04 UTC (rev 775)
+++ branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP.pm        2012-11-29 
07:42:41 UTC (rev 776)
@@ -49,6 +49,7 @@
 use IPC::Run qw( run timeout start finish pump);
 #use IO::Pty;
 use POSIX ":sys_wait_h";
+use DateTime;
 use base qw(perfSONAR::Echo);
 use base qw(perfSONAR::Selftest);
 

Modified: branches/perfsonar-oppd-all-0.53/lib/perfSONAR.pm
===================================================================
--- branches/perfsonar-oppd-all-0.53/lib/perfSONAR.pm   2012-11-09 11:53:04 
UTC (rev 775)
+++ branches/perfsonar-oppd-all-0.53/lib/perfSONAR.pm   2012-11-29 07:42:41 
UTC (rev 776)
@@ -95,7 +95,7 @@
        $datalines[0]="Service request Error:";
        push @datalines, $errormsg;
        push @datalines, "error.common.service_not_availible";
-       $ds->{PARAMS}->{"1"}->{MRESULT} = 
\@datalines;
+       $ds->{SERVICE}->{DATA}->{1}->{MRESULT}  = 
\@datalines;
        $ds->{$ds->{DSTYPE}}->parseResult(\$ds);
        return;
     }