perfsonar development work

Author: dfn.calim
Date: 2013-03-27 11:28:15 +0000 (Wed, 27 Mar 2013)
New Revision: 799

Added:
   branches/perfsonar-oppd-all-0.53/build/rpm/0.53-9/
   
branches/perfsonar-oppd-all-0.53/build/rpm/0.53-9/perfsonar-oppd-0.53-9.noarch.rpm
   
branches/perfsonar-oppd-all-0.53/build/rpm/0.53-9/perfsonar-oppd-mp-owamp-0.53-5.noarch.rpm
Modified:
   branches/perfsonar-oppd-all-0.53/build/rpm/SPECS/oppd-MDM.spec
   branches/perfsonar-oppd-all-0.53/build/rpm/SPECS/oppd-MP-OWAMP-MDM.spec
   branches/perfsonar-oppd-all-0.53/etc/oppd.d.example/owamp.conf
   branches/perfsonar-oppd-all-0.53/lib/perfSONAR/DataStruct/NMWG.pm
Log:
adjusting store to request with request message

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


Property changes on: 
branches/perfsonar-oppd-all-0.53/build/rpm/0.53-9/perfsonar-oppd-0.53-9.noarch.rpm
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: 
branches/perfsonar-oppd-all-0.53/build/rpm/0.53-9/perfsonar-oppd-mp-owamp-0.53-5.noarch.rpm
===================================================================
(Binary files differ)


Property changes on: 
branches/perfsonar-oppd-all-0.53/build/rpm/0.53-9/perfsonar-oppd-mp-owamp-0.53-5.noarch.rpm
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: branches/perfsonar-oppd-all-0.53/build/rpm/SPECS/oppd-MDM.spec
===================================================================
--- branches/perfsonar-oppd-all-0.53/build/rpm/SPECS/oppd-MDM.spec      
2013-03-15 10:15:10 UTC (rev 798)
+++ branches/perfsonar-oppd-all-0.53/build/rpm/SPECS/oppd-MDM.spec      
2013-03-27 11:28:15 UTC (rev 799)
@@ -3,7 +3,7 @@
 
 Name:           perfsonar-oppd
 Version:        0.53
-Release:        8
+Release:        9 
 Summary:        open Perl perfSONAR daemon and perl modules
 License:        BSD
 Group:          Development/Libraries
@@ -43,6 +43,7 @@
 Requires:       perl(XML::LibXML)
 Requires:       perl(XML::LibXML::NodeList)
 Requires:      perl(DateTime)
+Requires:      perl(Log::Log4perl)
 Obsoletes:      oppd
 Obsoletes:      perfsonar-oppd < 0.53
 

Modified: 
branches/perfsonar-oppd-all-0.53/build/rpm/SPECS/oppd-MP-OWAMP-MDM.spec
===================================================================
--- branches/perfsonar-oppd-all-0.53/build/rpm/SPECS/oppd-MP-OWAMP-MDM.spec   
  2013-03-15 10:15:10 UTC (rev 798)
+++ branches/perfsonar-oppd-all-0.53/build/rpm/SPECS/oppd-MP-OWAMP-MDM.spec   
  2013-03-27 11:28:15 UTC (rev 799)
@@ -2,7 +2,7 @@
 
 Name:           perfsonar-oppd-mp-owamp
 Version:        0.53
-Release:        4
+Release:        5
 Summary:        perfSONAR::MP::OWAMP Perl module
 License:        BSD
 Group:          Development/Libraries

Modified: branches/perfsonar-oppd-all-0.53/etc/oppd.d.example/owamp.conf
===================================================================
--- branches/perfsonar-oppd-all-0.53/etc/oppd.d.example/owamp.conf      
2013-03-15 10:15:10 UTC (rev 798)
+++ branches/perfsonar-oppd-all-0.53/etc/oppd.d.example/owamp.conf      
2013-03-27 11:28:15 UTC (rev 799)
@@ -80,7 +80,7 @@
     store       off
 
     # URL of a MA service to sent the results of measurements to
-    store_url   
"http://ql-ma-hostname8080/geant2-java-sql-ma/services/MeasurementArchiveService";
+    store_url   
"http://sql-ma-hostname8080/geant2-java-sql-ma/services/MeasurementArchiveService";
 
   </module_param>
 

Modified: branches/perfsonar-oppd-all-0.53/lib/perfSONAR/DataStruct/NMWG.pm
===================================================================
--- branches/perfsonar-oppd-all-0.53/lib/perfSONAR/DataStruct/NMWG.pm   
2013-03-15 10:15:10 UTC (rev 798)
+++ branches/perfsonar-oppd-all-0.53/lib/perfSONAR/DataStruct/NMWG.pm   
2013-03-27 11:28:15 UTC (rev 799)
@@ -99,6 +99,7 @@
     select => "http://ggf.org/ns/nmwg/ops/select/2.0";,
     hoplist => "http://ggf.org/ns/nmwg/tools/hades/traceroute/hoplist/2.0/";,
     echo => "http://schemas.perfsonar.net/tools/admin/echo/2.0/";,
+    store => "http://ggf.org/ns/nmwg/ops/store/2.0/";,
     selftest => "http://schemas.perfsonar.net/tools/admin/selftest/1.0/";
     };    
        
@@ -602,18 +603,22 @@
        $request->send();
    
    #my $result = $response->as_string(2);
+   my $et;
+   my $msg;
        if ( $request->{SEND_SUCCESS} ){
-               $self->{LOGGER}->info("Store was successful on SQL MA");      
  
+               $msg = "Store was successful on SQL MA";
+               $self->{LOGGER}->info($msg);
+               $et = "success.mp.store";       
    }else{
-               $self->{LOGGER}->error("Store was NOT successful on SQL MA"); 
          
+               $msg = "Store was NOT successful on SQL MA";
+               $self->{LOGGER}->error($msg);
+               $et = "error.mp.store";         
    }
     
     
     #Write success to METADATA if requestet
     if ($store_by eq "META"){
-       my $et = "success.mp.store";
-                my $msg = "Store was successful on SQL MA: $store_url";
-                $$ds->{REQUESTMSG}->return_result_code($et, $msg, 
$$ds->{REQUESTMSG}->{"dataIDs"}{$id}{"metaref"});
+               $$ds->{REQUESTMSG}->return_result_code($et, $msg, 
$$ds->{REQUESTMSG}->{"dataIDs"}{$id}{"metaref"});
     }
     return 1;  
 }