perfsonar development work

Author: dfn.calim
Date: 2013-03-01 06:56:55 +0000 (Fri, 01 Mar 2013)
New Revision: 790

Added:
   
branches/perfsonar-oppd-all-0.53/build/rpm/0.53-8/perfsonar-oppd-ma-hades-0.53-5.noarch.rpm
   
branches/perfsonar-oppd-all-0.53/build/rpm/0.53-8/perfsonar-oppd-mp-bwctl-0.53-5.noarch.rpm
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-8/perfsonar-oppd-0.53-8.noarch.rpm
   branches/perfsonar-oppd-all-0.53/build/rpm/SPECS/oppd-MA-Hades.spec
   branches/perfsonar-oppd-all-0.53/build/rpm/SPECS/oppd-MP-BWCTL-MDM.spec
   branches/perfsonar-oppd-all-0.53/etc/oppd.conf.example
   branches/perfsonar-oppd-all-0.53/etc/oppd.d.example/hades.conf
   branches/perfsonar-oppd-all-0.53/etc/oppd.d.example/owamp.conf
   branches/perfsonar-oppd-all-0.53/etc/oppd.d.example/status.conf
   branches/perfsonar-oppd-all-0.53/lib/perfSONAR/DataStruct/NMWG.pm
Log:
build new HADES MA RHEL 6 packages

Modified: branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST
===================================================================
--- branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST   2013-02-11 
08:01:45 UTC (rev 789)
+++ branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST   2013-03-01 
06:56:55 UTC (rev 790)
@@ -19,7 +19,7 @@
 lib/perfSONAR/DataStruct.pm
 lib/perfSONAR/DataStruct/NMWG.pm
 lib/perfSONAR/Echo.pm
-lib/perfSONAR/LS.pm
+lib/perfSONAR/Request.pm
 lib/perfSONAR/MA.pm
 lib/perfSONAR/MP.pm
 lib/perfSONAR/Selftest.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  
2013-02-11 08:01:45 UTC (rev 789)
+++ branches/perfsonar-oppd-all-0.53/build/perfSONAR-MA-Hades/META.yml  
2013-03-01 06:56:55 UTC (rev 790)
@@ -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-8/perfsonar-oppd-0.53-8.noarch.rpm
===================================================================
(Binary files differ)

Added: 
branches/perfsonar-oppd-all-0.53/build/rpm/0.53-8/perfsonar-oppd-ma-hades-0.53-5.noarch.rpm
===================================================================
(Binary files differ)


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

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


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

Modified: branches/perfsonar-oppd-all-0.53/build/rpm/SPECS/oppd-MA-Hades.spec
===================================================================
--- branches/perfsonar-oppd-all-0.53/build/rpm/SPECS/oppd-MA-Hades.spec 
2013-02-11 08:01:45 UTC (rev 789)
+++ branches/perfsonar-oppd-all-0.53/build/rpm/SPECS/oppd-MA-Hades.spec 
2013-03-01 06:56:55 UTC (rev 790)
@@ -3,7 +3,7 @@
 AutoReqProv:   no
 Name:           perfsonar-oppd-ma-hades
 Version:        0.53
-Release:        4
+Release:        5
 Summary:        perfSONAR::MA::Hades Perl module
 License:        BSD
 Group:          Development/Libraries

Modified: 
branches/perfsonar-oppd-all-0.53/build/rpm/SPECS/oppd-MP-BWCTL-MDM.spec
===================================================================
--- branches/perfsonar-oppd-all-0.53/build/rpm/SPECS/oppd-MP-BWCTL-MDM.spec   
  2013-02-11 08:01:45 UTC (rev 789)
+++ branches/perfsonar-oppd-all-0.53/build/rpm/SPECS/oppd-MP-BWCTL-MDM.spec   
  2013-03-01 06:56:55 UTC (rev 790)
@@ -2,7 +2,7 @@
 
 Name:           perfsonar-oppd-mp-bwctl
 Version:        0.53
-Release:        4
+Release:        5
 Summary:        perfSONAR::MP::BWCTL Perl module
 License:        BSD
 Group:          Development/Libraries

Modified: branches/perfsonar-oppd-all-0.53/etc/oppd.conf.example
===================================================================
--- branches/perfsonar-oppd-all-0.53/etc/oppd.conf.example      2013-02-11 
08:01:45 UTC (rev 789)
+++ branches/perfsonar-oppd-all-0.53/etc/oppd.conf.example      2013-03-01 
06:56:55 UTC (rev 790)
@@ -203,7 +203,7 @@
 # Default: off
 #
 # Example:
-#ls_register    on
+ls_register    on
 #
 #ls_register    off
 
@@ -221,7 +221,7 @@
 # Example:
 # keepalive      7200
 #
-keepalive      1800
+keepalive      7200
 
 
 #

Modified: branches/perfsonar-oppd-all-0.53/etc/oppd.d.example/hades.conf
===================================================================
--- branches/perfsonar-oppd-all-0.53/etc/oppd.d.example/hades.conf      
2013-02-11 08:01:45 UTC (rev 789)
+++ branches/perfsonar-oppd-all-0.53/etc/oppd.d.example/hades.conf      
2013-03-01 06:56:55 UTC (rev 790)
@@ -60,13 +60,13 @@
   #### END LS INFORMATION     ####
   ################################
 
-       # Hades domain for which data should be available via this service
-    config  "/etc/hades/hades.conf"
+  # Hades domain for which data should be available via this service
+  config  "/etc/hades/hades.conf"
 
-    # service
-    # This is to get different service setting
-    # For example eventtpye
-    service     "hades"
+  # service
+  # This is to get different service setting
+  # For example eventtpye
+  service     "hades"
 
   </module_param>
 

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-02-11 08:01:45 UTC (rev 789)
+++ branches/perfsonar-oppd-all-0.53/etc/oppd.d.example/owamp.conf      
2013-03-01 06:56:55 UTC (rev 790)
@@ -23,7 +23,7 @@
   <ls_param>
   # Mandatory fields:
   #ServiceName: can be freely chosen
-  ServiceName          "OWAMP Measurement Point"
+  ServiceName          "OWAMP MP Dev test Erlangen"
 
   #Access point: the URL at which the service is available
   # This is set by the service itself

Modified: branches/perfsonar-oppd-all-0.53/etc/oppd.d.example/status.conf
===================================================================
--- branches/perfsonar-oppd-all-0.53/etc/oppd.d.example/status.conf     
2013-02-11 08:01:45 UTC (rev 789)
+++ branches/perfsonar-oppd-all-0.53/etc/oppd.d.example/status.conf     
2013-03-01 06:56:55 UTC (rev 790)
@@ -1,5 +1,5 @@
 #
-# Status MA example configuration
+#  Status MA example configuration
 #
 
 <service MA/HADES/MYDOMAIN/STATUS>
@@ -7,33 +7,67 @@
   #
   # Necessary parameters for module initialisation
   #
-  module        MA::Status      # Name of module to load
-  servicetype   MA              # Service type: MP or MA
+  module        MA::Status       # Name of module to load
+  servicetype   MA            # Service type: MP or MA
 
   #
-  # Name, description, and keyword will be reported to Lookup Server
+  # Module parameters
   #
-  name          "Hades Status Measurement Archive"
-  description   "Measurement Archive for Hades Traceroute data \
-                 from measurement points in my network (mydomain)"
-  keyword       "project:mydomain"
+  <module_param>
 
-  #
-  # Further parameters
-  #
-  metric        "traceroute status"
-    # Measurement metric(s). More than one element definition possible.
+  ##################################
+  #### BEGIN LS INFORMATION            ####
+  #### This fields will be sent        ####
+  #### to Lookup Service server        ####
+  ##################################
+  <ls_param>
+  # Mandatory fields:
+  #ServiceName: can be freely chosen
+  ServiceName          "Hades Status Measurement Archive"
 
+  #Access point: the URL at which the service is available
+  # This is set by the service itself
+
+  #Service type in this case BWCTL_MP
+  ServiceType  "STATUS_MA"
+
+  # Organization/Domain set it to the used domain for example GEANT
+  Organization "GEANT"
+
   #
-  # Module parameters
+  # Optional fields:
   #
-  <module_param>
+  # Service description: can be freely chosen
+  ServiceDescription   "Measurement Archive for Hades Traceroute data \
+                        from measurement points in my network (mydomain)"
 
-    config  "/etc/hades/hades.conf"
-      # Hades domain for which data should be available via this service
+  keyword       "project:mydomain"
 
-    # You can add further Hades configuration parameters here.
-    # TODO: pointer to useful documentation
+  #Service version
+  # This is done by the service itself
+
+  # Contact email: can be freely chosen
+  ContactEmail 
""
+
+  # keyword: describe service by keywords
+  keyword       "project:mybwctl"
+
+  # Measurement metric(s). More than one element definition possible.
+  metric       "traceroute status"
+        
+  </ls_param>
+  ################################
+  #### END LS INFORMATION     ####
+  ################################
+
+  # Hades domain for which data should be available via this service
+  config  "/etc/hades/hades-status.conf"
+
+  # service
+  # This is to get different service setting
+  # For example eventtpye
+  service     "hades-status"
+
   </module_param>
 
 </service MA/HADES/MYDOMAIN/STATUS>

Modified: branches/perfsonar-oppd-all-0.53/lib/perfSONAR/DataStruct/NMWG.pm
===================================================================
--- branches/perfsonar-oppd-all-0.53/lib/perfSONAR/DataStruct/NMWG.pm   
2013-02-11 08:01:45 UTC (rev 789)
+++ branches/perfsonar-oppd-all-0.53/lib/perfSONAR/DataStruct/NMWG.pm   
2013-03-01 06:56:55 UTC (rev 790)
@@ -586,7 +586,7 @@
         $$ds->{ERRORMSG} = "No store url defined in configuration file";
         return 0;
     }
-    $self->{LOGGER}->info("Storing data to SQL MA: $store_url");
+    $self->{LOGGER}->debug("Storing data to SQL MA: $store_url");
     my $store_msg = $$ds->{REQUESTMSG}->clone;
     
     if (!$store_msg){