perfsonar-dev - [pS-dev] [GEANT/SA2/SA2T3-OPPD] r770 - in branches/perfsonar-oppd-all-0.53: build/debian build/debian/0.53-7 build/perfSONAR-MP-BWCTL/etc contrib/debian lib/NMWG/examples/2.0 lib/perfSONAR/MP tools/perfSONAR-client
Subject: perfsonar development work
List archive
[pS-dev] [GEANT/SA2/SA2T3-OPPD] r770 - in branches/perfsonar-oppd-all-0.53: build/debian build/debian/0.53-7 build/perfSONAR-MP-BWCTL/etc contrib/debian lib/NMWG/examples/2.0 lib/perfSONAR/MP tools/perfSONAR-client
Chronological Thread
- From:
- To:
- Subject: [pS-dev] [GEANT/SA2/SA2T3-OPPD] r770 - in branches/perfsonar-oppd-all-0.53: build/debian build/debian/0.53-7 build/perfSONAR-MP-BWCTL/etc contrib/debian lib/NMWG/examples/2.0 lib/perfSONAR/MP tools/perfSONAR-client
- Date: Fri, 14 Sep 2012 14:32:16 +0100 (BST)
Author: dfn.calim
Date: 2012-09-14 14:32:16 +0100 (Fri, 14 Sep 2012)
New Revision: 770
Added:
branches/perfsonar-oppd-all-0.53/build/debian/0.53-7/
branches/perfsonar-oppd-all-0.53/build/debian/0.53-7/perfsonar-oppd-mp-owamp_0.53-7_all.deb
branches/perfsonar-oppd-all-0.53/build/debian/0.53-7/perfsonar-oppd_0.53-7_all.deb
branches/perfsonar-oppd-all-0.53/build/perfSONAR-MP-BWCTL/etc/oppd-bwctl.conf.example
branches/perfsonar-oppd-all-0.53/tools/perfSONAR-client/Build.PL
branches/perfsonar-oppd-all-0.53/tools/perfSONAR-client/MANIFEST.SKIP
Removed:
branches/perfsonar-oppd-all-0.53/build/perfSONAR-MP-BWCTL/etc/oppd-bwctl.conf.example
Modified:
branches/perfsonar-oppd-all-0.53/contrib/debian/oppd.init
branches/perfsonar-oppd-all-0.53/lib/NMWG/examples/2.0/SetupDataRequest-01-owamp.xml
branches/perfsonar-oppd-all-0.53/lib/NMWG/examples/2.0/SetupDataRequest-02-owamp.xml
branches/perfsonar-oppd-all-0.53/lib/NMWG/examples/2.0/SetupDataRequest-03-owamp.xml
branches/perfsonar-oppd-all-0.53/lib/NMWG/examples/2.0/SetupDataResponse-01-owamp.xml
branches/perfsonar-oppd-all-0.53/lib/NMWG/examples/2.0/SetupDataResponse-02-owamp.xml
branches/perfsonar-oppd-all-0.53/lib/NMWG/examples/2.0/SetupDataResponse-03-owamp.xml
branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP/OWAMP.pm
Log:
add debian packages 0.53-7
Added:
branches/perfsonar-oppd-all-0.53/build/debian/0.53-7/perfsonar-oppd-mp-owamp_0.53-7_all.deb
===================================================================
(Binary files differ)
Property changes on:
branches/perfsonar-oppd-all-0.53/build/debian/0.53-7/perfsonar-oppd-mp-owamp_0.53-7_all.deb
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
branches/perfsonar-oppd-all-0.53/build/debian/0.53-7/perfsonar-oppd_0.53-7_all.deb
===================================================================
(Binary files differ)
Property changes on:
branches/perfsonar-oppd-all-0.53/build/debian/0.53-7/perfsonar-oppd_0.53-7_all.deb
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted:
branches/perfsonar-oppd-all-0.53/build/perfSONAR-MP-BWCTL/etc/oppd-bwctl.conf.example
===================================================================
---
branches/perfsonar-oppd-all-0.53/build/perfSONAR-MP-BWCTL/etc/oppd-bwctl.conf.example
2012-09-14 13:29:06 UTC (rev 769)
+++
branches/perfsonar-oppd-all-0.53/build/perfSONAR-MP-BWCTL/etc/oppd-bwctl.conf.example
2012-09-14 13:32:16 UTC (rev 770)
@@ -1 +0,0 @@
-link ../../../etc/oppd-egee/oppd.d/bwctl.conf
\ No newline at end of file
Added:
branches/perfsonar-oppd-all-0.53/build/perfSONAR-MP-BWCTL/etc/oppd-bwctl.conf.example
===================================================================
---
branches/perfsonar-oppd-all-0.53/build/perfSONAR-MP-BWCTL/etc/oppd-bwctl.conf.example
(rev 0)
+++
branches/perfsonar-oppd-all-0.53/build/perfSONAR-MP-BWCTL/etc/oppd-bwctl.conf.example
2012-09-14 13:32:16 UTC (rev 770)
@@ -0,0 +1 @@
+link ../../../etc/oppd.d.example/bwctl.conf
\ No newline at end of file
Property changes on:
branches/perfsonar-oppd-all-0.53/build/perfSONAR-MP-BWCTL/etc/oppd-bwctl.conf.example
___________________________________________________________________
Added: svn:special
+ *
Modified: branches/perfsonar-oppd-all-0.53/contrib/debian/oppd.init
===================================================================
--- branches/perfsonar-oppd-all-0.53/contrib/debian/oppd.init 2012-09-14
13:29:06 UTC (rev 769)
+++ branches/perfsonar-oppd-all-0.53/contrib/debian/oppd.init 2012-09-14
13:32:16 UTC (rev 770)
@@ -155,15 +155,15 @@
#log_end_msg $?
#;;
restart|force-reload)
- log_daemon_msg "Restarting $DESC" "$NAME"
+ [ "$VERBOSE" != no ] && log_daemon_msg "Restarting $DESC" "$NAME"
do_stop
case "$?" in
0|1)
do_start
case "$?" in
- 0) log_end_msg 0 ;;
- 1) log_end_msg 1 ;; # Old process is still running
- *) log_end_msg 1 ;; # Failed to start
+ 0) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+ 1) [ "$VERBOSE" != no ] && log_end_msg 1 ;; # Old process is still
running
+ *) [ "$VERBOSE" != no ] && log_end_msg 1 ;; # Failed to start
esac
;;
*)
Modified:
branches/perfsonar-oppd-all-0.53/lib/NMWG/examples/2.0/SetupDataRequest-01-owamp.xml
===================================================================
---
branches/perfsonar-oppd-all-0.53/lib/NMWG/examples/2.0/SetupDataRequest-01-owamp.xml
2012-09-14 13:29:06 UTC (rev 769)
+++
branches/perfsonar-oppd-all-0.53/lib/NMWG/examples/2.0/SetupDataRequest-01-owamp.xml
2012-09-14 13:32:16 UTC (rev 770)
@@ -1,49 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This request triggers the following command on the host:
- owping -S 131.188.81.234 -c 10 -s 10 -R -t 198.124.252.101
- This is a example to get raw data from the measurement
- For details of response look at: SetupDataResponse-01-owamp.xml
--->
<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/">
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/"
+ xmlns:store="http://ggf.org/ns/nmwg/ops/store/2.0/">
- <nmwg:metadata id="meta1">
- <owamp:subject id="subj1">
- <nmwgt:endPointPair>
- <nmwgt:src type="ipv4" value="131.188.81.234"/> <!-- The host
where is OWAMP M -->
- <nmwgt:dst type="ipv4" value="198.124.252.101"/> <!--
destination host -->
- </nmwgt:endPointPair>
- </owamp:subject>
+<nmwg:metadata id="meta1">
+<owamp:subject id="subj1">
+<nmwgt:endPointPair>
+<nmwgt:src type="ipv4" value="131.188.81.234"/> <!-- The host where is OWAMP
M -->
+<nmwgt:dst type="ipv4" value="198.124.252.101"/> <!-- destination host -->
+</nmwgt:endPointPair>
+</owamp: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="size" value="10"/>
- </nmwg:parameters>
- </nmwg:metadata>
-
- <!-- Define here where is SQL MA -->
- <nmwg:metadata id="meta2">
- <perfsonar:subject id="store1" dataIdRef="1"/>
- <nmwg:eventType>store</nmwg:eventType>
- <nmwg:parameters id="param2">
- <nmwg:parameter name="uri"
value="http://radagast.x-win.dfn.de:3070/services/MA/BWCTL/GEANT"/>
- </nmwg:parameters>
- </nmwg:metadata>
-
+<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="size" value="10"/>
+</nmwg:parameters>
+</nmwg:metadata>
- <!-- triggers to indicate head of chains -->
- <nmwg:data id="1" metadataIdRef="meta1"/>
+<!-- Define here where is SQL MA -->
+<nmwg:metadata id="meta2">
+<store:subject id="store1" metadataIdRef="meta1"/>
+<store:parameters id="param1">
+<nmwg:parameter name="accessPoint">
+ http://radagast.x-win.dfn.de:3070/services/MA/BWCTL/GEANT
+</nmwg:parameter>
+</store:parameters>
+<nmwg:eventType>http://ggf.org/ns/nmwg/ops/store/2.0</nmwg:eventType>
+</nmwg:metadata>
- <!-- This executes the store of measurement data -->
- <nmwg:data id="2" metadataIdRef="meta2"/>
+<!-- triggers to indicate head of chains -->
+<nmwg:data id="data1" metadataIdRef="meta2"/>
-</nmwg:message>
+</nmwg:message>
Modified:
branches/perfsonar-oppd-all-0.53/lib/NMWG/examples/2.0/SetupDataRequest-02-owamp.xml
===================================================================
---
branches/perfsonar-oppd-all-0.53/lib/NMWG/examples/2.0/SetupDataRequest-02-owamp.xml
2012-09-14 13:29:06 UTC (rev 769)
+++
branches/perfsonar-oppd-all-0.53/lib/NMWG/examples/2.0/SetupDataRequest-02-owamp.xml
2012-09-14 13:32:16 UTC (rev 770)
@@ -15,12 +15,12 @@
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/">
<nmwg:metadata id="meta1">
- <perfsonar:subject id="subj1">
+ <owamp:subject id="subj1">
<nmwgt:endPointPair>
<nmwgt:src type="ipv4" value="131.188.81.234"/> <!-- The host
where is OWAMP M -->
<nmwgt:dst type="ipv4" value="198.124.252.101"/> <!--
destination host -->
</nmwgt:endPointPair>
- </perfsonar:subject>
+ </owamp:subject>
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0</nmwg:eventType>
<nmwg:parameters id="param1">
Modified:
branches/perfsonar-oppd-all-0.53/lib/NMWG/examples/2.0/SetupDataRequest-03-owamp.xml
===================================================================
---
branches/perfsonar-oppd-all-0.53/lib/NMWG/examples/2.0/SetupDataRequest-03-owamp.xml
2012-09-14 13:29:06 UTC (rev 769)
+++
branches/perfsonar-oppd-all-0.53/lib/NMWG/examples/2.0/SetupDataRequest-03-owamp.xml
2012-09-14 13:32:16 UTC (rev 770)
@@ -16,12 +16,12 @@
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/">
<nmwg:metadata id="meta1">
- <perfsonar:subject id="subj1">
+ <owamp:subject id="subj1">
<nmwgt:endPointPair>
<nmwgt:src type="ipv4" value="131.188.81.24"/> <!-- The host
where is OWAMP M -->
<nmwgt:dst type="ipv4" value="198.124.252.101"/> <!--
destination host -->
</nmwgt:endPointPair>
- </perfsonar:subject>
+ </owamp:subject>
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0</nmwg:eventType>
<nmwg:parameters id="param1">
Modified:
branches/perfsonar-oppd-all-0.53/lib/NMWG/examples/2.0/SetupDataResponse-01-owamp.xml
===================================================================
---
branches/perfsonar-oppd-all-0.53/lib/NMWG/examples/2.0/SetupDataResponse-01-owamp.xml
2012-09-14 13:29:06 UTC (rev 769)
+++
branches/perfsonar-oppd-all-0.53/lib/NMWG/examples/2.0/SetupDataResponse-01-owamp.xml
2012-09-14 13:32:16 UTC (rev 770)
@@ -7,14 +7,14 @@
xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/"
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/"
xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/">
<nmwg:metadata id="meta1">
- <perfsonar:subject id="subj1">
+ <owamp:subject id="subj1">
<nmwgt:endPointPair>
<nmwgt:src type="ipv4" value="131.188.81.234"/>
<!-- The host where is OWAMP M -->
<nmwgt:dst type="ipv4" value="198.124.252.101"/>
<!-- destination host -->
</nmwgt:endPointPair>
- </perfsonar:subject>
+ </owamp:subject>
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0</nmwg:eventType>
<nmwg:parameters id="param1">
<nmwg:parameter name="count" value="10"/>
@@ -104,4 +104,4 @@
send_time="15080301495517488687" sender_error="2.32831e-10"
sender_sync="0" sequenceNumber="9"/>
</nmwg:data>
-</nmwg:message>
\ No newline at end of file
+</nmwg:message>
Modified:
branches/perfsonar-oppd-all-0.53/lib/NMWG/examples/2.0/SetupDataResponse-02-owamp.xml
===================================================================
---
branches/perfsonar-oppd-all-0.53/lib/NMWG/examples/2.0/SetupDataResponse-02-owamp.xml
2012-09-14 13:29:06 UTC (rev 769)
+++
branches/perfsonar-oppd-all-0.53/lib/NMWG/examples/2.0/SetupDataResponse-02-owamp.xml
2012-09-14 13:32:16 UTC (rev 770)
@@ -7,14 +7,14 @@
xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/"
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/"
xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/">
<nmwg:metadata id="meta1">
- <perfsonar:subject id="subj1">
+ <owamp:subject id="subj1">
<nmwgt:endPointPair>
<nmwgt:src type="ipv4" value="131.188.81.234"/>
<!-- The host where is OWAMP M -->
<nmwgt:dst type="ipv4" value="198.124.252.101"/>
<!-- destination host -->
</nmwgt:endPointPair>
- </perfsonar:subject>
+ </owamp:subject>
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0</nmwg:eventType>
<nmwg:parameters id="param1">
<nmwg:parameter name="count" value="10"/>
@@ -30,4 +30,4 @@
min_delay="56.6" receiver="198.124.252.101"
sender="131.188.81.234" sent="10"/>
</nmwg:data>
-</nmwg:message>
\ No newline at end of file
+</nmwg:message>
Modified:
branches/perfsonar-oppd-all-0.53/lib/NMWG/examples/2.0/SetupDataResponse-03-owamp.xml
===================================================================
---
branches/perfsonar-oppd-all-0.53/lib/NMWG/examples/2.0/SetupDataResponse-03-owamp.xml
2012-09-14 13:29:06 UTC (rev 769)
+++
branches/perfsonar-oppd-all-0.53/lib/NMWG/examples/2.0/SetupDataResponse-03-owamp.xml
2012-09-14 13:32:16 UTC (rev 770)
@@ -8,14 +8,14 @@
xmlns:owamp="http://ggf.org/ns/nmwg/tools/owamp/2.0/"
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/"
xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/">
<nmwg:metadata id="meta1">
- <perfsonar:subject id="subj1">
+ <owamp:subject id="subj1">
<nmwgt:endPointPair>
<nmwgt:src type="ipv4" value="131.188.81.24"/>
<!-- The host where is OWAMP M -->
<nmwgt:dst type="ipv4" value="198.124.252.101"/>
<!-- destination host -->
</nmwgt:endPointPair>
- </perfsonar:subject>
+ </owamp:subject>
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0</nmwg:eventType>
<nmwg:parameters id="param1">
<nmwg:parameter name="count" value="10"/>
Modified: branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP/OWAMP.pm
===================================================================
--- branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP/OWAMP.pm 2012-09-14
13:29:06 UTC (rev 769)
+++ branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP/OWAMP.pm 2012-09-14
13:32:16 UTC (rev 770)
@@ -85,7 +85,7 @@
push @commandline, "-s" , $parameters{size} if $parameters{size};
push @commandline, "-H" , $parameters{PHB} if $parameters{PHB};
push @commandline, "-D", $parameters{DSCP} if $parameters{DSCP};
- push @commandline, "-i", $parameters{send_schedule} if
$parameters{send_schedule};
+ push @commandline, "-i", $parameters{wait} if $parameters{wait};
push @commandline, "-E", $parameters{enddelay} if $parameters{enddelay};
push @commandline, "-z", $parameters{startdelay} if
$parameters{startdelay};
push @commandline, "-b", $parameters{bucket_width} if
$parameters{bucket_width};
Added: branches/perfsonar-oppd-all-0.53/tools/perfSONAR-client/Build.PL
===================================================================
--- branches/perfsonar-oppd-all-0.53/tools/perfSONAR-client/Build.PL
(rev 0)
+++ branches/perfsonar-oppd-all-0.53/tools/perfSONAR-client/Build.PL
2012-09-14 13:32:16 UTC (rev 770)
@@ -0,0 +1,19 @@
+use strict;
+use warnings;
+use Module::Build;
+
+my $builder = Module::Build->new(
+ module_name => 'perfSONAR::MP::OWAMP',
+ dist_name => 'perfsonar-client',
+ license => 'apache',
+ dist_author => 'DFN-Labor
<>',
+ dist_version => '0.53',
+ dist_abstract => 'perfSONAR command line client',
+ build_requires => {
+ 'Test::More' => 0,
+ },
+ add_to_cleanup => [ 'perfsonar-client-*' ],
+ create_makefile_pl => 'small',
+);
+
+$builder->create_build_script();
Added: branches/perfsonar-oppd-all-0.53/tools/perfSONAR-client/MANIFEST.SKIP
===================================================================
--- branches/perfsonar-oppd-all-0.53/tools/perfSONAR-client/MANIFEST.SKIP
(rev 0)
+++ branches/perfsonar-oppd-all-0.53/tools/perfSONAR-client/MANIFEST.SKIP
2012-09-14 13:32:16 UTC (rev 770)
@@ -0,0 +1,50 @@
+
+#!start included /usr/share/perl/5.10/ExtUtils/MANIFEST.SKIP
+# Avoid version control files.
+\bRCS\b
+\bCVS\b
+\bSCCS\b
+,v$
+\B\.svn\b
+\B\.git\b
+\B\.gitignore\b
+\b_darcs\b
+
+# Avoid Makemaker generated and utility files.
+\bMANIFEST\.bak
+\bMakefile$
+\bblib/
+\bMakeMaker-\d
+\bpm_to_blib\.ts$
+\bpm_to_blib$
+\bblibdirs\.ts$ # 6.18 through 6.25 generated this
+
+# Avoid Module::Build generated and utility files.
+\bBuild$
+\b_build/
+
+# Avoid temp and backup files.
+~$
+\.old$
+\#$
+\b\.#
+\.bak$
+
+# Avoid Devel::Cover files.
+\bcover_db\b
+#!end included /usr/share/perl/5.10/ExtUtils/MANIFEST.SKIP
+
+
+# Avoid Module::Build generated and utility files.
+\bBuild$
+\bBuild.bat$
+\b_build
+\bBuild.COM$
+\bBUILD.COM$
+\bbuild.com$
+
+# Avoid archives of this distribution
+\bperfsonar-client-[\d\.\_]+
+
+# Avoid example files in package
+\bexamples\b
- [pS-dev] [GEANT/SA2/SA2T3-OPPD] r770 - in branches/perfsonar-oppd-all-0.53: build/debian build/debian/0.53-7 build/perfSONAR-MP-BWCTL/etc contrib/debian lib/NMWG/examples/2.0 lib/perfSONAR/MP tools/perfSONAR-client, svn-noreply, 09/14/2012
Archive powered by MHonArc 2.6.16.