Skip to Content.
Sympa Menu

perfsonar-dev - [pS-dev] [GEANT/SA2/SA2T3-OPPD] r788 - in branches/perfsonar-oppd-all-0.53: bin build/perfSONAR build/perfSONAR-MP-OWAMP build/rpm build/rpm/0.53-8 build/rpm/SPECS etc etc/oppd.d.example lib/perfSONAR lib/perfSONAR/Client lib/perfSONAR/MP

Subject: perfsonar development work

List archive

[pS-dev] [GEANT/SA2/SA2T3-OPPD] r788 - in branches/perfsonar-oppd-all-0.53: bin build/perfSONAR build/perfSONAR-MP-OWAMP build/rpm build/rpm/0.53-8 build/rpm/SPECS etc etc/oppd.d.example lib/perfSONAR lib/perfSONAR/Client lib/perfSONAR/MP


Chronological Thread 
  • From:
  • To:
  • Subject: [pS-dev] [GEANT/SA2/SA2T3-OPPD] r788 - in branches/perfsonar-oppd-all-0.53: bin build/perfSONAR build/perfSONAR-MP-OWAMP build/rpm build/rpm/0.53-8 build/rpm/SPECS etc etc/oppd.d.example lib/perfSONAR lib/perfSONAR/Client lib/perfSONAR/MP
  • Date: Thu, 24 Jan 2013 13:53:49 +0000 (GMT)
Author: dfn.calim
Date: 2013-01-24 13:53:49 +0000 (Thu, 24 Jan 2013)
New Revision: 788

Added:
branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST.SKIP.rpm
branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST.rpm
branches/perfsonar-oppd-all-0.53/build/rpm/0.53-8/

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/0.53-8/perfsonar-oppd-mp-lstoolreg-0.53-3.noarch.rpm

branches/perfsonar-oppd-all-0.53/build/rpm/0.53-8/perfsonar-oppd-mp-owamp-0.53-4.noarch.rpm
Modified:
branches/perfsonar-oppd-all-0.53/bin/oppd.pl
branches/perfsonar-oppd-all-0.53/build/perfSONAR-MP-OWAMP/Build.PL.redhat
branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST
branches/perfsonar-oppd-all-0.53/build/rpm/SPECS/oppd-MDM.spec
branches/perfsonar-oppd-all-0.53/build/rpm/SPECS/oppd-MP-LSToolreg-MDM.spec
branches/perfsonar-oppd-all-0.53/build/rpm/SPECS/oppd-MP-OWAMP-MDM.spec
branches/perfsonar-oppd-all-0.53/etc/oppd.conf.example
branches/perfsonar-oppd-all-0.53/etc/oppd.d.example/bwctl.conf
branches/perfsonar-oppd-all-0.53/etc/oppd.d.example/hades.conf
branches/perfsonar-oppd-all-0.53/etc/oppd.d.example/lstoolreg.conf
branches/perfsonar-oppd-all-0.53/etc/oppd.d.example/owamp.conf
branches/perfsonar-oppd-all-0.53/lib/perfSONAR/Client/LS.pm
branches/perfsonar-oppd-all-0.53/lib/perfSONAR/DataStruct.pm
branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP.pm
branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP/LSToolreg.pm
branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP/OWAMP.pm
Log:
fixed some LS registration bugs in lstoolreg and main code. Addded new rpm
packages

Modified: branches/perfsonar-oppd-all-0.53/bin/oppd.pl
===================================================================
--- branches/perfsonar-oppd-all-0.53/bin/oppd.pl 2013-01-24 13:53:04
UTC (rev 787)
+++ branches/perfsonar-oppd-all-0.53/bin/oppd.pl 2013-01-24 13:53:49
UTC (rev 788)
@@ -749,7 +749,7 @@
# http://www.perlmonks.org/?node_id=761270
$conn->timeout($conn_timeout) unless($ssl);
while (my $request = $conn->get_request) {
- $logger->info("Incoming request");
+ $logger->debug("Incoming request");
$logger->debug("Disabling connection timeout");
# TODO: timeout() is broken with HTTP::Daemon::SSL
$conn->timeout(0) unless($ssl);

Modified: branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST
===================================================================
--- branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST 2013-01-24
13:53:04 UTC (rev 787)
+++ branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST 2013-01-24
13:53:49 UTC (rev 788)
@@ -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

Added: branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST.SKIP.rpm
===================================================================
--- branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST.SKIP.rpm
(rev 0)
+++ branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST.SKIP.rpm
2013-01-24 13:53:49 UTC (rev 788)
@@ -0,0 +1,54 @@
+# Avoid version control files.
+\bRCS\b
+\bCVS\b
+,v$
+\B\.svn\b
+\B\.cvsignore$
+
+# Avoid Makemaker generated and utility files.
+\bMakefile$
+\bblib
+\bMakeMaker-\d
+\bpm_to_blib$
+\bblibdirs$
+^MANIFEST\.SKIP$
+
+# Avoid Module::Build generated and utility files.
+\bBuild$
+\bBuild.bat$
+\b_build
+
+# Avoid Devel::Cover generated files
+\bcover_db
+
+# Avoid temp and backup files.
+~$
+\.tmp$
+\.old$
+\.bak$
+\#$
+\.#
+\.rej$
+
+# Avoid OS-specific files/dirs
+# Mac OSX metadata
+\B\.DS_Store
+# Mac OSX SMB mount metadata files
+\B\._
+# Avoid archives of this distribution
+\bperfsonar-oppd-[\d\.\_]+
+
+#avoid redhat specific files
+#for debian package
+\bredhat
+\bspec
+
+#avoid debian specific files
+#for rpm package
+#\bdebian
+
+
+
+
+#All ege because this is MDM
+\bege

Added: branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST.rpm
===================================================================
--- branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST.rpm
(rev 0)
+++ branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST.rpm
2013-01-24 13:53:49 UTC (rev 788)
@@ -0,0 +1,40 @@
+bin/oppd.pl
+Build.deb.PL
+Build.PL
+Build.rpm.PL
+Changes
+etc/Auth_request.xml
+etc/Auth_response.xml
+etc/LS_deregister.xml
+etc/LS_keepalive.xml
+etc/LS_KeyRequest.xml
+etc/LS_register.xml
+etc/oppd-mdm.conf
+etc/oppd.conf.example
+etc/oppd.default.debian
+etc/oppd.init.debian
+lib/perfSONAR.pm
+lib/perfSONAR/Auth.pm
+lib/perfSONAR/Client/LS.pm
+lib/perfSONAR/DataStruct.pm
+lib/perfSONAR/DataStruct/NMWG.pm
+lib/perfSONAR/Echo.pm
+lib/perfSONAR/MA.pm
+lib/perfSONAR/MP.pm
+lib/perfSONAR/Selftest.pm
+lib/perfSONAR/SOAP.pm
+lib/perfSONAR/SOAP/Fault.pm
+lib/perfSONAR/SOAP/Fault_v1_1.pm
+lib/perfSONAR/SOAP/Fault_v1_2.pm
+lib/perfSONAR/SOAP/HTTP/Request.pm
+lib/perfSONAR/SOAP/HTTP/Response.pm
+lib/perfSONAR/SOAP/HTTP/UserAgent.pm
+lib/perfSONAR/SOAP/Message.pm
+Makefile.PL
+MANIFEST This list of files
+META.yml
+prepare-oppd-debian.pl
+README
+t/00-load.t
+t/perfSONAR-001-SOAP-Message.t
+t/perfSONAR-002-Core.t

Modified:
branches/perfsonar-oppd-all-0.53/build/perfSONAR-MP-OWAMP/Build.PL.redhat
===================================================================
--- branches/perfsonar-oppd-all-0.53/build/perfSONAR-MP-OWAMP/Build.PL.redhat
2013-01-24 13:53:04 UTC (rev 787)
+++ branches/perfsonar-oppd-all-0.53/build/perfSONAR-MP-OWAMP/Build.PL.redhat
2013-01-24 13:53:49 UTC (rev 788)
@@ -7,7 +7,7 @@
dist_name => 'perfsonar-oppd-mp-owamp',
license => 'apache',
dist_author => 'DFN-Labor
<>',
- dist_version => '0.54',
+ dist_version => '0.53',
dist_abstract => 'OWAMP MP module for perl-perfSONAR',
build_requires => {
'Test::More' => 0,

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


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

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


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

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


Property changes on:
branches/perfsonar-oppd-all-0.53/build/rpm/0.53-8/perfsonar-oppd-mp-owamp-0.53-4.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-01-24 13:53:04 UTC (rev 787)
+++ branches/perfsonar-oppd-all-0.53/build/rpm/SPECS/oppd-MDM.spec
2013-01-24 13:53:49 UTC (rev 788)
@@ -3,7 +3,7 @@

Name: perfsonar-oppd
Version: 0.53
-Release: 7
+Release: 8
Summary: open Perl perfSONAR daemon and perl modules
License: BSD
Group: Development/Libraries
@@ -42,7 +42,7 @@
Requires: perl(URI)
Requires: perl(XML::LibXML)
Requires: perl(XML::LibXML::NodeList)
-Requires: perl(TimeDate)
+Requires: perl(DateTime)
Obsoletes: oppd
Obsoletes: perfsonar-oppd < 0.53

@@ -122,6 +122,9 @@
%config /etc/sysconfig/oppd

%changelog
+* Wed Jan 23 2013 Hakan Calim
+- LS Registration ajusted
+- OWAMP MP schema adjusted for SQL MA
* Fri Nov 08 2012 Hakan Calim
- Problem with HADES MA eventype fixed
* Mon Sep 17 2012 Hakan Calim

Modified:
branches/perfsonar-oppd-all-0.53/build/rpm/SPECS/oppd-MP-LSToolreg-MDM.spec
===================================================================
---
branches/perfsonar-oppd-all-0.53/build/rpm/SPECS/oppd-MP-LSToolreg-MDM.spec
2013-01-24 13:53:04 UTC (rev 787)
+++
branches/perfsonar-oppd-all-0.53/build/rpm/SPECS/oppd-MP-LSToolreg-MDM.spec
2013-01-24 13:53:49 UTC (rev 788)
@@ -2,7 +2,7 @@

Name: perfsonar-oppd-mp-lstoolreg
Version: 0.53
-Release: 2
+Release: 3
Summary: perfSONAR::MP::LSToolreg Perl module
License: BSD
Group: Development/Libraries
@@ -66,6 +66,10 @@
%config /etc/oppd.d/lstoolreg.conf

%changelog
+* Wed Jan 23 2013 Hakan Calim
+- deleted to read from tool config file
+- because get many errors or failures.
+- Adjusted to one template for all tools
* Thu Jul 07 2011 Hakan Calim
- Change Release to RC2
- Fixed problem with Ls registration

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-01-24 13:53:04 UTC (rev 787)
+++ branches/perfsonar-oppd-all-0.53/build/rpm/SPECS/oppd-MP-OWAMP-MDM.spec
2013-01-24 13:53:49 UTC (rev 788)
@@ -2,7 +2,7 @@

Name: perfsonar-oppd-mp-owamp
Version: 0.53
-Release: 3
+Release: 4
Summary: perfSONAR::MP::OWAMP Perl module
License: BSD
Group: Development/Libraries
@@ -76,6 +76,9 @@
%config /etc/oppd.d/owamp.conf

%changelog
+* Wed Jan 23 2013 Hakan Calim
+- Adjustment to new owamp.rnc schema
+- Scheduling mechanism added
* Mon Sep 17 2012 Hakan Calim
- Fix the parse problem of
- raw data in MP/OWAMP

Modified: branches/perfsonar-oppd-all-0.53/etc/oppd.conf.example
===================================================================
--- branches/perfsonar-oppd-all-0.53/etc/oppd.conf.example 2013-01-24
13:53:04 UTC (rev 787)
+++ branches/perfsonar-oppd-all-0.53/etc/oppd.conf.example 2013-01-24
13:53:49 UTC (rev 788)
@@ -203,7 +203,7 @@
# Default: off
#
# Example:
-# ls_register on
+ls_register on
#
#ls_register off

@@ -221,7 +221,7 @@
# Example:
# keepalive 7200
#
-#keepalive 3600
+keepalive 1800


#
@@ -243,9 +243,9 @@
# ls_url
"http://ndb0-aami.internet2.edu:9095/perfSONAR_PS/services/hLS";
# ls_url "http://ndb1.internet2.edu:9995/perfSONAR_PS/services/hLS";
# ls_url "http://dc211.internet2.edu:9995/perfSONAR_PS/services/hLS";
-# ls_url
"http://loco4.man.poznan.pl:8180/geant2-java-xml-ls/services/LookupService";
+#ls_url
"http://loco4.man.poznan.pl:8180/geant2-java-xml-ls/services/LookupSe#rvice";
#
-#ls_url [FILL ME]
+ls_url
"http://ls.geant.net:8080/perfsonar-java-xml-ls/services/LookupService";


#
@@ -260,7 +260,7 @@
# Example:
# hostname "myhost.mydomain.org"
#
-#hostname [FILL ME]
+hostname "genesis-vm-centos5-32.rrze.uni-erlangen.de"


#

Modified: branches/perfsonar-oppd-all-0.53/etc/oppd.d.example/bwctl.conf
===================================================================
--- branches/perfsonar-oppd-all-0.53/etc/oppd.d.example/bwctl.conf
2013-01-24 13:53:04 UTC (rev 787)
+++ branches/perfsonar-oppd-all-0.53/etc/oppd.d.example/bwctl.conf
2013-01-24 13:53:49 UTC (rev 788)
@@ -11,23 +11,54 @@
servicetype MP # Service type: MP or MA

#
- # Name, description, and keyword will be reported to Lookup Server
+ # Module parameters
#
- name "BWCTL Measurement Point"
- description "Measurement Point for doing on-demand BWCTL tests"
- keyword "project:mybwctl"
+ <module_param>

+ ##################################
+ #### BEGIN LS INFORMATION ####
+ #### This fields will be sent ####
+ #### to Lookup Service server ####
+ ##################################
+ <ls_param>
+ # Mandatory fields:
+ #ServiceName: can be freely chosen
+ ServiceName "BWCTL Measurement Point"
+
+ #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 "BWCTL_MP"
+
+ # Organization/Domain set it to the used domain for example GEANT
+ Organization "GEANT"
+
#
- # Further parameters
+ # Optional fields:
#
+ # Service description: can be freely chosen
+ ServiceDescription "Measurement Point for doing on-demand BWCTL tests"
+
+ #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 "bandwidth"
- # Measurement metric(s). More than one element definition possible.
- tool "bwctl" # Tool name
+
+ </ls_param>
+ ################################
+ #### END LS INFORMATION ####
+ ################################

- #
- # Module parameters
- #
- <module_param>
+ # tool which tool is used from this service
+ tool "bwctl"

# Command to execute e.g. "/usr/bin/bwctl" or "/bin/bwctl".
# Omitting path searches $PATH.
@@ -42,9 +73,11 @@
#
# Store functionality
#
- store off # Enable/disable store functionality
+ # store: Enable/disable store functionality
+ store off
+
+ # URL of a MA service to sent the results of measurements to
store_url "http://www.mySQL-MA:8090";
- # URL of a MA service to sent the results of measurements to

</module_param>


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-01-24 13:53:04 UTC (rev 787)
+++ branches/perfsonar-oppd-all-0.53/etc/oppd.d.example/hades.conf
2013-01-24 13:53:49 UTC (rev 788)
@@ -1,5 +1,5 @@
#
-# Hades MA example configuration
+# HADES MA example configuration
#

<service MA/HADES/MYDOMAIN>
@@ -8,30 +8,59 @@
# Necessary parameters for module initialisation
#
module MA::Hades # Name of module to load
- servicetype MA # Service type: MP or MA
+ servicetype MA # Service type: MP or MA

#
- # Name, description, and keyword will be reported to Lookup Server
+ # Module parameters
#
- name "Hades Measurement Archive"
- description "Measurement Archive for Hades (OWD, OWDV, Packet Loss) data
\
- from measurement points in my network (mydomain)"
- keyword "project:mydomain"
+ <module_param>

- #
- # Further parameters
- #
- metric "one way delay"
- metric "one way delay variation"
- metric "packet loss"
- # 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 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 "HADES_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 (OWD, OWDV, Packet
Loss) data \
+ from measurement points in my
network (mydomain)"

- # Hades domain for which data should be available via this service
+ #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 "one way delay"
+ metric "one way delay variation"
+ metric "packet loss"
+
+ </ls_param>
+ ################################
+ #### END LS INFORMATION ####
+ ################################
+
+ # Hades domain for which data should be available via this service
config "/etc/hades/hades.conf"

# service
@@ -39,9 +68,6 @@
# For example eventtpye
service "hades"

- # You can add further Hades configuration parameters here.
- # TODO: pointer to useful documentation
-
</module_param>

</service MA/HADES/MYDOMAIN>

Modified: branches/perfsonar-oppd-all-0.53/etc/oppd.d.example/lstoolreg.conf
===================================================================
--- branches/perfsonar-oppd-all-0.53/etc/oppd.d.example/lstoolreg.conf
2013-01-24 13:53:04 UTC (rev 787)
+++ branches/perfsonar-oppd-all-0.53/etc/oppd.d.example/lstoolreg.conf
2013-01-24 13:53:49 UTC (rev 788)
@@ -15,26 +15,29 @@
#
<module_param>
#Define here the tools for registration
- #<bwctld>
+ # Following you can see a template
+ # how to define a tool for registration on a LS
+ # You can paste here one or more tools for registration
+ #<TOOLNAME>
#
# Name, description, and keyword will be reported to Lookup Server
# #
- #name "Bandwidth Test Controller"
- #description "Bandwidth Test Controller...."
+ #ServiceName "Bandwidth Test Controller"
+ #ServiceDescription "Bandwidth Test Controller...."
#keyword "MDM:MP" #Specify your service by keywords
- #pot "9999" #Port on which is listening tool
+ #port "9999" #Port on which is listening tool
#protocol "tcp" #Give here the protocol of tool e.g. tcp or udp
or http
- #servicetype "MP"
- #</bwctld>
- #<owampd>
- #name "One-Way Ping"
- #description "One-Way Active Measurement Point"
- #keyword "MDM:MP"
- #port "8888"
- #protocol "tcp"
- #servicetype "MP"
- #</ow#ampd>
+ #ServiceType "OWAMP_MP"
+ #Organization "MDM"
+ #</TOOLNAME>
+ <owamp2hades>
+ ServiceName "One way delay with HADES"
+ ServiceDescription "Use this to start on demand one way delay
measurement with Hades"
+ keyword "HADES:OWAMP:MP"
+ port "8610"
+ protocol "tcp"
+ ServiceType "HADES_MP"
+ Organization "GEANT"
+ </owamp2hades>
</module_param>
-
</service MP/LSToolreg>
-

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-01-24 13:53:04 UTC (rev 787)
+++ branches/perfsonar-oppd-all-0.53/etc/oppd.d.example/owamp.conf
2013-01-24 13:53:49 UTC (rev 788)
@@ -1,5 +1,5 @@
#
-# OWAMP MP configuration for MDM client machines
+# OWAMP MP example configuration
#

<service MP/OWAMP>
@@ -8,43 +8,80 @@
# Necessary parameters for module initialisation
#
module MP::OWAMP # Name of module to load
- servicetype MP # Service type: MP or MA
+ servicetype MP # Service type: MP or MA

#
- # Name, description, and keyword will be reported to Lookup Server
+ # Module parameters
#
- name "OWAMP Measurement Point"
- description "Measurement Point for doing on-demand OWAMP tests"
- keyword "MDM"
+ <module_param>

- #
- # Further parameters
- #
- metric "bandwidth"
- # Measurement metric(s). More than one element definition possible.
- tool "owping" # Tool name
- countlimit 6000 # Number of packages allowed. Not to
overflow the server
+ ##################################
+ #### BEGIN LS INFORMATION ####
+ #### This fields will be sent ####
+ #### to Lookup Service server ####
+ ##################################
+ <ls_param>
+ # Mandatory fields:
+ #ServiceName: can be freely chosen
+ ServiceName "OWAMP Measurement Point"

+ #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 "OWAMP_MP"
+
+ # 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 Point for doing on-demand OWAMP tests"

- # Command to execute e.g. "/usr/bin/owping" or "/bin/owping".
+ #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 "one-way-delay"
+ metric "jitter"
+
+ # tool which tool is used from this service
+ tool "owping"
+ </ls_param>
+ ################################
+ #### END LS INFORMATION ####
+ ################################
+
+ # Command to execute e.g. "/usr/bin/bwctl" or "/bin/bwctl".
# Omitting path searches $PATH.
command "owping"

+
# service
# This is to get different service setting
# For example eventtpye
- service "owamp"
-
+ service "owamp"
+
+ # Number of packages allowed. Not to overflow the server
+ countlimit 6000
+
+ #
# Store functionality
#
- store off # Enable/disable store functionality
+ # store: Enable/disable store functionality
+ store off
+
+ # URL of a MA service to sent the results of measurements to
store_url "http://www.mySQL-MA:8090";
- # URL of a MA service to sent the results of measurements to

</module_param>

-</service MP/OWAMP>
+</service MP/BWCTL>

Modified: branches/perfsonar-oppd-all-0.53/lib/perfSONAR/Client/LS.pm
===================================================================
--- branches/perfsonar-oppd-all-0.53/lib/perfSONAR/Client/LS.pm 2013-01-24
13:53:04 UTC (rev 787)
+++ branches/perfsonar-oppd-all-0.53/lib/perfSONAR/Client/LS.pm 2013-01-24
13:53:49 UTC (rev 788)
@@ -87,6 +87,15 @@
$log = $p{log};
$protocol = "http"; #Default

+ # Stroe hostport or LSToolreg will override
+ my $hostport = $port;
+
+ # Look first if hostname is set if not exit
+ if (!defined($hostname) || length($hostname) <= 1){
+ $log->error("Hostname parameter in configuration file is not
set. Please set it");
+ die;
+ }
+
#first registration:
foreach my $service (keys %services){
if ($service =~ /LSToolreg/){
@@ -94,9 +103,10 @@
foreach my $tool (keys %modparam){
#register tool only if availible
if
($services{$service}->{'handler'}->{MODPARAM}->{$tool}->{REGTOOL} eq "yes"){
- $services{$service}->{'name'} =
$modparam{$tool}{'name'};
- $services{$service}->{'servicetype'} =
$modparam{$tool}{'servicetype'};
- $services{$service}->{'description'} =
$modparam{$tool}{'description'};
+
$services{$service}{handler}->{MODPARAM}->{ls_param}->{ServiceName} =
$modparam{$tool}{'ServiceName'};
+
$services{$service}{handler}->{MODPARAM}->{ls_param}->{ServiceType} =
$modparam{$tool}{'ServiceType'};
+
$services{$service}{handler}->{MODPARAM}->{ls_param}->{ServiceDescription} =
$modparam{$tool}{'ServiceDescription'};
+
$services{$service}{handler}->{MODPARAM}->{ls_param}->{Organization} =
$modparam{$tool}{'Organization'};
$protocol = $modparam{$tool}{'protocol'};
$port = $modparam{$tool}{'port'};
create_register_message($service);
@@ -104,7 +114,8 @@
}
}

- }else{
+ }else{
+ $port = $hostport;
create_register_message($service);
send_all_registration($messages{$service}{"register_msg"},
$service);
}
@@ -161,16 +172,19 @@
my $message = NMWG::Message->new();
$message->parse_xml_from_file($register_template);
my $servicenode = ($message->{dom}->getElementsByTagNameNS("$psservice",
"service"))[0];
-
- $message->add_element_NS($servicenode, "serviceName",
"$services{$service}->{name}", $psservice);
+
+ $message->add_element_NS($servicenode, "serviceName",
"$services{$service}{handler}->{MODPARAM}->{ls_param}->{ServiceName}",
$psservice);
+ $message->add_element_NS($servicenode, "organization",
"$services{$service}{handler}->{MODPARAM}->{ls_param}->{Organization}",
$psservice);
if ($service =~ /LSToolreg/){
$message->add_element_NS($servicenode, "accessPoint",
"$protocol://$hostname:$port", $psservice);
}else{
$message->add_element_NS($servicenode, "accessPoint",
"http://$hostname:$port/services/$service";, $psservice);
}
- $message->add_element_NS($servicenode, "serviceType",
"$services{$service}->{servicetype}", $psservice);
- $message->add_element_NS($servicenode, "serviceDescription",
"$services{$service}->{description}", $psservice);
-
+ $message->add_element_NS($servicenode, "serviceType",
"$services{$service}{handler}->{MODPARAM}->{ls_param}->{ServiceType}",
$psservice);
+ $message->add_element_NS($servicenode, "description",
"$services{$service}{handler}->{MODPARAM}->{ls_param}->{ServiceDescription}",
$psservice);
+
+ $log->debug($message->as_string());
+
my $datanode = ($message->{dom}->getElementsByTagNameNS("$nmwg",
"data"))[0];
my $metanode = $message->add_attribute (namespace => $nmwg,
parent => $datanode,

Modified: branches/perfsonar-oppd-all-0.53/lib/perfSONAR/DataStruct.pm
===================================================================
--- branches/perfsonar-oppd-all-0.53/lib/perfSONAR/DataStruct.pm
2013-01-24 13:53:04 UTC (rev 787)
+++ branches/perfsonar-oppd-all-0.53/lib/perfSONAR/DataStruct.pm
2013-01-24 13:53:49 UTC (rev 788)
@@ -40,6 +40,7 @@

$self ERROROCCUR If error occur set to 1. Default 0
ERRORMSG If error occur here is the error msg
+ LS_REGISTER True if lookup service registration is on otherwise False
WARN Here are the warninhs stored
|-OCCUR If warninhs occur this is set to 1 default 0
|- MSG If warninhs occur all messages are here
@@ -91,6 +92,7 @@
$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
+ $self->{LS_REGISTER} = undef;
$self->{SERVICE} = undef; #The request message
$self->{SERVICES} = $services_ref;
$self->{RETURNMSG} = undef;
@@ -173,7 +175,7 @@

#Look if message is nmwg message
if ( $msg && ref( $msg ) eq 'NMWG::Message') {
- $self->{LOGGER}->info("Get a NMWG message request");
+ $self->{LOGGER}->debug("Get a NMWG message request");
use perfSONAR::DataStruct::NMWG;
my $nmwgds = perfSONAR::DataStruct::NMWG->new();
$nmwgds->nmwg2ds($msg,$self);

Modified: branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP/LSToolreg.pm
===================================================================
--- branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP/LSToolreg.pm
2013-01-24 13:53:04 UTC (rev 787)
+++ branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP/LSToolreg.pm
2013-01-24 13:53:49 UTC (rev 788)
@@ -16,11 +16,6 @@
#
#

-#TODO
-# - Please make me a proper class! There should be an object for every
service
-# and this class brings everything together.
-# - Replace the usage of $log with something more useful.
-
use strict;
use warnings;

@@ -55,9 +50,10 @@
#Define default
$self->{DEFAULT}->{PORT}->{'bwctld'} = "4823";
$self->{DEFAULT}->{PORT}->{'owampd'} = "861";
+ $self->{DEFAULT}->{PORT}->{'owamp2hades'} = "8610";

#look if tools are availible
- my $i = scalar keys %{$self->{MODPARAM}};
+ my $i = scalar keys %{$self->{MODPARAM}};
if ($i < 1){
$self->{LOGGER}->warn("No tools defined for LSToolreg.Please
define it in lstoolreg.conf file");
}
@@ -66,52 +62,13 @@
my @res = $self->checkToolisrunning($tool);
if ($res[1] eq "success"){
#set tool is availible
- $self->{MODPARAM}->{$tool}->{REGTOOL} = "yes";

-
- #read conf file for information
- my $conffile =
$self->{MODPARAM}->{$tool}->{'conffile'};
- if ($conffile){
- $self->{LOGGER}->info("Opening: $conffile");
- my $conf = new Config::General($conffile);
- my %config = $conf->getall;
- #Get options for bwctld
- if ($tool eq 'bwctld'){
- if ($config{'src_node'}){
- my @src_node = split(/:/,
$config{'src_node'});
- #get port src_node is
host:port
-
$self->{MODPARAM}->{$tool}->{'host'} = $src_node[0];
-
$self->{MODPARAM}->{$tool}->{'port'} = $src_node[1];
- }else{
- $self->{LOGGER}->warn("Source
node is not set in config file. Using defaul values");
-
$self->{MODPARAM}->{$tool}->{'port'} = $self->{DEFAULT}->{PORT}->{$tool};
- }
- }elsif ($tool eq 'owampd'){
- if ($config{'srcnode'}){
- my @src_node = split(/:/,
$config{'srcnode'});
- #get port src_node is
host:port
-
$self->{MODPARAM}->{$tool}->{'host'} = $src_node[0];
-
$self->{MODPARAM}->{$tool}->{'port'} = $src_node[1];
- }else{
- $self->{LOGGER}->warn("Source
node is not set in config file. Using defaul values");
-
$self->{MODPARAM}->{$tool}->{'port'} = $self->{DEFAULT}->{PORT}->{$tool};
- }
- }
- }else{
- $self->{MODPARAM}->{$tool}->{REGTOOL} = "no";
- $self->{LOGGER}->warn("Cant open or find
config filel");
- }
- }else{
- #no conf file given get source node fron
lstoolreg.conf
- my @srcnode = split(/:/,
$self->{MODPARAM}->{$tool}->{'conffile'});
- if ($srcnode[0] && $srcnode[1]){
- $self->{MODPARAM}->{$tool}->{'host'} =
$srcnode[0];
- $self->{MODPARAM}->{$tool}->{'port'} =
$srcnode[1];
- }else{
- $self->{MODPARAM}->{$tool}->{REGTOOL} = "no";
- $self->{LOGGER}->warn("Tool: $tool is not
running not registering tool");
- }
- }
- }
-
+ $self->{MODPARAM}->{$tool}->{REGTOOL} = "yes";
+
+ if (!defined($self->{MODPARAM}->{$tool}->{'port'})){
+ $self->{LOGGER}->warn("Port is not defined.
Using default port for tool: $tool");
+ $self->{MODPARAM}->{$tool}->{'port'} =
$self->{DEFAULT}->{PORT}->{$tool};
+ } }
+ } # End foreach
+
}
1;

Modified: branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP/OWAMP.pm
===================================================================
--- branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP/OWAMP.pm 2013-01-24
13:53:04 UTC (rev 787)
+++ branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP/OWAMP.pm 2013-01-24
13:53:49 UTC (rev 788)
@@ -157,7 +157,8 @@
}

#Check the command
- my $countlimit =
$$ds->{SERVICES}->{$$ds->{SERVICE}->{NAME}}->{countlimit};
+
#$self->{LOGGER}->info(Dumper($$ds->{SERVICES}->{$$ds->{SERVICE}->{NAME}}->{module_param}));
+ my $countlimit =
$$ds->{SERVICES}->{$$ds->{SERVICE}->{NAME}}->{module_param}->{countlimit};
if (int($parameters{"count"}) >int($countlimit)){
$errormsg = "count parameter greater than $countlimit is not allowed.
Please change it in your request.";
return "ERROR", $errormsg;
@@ -204,6 +205,7 @@
$data_hash{"packetTTL"} = $8;
push @datalines, \%data_hash;
} #End foreach
+ #$self->{LOGGER}->info(Dumper(@datalines));
}#End if
}elsif ($self->{OUTPUTTYPE} eq "machine_readable"){
my $begin_buckets = 0;

Modified: branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP.pm
===================================================================
--- branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP.pm 2013-01-24
13:53:04 UTC (rev 787)
+++ branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP.pm 2013-01-24
13:53:49 UTC (rev 788)
@@ -137,7 +137,8 @@
my $pass;

#Get tool for commandline
- my $tool = $$ds->{SERVICES}->{$$ds->{SERVICE}->{NAME}}->{tool};
+ #my $tool = $$ds->{SERVICES}->{$$ds->{SERVICE}->{NAME}}->{tool};
+ my $tool = $self->{COMMAND};

my $data = $$ds->{SERVICE}->{DATA};
#$self->{LOGGER}->info(Dumper($data));
@@ -168,7 +169,7 @@
return;
}

- $self->{LOGGER}->info("Service: $$ds->{SERVICE}->{NAME} called with
command: $tool @commandline");
+ $self->{LOGGER}->debug("Service: $$ds->{SERVICE}->{NAME} called with
command: $tool @commandline");

#Define pipes
my ($in, $out, $err);


  • [pS-dev] [GEANT/SA2/SA2T3-OPPD] r788 - in branches/perfsonar-oppd-all-0.53: bin build/perfSONAR build/perfSONAR-MP-OWAMP build/rpm build/rpm/0.53-8 build/rpm/SPECS etc etc/oppd.d.example lib/perfSONAR lib/perfSONAR/Client lib/perfSONAR/MP, svn-noreply, 01/24/2013

Archive powered by MHonArc 2.6.16.

Top of Page