perfsonar development work

Author: dfn.calim
Date: 2011-09-12 16:20:00 +0100 (Mon, 12 Sep 2011)
New Revision: 739

Removed:
   
branches/perfsonar-oppd-all-0.53/build/rpm/0.53-2/perfsonar-oppd-0.53-2.noarch.rpm
Modified:
   
branches/perfsonar-oppd-all-0.53/build/rpm/0.53-3/perfsonar-oppd-0.53-3.noarch.rpm
   branches/perfsonar-oppd-all-0.53/lib/perfSONAR/DataStruct/NMWG.pm
Log:
fix error in echo request for ma hades

Deleted: 
branches/perfsonar-oppd-all-0.53/build/rpm/0.53-2/perfsonar-oppd-0.53-2.noarch.rpm
===================================================================
(Binary files differ)

Modified: 
branches/perfsonar-oppd-all-0.53/build/rpm/0.53-3/perfsonar-oppd-0.53-3.noarch.rpm
===================================================================
(Binary files differ)

Modified: branches/perfsonar-oppd-all-0.53/lib/perfSONAR/DataStruct/NMWG.pm
===================================================================
--- branches/perfsonar-oppd-all-0.53/lib/perfSONAR/DataStruct/NMWG.pm   
2011-09-09 13:03:28 UTC (rev 738)
+++ branches/perfsonar-oppd-all-0.53/lib/perfSONAR/DataStruct/NMWG.pm   
2011-09-12 15:20:00 UTC (rev 739)
@@ -173,12 +173,12 @@
         my $et = $ds->{REQUESTMSG}->{"metadataIDs"}{$meta}{"eventType"};
         #$self->{LOGGER}->info("Eventype: $et");
         #look for echo
-        if ($et =~ /admin\/echo/){
+        if ($et =~ /admin\/echo/  || $et eq "echo"){
             $ds->{DOECHO} = 1;;
             $self->{LOGGER}->info("Get Echo request");
         }
         #look for selftest
-        if ($et =~ /admin\/selftest/){
+        if ($et =~ /admin\/selftest/ || $et eq "echo"){
             $ds->{DOSELFTEST} = 1;
             $self->{LOGGER}->info("Get selftest request");
         }
@@ -253,7 +253,7 @@
         }# End foreach my $key
         
         #Do here some MA::HADES Stuff
-        if ($ds->{SERVICE}->{NAME} =~ /MA\/HADES/){
+        if ($ds->{SERVICE}->{NAME} =~ /MA\/HADES/  && $ds->{DOECHO} != 1){
             if ($ds->{SERVICE}->{NAME} =~ /STATUS/){
                 $ds->{SERVICE}->{NAME} =~ s/\/STATUS//;
                 $self->{HADES}->{ACTION}->{TYPE} = "traceroute";