perfsonar development work

Author: dfn.calim
Date: 2011-11-24 14:34:53 +0000 (Thu, 24 Nov 2011)
New Revision: 748

Modified:
   branches/perfsonar-oppd-all-0.53/build/perfSONAR-MA-Hades/META.yml
   branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST
   
branches/perfsonar-oppd-all-0.53/build/rpm/0.53-4/perfsonar-oppd-0.53-4.noarch.rpm
   branches/perfsonar-oppd-all-0.53/contrib/redhat/oppd.init
   branches/perfsonar-oppd-all-0.53/etc/oppd-dev/oppd.dev.conf
   branches/perfsonar-oppd-all-0.53/lib/NMWG/Message.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/BWCTL.pm
Log:
solution for YML::libXML method problem

Modified: branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST
===================================================================
--- branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST   2011-11-21 
12:57:36 UTC (rev 747)
+++ branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST   2011-11-24 
14:34:53 UTC (rev 748)
@@ -11,8 +11,8 @@
 etc/LS_register.xml
 etc/oppd-mdm.conf
 etc/oppd.conf.example
-etc/oppd.default.debian
-etc/oppd.init.debian
+etc/oppd.sysconfig.redhat
+etc/oppd.init.redhat
 lib/perfSONAR.pm
 lib/perfSONAR/Auth.pm
 lib/perfSONAR/Client/LS.pm

Modified: branches/perfsonar-oppd-all-0.53/build/perfSONAR-MA-Hades/META.yml
===================================================================
--- branches/perfsonar-oppd-all-0.53/build/perfSONAR-MA-Hades/META.yml  
2011-11-21 12:57:36 UTC (rev 747)
+++ branches/perfsonar-oppd-all-0.53/build/perfSONAR-MA-Hades/META.yml  
2011-11-24 14:34:53 UTC (rev 748)
@@ -7,18 +7,16 @@
 license: apache
 resources:
   license: http://apache.org/licenses/LICENSE-2.0
-build_requires:
-  Test::More: 0
 requires:
   perfSONAR: 0.53
-configure_requires:
-  Module::Build: 0.340201
+build_requires:
+  Test::More: 0
 provides:
   perfSONAR::MA::Hades:
     file: lib/perfSONAR/MA/Hades.pm
   perfSONAR::MA::Status:
     file: lib/perfSONAR/MA/Status.pm
-generated_by: Module::Build version 0.340201
+generated_by: Module::Build version 0.2808
 meta-spec:
-  url: http://module-build.sourceforge.net/META-spec-v1.4.html
-  version: 1.4
+  url: http://module-build.sourceforge.net/META-spec-v1.2.html
+  version: 1.2

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

Modified: branches/perfsonar-oppd-all-0.53/contrib/redhat/oppd.init
===================================================================
--- branches/perfsonar-oppd-all-0.53/contrib/redhat/oppd.init   2011-11-21 
12:57:36 UTC (rev 747)
+++ branches/perfsonar-oppd-all-0.53/contrib/redhat/oppd.init   2011-11-24 
14:34:53 UTC (rev 748)
@@ -9,6 +9,10 @@
 # config: /etc/oppd.conf
 # pidfile: /var/run/oppd.pid
 
+PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin
+export PATH
+
+
 # source function library
 . /etc/rc.d/init.d/functions
 

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 2011-11-21 
12:57:36 UTC (rev 747)
+++ branches/perfsonar-oppd-all-0.53/etc/oppd-dev/oppd.dev.conf 2011-11-24 
14:34:53 UTC (rev 748)
@@ -42,7 +42,7 @@
 # logfile        "/var/log/oppd.log"
 #
 #logfile        off
-logfile        "/var/log/oppd.log"
+#logfile        "/var/log/oppd.log"
 
 
 #

Modified: branches/perfsonar-oppd-all-0.53/lib/NMWG/Message.pm
===================================================================
--- branches/perfsonar-oppd-all-0.53/lib/NMWG/Message.pm        2011-11-21 
12:57:36 UTC (rev 747)
+++ branches/perfsonar-oppd-all-0.53/lib/NMWG/Message.pm        2011-11-24 
14:34:53 UTC (rev 748)
@@ -60,11 +60,17 @@
   my $self = shift;
   my $file = shift;
   croak "No XML source to parse!" unless $file;
-  
+  my $xml_version = XML::LibXML->VERSION;
   my $dom;
-  eval{ 
-    $dom = XML::LibXML->load_xml(location => $file);
-  };
+  #eval{ 
+  if ( $xml_version < 1.7){
+      my $parser = XML::LibXML->new();
+      $dom = $parser->parse_file($file);
+  }else{
+      $dom = XML::LibXML->load_xml(location => $file);
+  }
+
+#  };
   if ($@){
     #TODO The following should be sent as NMWG error, not SOAP error
     #return ("Error parsing message: $@", "no_id");

Modified: branches/perfsonar-oppd-all-0.53/lib/perfSONAR/DataStruct/NMWG.pm
===================================================================
--- branches/perfsonar-oppd-all-0.53/lib/perfSONAR/DataStruct/NMWG.pm   
2011-11-21 12:57:36 UTC (rev 747)
+++ branches/perfsonar-oppd-all-0.53/lib/perfSONAR/DataStruct/NMWG.pm   
2011-11-24 14:34:53 UTC (rev 748)
@@ -87,18 +87,18 @@
        push @{$self->{"supportedEventtypes"}},
 
     {
-    bwctl => "http://ggf.org/ns/nmwg/tools/bwctl/2.0";,
-    iperf => "http://ggf.org/ns/nmwg/tools/iperf/2.0";,
-    owamp => "http://ggf.org/ns/nmwg/tools/owamp/2.0";,
-    hades => "http://ggf.org/ns/nmwg/tools/hades";,
-    summary => "http://ggf.org/ns/nmwg/characteristic/delay/summary/";,
-    owd_raw => "http://ggf.org/ns/nmwg/tools/owd/raw";,
-    hades_agg => "http://ggf.org/ns/nwmg/tools/hades/aggregated";,
+    bwctl => "http://ggf.org/ns/nmwg/tools/bwctl/2.0/";,
+    iperf => "http://ggf.org/ns/nmwg/tools/iperf/2.0/";,
+    owamp => "http://ggf.org/ns/nmwg/tools/owamp/2.0/";,
+    hades => "http://ggf.org/ns/nmwg/tools/hades/";,
+    summary => "http://ggf.org/ns/nmwg/characteristic/delay/summary//";,
+    owd_raw => "http://ggf.org/ns/nmwg/tools/owd/raw/";,
+    hades_agg => "http://ggf.org/ns/nwmg/tools/hades/aggregated/";,
     one_way_delay => "http://ggf.org/ns/nmwg/characteristic/delay/one-way/";,
     select => "http://ggf.org/ns/nmwg/ops/select/";,
     hoplist => "http://ggf.org/ns/nmwg/tools/hades/traceroute/hoplist/2.0/";,
-    echo => "http://schemas.perfsonar.net/tools/admin/echo/2.0";,
-    selftest => "http://schemas.perfsonar.net/tools/admin/selftest/1.0";
+    echo => "http://schemas.perfsonar.net/tools/admin/echo/2.0/";,
+    selftest => "http://schemas.perfsonar.net/tools/admin/selftest/1.0/";
     };    
        
        bless $self, $class;

Modified: branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP/BWCTL.pm
===================================================================
--- branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP/BWCTL.pm  2011-11-21 
12:57:36 UTC (rev 747)
+++ branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP/BWCTL.pm  2011-11-24 
14:34:53 UTC (rev 748)
@@ -216,4 +216,4 @@
        return;
 }
 
-1;
\ No newline at end of file
+1;

Modified: branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP.pm
===================================================================
--- branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP.pm        2011-11-21 
12:57:36 UTC (rev 747)
+++ branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP.pm        2011-11-24 
14:34:53 UTC (rev 748)
@@ -47,7 +47,7 @@
 
 use Log::Log4perl qw(get_logger);
 use IPC::Run qw( run timeout start finish pump);
-use IO::Pty;
+#use IO::Pty;
 use POSIX ":sys_wait_h";
 use base qw(perfSONAR::Echo);
 use base qw(perfSONAR::Selftest);
@@ -176,7 +176,8 @@
         my @call = @commandline;
         unshift @call, $tool;
         
-        my $h = start 
(\@call,
 '<pty<', \$in, '>pty>', \$out, '2>', \$err);
+        my $h = start 
(\@call,
 \$in, \$out, \$err);
+        #my $h = start 
(\@call,
 '<pty<', \$in, '>pty>', \$out, '2>', \$err);
         while (1){
             pump $h;
             if ($err =~ /passphrase/){
@@ -190,16 +191,16 @@
         my $out_tmp = $out;
         my $err_tmp = $err;
         finish $h;
-        
+
         if (!$out){
             $$ds->{SERVICE}->{DATA}->{$id}->{MEASRESULT}  = "$err";
         }
         else{
                $$ds->{SERVICE}->{DATA}->{$id}->{MEASRESULT} = "$out";
         }
-        #$logger->info(Dumper($out));
         #parse the result
         my @mresult = $self->parse_result($ds,$id);
+        #$self->{LOGGER}->info(Dumper(@mresult));
         $$ds->{SERVICE}->{DATA}->{$id}->{MRESULT} = 
\@mresult;
         #$logger->info(Dumper(@mresult));        
        }#End foreach my $id