Skip to Content.
Sympa Menu

perfsonar-dev - [pS-dev] [GEANT/SA2/SA2T3-OPPD] r789 - in branches/perfsonar-oppd-all-0.53: build/perfSONAR build/perfSONAR/lib/perfSONAR build/perfSONAR-MP-LSToolreg build/rpm/0.53-8 build/rpm/SPECS etc etc/oppd.d.example lib/NMWG/schema/2.0 lib/perfSONAR lib/perfSONAR/DataStruct lib/perfSONAR/MP tools/perfSONAR-client

Subject: perfsonar development work

List archive

[pS-dev] [GEANT/SA2/SA2T3-OPPD] r789 - in branches/perfsonar-oppd-all-0.53: build/perfSONAR build/perfSONAR/lib/perfSONAR build/perfSONAR-MP-LSToolreg build/rpm/0.53-8 build/rpm/SPECS etc etc/oppd.d.example lib/NMWG/schema/2.0 lib/perfSONAR lib/perfSONAR/DataStruct lib/perfSONAR/MP tools/perfSONAR-client


Chronological Thread 
  • From:
  • To:
  • Subject: [pS-dev] [GEANT/SA2/SA2T3-OPPD] r789 - in branches/perfsonar-oppd-all-0.53: build/perfSONAR build/perfSONAR/lib/perfSONAR build/perfSONAR-MP-LSToolreg build/rpm/0.53-8 build/rpm/SPECS etc etc/oppd.d.example lib/NMWG/schema/2.0 lib/perfSONAR lib/perfSONAR/DataStruct lib/perfSONAR/MP tools/perfSONAR-client
  • Date: Mon, 11 Feb 2013 08:01:45 +0000 (GMT)
Author: dfn.calim
Date: 2013-02-11 08:01:45 +0000 (Mon, 11 Feb 2013)
New Revision: 789

Added:
branches/perfsonar-oppd-all-0.53/build/perfSONAR/lib/perfSONAR/LS.pm

branches/perfsonar-oppd-all-0.53/build/rpm/0.53-8/perfsonar-client-0.53-6.noarch.rpm
branches/perfsonar-oppd-all-0.53/lib/perfSONAR/LS.pm
Modified:
branches/perfsonar-oppd-all-0.53/build/perfSONAR-MP-LSToolreg/Build
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/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
branches/perfsonar-oppd-all-0.53/build/rpm/SPECS/perfsonar-client.spec
branches/perfsonar-oppd-all-0.53/etc/oppd.conf.example
branches/perfsonar-oppd-all-0.53/etc/oppd.d.example/owamp.conf
branches/perfsonar-oppd-all-0.53/lib/NMWG/schema/2.0/owamp.rnc
branches/perfsonar-oppd-all-0.53/lib/perfSONAR/DataStruct/NMWG.pm
branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP/OWAMP.pm

branches/perfsonar-oppd-all-0.53/tools/perfSONAR-client/template-owamp-mp.xml
Log:
Adding new rpm packages for perfsonar-oppd 0.53-8 with OWAMP MP and LSToolreg
MP

Modified: branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST
===================================================================
--- branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST 2013-01-24
13:53:49 UTC (rev 788)
+++ branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST 2013-02-11
08:01:45 UTC (rev 789)
@@ -19,6 +19,7 @@
lib/perfSONAR/DataStruct.pm
lib/perfSONAR/DataStruct/NMWG.pm
lib/perfSONAR/Echo.pm
+lib/perfSONAR/LS.pm
lib/perfSONAR/MA.pm
lib/perfSONAR/MP.pm
lib/perfSONAR/Selftest.pm

Added: branches/perfsonar-oppd-all-0.53/build/perfSONAR/lib/perfSONAR/LS.pm
===================================================================
--- branches/perfsonar-oppd-all-0.53/build/perfSONAR/lib/perfSONAR/LS.pm
(rev 0)
+++ branches/perfsonar-oppd-all-0.53/build/perfSONAR/lib/perfSONAR/LS.pm
2013-02-11 08:01:45 UTC (rev 789)
@@ -0,0 +1 @@
+link ../../../../lib/perfSONAR/LS.pm
\ No newline at end of file


Property changes on:
branches/perfsonar-oppd-all-0.53/build/perfSONAR/lib/perfSONAR/LS.pm
___________________________________________________________________
Added: svn:special
+ *

Modified: branches/perfsonar-oppd-all-0.53/build/perfSONAR-MP-LSToolreg/Build
===================================================================
--- branches/perfsonar-oppd-all-0.53/build/perfSONAR-MP-LSToolreg/Build
2013-01-24 13:53:49 UTC (rev 788)
+++ branches/perfsonar-oppd-all-0.53/build/perfSONAR-MP-LSToolreg/Build
2013-02-11 08:01:45 UTC (rev 789)
@@ -11,7 +11,7 @@
open FH, '_build/magicnum' or return 0;
my $filenum = <FH>;
close FH;
- return $filenum == 539334;
+ return $filenum == 771936;
}

my $progname;
@@ -20,7 +20,7 @@
$^W = 1; # Use warnings
$progname = basename($0);
$orig_dir = Cwd::cwd();
- my $base_dir =
'/home/unrz217/SA2T3-OPPD/trunk/build/perfSONAR-MP-LSToolreg';
+ my $base_dir =
'/home/unrz217/SA2T3-OPPD/branches/perfsonar-oppd-all-0.53/build/perfSONAR-MP-LSToolreg';
if (!magic_number_matches()) {
unless (chdir($base_dir)) {
die ("Couldn't chdir($base_dir), aborting\n");

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


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

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

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

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

Modified:
branches/perfsonar-oppd-all-0.53/build/rpm/SPECS/perfsonar-client.spec
===================================================================
--- branches/perfsonar-oppd-all-0.53/build/rpm/SPECS/perfsonar-client.spec
2013-01-24 13:53:49 UTC (rev 788)
+++ branches/perfsonar-oppd-all-0.53/build/rpm/SPECS/perfsonar-client.spec
2013-02-11 08:01:45 UTC (rev 789)
@@ -2,7 +2,7 @@

Name: perfsonar-client
Version: 0.53
-Release: 5
+Release: 6
Summary: perfSONAR command line clinet
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-01-24
13:53:49 UTC (rev 788)
+++ branches/perfsonar-oppd-all-0.53/etc/oppd.conf.example 2013-02-11
08:01:45 UTC (rev 789)
@@ -203,7 +203,7 @@
# Default: off
#
# Example:
-ls_register on
+#ls_register on
#
#ls_register off


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:49 UTC (rev 788)
+++ branches/perfsonar-oppd-all-0.53/etc/oppd.d.example/owamp.conf
2013-02-11 08:01:45 UTC (rev 789)
@@ -77,10 +77,10 @@
# Store functionality
#
# store: Enable/disable store functionality
- store off
+ store on

# URL of a MA service to sent the results of measurements to
- store_url "http://www.mySQL-MA:8090";
+ store_url
"http://bwctl-2-ba2.rrze.uni-erlangen.de:8080/geant2-java-sql-ma/services/MeasurementArchiveService";

</module_param>


Modified: branches/perfsonar-oppd-all-0.53/lib/NMWG/schema/2.0/owamp.rnc
===================================================================
--- branches/perfsonar-oppd-all-0.53/lib/NMWG/schema/2.0/owamp.rnc
2013-01-24 13:53:49 UTC (rev 788)
+++ branches/perfsonar-oppd-all-0.53/lib/NMWG/schema/2.0/owamp.rnc
2013-02-11 08:01:45 UTC (rev 789)
@@ -69,7 +69,7 @@
element nmwg:parameter {
attribute name { "count" | "timeout" | "size" |
"percentile" | "DSCP" | "enddelay" |
- "startdelay" | "bucket_width" |
+ "startdelay" | "bucket_width" | "wait" |
"intermediates" | "portrange"
} &
(

Modified: branches/perfsonar-oppd-all-0.53/lib/perfSONAR/DataStruct/NMWG.pm
===================================================================
--- branches/perfsonar-oppd-all-0.53/lib/perfSONAR/DataStruct/NMWG.pm
2013-01-24 13:53:49 UTC (rev 788)
+++ branches/perfsonar-oppd-all-0.53/lib/perfSONAR/DataStruct/NMWG.pm
2013-02-11 08:01:45 UTC (rev 789)
@@ -46,7 +46,7 @@
use Carp;

use perfSONAR::SOAP::Message;
-use perfSONAR::SOAP::HTTP::UserAgent;
+use perfSONAR::Request;
use perfSONAR::SOAP::HTTP::Request;

=head2 new({})
@@ -595,27 +595,20 @@
}

$store_msg->set_message_type("MeasurementArchiveStoreRequest");
- my $body = $store_msg->as_dom;
- my $message = perfSONAR::SOAP::Message->new(
- body => $body,
- uri => $store_url
- );
+ my $request = perfSONAR::Request->new(
+ message => $store_msg->clone,
+ uri => $store_url,
+ );
+ $request->send();
+
+ #my $result = $response->as_string(2);
+ if ( $request->{SEND_SUCCESS} ){
+ $self->{LOGGER}->info("Store was successful on SQL MA");

+ }else{
+ $self->{LOGGER}->error("Store was NOT successful on SQL MA");

+ }

- my $userAgent = perfSONAR::SOAP::HTTP::UserAgent->new;
- my $request = perfSONAR::SOAP::HTTP::Request->new(message => $message);
- my $response = $userAgent->request($request);

- unless ($response->is_success) {
- # HTTP error
- my $httperror = $response->status_line;
- $$ds->{ERRORMSG} = "HTTP ERROR: Response from SQL MA:$httperror";
- #$self->{LOGGER}->error($$ds->{ERRORMSG});
- return 0;
- }
-
- #my $result = $response->as_string(2);
- $self->{LOGGER}->info("Store was successful on SQL MA");
-
#Write success to METADATA if requestet
if ($store_by eq "META"){
my $et = "success.mp.store";

Added: branches/perfsonar-oppd-all-0.53/lib/perfSONAR/LS.pm
===================================================================
--- branches/perfsonar-oppd-all-0.53/lib/perfSONAR/LS.pm
(rev 0)
+++ branches/perfsonar-oppd-all-0.53/lib/perfSONAR/LS.pm 2013-02-11
08:01:45 UTC (rev 789)
@@ -0,0 +1,101 @@
+package perfSONAR::LS;
+#
+# Copyright 2010 Verein zur Foerderung eines Deutschen Forschungsnetzes e.
V.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
+=head1 NAME
+
+perfSONAR::LS - Main class for Lookup Service (LS) registration
+
+=head1 DESCRIPTION
+
+This is the main class for registering a service to a Lookup Service (LS).
+It includes all functions which are needes to register a service to LS. It
is only used if the parameter
+
+$ds->{LS_REGISTER}
+
+is set to True. Then the start function is used. Some parameters are get
from the main configuration
+file oppd.conf. For example LS url or hostname. The service specific
parameters are get from the service
+configuration file. For this the ls_param block is used. For details open
this files fro example:
+
+oppd.d/owamp.conf
+
+
+
+=cut
+
+use strict;
+use warnings;
+
+ use Log::Log4perl qw(get_logger);
+ use NMWG::Message;
+#use perfSONAR qw(print_log);
+
+my $register_template;
+my $deregister_template;
+my $keepalive_template;
+
+
+if (-e "$FindBin::RealBin/../etc/"){
+ $register_template = "$FindBin::RealBin/../etc/LS_register.xml";
+ $deregister_template = "$FindBin::RealBin/../etc/LS_deregister.xml";
+ $keepalive_template = "$FindBin::RealBin/../etc/LS_keepalive.xml";
+} else {
+ $register_template = "/etc/oppd.d/LS_register.xml";
+ $deregister_template = "/etc/oppd.d/LS_deregister.xml";
+ $keepalive_template = "/etc/oppd.d/LS_keepalive.xml";
+}
+
+my $psservice = "http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";;
+my $nmwg = "http://ggf.org/ns/nmwg/base/2.0/";;
+my $nmtb = "http://ogf.org/schema/network/topology/base/20070828/";;
+my $nmtl3 = "http://ogf.org/schema/network/topology/l3/20070828/";;
+my $nmwgr = "http://ggf.org/ns/nmwg/result/2.0/";;
+
+our %services = ();
+our (
+ $hostname, $port, $organization, $contact, $log,$protocol
+);
+
+our @ls_url = ();
+my %messages;
+my $reg_services ={};
+my $debug_write = 0;
+
+
+=head1 Methods:
+
+=head2 parseConfiguration($ds)
+
+This function should only be called at the geginning of a service. It use
the ls_param block of the service
+and sotes the key and value which should be registered in a a hash variable:
+
+$self->{LS_PARAM}
+
+This is used to create the registration request.
+
+=cut
+
+sub parseConfiguration{
+ my ($self) = @_;
+ my $module_param_ref = $self->{MODPARAM};
+
+ print "$module_param_ref->{ls_param}->{Name}\n";
+
+}
+
+ 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:49 UTC (rev 788)
+++ branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP/OWAMP.pm 2013-02-11
08:01:45 UTC (rev 789)
@@ -277,7 +277,7 @@
#first: 2012-10-17T11:45:00.601
/first:\s+(\d+-\d+-\d+T\d+:\d+:\d+.\d+)/){
my $starttime = $self->parseOWAMPTime($1);
- $self->{LOGGER}->info("Starttime: $starttime");
+ $self->{LOGGER}->debug("Starttime: $starttime");
$data_hash{"startTime"} = $starttime;
}elsif ($resultline =~
#last: 2012-11-29T15:13:11.386

Modified:
branches/perfsonar-oppd-all-0.53/tools/perfSONAR-client/template-owamp-mp.xml
===================================================================
---
branches/perfsonar-oppd-all-0.53/tools/perfSONAR-client/template-owamp-mp.xml
2013-01-24 13:53:49 UTC (rev 788)
+++
branches/perfsonar-oppd-all-0.53/tools/perfSONAR-client/template-owamp-mp.xml
2013-02-11 08:01:45 UTC (rev 789)
@@ -20,8 +20,7 @@
</nmwgt:endPointPair>
</owamp:subject>

- <nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0</nmwg:eventType>
-->
-
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/delay/summary</nmwg:eventType>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0</nmwg:eventType>
<nmwg:parameters id="owamp-parameters">
<!-- count - number of test packets-->
<nmwg:parameter name="count" value=VALUE/>
@@ -33,16 +32,16 @@
<nmwg:parameter name="size" value="VALUE"/> -->
<!-- startdelay - time to wait before executing test (seconds)
<nmwg:parameter name="startdelay" value="VALUE"/> -->
- <!-- output - set here the outputtype of response data (raw
or summary) -->
- <nmwg:parameter name="output" value="summary"/>
+ <!-- output - set here the outputtype of response data (raw
or summary)
+ <nmwg:parameter name="output" value="VALUE"/> -->
<!-- DSCP - RFC 2474 style DSCP value for TOS byte
<nmwg:parameter name="DSCP" value="VALUE"/> -->
<!-- bucket_width - bin size for histogram calculations
<nmwg:parameter name="bucket_width" value="VALUE"/> -->
<!-- one_way - give the direction of test (from/to)
<nmwg:parameter name="one_way" value="VALUE"/> -->
- <!-- intermediates - (packets per sub test session) - number
of test packets (to summarize per sub-session) -->
- <nmwg:parameter name="intermediates" value="600"/>
+ <!-- intermediates - (packets per sub test session) - number
of test packets (to summarize per sub-session)
+ <nmwg:parameter name="intermediates" value="VALUE"/> -->
</nmwg:parameters>
</nmwg:metadata>



  • [pS-dev] [GEANT/SA2/SA2T3-OPPD] r789 - in branches/perfsonar-oppd-all-0.53: build/perfSONAR build/perfSONAR/lib/perfSONAR build/perfSONAR-MP-LSToolreg build/rpm/0.53-8 build/rpm/SPECS etc etc/oppd.d.example lib/NMWG/schema/2.0 lib/perfSONAR lib/perfSONAR/DataStruct lib/perfSONAR/MP tools/perfSONAR-client, svn-noreply, 02/11/2013

Archive powered by MHonArc 2.6.16.

Top of Page