perfsonar development work

Author: dfn.calim
Date: 2010-08-16 15:53:31 +0100 (Mon, 16 Aug 2010)
New Revision: 621

Modified:
   branches/perfsonar-oppd-new-architect/bin/oppd.pl
   branches/perfsonar-oppd-new-architect/lib/perfSONAR/DataStruct/NMWG.pm
   branches/perfsonar-oppd-new-architect/lib/perfSONAR/MP.pm
   branches/perfsonar-oppd-new-architect/lib/perfSONAR/MP/OWAMP.pm
   
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-ind2-req.xml
Log:
Debug Return owamp error message

Modified: branches/perfsonar-oppd-new-architect/bin/oppd.pl
===================================================================
--- branches/perfsonar-oppd-new-architect/bin/oppd.pl   2010-08-09 08:28:27 
UTC (rev 620)
+++ branches/perfsonar-oppd-new-architect/bin/oppd.pl   2010-08-16 14:53:31 
UTC (rev 621)
@@ -839,15 +839,14 @@
       if ($ds->{ERROROCCUR} == 1){
        #Do here response on error
        $log->error("A error occured in creating data struct");
-       $nmwg_response = $ds->{RETURNMSG};
-      }
-      else{
+       $log->error("$ds->{ERROROCCUR}");
+      } else{
         $ds->{SERVICES} = \%services;
         #Run $ds
         perfSONAR->handle_request($ds);
-        $nmwg_response = $ds->{REQUESTMSG};
       } 
       
+      $nmwg_response = $ds->{REQUESTMSG};
       #TODO $nmwg_message <-> $nmwg_response? clone?
       #TODO what about header?
       $soap_message->body($nmwg_response->as_dom()->documentElement);

Modified: 
branches/perfsonar-oppd-new-architect/lib/perfSONAR/DataStruct/NMWG.pm
===================================================================
--- branches/perfsonar-oppd-new-architect/lib/perfSONAR/DataStruct/NMWG.pm    
  2010-08-09 08:28:27 UTC (rev 620)
+++ branches/perfsonar-oppd-new-architect/lib/perfSONAR/DataStruct/NMWG.pm    
  2010-08-16 14:53:31 UTC (rev 621)
@@ -91,7 +91,7 @@
     my ($errorstring, $metaid) = $ds->{REQUESTMSG}->parse_all;
     if($errorstring){
         $self->{LOGGER}->error($errorstring);
-        $$ds->{RETURNMSG} = 
$ds->{REQUESTMSG}->return_result_code("error.common.parse_error", 
"$errorstring", $metaid);
+        $ds->{REQUESTMSG}->return_result_code("error.common.parse_error", 
"$errorstring", $metaid);
         $self->{ERROROCCUR} = 1;
         return;
     }
@@ -100,7 +100,7 @@
     if(!($ds->{REQUESTMSG}->{"metadataIDs"})){
         $errorstring = "No metadata definition in message.";
         $self->{LOGGER}->error($errorstring);
-        $$ds->{RETURNMSG} = 
$ds->{REQUESTMSG}->return_result_code("error.common.message", "$errorstring", 
"message");
+        $ds->{REQUESTMSG}->return_result_code("error.common.message", 
"$errorstring", "message");
         $ds->{ERROROCCUR} = 1;
         return;
     }
@@ -133,8 +133,10 @@
         #TODO check of evebttypes
         if (!defined $found){
             my $errorstring = "Unknown eventType: $et";
-            $self->{LOGGER}->info($errorstring);
+            $self->{LOGGER}->error($errorstring);
             
$ds->{REQUESTMSG}->return_result_code("error.common.parse_error", 
$errorstring, $meta);
+            $ds->{ERROROCCUR} = 1;
+            return;
         }
         #check times
         my $startTime = 
$ds->{REQUESTMSG}->{"metadataIDs"}{$meta}{"startTime"};
@@ -247,7 +249,6 @@
     my ($self,$messagetype,$ds) = @_;
     
     if ($messagetype eq "ErrorResponse"){ #error from authentication!
-        $$ds->{RETURNMSG} = $$ds->{REQUESTMSG};
         return -1;
     }    
     if ($messagetype eq "AuthNEERequest"){ #authorization rquest to dummy AS
@@ -271,7 +272,6 @@
         my $errorstring = "Unknown messagetype: $messagetype";
         $self->{LOGGER}->error($errorstring);
         $$ds->{REQUESTMSG}->set_message_type("ErrorResponse");
-        $$ds->{RETURNMSG} = 
$$ds->{REQUESTMSG}->return_result_code("error.common.action_not_supported", 
"$errorstring", "message");
         return -1;
     }
     return 1;

Modified: branches/perfsonar-oppd-new-architect/lib/perfSONAR/MP/OWAMP.pm
===================================================================
--- branches/perfsonar-oppd-new-architect/lib/perfSONAR/MP/OWAMP.pm     
2010-08-09 08:28:27 UTC (rev 620)
+++ branches/perfsonar-oppd-new-architect/lib/perfSONAR/MP/OWAMP.pm     
2010-08-16 14:53:31 UTC (rev 621)
@@ -93,7 +93,7 @@
     else{
        $errormsg = "No destination ip address or port specified.";
         $self->{LOGGER}->error($errormsg);
-        return "ERROR", $errormsg;
+        return "ERROR", $errormsg, "error.mp.owping";
     }
     
     #$self->{LOGGER}->info(Dumper(@commandline));

Modified: branches/perfsonar-oppd-new-architect/lib/perfSONAR/MP.pm
===================================================================
--- branches/perfsonar-oppd-new-architect/lib/perfSONAR/MP.pm   2010-08-09 
08:28:27 UTC (rev 620)
+++ branches/perfsonar-oppd-new-architect/lib/perfSONAR/MP.pm   2010-08-16 
14:53:31 UTC (rev 621)
@@ -59,14 +59,14 @@
        my $ds = $self->{DS};
        my $pass;
        
-       $logger->info("Starting...");
        my $params = $$ds->{PARAMS};
        foreach my $id (keys %{$params}){
                my @commandline = $self->createCommandLine(
                      %{$$ds->{PARAMS}->{$id}});
         
                if ($commandline[0] eq "ERROR") {
-            #TODO RETURN ERROR MSG
+            $$ds->{REQUESTMSG}->return_result_code($commandline[2], 
$commandline[1], $$ds->{REQUESTMSG}->{"dataIDs"}{$id}{"metaref"});
+            return;
         }
         #Start commandline
         #Get tool for commandline

Modified: 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-ind2-req.xml
===================================================================
--- 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-ind2-req.xml
     2010-08-09 08:28:27 UTC (rev 620)
+++ 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-ind2-req.xml
     2010-08-16 14:53:31 UTC (rev 621)
@@ -11,10 +11,7 @@
 
   <nmwg:metadata id="meta1">
     <perfsonar:subject id="subj1">
-      <nmwgt:endPointPair>
-        <nmwgt:src type="ipv4" value="198.129.254.74"/>
-        <nmwgt:dst type="ipv4" value="198.129.254.102"/>
-      </nmwgt:endPointPair>
+      <nmwgt:endPoint type="ipv4" value="198.129.254.102"/>
     </perfsonar:subject>
 
     <nmwg:eventType>owamp</nmwg:eventType>