perfsonar development work

Author: dfn.calim
Date: 2011-02-10 12:48:20 +0000 (Thu, 10 Feb 2011)
New Revision: 681

Modified:
   branches/perfsonar-oppd-new-architect/lib/perfSONAR/DataStruct/NMWG.pm
Log:
Add Hades MA request

Modified: 
branches/perfsonar-oppd-new-architect/lib/perfSONAR/DataStruct/NMWG.pm
===================================================================
--- branches/perfsonar-oppd-new-architect/lib/perfSONAR/DataStruct/NMWG.pm    
  2011-02-10 12:46:42 UTC (rev 680)
+++ branches/perfsonar-oppd-new-architect/lib/perfSONAR/DataStruct/NMWG.pm    
  2011-02-10 12:48:20 UTC (rev 681)
@@ -92,6 +92,7 @@
     "http://ggf.org/ns/nwmg/tools/hades/aggregated";,
     "http://ggf.org/ns/nmwg/characteristic/delay/one-way/";,
     "http://ggf.org/ns/nmwg/ops/select/";,
+    "http://ggf.org/ns/nmwg/tools/hades/traceroute/hoplist/2.0/";,
     "hades",
     "owamp",
     "bwctl",
@@ -275,7 +276,16 @@
                 $self->{HADES}->{ACTION}->{TYPE} = "ippm_aggregated";
             } elsif($raw_ets =~ /$self->{HADES}->{ACTION}->{EVENTYPE}/){
                 $self->{HADES}->{ACTION}->{TYPE} = "ippm_raw";
+<<<<<<< .mine
+            }
+           my $filter = 
$ds->{REQUESTMSG}->{"dataIDs"}{$dataid}{$self->{HADES}->{ACTION}->{EVENTYPE}};
   
+            if ($$filter{"interval"}){
+                $$filter{"interval"} *= 1000000;
+            }
+            $self->{HADES}->{FILTER} = $filter;
+=======
             }               
+>>>>>>> .r679
         }# End Hades stuff
         
         my $error = $self->checkParams($ds, %parameters);
@@ -440,27 +450,43 @@
 =cut
 sub parseResult{
     my ($self, $ds) = @_;
-       
-       my $ns_serivce = $$ds->{SERVICE}->{NAME};
-       $ns_serivce =~ s/\///;
-       my $ns = $self->{NS}->{$ns_serivce};
+    my $ns_serivce = $$ds->{SERVICE}->{NAME};
+    $ns_serivce =~ s/\///;
+    my $ns = $self->{NS}->{$ns_serivce};
     my $data = $$ds->{SERVICE}->{DATA};
     
     #Do here all for MetakeyDataRequest
     my $messagetype = $$ds->{REQUESTMSG}->get_message_type();
+    $self->{LOGGER}->info("Starting parse...");        
     
     foreach my $id (keys %{$data}){
         my $datalines_ref = $$ds->{SERVICE}->{DATA}->{$id}->{MRESULT};
-        $self->{LOGGER}->debug(Dumper(@$datalines_ref));
+        #$self->{LOGGER}->debug(Dumper(@$datalines_ref));
         if ($$ds->{DOECHO}){              
             my $data_hash = pop @$datalines_ref;
             my %echo = %$data_hash;
             $$ds->{REQUESTMSG}->return_result_code($echo{echocode}, 
$echo{echomsg}, "$id")
         }elsif ($$ds->{ERROROCCUR}){
             my $et = pop @$datalines_ref;
+            #Hades MA parameters occur
+            if ($$ds->{NMWG}->{HADES}->{RESPARAMS}->{OCCUR}){
+                my $result_params = 
$$ds->{NMWG}->{HADES}->{RESPARAMS}->{DATA};
+                $$ds->{REQUESTMSG}->set_parameter_list(@$result_params);
+            }
             $$ds->{REQUESTMSG}->return_result_code($et, "@$datalines_ref", 
$$ds->{REQUESTMSG}->{"dataIDs"}{$id}{"metaref"});
         }else{ 
+            #Look if Hades MA parameters should be append
+            if ($$ds->{NMWG}->{HADES}->{RESPARAMS}->{OCCUR}){
+                my %result_params = 
%{$$ds->{NMWG}->{HADES}->{RESPARAMS}->{DATA}};
+                $result_params{metadataIdRef} = 
$$ds->{REQUESTMSG}->{"dataIDs"}{$id}{"metaref"};
+                $$ds->{REQUESTMSG}->set_parameter_hash(%result_params);
+            }
+            #Hades MA need a another parse
+            if ($$ds->{SERVICE}->{NAME} =~ /HADES/){
+                $self->{LOGGER}->info("Parsing Hades MA data...");
+            }
             $$ds->{REQUESTMSG}->set_data_ns ($id, $ns, @$datalines_ref);
+
             my $storesuccess = 1;
             #Look if data should be stored by metadata
             if (defined $$ds->{SERVICE}->{DATA}->{$id}->{STORE}->{DOIT}){
@@ -565,4 +591,4 @@
 
 
 
-1;
\ No newline at end of file
+1;