Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r4936 - in trunk/geant2-java-sql-ma: conf samples/requests

Subject: perfsonar development work

List archive

perfsonar: r4936 - in trunk/geant2-java-sql-ma: conf samples/requests


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r4936 - in trunk/geant2-java-sql-ma: conf samples/requests
  • Date: Tue, 3 Feb 2009 06:01:53 -0500
Author: roman
Date: 2009-02-03 06:01:52 -0500 (Tue, 03 Feb 2009)
New Revision: 4936

Added:

trunk/geant2-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-Ping-2.xml
trunk/geant2-java-sql-ma/samples/requests/MetadataKeyRequest-Ping-1.xml
trunk/geant2-java-sql-ma/samples/requests/MetadataKeyRequest-Ping-2.xml
trunk/geant2-java-sql-ma/samples/requests/SetupDataRequest-Ping-2.xml
Modified:
trunk/geant2-java-sql-ma/conf/eventType-map.xml
trunk/geant2-java-sql-ma/conf/ibatis-clmp-ping.xml
trunk/geant2-java-sql-ma/conf/mysql-sqlma-dbremove.sql
trunk/geant2-java-sql-ma/conf/mysql-sqlma-dbsetup.sql
trunk/geant2-java-sql-ma/conf/sql-database_TEST.xml
trunk/geant2-java-sql-ma/conf/sql-database_clmp-ping.xml
Log:
functionality for ping data updated (and enabled by default)



Modified: trunk/geant2-java-sql-ma/conf/eventType-map.xml
===================================================================
--- trunk/geant2-java-sql-ma/conf/eventType-map.xml 2009-02-03 10:02:33
UTC (rev 4935)
+++ trunk/geant2-java-sql-ma/conf/eventType-map.xml 2009-02-03 11:01:52
UTC (rev 4936)
@@ -92,6 +92,7 @@

<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.PingQueryGenerator</metadataQueryGenerator>

<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.PingResponseGenerator</responseGenerator>

<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.PingStoreRequestProcess</storeRequestProcess>
+ <ibatisConfig>ibatis-SqlMapConfig-clmp-ping.xml</ibatisConfig>
</eventType>

</eventType-config>

Modified: trunk/geant2-java-sql-ma/conf/ibatis-clmp-ping.xml
===================================================================
--- trunk/geant2-java-sql-ma/conf/ibatis-clmp-ping.xml 2009-02-03 10:02:33
UTC (rev 4935)
+++ trunk/geant2-java-sql-ma/conf/ibatis-clmp-ping.xml 2009-02-03 11:01:52
UTC (rev 4936)
@@ -27,23 +27,30 @@
<parameter property="endTime" />
</parameterMap>

+ <!--
<parameterMap id="select-parameters2" class="java.util.HashMap">
<parameter property="metadataId" />
</parameterMap>
+ -->
+ <parameterMap id="select-parameters2" class="java.util.HashMap">
+ <parameter property="metadataId" />
+ <parameter property="metadataId" />
+ </parameterMap>

+
<select id="getResults1"
parameterMap="select-parameters1" resultMap="select-results">
<![CDATA[
select seqNum, value, valueUnits, ttl, numBytes, numBytesUnits,
timeValue, timeType
from clmp_ping
where metadataId = ?
- and timeValue >= ?
+ and timeValue >= ?
and timeValue <= ?
- order by timeValue ASC

+ order by timeValue ASC
]]>
</select>

-
+ <!--
<select id="getResults2"
parameterMap="select-parameters2" resultMap="select-results">
<![CDATA[
@@ -52,6 +59,16 @@
where metadataId = ?
]]>
</select>
+ -->
+ <select id="getResults2"
+ parameterMap="select-parameters2" resultMap="select-results">
+ <![CDATA[
+ select seqNum, value, valueUnits, ttl, numBytes, numBytesUnits,
timeValue, timeType
+ from clmp_ping
+ where metadataId = ?
+ and timeValue = (select MAX(timeValue) from clmp_ping where
metadataId = ?)
+ ]]>
+ </select>




Modified: trunk/geant2-java-sql-ma/conf/mysql-sqlma-dbremove.sql
===================================================================
--- trunk/geant2-java-sql-ma/conf/mysql-sqlma-dbremove.sql 2009-02-03
10:02:33 UTC (rev 4935)
+++ trunk/geant2-java-sql-ma/conf/mysql-sqlma-dbremove.sql 2009-02-03
11:01:52 UTC (rev 4936)
@@ -53,8 +53,8 @@
# clmp_bwctl;


-#DROP TABLE
-# clmp_ping;
+DROP TABLE
+ clmp_ping;


DROP USER

Modified: trunk/geant2-java-sql-ma/conf/mysql-sqlma-dbsetup.sql
===================================================================
--- trunk/geant2-java-sql-ma/conf/mysql-sqlma-dbsetup.sql 2009-02-03
10:02:33 UTC (rev 4935)
+++ trunk/geant2-java-sql-ma/conf/mysql-sqlma-dbsetup.sql 2009-02-03
11:01:52 UTC (rev 4936)
@@ -156,18 +156,18 @@
###########################################################

############### Create table for ping data ################
-#CREATE TABLE
-# clmp_ping
-# (metadataId VARCHAR(255) NOT NULL,
-# seqNum INT UNSIGNED NULL DEFAULT 0,
-# value FLOAT (16,4) NOT NULL,
-# valueUnits VARCHAR(4) NULL,
-# ttl TINYINT UNSIGNED NULL DEFAULT 0,
-# numBytes INT NULL DEFAULT 0,
-# numBytesUnits VARCHAR(10) NULL,
-# timeValue LONG NOT NULL,
-# timeType VARCHAR(4) NULL,
-# ts TIMESTAMP DEFAULT NOW());
+CREATE TABLE
+ clmp_ping
+ (metadataId VARCHAR(255) NOT NULL,
+ seqNum INT UNSIGNED NULL DEFAULT 0,
+ value FLOAT (16,4) NOT NULL,
+ valueUnits VARCHAR(4) NULL,
+ ttl TINYINT UNSIGNED NULL DEFAULT 0,
+ numBytes INT NULL DEFAULT 0,
+ numBytesUnits VARCHAR(10) NULL,
+ timeValue LONG NOT NULL,
+ timeType VARCHAR(4) NULL,
+ ts TIMESTAMP DEFAULT NOW());
############################################################

# insert statements for testing perfsonar_utilization table
@@ -279,3 +279,15 @@
INSERT
INTO perfsonar_iperf
VALUES ('meta2-iperf-test', 93938560, 'bits/sec', 23484640, 'Bytes',
1197642662, NULL, NULL, 'UDP', NULL, NULL, NULL, NULL, NULL, NULL, default);
+
+
+
+# insert statements for testing clmp_ping table
+
+INSERT
+ INTO clmp_ping
+ VALUES ('ping-meta1', 1, 5.3, 'ms', 253, 8, 'Bytes', 1233655716, 'unix',
default);
+
+INSERT
+ INTO clmp_ping
+ VALUES ('ping-meta1', 2, 2.5, 'ms', 253, 8, 'Bytes', 1233655718, 'unix',
default);

Modified: trunk/geant2-java-sql-ma/conf/sql-database_TEST.xml
===================================================================
--- trunk/geant2-java-sql-ma/conf/sql-database_TEST.xml 2009-02-03 10:02:33
UTC (rev 4935)
+++ trunk/geant2-java-sql-ma/conf/sql-database_TEST.xml 2009-02-03 11:01:52
UTC (rev 4936)
@@ -10,6 +10,7 @@
xmlns:errors="http://ggf.org/ns/nmwg/characteristic/errors/2.0/";
xmlns:discards="http://ggf.org/ns/nmwg/characteristic/discards/2.0/";
xmlns:iperf="http://ggf.org/ns/nmwg/tools/iperf/2.0/";
+ xmlns:ping="http://ggf.org/ns/nmwg/tools/ping/2.0/";
xmlns="http://ggf.org/ns/nmwg/base/2.0/";>


@@ -336,7 +337,7 @@
</nmwg:data>


- <!-- iperf/bwctl -->
+ <!-- iperf/bwctl metadata section -->


<nmwg:metadata id="meta1-iperf-test">
@@ -363,7 +364,6 @@
</nmwg:data>


-
<nmwg:metadata id="meta2-iperf-test">
<iperf:subject id="subject-1">
<nmwgt:endPointPair
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
@@ -388,4 +388,28 @@
</nmwg:data>


+ <!-- ping metadata section -->
+
+
+ <nmwg:metadata id="ping-meta1">
+ <ping:subject id="sub1">
+ <nmwgt:endPointPair>
+ <nmwgt:src type="ipv4" value="222.22.22.22"/>
+ <nmwgt:dst type="ipv4" value="111.11.11.11"/>
+ </nmwgt:endPointPair>
+ </ping:subject>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/ping/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+ <nmwg:data id="ping-data1" metadataIdRef="ping-meta1">
+ <nmwg:key>
+ <nmwg:parameters>
+ <nmwg:parameter name="metadataId">ping-meta1</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-clmp-ping.xml</nmwg:parameter>
+ <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/tools/ping/2.0</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:data>
+
+
</nmwg:store>
\ No newline at end of file

Modified: trunk/geant2-java-sql-ma/conf/sql-database_clmp-ping.xml
===================================================================
--- trunk/geant2-java-sql-ma/conf/sql-database_clmp-ping.xml 2009-02-03
10:02:33 UTC (rev 4935)
+++ trunk/geant2-java-sql-ma/conf/sql-database_clmp-ping.xml 2009-02-03
11:01:52 UTC (rev 4936)
@@ -19,6 +19,7 @@
<nmwg:parameters>
<nmwg:parameter name="metadataId">ping-meta1</nmwg:parameter>
<nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-clmp-ping.xml</nmwg:parameter>
+ <nmwg:parameter
name="eventType">http://ggf.org/ns/nmwg/tools/ping/2.0</nmwg:parameter>
</nmwg:parameters>
</nmwg:key>
</nmwg:data>

Added:
trunk/geant2-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-Ping-2.xml

Added: trunk/geant2-java-sql-ma/samples/requests/MetadataKeyRequest-Ping-1.xml

Added: trunk/geant2-java-sql-ma/samples/requests/MetadataKeyRequest-Ping-2.xml

Added: trunk/geant2-java-sql-ma/samples/requests/SetupDataRequest-Ping-2.xml


  • perfsonar: r4936 - in trunk/geant2-java-sql-ma: conf samples/requests, svnlog, 02/03/2009

Archive powered by MHonArc 2.6.16.

Top of Page