perfsonar development work

Author: dfn.calim
Date: 2010-11-11 07:38:52 +0000 (Thu, 11 Nov 2010)
New Revision: 663

Added:
   branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/README
Removed:
   
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/bulk-request.xml
   
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/hoplist-request.xml
   branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/hoplist-test
   branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/message.xml
   
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-summary-req-01.xml
   
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-summary-req-02.xml
   
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/psui-all-request.xml
   
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/psui-one-request.xml
   
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/status-request.xml
   branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/status-test
Modified:
   branches/perfsonar-oppd-new-architect/bin/oppd.pl
   branches/perfsonar-oppd-new-architect/etc/oppd-mdm/oppd.conf
   branches/perfsonar-oppd-new-architect/lib/perfSONAR.pm
   branches/perfsonar-oppd-new-architect/lib/perfSONAR/DataStruct.pm
   branches/perfsonar-oppd-new-architect/lib/perfSONAR/DataStruct/NMWG.pm
   branches/perfsonar-oppd-new-architect/lib/perfSONAR/Echo.pm
   branches/perfsonar-oppd-new-architect/lib/perfSONAR/MP.pm
   
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-raw-req-01.xml
Log:
Fix log to screen

Modified: branches/perfsonar-oppd-new-architect/bin/oppd.pl
===================================================================
--- branches/perfsonar-oppd-new-architect/bin/oppd.pl   2010-11-10 14:54:12 
UTC (rev 662)
+++ branches/perfsonar-oppd-new-architect/bin/oppd.pl   2010-11-11 07:38:52 
UTC (rev 663)
@@ -80,7 +80,7 @@
 
 use NMWG;
 use perfSONAR;
-use perfSONAR::Echo;
+#use perfSONAR::Echo;
 use perfSONAR::SOAP::Message;
 use perfSONAR::Client::LS;
 use perfSONAR::DataStruct;
@@ -224,7 +224,7 @@
   get_opt($syslog_ident,    $Config{'syslog-ident'},    "oppd");
 $syslog_facility =
   get_opt($syslog_facility, $Config{'syslog-facility'}, "daemon");
-$loglevel     = get_opt($loglevel,    $Config{loglevel},    "notice");
+$loglevel     = get_opt($loglevel,    $Config{loglevel},    "info");
 $verbose      = get_opt($verbose,     0); # No verbose entry in config file!
 if ($verbose) {
   $loglevel = "info";
@@ -331,116 +331,102 @@
 }
 %services = %{$Config{service}};
 
+###################################################################################################################
+#Begin new include for LOG4Perl
+##################################################################################################################
+# Defined loglevel in config file
+# 0. trace
+# 1. debug
+# 2. = info
+# 3. = warning
+# 4. error
+# 5. fatal
+# Define this for Log4Perl
 
-#
-# Start logging ($log already initialised above)
-#
-
-$perfSONAR::log = $log;
-
 if (defined $logfile) {
 
-  #check if $logfile is an absolute path, and add current path if not
-  if (!File::Spec->file_name_is_absolute($logfile)){
-    $logfile = File::Spec->rel2abs($logfile);
-  }
-
-  eval {
-    use locale;
-    use POSIX qw(locale_h strftime);
-    # "use locale", POSIX::strftime and localtime faster than DateTime
-    # and this has quite an impact on debug loging. Detected via SmokePing:
-    # http://perfsonar.acad.bg/smokeping
-    #use DateTime;
-    #use DateTime::Locale;
-    #BEGIN {
-    #  if (DateTime::Locale->load(setlocale(LC_TIME))) {
-    #    DateTime->DefaultLocale(setlocale(LC_TIME));
-    #  }
-    #}
-    $log->add(
-      Log::Dispatch::File->new(
-        name => 'file',
-        min_level => $loglevel,
-        filename => $logfile,
-        mode => 'append', close_after_write => 1, autoflush => 1,
-        callbacks => sub {
-          my 
%p=@_;
-          $p{message} = "$log_prefix: $p{message}" if $log_prefix;
-          $p{message} = strftime("%FT%T",localtime) . " $p{level} 
$p{message}";
-            #DateTime->now(time_zone=>"local")->strftime("%c") .
-          return "$p{message}\n";
-        },
-      )
-    );
-  };
-  die "Cannot write to log file '$logfile': 
$@\n"
 if $@;
-}
-if ($syslog) {
-  eval {
-    my $syslog_socket = 'unix';
-    if ($syslog_host) {
-      $Sys::Syslog::host = $syslog_host;
-      $syslog_socket = 'inet';
+    #check if $logfile is an absolute path, and add current path if not
+    if (!File::Spec->file_name_is_absolute($logfile)){
+        $logfile = File::Spec->rel2abs($logfile);
     }
-    $log->add(
-      Log::Dispatch::Syslog->new(
-        name => 'syslog',
-        min_level => $loglevel,
-        ident => "$syslog_ident",
-        facility => "$syslog_facility",
-        socket => "$syslog_socket",
-        logopt => "ndelay",
-        callbacks => sub {
-          my 
%p=@_;
-          $p{message} = "$log_prefix: $p{message}" if $log_prefix;
-          #TODO Not nice! How can we change this?
-          # callback for SD stuff
-          if ($p{service}) {
-            $p{service} =~ s/\//\_/g;
-            $p{service} .= ".";
-          } else {
-            $p{service} = "";
-          }
-          $p{message} = "OPPD." . $p{service} . uc($p{level}) . "% 
$p{message}";
-          #/TODO
-          return "$p{message}\n";
-        },
-        #mode => 'append', close_after_write => 0, autoflush => 1,
-      )
-    );
-  };
-  die "Cannot write to syslog: 
$@\n"
 if $@;
 }
-unless ($detach) {
-  $log->add(
-    Log::Dispatch::Screen->new(
-      name => 'screen',
-      min_level => $loglevel,
-      stderr    => 1,
-      callbacks => sub {
-        my 
%p=@_;
-        $p{message} = "$log_prefix: $p{message}" if $log_prefix;
-        $p{message} = "$p{level}: $p{message}";
-        return "$p{message}\n";
-      },
-    )
-  );
+    
+my %L4P_loglevels = (
+       trace => $TRACE,
+       debug => $DEBUG,
+       info => $INFO,
+       warning => $WARN,
+       error => $ERROR,
+       fatal => $FATAL
+);
+
+#Set layout
+my $log_layout;
+if ($loglevel eq "debug"){
+       $log_layout = '%d (%P) <%p> %F{1}:%L %M - %m%n';
+}else{
+       $log_layout = '%d <%p> %c - %m%n';
 }
 
-
-#Add Log4perl
-my $logger;
+# Set options for L4P
 my %logger_opts = (
-    level  => $INFO,
-    layout => '%d (%P) %p> %F{1}:%L %M - %m%n',
+    level  => $L4P_loglevels{$loglevel},
+    file => "STDERR",
+    layout => $log_layout,
 );
-$logger_opts{file} = $logfile;
-Log::Log4perl->easy_init( \%logger_opts );
-$logger = get_logger( "perfsonar-oppd" );
 
 
+# If detach mode log to screen
+unless ($detach) {
+       $logger_opts{file} = "STDERR"; 
+}
+#log file defined
+if ($logfile) {
+    $logger_opts{file} = ">>$logfile"; #Append mode
+}
 
+    
+
+
+Log::Log4perl->easy_init( \%logger_opts );
+my $logger = get_logger( "perSONAR-oppd" );
+
+if ($syslog) {
+    eval {
+        my $syslog_socket = 'unix';
+        if ($syslog_host) {
+            $Sys::Syslog::host = $syslog_host;
+            $syslog_socket = 'inet';
+        }
+        my $appender = Log::Log4perl::Appender->new(        
+            "Log::Dispatch::Syslog",
+                name => 'syslog',
+                min_level => $loglevel,
+                ident => "$syslog_ident",
+                facility => "$syslog_facility",
+                socket => "$syslog_socket",
+                logopt => "ndelay",
+                callbacks => sub {
+                        my 
%p=@_;
+                        $p{message} = "$log_prefix: $p{message}" if 
$log_prefix;
+                        #TODO Not nice! How can we change this?
+                        # callback for SD stuff
+                        if ($p{service}) {
+                            $p{service} =~ s/\//\_/g;
+                            $p{service} .= ".";
+                        }else {
+                            $p{service} = "";
+                        }
+                        $p{message} = "OPPD." . $p{service} . uc($p{level}) 
. "% $p{message}";
+                        #/TODO
+                        return "$p{message}\n";
+                    }, #End callback sub
+                ); #End Appender-New'
+        $logger->add_appender($appender);
+    }; # End eval
+  die "Cannot write to syslog: 
$@\n"
 if $@;
+}
+
 # More flexible die:
 # Put error into Log and afterwards die with same message.
 # Also handy, because in the following code $@ is undef in die call:
@@ -451,7 +437,7 @@
   chomp $logmsg; # No new line for Log::Dispatch !
   # We should only be called with initialised $log, but we can be a bit
   # more friendly by only using it if it was initialised:
-  $log->error($logmsg) if defined $log && 
UNIVERSAL::isa($log,'Log::Dispatch');
+  $logger->error($logmsg) if defined $logger && 
UNIVERSAL::isa($logger,'Log::Log4perl');
   die @_;
 };
 
@@ -462,8 +448,8 @@
   chomp $logmsg; # No new line for Log::Dispatch !
   # We should only be called with initialised $log, but we can be a bit
   # more friendly by only using it if it was initialised:
-  $log->warning($logmsg)
-    if defined $log && UNIVERSAL::isa($log,'Log::Dispatch');
+  $logger->warn($logmsg)
+    if defined $logger && UNIVERSAL::isa($logger,'Log::Log4perl');
   warn @_;
 };
 
@@ -496,9 +482,6 @@
     "perfSONAR::$module"->new(%{$services{$service}->{module_param}});
 }
 
-# Set modules in dispatch module/class:
-%perfSONAR::services = %services;
-
 #
 # Daemonize
 #
@@ -556,27 +539,27 @@
 
 # die on typical signals
 $SIG{INT} = $SIG{TERM} = sub {
-  $log->notice("Caught SIG$_[0] - initiating shutdown");
+  $logger->info("Caught SIG$_[0] - initiating shutdown");
   $shutdown_gracefully = 0;
   exit 1;
   # See END {} for shutdown sequence
 };
 $SIG{USR1} = sub {
   # Gracefull shutdown with timeout
-  $log->notice("Caught SIGUSR1 - initiating gracefull shutdown");
+  $logger->info("Caught SIGUSR1 - initiating gracefull shutdown");
   $shutdown_gracefully = $gracetime;
   exit 1;
   # See END {} for shutdown sequence
 };
 $SIG{USR2} = sub {
   # Gracefull shutdown WITHOUT timeout -> Possibly blocking forever!
-  $log->notice("Caught SIGUSR2 - initiating gracefull shutdown");
+  $logger->info("Caught SIGUSR2 - initiating gracefull shutdown");
   $shutdown_gracefully = -1;
   exit 1;
   # See END {} for shutdown sequence
 };
 $SIG{HUP} = sub {
-  $log->warning("Caught SIGHUP - NO RELOAD SUPPORTED AT THE MOMENT");
+  $logger->warn("Caught SIGHUP - NO RELOAD SUPPORTED AT THE MOMENT");
   #TODO
 };
 $SIG{PIPE} = 'IGNORE';
@@ -587,9 +570,9 @@
 # Inform that everything looks good
 #
 
-$log->notice("oppd service started");
-$log->info("available services: " . join(",", sort keys(%services)));
-$log->info("PID $$ written to $pidfile") if defined $pidfile;
+$logger->info("oppd service started");
+$logger->info("available services: " . join(",", sort keys(%services)));
+$logger->info("PID $$ written to $pidfile") if defined $pidfile;
 
 #
 # Start "daemon", the network side of the job ;-)
@@ -654,7 +637,7 @@
 my $ls_reg_respawn_threshold = 60; # Respawn threshold for registration 
process
 if ($ls_register){
   if 
(!@ls_url){
-    $log->notice(
+    $logger->error(
       "No URL for LS registration - Continuing without registration"
     );
   } else {
@@ -735,12 +718,12 @@
       # Just ignore if accept() returned because a signal (most likely 
SIGCHLD)
       # was received. See 'man perlipc'.
     if ($!) {
-      $log->error("Error in incoming connection: $!");
+      $logger->error("Error in incoming connection: $!");
     } elsif (my $errstr = IO::Socket::SSL->errstr()) {
       # SSL stuff is obviously not setting $! ...
-      $log->error("SSL error in incoming connection: $errstr");
+      $logger->error("SSL error in incoming connection: $errstr");
     } else {
-      $log->error("Unknown error in incoming connection");
+      $logger->error("Unknown error in incoming connection");
     }
     next;
   }
@@ -749,10 +732,10 @@
     my ($port, $iaddr) = sockaddr_in($peer);
     $peer_str = inet_ntoa($iaddr) . ":" . $port;
   }
-  $log->info("Incoming connection from $peer_str");
+  $logger->info("Incoming connection from $peer_str");
   if (scalar(keys %connections)+1 > $max_conn) {
     my $msg = "Too many connections";
-    $log->notice("$msg - closing connection to $peer_str");
+    $logger->trace("$msg - closing connection to $peer_str");
     $conn->send_error(503, $msg); #RC_SERVICE_NOT_AVAILABLE
     close_socket($conn, "Error closing rejected connection");
     next;
@@ -764,11 +747,11 @@
     close_socket($conn, "Error closing rejected connection");
     next;
   }
-  $log->debug("Forking connection process for $peer_str");
+  $logger->debug("Forking connection process for $peer_str");
   my $pid = fork();
   unless (defined $pid) {
     # The fork failed
-    $log->error("Forking connection process failed: $!");
+    $logger->error("Forking connection process failed: $!");
     # Close the connection, because we have no process to care for it
     close_socket($conn, "Error closing incoming connection after failed 
fork");
     next;
@@ -779,9 +762,9 @@
     #
     # Child cares about the connection -> We can close it
     close_socket($conn, "Error closing incoming connection in parent");
-    $log->debug("Connection process $pid/$peer_str started");
+    $logger->debug("Connection process $pid/$peer_str started");
     $connections{$pid} = $peer_str; # We care about our children!
-    $log->debug(
+    $logger->debug(
       "Number of connections increased to " . scalar(keys %connections)
     );
     next;
@@ -794,7 +777,7 @@
   $proc_type = "connection";
   $log_prefix = "$$/$peer_str";
 
-  $log->debug("Connection process running");
+  $logger->debug("Connection process running");
 
   #
   # Signal handlers (if different from parent)
@@ -808,14 +791,14 @@
   #
   # Handle requests as they come in
   #
-  $log->debug("Setting connection timeout to $conn_timeout");
+  $logger->debug("Setting connection timeout to $conn_timeout");
   # TODO: timeout() is broken with HTTP::Daemon::SSL
   # http://rt.cpan.org/Public/Bug/Display.html?id=45625
   # http://www.perlmonks.org/?node_id=761270
   $conn->timeout($conn_timeout) unless($ssl);
   while (my $request = $conn->get_request) {
-    $log->info("Incoming request");
-    $log->debug("Disabling connection timeout");
+    $logger->info("Incoming request");
+    $logger->debug("Disabling connection timeout");
     # TODO: timeout() is broken with HTTP::Daemon::SSL
     $conn->timeout(0) unless($ssl);
     my $response = new HTTP::Response;
@@ -832,7 +815,9 @@
       if ($auth){
         perfSONAR::Auth::authenticate($soap_message, $nmwg_message, $as_url);
       }
-           
+      
+      $logger->debug("Request:\n".$soap_message->header);
+         
       #Create a DataStruct
       my $ds = perfSONAR::DataStruct->new($soap_message->uri,   
$nmwg_message);
       my $nmwg_response;
@@ -861,19 +846,19 @@
         )->as_string
       );
     }
-    $log->debug("Sending response");
-    $log->debug("Response:\n".$response->content());
+    $logger->debug("Sending response");
+    $logger->debug("Response:\n".$response->content());
     $conn->send_response($response);
-    $log->debug("Setting connection timeout to $conn_timeout");
+    $logger->debug("Setting connection timeout to $conn_timeout");
     # TODO: timeout() is broken with HTTP::Daemon::SSL
     $conn->timeout($conn_timeout) unless ($ssl);
   }
   if (my $reason = $conn->reason) {
-    $log->info("Connection terminated: $reason");
+    $logger->warn("Connection terminated: $reason");
   }
   # Cleanup -> close connection
   close_socket($conn, "Closing connection failed");
-  $log->debug("Exiting connection process");
+  $logger->debug("Exiting connection process");
   exit 0; # We are the child and have done our job -> exit
 }
 
@@ -907,12 +892,12 @@
   return if $proc_type eq "dummy"; # Do not execute anything below
   my $exitcode = $?; # Save $?
   if ($proc_type eq "main") {
-    $log->info("Starting shutdown sequence");
+    $logger->info("Starting shutdown sequence");
 
     my @pids = sort keys %connections;
     push @pids, $ls_reg_pid if $ls_reg_pid;
     if ($shutdown_gracefully && @pids) {
-      $log->info("Trying to terminate all known children gracefully");
+      $logger->info("Trying to terminate all known children gracefully");
       my $signal = $shutdown_gracefully > 0 ? "USR1" : "USR2";
       my @pids_new = ();
       foreach my $pid (@pids) {
@@ -923,11 +908,11 @@
       @pids = @pids_new; @pids_new = ();
       if (@pids) {
         # Some processes were signaled
-        $log->debug("Sent SIG$signal to " . join(', ', @pids));
+        $logger->debug("Sent SIG$signal to " . join(', ', @pids));
         # Wait till processes have ended or timeout is reached.
         # $shutdown_gracefully < 0 => Wait possibly forever!!
         my $timeout = $shutdown_gracefully < 0 ? 0 : $shutdown_gracefully;
-        $log->debug("Waiting for childern to exit" .
+        $logger->debug("Waiting for childern to exit" .
           ($timeout ? " with timeout of $timeout s" : " WITHOUT timeout")
         );
         eval {
@@ -939,7 +924,7 @@
             }
             @pids = @pids_new; @pids_new = ();
             if (@pids) {
-              $log->debug("Processes alive: " . join(', ', @pids));
+              $logger->debug("Processes alive: " . join(', ', @pids));
               sleep 1;
             }
           } until ! @pids;
@@ -951,7 +936,7 @@
     while (waitpid(-1,WNOHANG) > 0) {} # wait on all possibly exited children
     if (waitpid(-1, WNOHANG) >= 0) {
       # There are childern alive
-      $log->info("Trying to terminate all children using SIGTERM");
+      $logger->info("Trying to terminate all children using SIGTERM");
       local $SIG{TERM} = 'IGNORE';
       kill TERM => -$$;
       sleep 1; # Give everyone at least one second!
@@ -960,11 +945,11 @@
       # Clean up PID file
       unlink $pidfile or $log->warning("Cannot delete pid file: $!");
     }
-    $log->notice("Exiting");
+    $logger->info("Exiting");
     while (waitpid(-1,WNOHANG) > 0) {} # wait on all possibly exited children
     if (waitpid(-1, WNOHANG) >= 0) {
       # There is still someone alive! -> Take the axe and cut our branch
-      $log->warning("Not all children exited on SIGTERM -> KILLING 
EVERYTHING");
+      $logger->warn("Not all children exited on SIGTERM -> KILLING 
EVERYTHING");
       kill KILL => -$$;
     }
   } elsif ($proc_type eq "connection") {
@@ -975,16 +960,16 @@
     # case correctly, though.
     close_socket($conn, "Closing connection failed");
   } elsif ($proc_type eq "lsreg") {
-    $log->info("Starting shutdown sequence");
+    $logger->info("Starting shutdown sequence");
     if ($shutdown_gracefully) {
-      $log->info("Deregistering services");
+      $logger->info("Deregistering services");
       perfSONAR::Client::LS::deregister();
     } else {
       #TODO Change this? Perhaps a deregistration with a small timeout?
-      $log->info("Not deregistering services. Not a graceful shutdown.");
+      $logger->warn("Not deregistering services. Not a graceful shutdown.");
       #TODO Quit reg/dereg (close conn) somehow if they are running?
     }
-    $log->notice("Exiting");
+    $logger->info("Exiting");
   } else {
     warn "Internal error: END block executed with unknown process type: " .
       "\"$proc_type\"\n";
@@ -1018,16 +1003,16 @@
   while ((my $pid = waitpid(-1,WNOHANG)) > 0) {
     my $reason = $? ? " with exit code $?" : "";
     if (exists $connections{$pid}) {
-      $log->debug(
+      $logger->debug(
         "Connection process $pid for connection $connections{$pid} exited"
         . $reason
       );
       delete $connections{$pid};
-      $log->debug(
+      $logger->debug(
         "Number of connections decreased to " . scalar(keys %connections)
       );
     } elsif ($pid == $ls_reg_pid) {
-      $log->debug("LS registration process $pid exited" . $reason);
+      $logger->debug("LS registration process $pid exited" . $reason);
       $ls_reg_pid = undef;
       fork_ls_reg() unless $shutting_down;
     } else {
@@ -1047,18 +1032,18 @@
   return 1 unless $socket->opened; # Handle already closed sockets "silently"
   if (UNIVERSAL::isa($socket, "IO::Socket::SSL")) {
     unless ($socket->close(SSL_no_shutdown => 1)) {
-      $log->warning("$err_msg: $?");
+      $logger->warn("$err_msg: $?");
       return;
     }
     if(my $errstr = $socket->errstr()) {
-      $log->warning("$err_msg: $errstr");
+      $logger->warn("$err_msg: $errstr");
       return;
     }
     return 1;
   }
   if (UNIVERSAL::isa($socket, "IO::Socket")) {
     unless ($socket->close) {
-      $log->warning("$err_msg: $!");
+      $logger->warn("$err_msg: $!");
       return;
     }
     return 1;
@@ -1072,14 +1057,14 @@
 #
 sub fork_ls_reg {
   my $ppid = $$; # Give our pid to the child
-  $log->info("Starting LS registration process");
+  $logger->info("Starting LS registration process");
   my $pid = fork();
   if (!defined($pid)) {
     #
     # Fork failed
     #
-    $log->warning("Could not fork LS registration process: $!");
-    $log->warning("Continuing without registration");
+    $logger->warn("Could not fork LS registration process: $!");
+    $logger->warn("Continuing without registration");
     return;
   }
   if ($pid != 0) {
@@ -1101,7 +1086,7 @@
   # First try to prevent lots of respawns of ls registration process:
   if ($ls_reg_starttime+$ls_reg_respawn_threshold > time) {
       # Our $ls_reg_starttime is still the start time of our predecessor!
-    $log->notice(
+    $logger->info(
       "LS registration process respawning too fast" . 
       " - delayed for $ls_reg_respawn_threshold s"
     );
@@ -1111,7 +1096,7 @@
   unless (getppid == $ppid) {
     die "Internal error: Got wrong ppid from getppid!\n";
   }
-  $log->info("LS Registration process started");
+  $logger->info("LS Registration process started");
 
   #
   # Signal handlers (if different from parent)
@@ -1126,14 +1111,14 @@
     services => \%services, ls_url => 
\@ls_url,
     hostname => $hostname, port => $port,
     organization => $organization, contact => $contact,
-    log => $log
+    log => $logger
   );
   while (1) {
     sleep $keepalive;
     # Our parent may have died without being able to send us a signal. So 
take
     # a look whether it's already there and exit if not:
     unless (getppid == $ppid) {
-      $log->notice("Parent died - initiating shutdown");
+      $logger->info("Parent died - initiating shutdown");
       exit 1;
     }
     perfSONAR::Client::LS::heartbeat();

Modified: branches/perfsonar-oppd-new-architect/etc/oppd-mdm/oppd.conf
===================================================================
--- branches/perfsonar-oppd-new-architect/etc/oppd-mdm/oppd.conf        
2010-11-10 14:54:12 UTC (rev 662)
+++ branches/perfsonar-oppd-new-architect/etc/oppd-mdm/oppd.conf        
2010-11-11 07:38:52 UTC (rev 663)
@@ -121,21 +121,19 @@
 # The log levels available are the log levels defined by Log::Dispatch.
 #
 # Valid options: (This is a list of values that should be accepted.)
-# 0 = debug
-# 1 = info
-# 2 = notice
-# 3 = warning
-# 4 = err     = error
-# 5 = crit    = critical
-# 6 = alert
-# 7 = emerg   = emergency
+# 0. trace
+# 1. debug
+# 2. info
+# 3. warning
+# 4. error
+# 5. fatal
 #
-# Default: notice
+# Default: info 
 #
 # Example:
 # loglevel        "info"
 #
-#loglevel        "notice"
+#loglevel        "info"
 
 
 #
@@ -150,7 +148,7 @@
 # Default: /var/run/oppd.pid
 #
 # Example:
-pidfile        off
+#pidfile        off
 #
 #pidfile        "/var/run/oppd.pid"
 

Modified: 
branches/perfsonar-oppd-new-architect/lib/perfSONAR/DataStruct/NMWG.pm
===================================================================
--- branches/perfsonar-oppd-new-architect/lib/perfSONAR/DataStruct/NMWG.pm    
  2010-11-10 14:54:12 UTC (rev 662)
+++ branches/perfsonar-oppd-new-architect/lib/perfSONAR/DataStruct/NMWG.pm    
  2010-11-11 07:38:52 UTC (rev 663)
@@ -42,7 +42,6 @@
 our $VERSION = 0.52;
 
 #Here are everything to use
-use Readonly;
 use Log::Log4perl qw(get_logger);
 use Carp;
 
@@ -50,8 +49,6 @@
 use perfSONAR::SOAP::HTTP::UserAgent;
 use perfSONAR::SOAP::HTTP::Request;
 
-Readonly::Scalar our $CLASSPATH => "perfSONAR::DataStruct::NMWG";
-
 =head2 new({})
 
 The constructor.
@@ -61,7 +58,7 @@
 sub new{
        my ($class) = @_;
        my $self = {};
-       $self->{LOGGER} = get_logger( $CLASSPATH );
+       $self->{LOGGER} = get_logger(__PACKAGE__);
        
        $self->{NS}->{MPBWCTL} = "http://ggf.org/ns/nmwg/tools/iperf/2.0/";;
        $self->{NS}->{MPOWAMP} = "http://ggf.org/ns/nmwg/tools/owamp/2.0/";;
@@ -410,10 +407,11 @@
     
     foreach my $id (keys %{$data}){
         my $datalines_ref = $$ds->{SERVICE}->{DATA}->{$id}->{MRESULT};
-        #$self->{LOGGER}->debug(Dumper($datalines_ref));
-        if ($$ds->{DOECHO} == 1){                 
-            my %data_hash = 
%{@$datalines_ref[0]};
-            #$ds->{REQUESTMSG}->return_result_code($data_hash{'echocode'}, 
$data_hash{'echomsg'}, "$id")
+        $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;
             $$ds->{REQUESTMSG}->return_result_code($et, "@$datalines_ref", 
$$ds->{REQUESTMSG}->{"dataIDs"}{$id}{"metaref"});
@@ -460,14 +458,17 @@
        my ($self, $ds, $id, $store_by) = @_;
        my $store_url = undef;
        
+       #OWAMP store is acctually not supported
+       if ($$ds->{SERVICE}->{NAME}  =~ /OWAMP/ ){
+               $$ds->{ERRORMSG} = "Store by OWAMP MP is actually not 
supported";
+        return 0;
+       }
        if ($store_by eq "CONF"){
                $store_url = 
$$ds->{SERVICES}->{$$ds->{SERVICE}->{NAME}}->{module_param}->{store_url};
                
        }
        elsif ($store_by eq "META"){
                $store_url = 
$$ds->{SERVICE}->{DATA}->{$id}->{STORE}->{PARAMS}->{uri};
-               #$$ds->{ERRORMSG} = "Store by METADATA is actually not 
supported";
-        #return 0;             
        }else{
         $$ds->{ERRORMSG} = "This kind of store request is not supported";
         return 0;

Modified: branches/perfsonar-oppd-new-architect/lib/perfSONAR/DataStruct.pm
===================================================================
--- branches/perfsonar-oppd-new-architect/lib/perfSONAR/DataStruct.pm   
2010-11-10 14:54:12 UTC (rev 662)
+++ branches/perfsonar-oppd-new-architect/lib/perfSONAR/DataStruct.pm   
2010-11-11 07:38:52 UTC (rev 663)
@@ -71,12 +71,9 @@
 =cut
 
 #Here are everything to use
-use Readonly;
 use Log::Log4perl qw(get_logger);
 use Carp;
 
-Readonly::Scalar our $CLASSPATH => "perfSONAR::DataStruct";
-#our %services = ();
 
 =head2 new({})
 
@@ -87,7 +84,7 @@
 sub new {
     my ( $class, $uri, $msg ) = @_;
     my $self = {}; 
-    $self->{LOGGER} = get_logger( $CLASSPATH );
+    $self->{LOGGER} = get_logger(__PACKAGE__);
     $self->{ERROROCCUR} = 0;   #If error occur set to 1
     $self->{STORE}->{DOIT} = undef;
     $self->{ERRMSG} = "";   #If error occur look here for error message at 
the moment only string message is supported

Modified: branches/perfsonar-oppd-new-architect/lib/perfSONAR/Echo.pm
===================================================================
--- branches/perfsonar-oppd-new-architect/lib/perfSONAR/Echo.pm 2010-11-10 
14:54:12 UTC (rev 662)
+++ branches/perfsonar-oppd-new-architect/lib/perfSONAR/Echo.pm 2010-11-11 
07:38:52 UTC (rev 663)
@@ -46,8 +46,8 @@
        
        my ($self, $ds) = @_;
        my $logger = get_logger("perfSONAR::Echo" );
-       $logger->debug("Start Echo");
-       my $params = $$ds->{PARAMS};
+       $logger->info("Start Echo");
+       my $params = $$ds->{SERVICE}->{DATA};
        my @datalines;
        
     foreach my $id (keys %{$params}){   
@@ -56,11 +56,10 @@
         my %data_hash;
         $logger->info("Reply to EchoRequest ping");
         $data_hash{'echocode'} = "success.echo";
-        $data_hash{'echomsg'} = "Service: $$ds->{SERVICE} is ready for call";
+        $data_hash{'echomsg'} = "Service: $$ds->{SERVICE}->{NAME} is ready 
for call";
         push @datalines, \%data_hash;
-        $$ds->{PARAMS}->{$id}->{MRESULT} = 
\@datalines
-    }
-    
+        $$ds->{SERVICE}->{DATA}->{$id}->{MRESULT} = 
\@datalines
+    }    
 }
 
 

Modified: branches/perfsonar-oppd-new-architect/lib/perfSONAR/MP.pm
===================================================================
--- branches/perfsonar-oppd-new-architect/lib/perfSONAR/MP.pm   2010-11-10 
14:54:12 UTC (rev 662)
+++ branches/perfsonar-oppd-new-architect/lib/perfSONAR/MP.pm   2010-11-11 
07:38:52 UTC (rev 663)
@@ -98,7 +98,7 @@
 sub new{
        my ($class) = @_;
     my $self = {};
-    $self->{LOGGER} = get_logger("perfSONAR::MP");
+    $self->{LOGGER} = get_logger(__PACKAGE__);
     bless $self, $class;
 }
 

Modified: branches/perfsonar-oppd-new-architect/lib/perfSONAR.pm
===================================================================
--- branches/perfsonar-oppd-new-architect/lib/perfSONAR.pm      2010-11-10 
14:54:12 UTC (rev 662)
+++ branches/perfsonar-oppd-new-architect/lib/perfSONAR.pm      2010-11-11 
07:38:52 UTC (rev 663)
@@ -58,7 +58,6 @@
 =cut
 
 #This are the globals
-our $log = undef;
 our %services = ();
 my $echo_et = "http://schemas.perfsonar.net/tools/admin/echo/2.0";;
 
@@ -85,7 +84,7 @@
 sub handle_request {
   
     my ($self, $ds) = @_;
-    my $logger = get_logger("perfSONAR" );
+    my $logger = get_logger(__PACKAGE__);
     my @datalines;
     
     #look if service is availible

Added: branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/README
===================================================================
--- branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/README       
                  (rev 0)
+++ branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/README 
2010-11-11 07:38:52 UTC (rev 663)
@@ -0,0 +1,10 @@
+REQUESTS BY COMMANDLINE
+=========================
+
+At tte moment oppd supports following requests:
+    * BWCTL MP
+    * OWAMP MP
+
+To see if this services are available use the ECHO request.
+For this use a normal request endpoint. For example: MP/BWCTL.
+Look at the files in this directory for more details.

Deleted: 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/bulk-request.xml
===================================================================
--- 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/bulk-request.xml 
      2010-11-10 14:54:12 UTC (rev 662)
+++ 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/bulk-request.xml 
      2010-11-11 07:38:52 UTC (rev 663)
@@ -1,33 +0,0 @@
-<nmwg:message xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
-             xmlns:nmwgm="http://ggf.org/ns/nmwg/time/2.0/";
-             xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
-             xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
-             xmlns:hades="http://ggf.org/ns/nmwg/tools/hades/";
-             id="1208356112" type="MetadataKeyRequest">
-  <nmwg:metadata id="keymeta">
-    <key:subject id="keysubject"/>
-    <key:parameters id ="keyparam1">
-      <nmwg:parameter name="transfer" value="bulk"/>
-      <nmwg:parameter name="format" value="perl-storable"/>
-      <nmwg:parameter name="validity" value="30000"/> #seconds?
-    </key:parameters>
-  </nmwg:metadata>  
-  <nmwg:metadata id="meta1" metadataIdRef="keymeta">
-    <hades:subject id="subject1">
-      <nmwgt:endPointPair>
-        <nmwgt:src type="IFname" value="Ljubljana_ARNES"/>
-        <nmwgt:dst type="IFname" value="Amsterdam_SURFnet"/>
-      </nmwgt:endPointPair>
-    </hades:subject>
-    <nmwg:eventType>http://ggf.org/ns/nmwg/tools/hades/</nmwg:eventType>
-  </nmwg:metadata>
-  <nmwg:metadata id="meta2" metadataIdRef="meta1">
-    <select:subject id="subject2"/>
-    <select:parameters id="param1">
-      <nmwg:parameter name="startTime">1208296800</nmwg:parameter>
-      <nmwg:parameter name="endTime">1208383200</nmwg:parameter>
-    </select:parameters>
-    <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/</nmwg:eventType>
-  </nmwg:metadata>
-  <nmwg:data id="data1" metadataIdRef="meta2"/>
-</nmwg:message>

Deleted: 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/hoplist-request.xml
===================================================================
--- 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/hoplist-request.xml
    2010-11-10 14:54:12 UTC (rev 662)
+++ 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/hoplist-request.xml
    2010-11-11 07:38:52 UTC (rev 663)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-    <nmwg:message xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
-                  xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
-                  xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
-                  xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
-                  
xmlns:hoplist="http://ggf.org/ns/nmwg/tools/hades/traceroute/hoplist/2.0/";
-    type="SetupDataRequest">
-      <nmwg:metadata id="status_meta">
-        <hoplist:subject id="status_subject">
-          <nmwgt:endPointPair>
-            <nmwgt:src value="Poznan_GEANT" type="IFName"/>
-            <nmwgt:dst value="Frankfurt_GEANT" type="IFName"/>
-          </nmwgt:endPointPair>
-        </hoplist:subject>
-        
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/hades/traceroute/hoplist/2.0</nmwg:eventType>
-      </nmwg:metadata>
-      <nmwg:metadata id="select_meta">
-        <select:subject id="select_subject" metadataIdRef="status_meta"/>
-        
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
-        <select:parameters id="param2">
-          <nmwg:parameter name="startTime">1222706430</nmwg:parameter>
-          <nmwg:parameter name="endTime">1222766430</nmwg:parameter>
-        </select:parameters>
-      </nmwg:metadata>
-      <nmwg:data id="data1" metadataIdRef="select_meta"/>
-    </nmwg:message>

Deleted: 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/hoplist-test
===================================================================
--- branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/hoplist-test 
  2010-11-10 14:54:12 UTC (rev 662)
+++ branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/hoplist-test 
  2010-11-11 07:38:52 UTC (rev 663)
@@ -1 +0,0 @@
-./perfsonar-client.pl --reqfile=hoplist-fault-request.xml 
--uri=http://radagast.rrze.uni-erlangen.de:3030/services/MA/HADES/GEANT/STATUS
 --host=radagast.rrze.uni-erlangen.de

Deleted: 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/message.xml
===================================================================
--- branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/message.xml  
  2010-11-10 14:54:12 UTC (rev 662)
+++ branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/message.xml  
  2010-11-11 07:38:52 UTC (rev 663)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><soapenv:Envelope 
xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
-<nmwg:message xmlns="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/"; 
xmlns:bwctl="http://ggf.org/ns/nmwg/tools/bwctl/2.0/"; 
xmlns:iperf="http://ggf.org/ns/nmwg/tools/iperf/2.0/"; 
xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/"; 
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/"; 
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/"; id="bwctl-request" 
type="SetupDataRequest">
-  <nmwg:metadata id="bwctl-metadata">
-    <bwctl:subject id="bwctl-subject">
-      <nmwgt:endPoint type="ipv4" value="194.57.137.170"/>
-    </bwctl:subject>
-    <nmwg:eventType>http://ggf.org/ns/nmwg/tools/bwctl/2.0</nmwg:eventType>
-    <bwctl:parameters id="bwctl-parameters">
-      <nmwg:parameter name="duration" value="20"/>
-    </bwctl:parameters>
-  </nmwg:metadata>
-  <nmwg:metadata id="iperf-metadata">
-    <iperf:subject id="iperf-subject" metadataIdRef="bwctl-metadata">
-      <nmwgt:endPointPair>
-        <nmwgt:src type="ipv4" value="64.251.63.188"/>
-        <nmwgt:dst type="ipv4" value="142.104.63.180"/>
-      </nmwgt:endPointPair>
-    </iperf:subject>
-    <iperf:parameters id="iperf-parameters">
-      <nmwg:parameter name="interval" value="5"/>
-      <nmwg:parameter name="protocol" value="tcp"/>
-    </iperf:parameters>
-    <nmwg:eventType>http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:eventType>
-  </nmwg:metadata>
-  <nmwg:data id="1" metadataIdRef="iperf-metadata"/>
-</nmwg:message>

Modified: 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-raw-req-01.xml
===================================================================
--- 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-raw-req-01.xml
   2010-11-10 14:54:12 UTC (rev 662)
+++ 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-raw-req-01.xml
   2010-11-11 07:38:52 UTC (rev 663)
@@ -28,24 +28,4 @@
   <!-- triggers to indicate head of chains -->
   <nmwg:data id="1" metadataIdRef="meta1"/>
 
-  <!-- Second measurement -->
-  
-  <nmwg:metadata id="meta2">
-    <perfsonar:subject id="subj2">
-      <nmwgt:endPointPair>
-        <nmwgt:src type="ipv4" value="131.188.81.34"/>
-        <nmwgt:dst type="ipv4" value="82.130.1.234:861"/>
-      </nmwgt:endPointPair>
-    </perfsonar:subject>
-
-    <nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0</nmwg:eventType>
-    <nmwg:parameters id="param1">
-      <nmwg:parameter name="count" value="20"/>
-    </nmwg:parameters>
-  </nmwg:metadata>
-
-  <!-- triggers to indicate head of chains -->
-  <nmwg:data id="2" metadataIdRef="meta2"/>
-
 </nmwg:message>
-

Deleted: 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-summary-req-01.xml
===================================================================
--- 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-summary-req-01.xml
       2010-11-10 14:54:12 UTC (rev 662)
+++ 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-summary-req-01.xml
       2010-11-11 07:38:52 UTC (rev 663)
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<nmwg:message type="SetupDataRequest"
-                   id="datarq2-1"
-                   xmlns="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
-                   
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
-                   xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
-                  xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/";
-                   xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
-                   xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
-                   xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
-
-  <nmwg:metadata id="meta1">
-    <perfsonar:subject id="subj1">
-      <nmwgt:endPointPair>
-        <nmwgt:src type="ipv4" value="131.188.81.34"/>
-        <nmwgt:dst type="ipv4" value="131.188.81.178"/>
-      </nmwgt:endPointPair>
-    </perfsonar:subject>
-
-    <nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0</nmwg:eventType>
-    <nmwg:parameters id="param1">
-      <nmwg:parameter name="count" value="10"/>
-      <nmwg:parameter name="output" value="summary"/>     
-    </nmwg:parameters>
-  </nmwg:metadata>
-
-  <!-- triggers to indicate head of chains -->
-  <nmwg:data id="1" metadataIdRef="meta1"/>
-
-
-</nmwg:message>
-

Deleted: 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-summary-req-02.xml
===================================================================
--- 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-summary-req-02.xml
       2010-11-10 14:54:12 UTC (rev 662)
+++ 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-summary-req-02.xml
       2010-11-11 07:38:52 UTC (rev 663)
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<nmwg:message type="SetupDataRequest"
-                   id="datarq2-1"
-                   xmlns="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
-                   
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
-                   xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
-                  xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/";
-                   xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
-                   xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
-                   xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
-
-  <nmwg:metadata id="meta1">
-    <perfsonar:subject id="subj1">
-      <nmwgt:endPointPair>
-        <nmwgt:src type="ipv4" value="131.188.81.34"/>
-        <nmwgt:dst type="ipv4" value="131.188.81.178"/>
-      </nmwgt:endPointPair>
-    </perfsonar:subject>
-
-    <nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0</nmwg:eventType>
-    <nmwg:parameters id="param1">
-      <nmwg:parameter name="count" value="10"/>
-      <nmwg:parameter name="output" value="summary"/>     
-    </nmwg:parameters>
-  </nmwg:metadata>
-
-  <!-- triggers to indicate head of chains -->
-  <nmwg:data id="1" metadataIdRef="meta1"/>
-  
-  <!-- Second measurement -->
-  
-  <nmwg:metadata id="meta2">
-    <perfsonar:subject id="subj2">
-      <nmwgt:endPointPair>
-        <nmwgt:src type="ipv4" value="131.188.81.34"/>
-        <nmwgt:dst type="ipv4" value="82.130.1.234:861"/>
-      </nmwgt:endPointPair>
-    </perfsonar:subject>
-
-    <nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0</nmwg:eventType>
-    <nmwg:parameters id="param1">
-      <nmwg:parameter name="count" value="20"/> <!-- number of test packets 
-->
-      <nmwg:parameter name="output" value="summary"/> 
-      <nmwg:parameter name="startdelay" value="3"/> <!-- time to wait before 
executing test (seconds) -->
-    </nmwg:parameters>
-  </nmwg:metadata>
-
-  <!-- triggers to indicate head of chains -->
-  <nmwg:data id="2" metadataIdRef="meta2"/>
-
-</nmwg:message>
-

Deleted: 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/psui-all-request.xml
===================================================================
--- 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/psui-all-request.xml
   2010-11-10 14:54:12 UTC (rev 662)
+++ 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/psui-all-request.xml
   2010-11-11 07:38:52 UTC (rev 663)
@@ -1,22 +0,0 @@
-<nmwg:message xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
-             xmlns:nmwgm="http://ggf.org/ns/nmwg/time/2.0/";
-             xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
-             xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
-             xmlns:hades="http://ggf.org/ns/nmwg/tools/hades/";
-             id="1208356112" type="MetadataKeyRequest">
-  <nmwg:metadata id="meta1">
-    <hades:subject id="subject1">
-      <nmwgt:endpointPair/>
-    </hades:subject>
-    <nmwg:eventType>http://ggf.org/ns/nmwg/tools/hades/</nmwg:eventType>
-  </nmwg:metadata>
-  <nmwg:metadata id="meta2" metadataIdRef="meta1">
-    <select:subject id="subject2"/>
-    <select:parameters id="param1">
-      <nmwg:parameter name="startTime">1208296800</nmwg:parameter>
-      <nmwg:parameter name="endTime">1208383200</nmwg:parameter>
-    </select:parameters>
-    <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/</nmwg:eventType>
-  </nmwg:metadata>
-  <nmwg:data id="data1" metadataIdRef="meta2"/>
-</nmwg:message>

Deleted: 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/psui-one-request.xml
===================================================================
--- 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/psui-one-request.xml
   2010-11-10 14:54:12 UTC (rev 662)
+++ 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/psui-one-request.xml
   2010-11-11 07:38:52 UTC (rev 663)
@@ -1,33 +0,0 @@
-<nmwg:message xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
-              xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
-              xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
-              xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
-              xmlns:hades="http://ggf.org/ns/nmwg/tools/hades/";
-              id="datarq2-1" type="SetupDataRequest">
-
-  <nmwg:metadata id="meta1">
-    <hades:subject id="subj1">
-      <nmwgt:endPointPair>
-        <nmwgt:src type="IFname" value="Ljubljana_ARNES"/>
-        <nmwgt:dst type="IFname" value="Amsterdam_SURFnet"/>
-      </nmwgt:endPointPair>
-    </hades:subject>
-    <hades:parameters id="params1">
-      <nmwg:parameter name="mid" value="6461"/>
-    </hades:parameters>
-
-    <nmwg:eventType>http://ggf.org/ns/nmwg/tools/hades/</nmwg:eventType>
-  </nmwg:metadata>
-
-  <nmwg:metadata id="meta2">
-    <select:subject id="subj2" metadataIdRef="meta1"/>
-    <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/</nmwg:eventType>
-    <select:parameters id="param2">
-      <nmwg:parameter name="startTime">1208296800</nmwg:parameter>
-      <nmwg:parameter name="endTime">1208383200</nmwg:parameter>
-    </select:parameters>
-  </nmwg:metadata>
-
-  <!-- triggers to indicate head of chains -->
-  <nmwg:data id="1" metadataIdRef="meta2"/>
-</nmwg:message>

Deleted: 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/status-request.xml
===================================================================
--- 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/status-request.xml
     2010-11-10 14:54:12 UTC (rev 662)
+++ 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/status-request.xml
     2010-11-11 07:38:52 UTC (rev 663)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-    <nmwg:message xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
-                  xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
-                  xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
-                  xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
-                  
xmlns:status="http://ggf.org/ns/nmwg/tools/hades/traceroute/aggregated/2.0/";
-    type="SetupDataRequest">
-      <nmwg:metadata id="status_meta">
-        <status:subject id="status_subject">
-          <nmwgt:endPointPair>
-            <nmwgt:src value="Poznan_GEANT" type="IFName"/>
-            <nmwgt:dst value="Frankfurt_GEANT" type="IFName"/>
-          </nmwgt:endPointPair>
-        </status:subject>
-        
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/hades/traceroute/aggregated/2.0/</nmwg:eventType>
-      </nmwg:metadata>
-      <nmwg:metadata id="select_meta" metadataIdRef="status_meta">
-        <select:subject id="select_subject"/>
-        
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
-        <select:parameters id="param2">
-          <nmwg:parameter name="startTime">1228174750</nmwg:parameter>
-          <nmwg:parameter name="endTime">1228214350</nmwg:parameter>
-        </select:parameters>
-      </nmwg:metadata>
-      <nmwg:data id="data1" metadataIdRef="select_meta"/>
-    </nmwg:message>

Deleted: 
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/status-test
===================================================================
--- branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/status-test  
  2010-11-10 14:54:12 UTC (rev 662)
+++ branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/status-test  
  2010-11-11 07:38:52 UTC (rev 663)
@@ -1 +0,0 @@
-./perfsonar-client.pl --reqfile=psping.xml 
--uri=http://calim.rrze.uni-erlangen.de:8090/services/MP/OWAMP 
--host=calim.rrze.uni-erlangen.de --port=80900