perfsonar-dev - [pS-dev] [GEANT/SA2/SA2T3-OPPD] r724 - in trunk: build/perfSONAR-MA-Hades build/rpm build/rpm/0.53-1 build/rpm/0.53-2 build/rpm/SPECS etc/oppd.d.example lib/perfSONAR/MP
Subject: perfsonar development work
List archive
[pS-dev] [GEANT/SA2/SA2T3-OPPD] r724 - in trunk: build/perfSONAR-MA-Hades build/rpm build/rpm/0.53-1 build/rpm/0.53-2 build/rpm/SPECS etc/oppd.d.example lib/perfSONAR/MP
Chronological Thread
- From:
- To:
- Subject: [pS-dev] [GEANT/SA2/SA2T3-OPPD] r724 - in trunk: build/perfSONAR-MA-Hades build/rpm build/rpm/0.53-1 build/rpm/0.53-2 build/rpm/SPECS etc/oppd.d.example lib/perfSONAR/MP
- Date: Thu, 7 Jul 2011 10:34:10 +0100
Author: dfn.calim
Date: 2011-07-07 10:34:10 +0100 (Thu, 07 Jul 2011)
New Revision: 724
Added:
trunk/build/rpm/0.53-2/
trunk/build/rpm/0.53-2/perfsonar-oppd-0.53-2.noarch.rpm
trunk/build/rpm/0.53-2/perfsonar-oppd-ma-hades-0.53-2.noarch.rpm
trunk/build/rpm/0.53-2/perfsonar-oppd-mp-bwctl-0.53-2.noarch.rpm
trunk/build/rpm/0.53-2/perfsonar-oppd-mp-lstoolreg-0.53-2.noarch.rpm
trunk/build/rpm/0.53-2/perfsonar-oppd-mp-owamp-0.53-2.noarch.rpm
Modified:
trunk/build/perfSONAR-MA-Hades/Build.PL
trunk/build/perfSONAR-MA-Hades/MANIFEST
trunk/build/rpm/0.53-1/perfsonar-oppd-0.53-1.noarch.rpm
trunk/build/rpm/0.53-1/perfsonar-oppd-mp-lstoolreg-0.53-1.noarch.rpm
trunk/build/rpm/SPECS/oppd-MA-Hades.spec
trunk/build/rpm/SPECS/oppd-MDM.spec
trunk/build/rpm/SPECS/oppd-MP-BWCTL-MDM.spec
trunk/build/rpm/SPECS/oppd-MP-LSToolreg-MDM.spec
trunk/build/rpm/SPECS/oppd-MP-OWAMP-MDM.spec
trunk/etc/oppd.d.example/lstoolreg.conf
trunk/lib/perfSONAR/MP/LSToolreg.pm
Log:
fix LS registration problem and add 0.53-2 packages for rpm
Modified: trunk/build/perfSONAR-MA-Hades/Build.PL
===================================================================
--- trunk/build/perfSONAR-MA-Hades/Build.PL 2011-07-06 13:19:11 UTC (rev
723)
+++ trunk/build/perfSONAR-MA-Hades/Build.PL 2011-07-07 09:34:10 UTC (rev
724)
@@ -17,7 +17,6 @@
},
etc_files => {
'etc/hades.conf' => 'etc/oppd.d/hades.conf',
- 'etc/hades-status.conf' => 'etc/oppd.d/hades-status.conf',
},
add_to_cleanup => [ 'perfSONAR-MP-BWCTL-*' ],
create_makefile_pl => 'small',
Modified: trunk/build/perfSONAR-MA-Hades/MANIFEST
===================================================================
--- trunk/build/perfSONAR-MA-Hades/MANIFEST 2011-07-06 13:19:11 UTC (rev
723)
+++ trunk/build/perfSONAR-MA-Hades/MANIFEST 2011-07-07 09:34:10 UTC (rev
724)
@@ -1,6 +1,5 @@
Build.PL
Changes
-etc/hades-status.conf
etc/hades.conf
lib/perfSONAR/MA/Hades.pm
Makefile.PL
Modified: trunk/build/rpm/0.53-1/perfsonar-oppd-0.53-1.noarch.rpm
===================================================================
(Binary files differ)
Modified: trunk/build/rpm/0.53-1/perfsonar-oppd-mp-lstoolreg-0.53-1.noarch.rpm
===================================================================
(Binary files differ)
Added: trunk/build/rpm/0.53-2/perfsonar-oppd-0.53-2.noarch.rpm
===================================================================
(Binary files differ)
Property changes on: trunk/build/rpm/0.53-2/perfsonar-oppd-0.53-2.noarch.rpm
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/build/rpm/0.53-2/perfsonar-oppd-ma-hades-0.53-2.noarch.rpm
===================================================================
(Binary files differ)
Property changes on:
trunk/build/rpm/0.53-2/perfsonar-oppd-ma-hades-0.53-2.noarch.rpm
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/build/rpm/0.53-2/perfsonar-oppd-mp-bwctl-0.53-2.noarch.rpm
===================================================================
(Binary files differ)
Property changes on:
trunk/build/rpm/0.53-2/perfsonar-oppd-mp-bwctl-0.53-2.noarch.rpm
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/build/rpm/0.53-2/perfsonar-oppd-mp-lstoolreg-0.53-2.noarch.rpm
===================================================================
(Binary files differ)
Property changes on:
trunk/build/rpm/0.53-2/perfsonar-oppd-mp-lstoolreg-0.53-2.noarch.rpm
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/build/rpm/0.53-2/perfsonar-oppd-mp-owamp-0.53-2.noarch.rpm
===================================================================
(Binary files differ)
Property changes on:
trunk/build/rpm/0.53-2/perfsonar-oppd-mp-owamp-0.53-2.noarch.rpm
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/build/rpm/SPECS/oppd-MA-Hades.spec
===================================================================
--- trunk/build/rpm/SPECS/oppd-MA-Hades.spec 2011-07-06 13:19:11 UTC (rev
723)
+++ trunk/build/rpm/SPECS/oppd-MA-Hades.spec 2011-07-07 09:34:10 UTC (rev
724)
@@ -3,7 +3,7 @@
AutoReqProv: no
Name: perfsonar-oppd-ma-hades
Version: 0.53
-Release: 1
+Release: 2
Summary: perfSONAR::MA::Hades Perl module
License: BSD
Group: Development/Libraries
@@ -76,5 +76,10 @@
%config /etc/oppd.d/hades.conf
%changelog
-* Thu Mar 29 2011 Hakan Calim
-- New creation of RPM Hades MA Modul Version 0.54
+* Thu Jul 07 2011 Hakan Calim
+- Change Release to RC2
+- Fixed problem with Ls registration
+- and compatibility with all packages of perfsonar-oppd
+* Thu Jul 01 2011 Hakan Calim
+- New creation of RPM Hades MA Modul Version 0.53
+
Modified: trunk/build/rpm/SPECS/oppd-MDM.spec
===================================================================
--- trunk/build/rpm/SPECS/oppd-MDM.spec 2011-07-06 13:19:11 UTC (rev 723)
+++ trunk/build/rpm/SPECS/oppd-MDM.spec 2011-07-07 09:34:10 UTC (rev 724)
@@ -3,7 +3,7 @@
Name: perfsonar-oppd
Version: 0.53
-Release: 1
+Release: 2
Summary: open Perl perfSONAR daemon and perl modules
License: BSD
Group: Development/Libraries
@@ -121,6 +121,12 @@
%config /etc/sysconfig/oppd
%changelog
+* Thu Jul 07 2011 Hakan Calim
+- Change Release to RC2
+- Fixed problem with Ls registration
+- and compatibility with all packages of perfsonar-oppd
+* Thu Jul 02 2011 Hakan Calim
+- New Relase 0.53 wirth new architecture
* Thu Jul 02 2009 Verena Venus
- Changed Release to 1 added obsoletes
for old oppd packages
@@ -168,3 +174,4 @@
- Changed to match MDM requirements
* Mon Jan 14 2008 DFN-Labor 0.4-1
- Specfile autogenerated by cpanspec 1.73.
+
Modified: trunk/build/rpm/SPECS/oppd-MP-BWCTL-MDM.spec
===================================================================
--- trunk/build/rpm/SPECS/oppd-MP-BWCTL-MDM.spec 2011-07-06 13:19:11
UTC (rev 723)
+++ trunk/build/rpm/SPECS/oppd-MP-BWCTL-MDM.spec 2011-07-07 09:34:10
UTC (rev 724)
@@ -2,7 +2,7 @@
Name: perfsonar-oppd-mp-bwctl
Version: 0.53
-Release: 1
+Release: 2
Summary: perfSONAR::MP::BWCTL Perl module
License: BSD
Group: Development/Libraries
@@ -76,6 +76,12 @@
%config /etc/oppd.d/bwctl.conf
%changelog
+* Thu Jul 07 2011 Hakan Calim
+- Change Release to RC2
+- Fixed problem with Ls registration
+- and compatibility with all packages of perfsonar-oppd
+* Thu Jul 01 2011 Hakan Calim
+- New Realse 0.53 with new architecture
* Thu Jul 02 2009 Verena Venus
- Changed Release to 1 added obsoletes
for old oppd packages
@@ -116,3 +122,4 @@
- Changed %defattr from root to perfsonar user
* Wed Jan 16 2008 DFN-Labor 0.4-1
- Specfile autogenerated by cpanspec 1.73.
+
Modified: trunk/build/rpm/SPECS/oppd-MP-LSToolreg-MDM.spec
===================================================================
--- trunk/build/rpm/SPECS/oppd-MP-LSToolreg-MDM.spec 2011-07-06 13:19:11
UTC (rev 723)
+++ trunk/build/rpm/SPECS/oppd-MP-LSToolreg-MDM.spec 2011-07-07 09:34:10
UTC (rev 724)
@@ -2,7 +2,7 @@
Name: perfsonar-oppd-mp-lstoolreg
Version: 0.53
-Release: 1
+Release: 2
Summary: perfSONAR::MP::LSToolreg Perl module
License: BSD
Group: Development/Libraries
@@ -66,5 +66,13 @@
%config /etc/oppd.d/lstoolreg.conf
%changelog
+* Thu Jul 07 2011 Hakan Calim
+- Change Release to RC2
+- Fixed problem with Ls registration
+- and compatibility with all packages of perfsonar-oppd
* Tue Jun 20 2011 Hakan Calim
- This new module added to versioon 0.53
+* Thu Jul 01 2009 Hakan Calim
+- New Realse 0.53 with new architecture
+
+
Modified: trunk/build/rpm/SPECS/oppd-MP-OWAMP-MDM.spec
===================================================================
--- trunk/build/rpm/SPECS/oppd-MP-OWAMP-MDM.spec 2011-07-06 13:19:11
UTC (rev 723)
+++ trunk/build/rpm/SPECS/oppd-MP-OWAMP-MDM.spec 2011-07-07 09:34:10
UTC (rev 724)
@@ -2,7 +2,7 @@
Name: perfsonar-oppd-mp-owamp
Version: 0.53
-Release: 1
+Release: 2
Summary: perfSONAR::MP::OWAMP Perl module
License: BSD
Group: Development/Libraries
@@ -76,6 +76,12 @@
%config /etc/oppd.d/owamp.conf
%changelog
+* Thu Jul 07 2011 Hakan Calim
+- Change Release to RC2
+- Fixed problem with Ls registration
+- and compatibility with all packages of perfsonar-oppd
+* Thu Jul 01 2011 Hakan Calim
+- New Realse 0.53 with new architecture
* Thu Jul 02 2009 Verena Venus
- Changed Release to 1 added obsoletes
for old oppd packages
Modified: trunk/etc/oppd.d.example/lstoolreg.conf
===================================================================
--- trunk/etc/oppd.d.example/lstoolreg.conf 2011-07-06 13:19:11 UTC (rev
723)
+++ trunk/etc/oppd.d.example/lstoolreg.conf 2011-07-07 09:34:10 UTC (rev
724)
@@ -15,25 +15,25 @@
#
<module_param>
#Define here the tools for registration
- <bwctld>
+ #<bwctld>
#
# Name, description, and keyword will be reported to Lookup Server
# #
- name "Bandwidth Test Controller"
- description "Bandwidth Test Controller...."
- keyword "MDM:MP" #Specify your service by keywords
- pot "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"
- </owampd>
+ #name "Bandwidth Test Controller"
+ #description "Bandwidth Test Controller...."
+ #keyword "MDM:MP" #Specify your service by keywords
+ #pot "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>
</module_param>
</service MP/LSToolreg>
Modified: trunk/lib/perfSONAR/MP/LSToolreg.pm
===================================================================
--- trunk/lib/perfSONAR/MP/LSToolreg.pm 2011-07-06 13:19:11 UTC (rev 723)
+++ trunk/lib/perfSONAR/MP/LSToolreg.pm 2011-07-07 09:34:10 UTC (rev 724)
@@ -57,6 +57,10 @@
$self->{DEFAULT}->{PORT}->{'owampd'} = "861";
#look if tools are availible
+ my $i = scalar keys %{$self->{MODPARAM}};
+ if ($i < 1){
+ $self->{LOGGER}->warn("No tools defined for LSToolreg.Please
define it in lstoolreg.conf file");
+ }
foreach my $tool (keys %{$self->{MODPARAM}}){
#look if tool is running
my @res = $self->checkToolisrunning($tool);
@@ -104,4 +108,4 @@
}
}
-1;
\ No newline at end of file
+1;
- [pS-dev] [GEANT/SA2/SA2T3-OPPD] r724 - in trunk: build/perfSONAR-MA-Hades build/rpm build/rpm/0.53-1 build/rpm/0.53-2 build/rpm/SPECS etc/oppd.d.example lib/perfSONAR/MP, svn-noreply, 07/07/2011
Archive powered by MHonArc 2.6.16.