Skip to Content.
Sympa Menu

perfsonar-dev - [pS-dev] [GEANT/SA2/SA2T3-OPPD] r652 - in branches/perfsonar-oppd-new-architect: bin lib lib/perfSONAR lib/perfSONAR/DataStruct lib/perfSONAR/MP tools/perfSONAR-client

Subject: perfsonar development work

List archive

[pS-dev] [GEANT/SA2/SA2T3-OPPD] r652 - in branches/perfsonar-oppd-new-architect: bin lib lib/perfSONAR lib/perfSONAR/DataStruct lib/perfSONAR/MP tools/perfSONAR-client


Chronological Thread 
  • From:
  • To:
  • Subject: [pS-dev] [GEANT/SA2/SA2T3-OPPD] r652 - in branches/perfsonar-oppd-new-architect: bin lib lib/perfSONAR lib/perfSONAR/DataStruct lib/perfSONAR/MP tools/perfSONAR-client
  • Date: Thu, 14 Oct 2010 08:41:53 +0100
Author: dfn.calim
Date: 2010-10-14 08:41:53 +0100 (Thu, 14 Oct 2010)
New Revision: 652

Added:

branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/bwctl-iperf-req-more-data.xml
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/message.xml

branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-raw-req-more-01.xml
Removed:
branches/perfsonar-oppd-new-architect/lib/perfSONAR/DataStruct/BWCTL.pm

branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/generic-req-which.xml

branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/generic-req.xml
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/generic-test
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/hades-ping

branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/hades-request-l4.xml

branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/hades-request-win-WORKING.xml

branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/hades-request.xml
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/hades-test
Modified:
branches/perfsonar-oppd-new-architect/bin/oppd.pl
branches/perfsonar-oppd-new-architect/lib/perfSONAR.pm
branches/perfsonar-oppd-new-architect/lib/perfSONAR/DataStruct.pm
branches/perfsonar-oppd-new-architect/lib/perfSONAR/DataStruct/NMWG.pm
branches/perfsonar-oppd-new-architect/lib/perfSONAR/MP.pm
branches/perfsonar-oppd-new-architect/lib/perfSONAR/MP/BWCTL.pm
branches/perfsonar-oppd-new-architect/lib/perfSONAR/MP/OWAMP.pm

branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-raw-req-01.xml
Log:
Adding method for store request

Modified: branches/perfsonar-oppd-new-architect/bin/oppd.pl
===================================================================
--- branches/perfsonar-oppd-new-architect/bin/oppd.pl 2010-10-04 15:47:43
UTC (rev 651)
+++ branches/perfsonar-oppd-new-architect/bin/oppd.pl 2010-10-14 07:41:53
UTC (rev 652)
@@ -432,7 +432,7 @@
#Add Log4perl
my $logger;
my %logger_opts = (
- level => $DEBUG,
+ level => $INFO,
layout => '%d (%P) %p> %F{1}:%L %M - %m%n',
);
$logger_opts{file} = $logfile;

Deleted:
branches/perfsonar-oppd-new-architect/lib/perfSONAR/DataStruct/BWCTL.pm
===================================================================
--- branches/perfsonar-oppd-new-architect/lib/perfSONAR/DataStruct/BWCTL.pm
2010-10-04 15:47:43 UTC (rev 651)
+++ branches/perfsonar-oppd-new-architect/lib/perfSONAR/DataStruct/BWCTL.pm
2010-10-14 07:41:53 UTC (rev 652)
@@ -1,45 +0,0 @@
-package perfSONAR::DataStruct::BWCTL;
-
-use strict;
-use warnings;
-
-
-#DEBUG
-use Data::Dumper;
-#DEBUG
-
-use version;
-our $VERSION = 0.52;
-
-use Log::Log4perl qw(get_logger);
-
-=head1 NAME
-
-perfSONAR::DataStruct::BWCTL
-
-=head1 DESCRIPTION
-
-This class is responsible to convert request parameters to a datastruct
format.
-This can be used to call bwctl from commandline. Measurement is not called
from this class.
-This class converts only data.
-
-=head1 Methods
-
-
-=head2 new({})
-
-The constructorneeds no parameter.
-
-=cut
-
-sub new{
- my $class = shift;
- my $self = {};
- bless $self, $class;
-
- $self->{LOGGER} = get_logger( "perfSONAR::DataStruct::BWCTL" );
- return $self;
-}
-
-
-1;

Modified:
branches/perfsonar-oppd-new-architect/lib/perfSONAR/DataStruct/NMWG.pm
===================================================================
--- branches/perfsonar-oppd-new-architect/lib/perfSONAR/DataStruct/NMWG.pm
2010-10-04 15:47:43 UTC (rev 651)
+++ branches/perfsonar-oppd-new-architect/lib/perfSONAR/DataStruct/NMWG.pm
2010-10-14 07:41:53 UTC (rev 652)
@@ -61,6 +61,7 @@

$self->{NS}->{MPBWCTL} = "http://ggf.org/ns/nmwg/tools/iperf/2.0/";;
$self->{NS}->{MPOWAMP} = "http://ggf.org/ns/nmwg/tools/owamp/2.0/";;
+ $self->{NS}->{STORE} = "http://ggf.org/ns/nmwg/ops/store/2.0/";;


push @{$self->{"supportedEventtypes"}},
@@ -70,6 +71,7 @@
"http://ggf.org/ns/nmwg/tools/owamp/2.0/";,
"owamp",
"bwctl",
+ "store",
"http://schemas.perfsonar.net/tools/admin/echo/2.0";
);

@@ -89,9 +91,9 @@
$ds->{DSTYPE} = 'NMWG';
$ds->{REQUESTMSG} = $nmwg;

- ($ds->{SERVICE} = $ds->{URI}) =~ s/^.*\/services\///;
- $ds->{SERVICE} =~ s/\/$//;
- $self->{LOGGER}->info("Requested service: $ds->{SERVICE}");
+ ($ds->{SERVICE}->{NAME} = $ds->{URI}) =~ s/^.*\/services\///;
+ $ds->{SERVICE}->{NAME} =~ s/\/$//;
+ $self->{LOGGER}->info("Requested service: $ds->{SERVICE}->{NAME}");

#Check messagetype
if (!$self->NMWGcheckMessagetype($messagetype,\$ds)){
@@ -145,7 +147,8 @@
if ($et =~ /admin\/selftest/){
$ds->{DOSELFTEST} = 1;;
}
-
+ #look for store messages
+
my $found = undef;
foreach my $sup_et (@module_ets){
next unless ($sup_et =~ /$et/);
@@ -188,10 +191,11 @@

#Prepare for each dataID a measurement
#Getparameters
- my %parameters;
my $params = {};
foreach my $dataid (keys %{$ds->{REQUESTMSG}->{"dataIDs"}}){
my $datablock = $ds->{REQUESTMSG}->{"dataIDs"}{$dataid};
+ my %parameters;
+ #$self->{LOGGER}->info($datablock[0]);
foreach my $key (keys %{$datablock}){ #get eventtypes
next if ($key eq "node" || $key eq "metaref" ); #Get only evebttypes
foreach my $k (keys %{$datablock->{$key}}){
@@ -204,20 +208,34 @@
}
}# End if (!defined $parameters
}#End foreach my $k
+ if ( $key =~ /store/){
+ #This parameters are store data
+ $params->{$parameters{'dataref'}}->{STORE}->{DOIT} = 1;
+ $self->{LOGGER}->info("Get store request for measurement
data");
+ }
}# End foreach my $key

my $error = $self->checkParams($ds, %parameters);
if ($error){
$self->{LOGGER}->error($error);
- $ds->{REQUESTMSG}->return_result_code("ERROR",
$ds->{SERVICE},$error, $ds->{REQUESTMSG}->{"dataIDs"}{$dataid}{"metaref"});
+ $ds->{REQUESTMSG}->return_result_code("ERROR",
$ds->{SERVICE}->{NAME},$error,
$ds->{REQUESTMSG}->{"dataIDs"}{$dataid}{"metaref"});
$ds->{ERROROCCUR} = 1;
return;
}#Endf ($error)

- #Checks for parameters ok add to parameterlist
- #push @paramlist,%parameters;
- $params->{$dataid} = \%parameters;
+ #Checks for parameterswas ok add to parameterlist
+ #Check if store parameters or service
+ if (defined $parameters{'dataref'}){
+ if ( $params->{ $parameters{'dataref'}}->{STORE}->{DOIT}){
+ $params->{$parameters{'dataref'}}->{STORE}->{PARAMS} =
\%parameters;
+ }
+ }
+ else{
+ $params->{$dataid}->{PARAMS} = \%parameters;
+ }

+ #$self->{LOGGER}->info(Dumper(%parameters));
+
#do selftests
#TODO test this part
if($messagetype =~ /EEchoResponse/){
@@ -259,7 +277,9 @@

}# End foreach my $dataid

- $ds->{PARAMS} = $params;
+ $ds->{SERVICE}->{DATA} = $params;
+ #$self->{LOGGER}->info(Dumper($params));
+

}

@@ -328,6 +348,7 @@
my (@unknown,@unsupported, $error);
#$self->{LOGGER}->info(Dumper($ds->{"known_parameters"}));

+
foreach my $par (keys %parameters){
next if ($par eq "ns_prefix" ||
$par eq "param_ns_prefix" ||
@@ -353,6 +374,7 @@
return $error;
}
}# End foreach my $par
+
#TODO
if ($#unknown >= 0){
$error = "Unknown parameter(s): " . join (", ", @unknown);
@@ -378,16 +400,17 @@
sub parseResult{
my ($self, $ds) = @_;

- my $ns_serivce = $$ds->{SERVICE};
+ my $ns_serivce = $$ds->{SERVICE}->{NAME};
$ns_serivce =~ s/\///;
my $ns = $self->{NS}->{$ns_serivce};
- my $params = $$ds->{PARAMS};
+ my $data = $$ds->{SERVICE}->{DATA};

#Do here all for MetakeyDataRequest
my $messagetype = $$ds->{REQUESTMSG}->get_message_type();

- foreach my $id (keys %{$params}){
- my $datalines_ref = $$ds->{PARAMS}->{$id}->{MRESULT}; #Returns a
ref to array
+ foreach my $id (keys %{$data}){
+ my $datalines_ref = $$ds->{SERVICE}->{DATA}->{$id}->{MRESULT};
+ #$self->{LOGGER}->debug(Dumper($datalines_ref));
if ($$ds->{DOECHO} == 1){
my %data_hash =
%{@$datalines_ref[0]};
$$ds->{REQUESTMSG}->return_result_code($data_hash{'echocode'},
$data_hash{'echomsg'}, "$id")
@@ -396,7 +419,11 @@
$$ds->{REQUESTMSG}->return_result_code($et,
"@$datalines_ref", $$ds->{REQUESTMSG}->{"dataIDs"}{$id}{"metaref"});
}else{
$$ds->{REQUESTMSG}->set_data_ns ($id, $ns, @$datalines_ref);
- #$$ds->{REQUESTMSG}->set_data ($id, @$datalines_ref);
+
+ #Look if data should be store
+ if (defined $$ds->{SERVICE}->{DATA}->{$id}->{STORE}->{DOIT}){
+ $self->{LOGGER}->info("Storing data...")
+ }
}
#$self->{LOGGER}->debug(Dumper(@$datalines_ref));
}

Modified: branches/perfsonar-oppd-new-architect/lib/perfSONAR/DataStruct.pm
===================================================================
--- branches/perfsonar-oppd-new-architect/lib/perfSONAR/DataStruct.pm
2010-10-04 15:47:43 UTC (rev 651)
+++ branches/perfsonar-oppd-new-architect/lib/perfSONAR/DataStruct.pm
2010-10-14 07:41:53 UTC (rev 652)
@@ -28,7 +28,7 @@

=head1 NAME

-perfSONAR::DataStruct
+perfSONAR::DataStruct - Main class for all data types NMWG..etc used in OPPD.

=head1 DESCRIPTION

@@ -40,14 +40,19 @@

$self ERROROCCUR If error occur set to 1. Default 0
ERRORMSG If error occur here is the error msg
- SERVICE The called service
SERVICES The availible services as Reference
REQUESTMSG A reference to the requested message type with the
handlers
DOECHO If echo is requested set to 1. Default 0
DOSELFTEST If selftest is requested set to 1. Default 0
RETURNMSG
- PARAMS The measurement structure
- |-$id
+ SERVICE The called service with his parameters and resul tdata.
+ |-NAME The name of the service
+ |-DATA All informations for the service
+ |-$id
+ |-STORE Store in a SQL MA
+ |-DOIT Undef for not storing otherwise 1
+ |-PARAMS The parameters for store message The id
defines a service call (measurement) with the parameters and result
+ |- PARAMS The parameters for a service. This is a hash
with options and values
|-MRESULT The result of a measurement command as a array
of data hashes.
All requests return a array. If a call was not
succesfull,
ERROROCCUR set to 1 then this array is used as a
error container
@@ -57,6 +62,10 @@



+To use the service part in a service define self or by the request data the
id. In NMWG is this given by data id element in the request message.
+The PARAMS field should be a hash with options and values. So a service can
use it. The service puts the reuslt data as a array of hashes in the
RESULTDATA
+field. For details see the specific service.
+
=head1 Methods

=cut
@@ -80,6 +89,7 @@
my $self = {};
$self->{LOGGER} = get_logger( $CLASSPATH );
$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->{SERVICE} = undef; #The request message
$self->{SERVICES} = ();
@@ -126,6 +136,10 @@
port => 1,
portrange => 1,
individual => 1, #TODO check this parameter
+
+ #store parameters
+ uri => 1,
+ dataref => 1,
};

$self->{"unsupported_parameters"} = {

Modified: branches/perfsonar-oppd-new-architect/lib/perfSONAR/MP/BWCTL.pm
===================================================================
--- branches/perfsonar-oppd-new-architect/lib/perfSONAR/MP/BWCTL.pm
2010-10-04 15:47:43 UTC (rev 651)
+++ branches/perfsonar-oppd-new-architect/lib/perfSONAR/MP/BWCTL.pm
2010-10-14 07:41:53 UTC (rev 652)
@@ -73,7 +73,7 @@
my ($self,%parameters) = @_;
my @commandline;
my $errormsg;
-
+
unless ($parameters{"src"} || $parameters{"dst"}) {
$errormsg = "Neither source nor destination ip address specified.";
$self->{LOGGER}->error($errormsg);
@@ -160,7 +160,7 @@
sub parse_result {

my ($self, $ds, $id) = @_;
- my $result = $$ds->{PARAMS}->{$id}->{MEASRESULT};
+ my $result = $$ds->{SERVICE}->{DATA}->{$id}->{MEASRESULT};
my @result = split(/\n/, $result);
my @datalines;
my $time = time;

Modified: branches/perfsonar-oppd-new-architect/lib/perfSONAR/MP/OWAMP.pm
===================================================================
--- branches/perfsonar-oppd-new-architect/lib/perfSONAR/MP/OWAMP.pm
2010-10-04 15:47:43 UTC (rev 651)
+++ branches/perfsonar-oppd-new-architect/lib/perfSONAR/MP/OWAMP.pm
2010-10-14 07:41:53 UTC (rev 652)
@@ -82,7 +82,7 @@
push @commandline, "-c" , $parameters{count} if $parameters{count};
push @commandline, "-L" , $parameters{timeout} if $parameters{timeout};
#TODO HOW to
- #push @commandline, "-s" , $parameters{"siz"} if parameters{"size"};
+ 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};
@@ -138,7 +138,7 @@
}

#Check the command
- my $countlimit = $$ds->{SERVICES}->{$$ds->{SERVICE}}->{countlimit};
+ my $countlimit =
$$ds->{SERVICES}->{$$ds->{SERVICE}->{NAME}}->{countlimit};
if (int($parameters{"count"}) >int($countlimit)){
$errormsg = "count greater than $countlimit is not allowed. Please
change it in your request.";
return "ERROR", $errormsg, "error.mp.owamp";
@@ -162,12 +162,11 @@
sub parse_result {

my ($self, $ds, $id) = @_;
- my $result = $$ds->{PARAMS}->{$id}->{MEASRESULT};
+ my $result = $$ds->{SERVICE}->{DATA}->{$id}->{MEASRESULT};
my @result = split(/\n/, $result);
my $time = time;
my @datalines = ();

-
if ($self->{OUTPUTTYPE} eq "raw"){
foreach my $resultline (@result){
if ($resultline =~

Modified: branches/perfsonar-oppd-new-architect/lib/perfSONAR/MP.pm
===================================================================
--- branches/perfsonar-oppd-new-architect/lib/perfSONAR/MP.pm 2010-10-04
15:47:43 UTC (rev 651)
+++ branches/perfsonar-oppd-new-architect/lib/perfSONAR/MP.pm 2010-10-14
07:41:53 UTC (rev 652)
@@ -17,7 +17,7 @@
#
=head1 NAME

-perfSONAR::MP
+perfSONAR::MP - Main class for all measurement poibt (MP) services.

=head1 DESCRIPTION

@@ -50,7 +50,47 @@
use IO::Pty;
use base qw(perfSONAR::Echo);

+=head1 Methods:

+=head2 createCommandLine(%parameters)
+
+Every service which works as a measurement point (MP) should have (overrite)
this method.
+This method will be called from the method MP::runMeasurement(). It called
with a hash
+which contains the iotions with the regarding value. Build from this a
array, which calls
+the command. Dont include the tool name like bwctl or owping. Return as
result this array.
+=cut
+sub createCommandLine{
+
+}
+
+=head2 parse_result($datastruct_ref, $id_of_measurement)
+
+After the measurement the method MP::runMeasurement() will call this method.
So include this method to your MP service.
+This method will get a reference to the data structure. As second value it
will get the identification from the measurement.
+Use this to get the result data from the measurement. Use:
+
+ my $result = $$ds->{SERVICE}->{DATA}->{$id}->{MEASRESULT};
+
+This is a string. Parse it to the specific form. Build a array of hashes
with the values. Return this array so the main method can use it.
+
+=cut
+sub parse_result{
+
+}
+
+=head2 run($reference_to_datastructucre)
+
+This is the starting point of a MP. So include this method to your service
to make runable. Only a reference to the
+data strucre is on start given. Save this and call the main method
runMeasurement() with no argument. Use the following
+template for this:
+ sub run{
+ my ($self, $ds) = @_;
+
+ $self->{DS} = $ds;
+ $self->runMeasurement();
+ }
+=cut
+
=head2 new()

The constructor is called withoud a parameter.
@@ -76,10 +116,12 @@
my $ds = $self->{DS};
my $pass;

- my $params = $$ds->{PARAMS};
- foreach my $id (keys %{$params}){
+ my $data = $$ds->{SERVICE}->{DATA};
+ #$self->{LOGGER}->info(Dumper($data));
+ foreach my $id (keys %{$data}){
+
my @commandline = $self->createCommandLine(
- %{$$ds->{PARAMS}->{$id}});
+ %{$data->{$id}->{PARAMS}});

if ($commandline[0] eq "ERROR") {
$$ds->{ERROROCCUR} = 1;
@@ -88,9 +130,9 @@
}
#Start commandline
#Get tool for commandline
- my $tool = $$ds->{SERVICES}->{$$ds->{SERVICE}}->{tool};
+ my $tool = $$ds->{SERVICES}->{$$ds->{SERVICE}->{NAME}}->{tool};

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

#Define pipes
my ($in, $out, $err);
@@ -115,24 +157,24 @@
finish $h;

if (!$out){
- $$ds->{PARAMS}->{$id}->{MEASRESULT} = "$err";
+ $$ds->{SERVICE}->{DATA}->{$id}->{MEASRESULT} = "$err";
}
else{
- $$ds->{PARAMS}->{$id}->{MEASRESULT} = "$out";
+ $$ds->{SERVICE}->{DATA}->{$id}->{MEASRESULT} = "$out";
}
#$logger->info(Dumper($out));
#parse the result
my @mresult = $self->parse_result($ds,$id);
- $$ds->{PARAMS}->{$id}->{MRESULT} =
\@mresult;
+ $$ds->{SERVICE}->{DATA}->{$id}->{MRESULT} =
\@mresult;
#$logger->info(Dumper(@mresult));
}#End foreach my $id

#On success write to log
if ($$ds->{ERROROCCUR}){
- $logger->info("Measurement point was NOT successfull for
service: $$ds->{SERVICE}");
+ $logger->info("Measurement point was NOT successfull for
service: $$ds->{SERVICE}->{NAME}");
}
else{
- $logger->info("Measurement point was successfull for service:
$$ds->{SERVICE}");
+ $logger->info("Measurement point was successfull for service:
$$ds->{SERVICE}->{NAME}");
}

}

Modified: branches/perfsonar-oppd-new-architect/lib/perfSONAR.pm
===================================================================
--- branches/perfsonar-oppd-new-architect/lib/perfSONAR.pm 2010-10-04
15:47:43 UTC (rev 651)
+++ branches/perfsonar-oppd-new-architect/lib/perfSONAR.pm 2010-10-14
07:41:53 UTC (rev 652)
@@ -89,8 +89,8 @@
my @datalines;

#look if service is availible
- if (! $ds->{SERVICES}->{$ds->{SERVICE}}){
- my $errormsg = "Requested service: $ds->{SERVICE} is not availible";
+ if (! $ds->{SERVICES}->{$ds->{SERVICE}->{NAME}}){
+ my $errormsg = "Requested service: $ds->{SERVICE}->{NAME} is not
availible";
$logger->error($errormsg);
$ds->{ERROROCCUR} = 1;
$datalines[0]="Service request Error:";
@@ -102,9 +102,9 @@
}

if ($ds->{DOECHO}){
-
$ds->{SERVICES}->{$ds->{SERVICE}}->{handler}->handle_echo_request(\$ds);
+
$ds->{SERVICES}->{$ds->{SERVICE}->{NAME}}->{handler}->handle_echo_request(\$ds);
}else{
- $ds->{SERVICES}->{$ds->{SERVICE}}->{handler}->run(\$ds);
+ $ds->{SERVICES}->{$ds->{SERVICE}->{NAME}}->{handler}->run(\$ds);
}
$ds->{$ds->{DSTYPE}}->parseResult(\$ds);


Copied:
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/bwctl-iperf-req-more-data.xml
(from rev 640,
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/bwctl-iperf-req2.xml)
===================================================================
---
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/bwctl-iperf-req-more-data.xml
(rev 0)
+++
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/bwctl-iperf-req-more-data.xml
2010-10-14 07:41:53 UTC (rev 652)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<nmwg:message type="SetupDataRequest"
+ id="bwctl-request"
+ xmlns="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
+ xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
+ xmlns:bwctl="http://ggf.org/ns/nmwg/tools/bwctl/2.0/";
+ xmlns:iperf="http://ggf.org/ns/nmwg/tools/iperf/2.0/";
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
+
+ <nmwg:metadata id="bwctl-metadata">
+ <bwctl:subject id="bwctl-subject">
+ <nmwgt:endPoint type="ipv4" value="130.59.35.142"/>
+ </bwctl:subject>
+
+ <nmwg:eventType>http://ggf.org/ns/nmwg/tools/bwctl/2.0</nmwg:eventType>
+ <bwctl:parameters id="bwctl-parameters">
+ <nmwg:parameter name="duration" value="5"/>
+ </bwctl:parameters>
+ </nmwg:metadata>
+
+ <nmwg:metadata id="iperf-metadata">
+ <iperf:subject id="iperf-subject" metadataIdRef="bwctl-metadata">
+ <nmwgt:endPointPair>
+ <nmwgt:src type="ipv4" value="130.59.35.142"/>
+ <nmwgt:dst type="ipv4" value="195.111.107.114"/>
+ </nmwgt:endPointPair>
+ </iperf:subject>
+ <iperf:parameters id="iperf-parameters">
+ <nmwg:parameter name="interval" value="2"/>
+ <nmwg:parameter name="protocol" value="tcp"/>
+ </iperf:parameters>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+ <!-- triggers to indicate head of chains -->
+
+ <nmwg:data id="1" metadataIdRef="iperf-metadata"/>
+ <nmwg:data id="2" metadataIdRef="iperf-metadata"/>
+ <nmwg:data id="3" metadataIdRef="iperf-metadata"/>
+
+</nmwg:message>

Deleted:
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/generic-req-which.xml
===================================================================
---
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/generic-req-which.xml
2010-10-04 15:47:43 UTC (rev 651)
+++
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/generic-req-which.xml
2010-10-14 07:41:53 UTC (rev 652)
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <nmwg:message xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
- xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
- xmlns:generic="http://ggf.org/ns/nmwg/tools/generic/2.0/";
- type="SetupDataRequest">
- <nmwg:metadata id="status_meta">
- <generic:subject id="status_subject">
- <nmwgt:endPointPair>
- <nmwgt:src value="131.188.81.12" type="ipv4"/>
- <nmwgt:dst value="131.188.81.12" type="ipv4"/>
- </nmwgt:endPointPair>
- </generic:subject>
- <generic:parameters id="gen-params">
- <nmwg:parameter name="command" value="which"/>
- <nmwg:parameter name="commandline" value="ping"/>
- </generic:parameters>
-
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/generic/2.0/</nmwg:eventType>
- </nmwg:metadata>
- <nmwg:data id="data1" metadataIdRef="status_meta"/>
- </nmwg:message>

Deleted:
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/generic-req.xml
===================================================================
---
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/generic-req.xml
2010-10-04 15:47:43 UTC (rev 651)
+++
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/generic-req.xml
2010-10-14 07:41:53 UTC (rev 652)
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <nmwg:message xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
- xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
- xmlns:generic="http://ggf.org/ns/nmwg/tools/generic/2.0/";
- type="SetupDataRequest">
- <nmwg:metadata id="status_meta">
- <generic:subject id="status_subject">
- <nmwgt:endPointPair>
- <nmwgt:src value="131.188.81.12" type="ipv4"/>
- <nmwgt:dst value="131.188.81.12" type="ipv4"/>
- </nmwgt:endPointPair>
- </generic:subject>
- <generic:parameters id="gen-params">
- <nmwg:parameter name="command" value="pingling"/>
- <nmwg:parameter name="commandline" value="131.188.81.30 -c 5"/>
- </generic:parameters>
-
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/generic/2.0/</nmwg:eventType>
- </nmwg:metadata>
- <nmwg:data id="data1" metadataIdRef="status_meta"/>
- </nmwg:message>

Deleted:
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/generic-test
===================================================================
--- branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/generic-test
2010-10-04 15:47:43 UTC (rev 651)
+++ branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/generic-test
2010-10-14 07:41:53 UTC (rev 652)
@@ -1 +0,0 @@
-./perfsonar-client.pl --reqfile=generic-req.xml
--uri=http://radagast.rrze.uni-erlangen.de:3070/services/MP/GENERIC
--host=radagast.rrze.uni-erlangen.de

Deleted:
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/hades-ping
===================================================================
--- branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/hades-ping
2010-10-04 15:47:43 UTC (rev 651)
+++ branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/hades-ping
2010-10-14 07:41:53 UTC (rev 652)
@@ -1,2 +0,0 @@
-/home/unrz170/trunk/tools/perfSONAR-client/perfsonar-client.pl
--reqfile=/home/unrz170/trunk/tools/perfSONAR-client/psping.xml
--uri=http://radagast.rrze.uni-erlangen.de:8090/services/MA/HADES/GEANT
--host=radagast.rrze.uni-erlangen.de
-

Deleted:
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/hades-request-l4.xml
===================================================================
---
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/hades-request-l4.xml
2010-10-04 15:47:43 UTC (rev 651)
+++
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/hades-request-l4.xml
2010-10-14 07:41:53 UTC (rev 652)
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <nmwg:message xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
- xmlns:hades="http://ggf.org/ns/nmwg/tools/hades/";
-
xmlns:summary="http://ggf.org/ns/nmwg/characteristic/delay/summary/";
- xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
-
xmlns:nmtl4="http://ogf.org/schema/network/topology/l4/20070707/";
- type="SetupDataRequest">
- <nmwg:metadata id="hades_meta">
- <hades:subject id="hades_subject">
- <nmtl4:endPointPair>
- <nmtl4:src value="62.40.122.123" type="ipv4"/>
- <nmtl4:dst value="62.40.122.11" type="ipv4"/>
- </nmtl4:endPointPair>
- </hades:subject>
- <nmwg:eventType>http://ggf.org/ns/nmwg/tools/hades</nmwg:eventType>
- <hades:parameters id="param1">
- <nmwg:parameter value="41" name="packetsize"/>
- <nmwg:parameter value="0x0" name="precedence"/>
- <nmwg:parameter value="9" name="groupsize"/>
- <nmwg:parameter value="60" name="interval"/>
- </hades:parameters>
- </nmwg:metadata>
- <nmwg:metadata id="select_meta" metadataIdRef="hades_meta">
- <select:subject id="select_subject"/>
-
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
- <select:parameters id="param2">
- <nmwg:parameter name="startTime">1210001700</nmwg:parameter>
- <nmwg:parameter name="endTime">1210002000</nmwg:parameter>
- </select:parameters>
- </nmwg:metadata>
- <nmwg:data id="data1" metadataIdRef="select_meta"/>
- </nmwg:message>

Deleted:
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/hades-request-win-WORKING.xml
===================================================================
---
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/hades-request-win-WORKING.xml
2010-10-04 15:47:43 UTC (rev 651)
+++
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/hades-request-win-WORKING.xml
2010-10-14 07:41:53 UTC (rev 652)
@@ -1,36 +0,0 @@
-<nmwg:message xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
- xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
- xmlns:hades="http://ggf.org/ns/nmwg/tools/hades/";
- id="datarq2-1" type="SetupDataRequest">
-
- <nmwg:metadata id="meta1">
- <hades:subject id="subj1">
- <nmwgt:endPointPair>
- <nmwgt:src type="IFname" value="Erlangen_DFN"/>
- <nmwgt:dst type="IFname" value="Frankfurt_DFN"/>
- </nmwgt:endPointPair>
- </hades:subject>
- <hades:parameters id="param1">
- <nmwg:parameter value="41" name="packetsize"/>
- <nmwg:parameter value="0x0" name="precedence"/>
- <nmwg:parameter value="9" name="groupsize"/>
- <nmwg:parameter value="60" name="interval"/>
- </hades:parameters>
-
- <nmwg:eventType>http://ggf.org/ns/nmwg/tools/hades/</nmwg:eventType>
- </nmwg:metadata>
-
- <nmwg:metadata id="meta2">
- <select:subject id="subj2" metadataIdRef="meta1"/>
- <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/</nmwg:eventType>
- <select:parameters id="param2">
- <nmwg:parameter name="startTime">1210001700</nmwg:parameter>
- <nmwg:parameter name="endTime">1210002000</nmwg:parameter>
- </select:parameters>
- </nmwg:metadata>
-
-
- <nmwg:data id="data1" metadataIdRef="meta2"/>
-</nmwg:message>

Deleted:
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/hades-request.xml
===================================================================
---
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/hades-request.xml
2010-10-04 15:47:43 UTC (rev 651)
+++
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/hades-request.xml
2010-10-14 07:41:53 UTC (rev 652)
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <nmwg:message xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
- xmlns:hades="http://ggf.org/ns/nmwg/tools/hades/";
-
xmlns:summary="http://ggf.org/ns/nmwg/characteristic/delay/summary/";
- xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
- type="SetupDataRequest">
- <nmwg:metadata id="hades_meta">
- <hades:subject id="hades_subject">
- <nmwgt:endPointPair>
- <nmwgt:src value="Poznan_GEANT" type="IFName"/>
- <nmwgt:dst value="Frankfurt_GEANT" type="IFName"/>
- </nmwgt:endPointPair>
- </hades:subject>
- <nmwg:eventType>http://ggf.org/ns/nmwg/tools/hades</nmwg:eventType>
- <hades:parameters id="param1">
- <nmwg:parameter value="41" name="packetsize"/>
- <nmwg:parameter value="0x0" name="precedence"/>
- <nmwg:parameter value="9" name="groupsize"/>
- <nmwg:parameter value="60" name="interval"/>
- </hades:parameters>
- </nmwg:metadata>
- <nmwg:metadata id="select_meta" metadataIdRef="hades_meta">
- <select:subject id="select_subject"/>
-
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0</nmwg:eventType>
- <select:parameters id="param2">
- <nmwg:parameter name="startTime">1210001700</nmwg:parameter>
- <nmwg:parameter name="endTime">1210002000</nmwg:parameter>
- </select:parameters>
- </nmwg:metadata>
- <nmwg:data id="data1" metadataIdRef="select_meta"/>
- </nmwg:message>

Deleted:
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/hades-test
===================================================================
--- branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/hades-test
2010-10-04 15:47:43 UTC (rev 651)
+++ branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/hades-test
2010-10-14 07:41:53 UTC (rev 652)
@@ -1 +0,0 @@
-./perfsonar-client.pl --reqfile=hades-psui-req1.xml
--uri=http://radagast.rrze.uni-erlangen.de:3070/services/MA/HADES/GEANT
--host=radagast.rrze.uni-erlangen.de

Added:
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/message.xml
===================================================================
--- branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/message.xml
(rev 0)
+++ branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/message.xml
2010-10-14 07:41:53 UTC (rev 652)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><soapenv:Envelope
xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<nmwg:message xmlns="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
xmlns:bwctl="http://ggf.org/ns/nmwg/tools/bwctl/2.0/";
xmlns:iperf="http://ggf.org/ns/nmwg/tools/iperf/2.0/";
xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/"; id="bwctl-request"
type="SetupDataRequest">
+ <nmwg:metadata id="bwctl-metadata">
+ <bwctl:subject id="bwctl-subject">
+ <nmwgt:endPoint type="ipv4" value="194.57.137.170"/>
+ </bwctl:subject>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/tools/bwctl/2.0</nmwg:eventType>
+ <bwctl:parameters id="bwctl-parameters">
+ <nmwg:parameter name="duration" value="20"/>
+ </bwctl:parameters>
+ </nmwg:metadata>
+ <nmwg:metadata id="iperf-metadata">
+ <iperf:subject id="iperf-subject" metadataIdRef="bwctl-metadata">
+ <nmwgt:endPointPair>
+ <nmwgt:src type="ipv4" value="64.251.63.188"/>
+ <nmwgt:dst type="ipv4" value="142.104.63.180"/>
+ </nmwgt:endPointPair>
+ </iperf:subject>
+ <iperf:parameters id="iperf-parameters">
+ <nmwg:parameter name="interval" value="5"/>
+ <nmwg:parameter name="protocol" value="tcp"/>
+ </iperf:parameters>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/tools/iperf/2.0</nmwg:eventType>
+ </nmwg:metadata>
+ <nmwg:data id="1" metadataIdRef="iperf-metadata"/>
+</nmwg:message>

Modified:
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-raw-req-01.xml
===================================================================
---
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-raw-req-01.xml
2010-10-04 15:47:43 UTC (rev 651)
+++
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-raw-req-01.xml
2010-10-14 07:41:53 UTC (rev 652)
@@ -21,6 +21,7 @@
<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>


Copied:
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-raw-req-more-01.xml
(from rev 640,
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-raw-req-01.xml)
===================================================================
---
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-raw-req-more-01.xml
(rev 0)
+++
branches/perfsonar-oppd-new-architect/tools/perfSONAR-client/owamp-raw-req-more-01.xml
2010-10-14 07:41:53 UTC (rev 652)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<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/";>
+
+
+ <nmwg:metadata id="meta2">
+ <perfsonar:subject id="subj2">
+ <nmwgt:endPointPair>
+ <nmwgt:src type="ipv4" value="131.188.81.34"/>
+ <nmwgt:dst type="ipv4" value="82.130.1.234:861"/>
+ </nmwgt:endPointPair>
+ </perfsonar:subject>
+
+ <nmwg:eventType>http://ggf.org/ns/nmwg/tools/owamp/2.0</nmwg:eventType>
+ <nmwg:parameters id="param1">
+ <nmwg:parameter name="count" value="20"/>
+ </nmwg:parameters>
+ </nmwg:metadata>
+
+ <!-- triggers to indicate head of chains -->
+ <nmwg:data id="1" metadataIdRef="meta2"/>
+ <nmwg:data id="2" metadataIdRef="meta2"/>
+ <nmwg:data id="3" metadataIdRef="meta2"/>
+ <nmwg:data id="4" metadataIdRef="meta2"/>
+
+</nmwg:message>
+


  • [pS-dev] [GEANT/SA2/SA2T3-OPPD] r652 - in branches/perfsonar-oppd-new-architect: bin lib lib/perfSONAR lib/perfSONAR/DataStruct lib/perfSONAR/MP tools/perfSONAR-client, svn-noreply, 10/14/2010

Archive powered by MHonArc 2.6.16.

Top of Page