perfsonar-dev - perfsonar: r2727 - in branches/new-structure/trunk/geant2_java-sql-ma: ant ant/ibatis-discards-jdbc-config conf samples/requests src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch src/main/java/org/perfsonar/service/measurementArchive/sqlType/store
Subject: perfsonar development work
List archive
perfsonar: r2727 - in branches/new-structure/trunk/geant2_java-sql-ma: ant ant/ibatis-discards-jdbc-config conf samples/requests src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch src/main/java/org/perfsonar/service/measurementArchive/sqlType/store
Chronological Thread
- From:
- To:
- Subject: perfsonar: r2727 - in branches/new-structure/trunk/geant2_java-sql-ma: ant ant/ibatis-discards-jdbc-config conf samples/requests src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch src/main/java/org/perfsonar/service/measurementArchive/sqlType/store
- Date: Mon, 27 Aug 2007 06:50:11 -0400
Author: roman
Date: 2007-08-27 06:50:10 -0400 (Mon, 27 Aug 2007)
New Revision: 2727
Added:
branches/new-structure/trunk/geant2_java-sql-ma/ant/ibatis-discards-jdbc-config/
branches/new-structure/trunk/geant2_java-sql-ma/ant/ibatis-discards-jdbc-config/ibatis-jdbc-config-targets.xml
branches/new-structure/trunk/geant2_java-sql-ma/conf/ibatis-SqlMapConfig-discards.template.xml
branches/new-structure/trunk/geant2_java-sql-ma/conf/ibatis-discards.xml
branches/new-structure/trunk/geant2_java-sql-ma/conf/sql-database_discards_TEST.xml
branches/new-structure/trunk/geant2_java-sql-ma/samples/requests/MetadataKeyRequest-Discards-1.xml
branches/new-structure/trunk/geant2_java-sql-ma/samples/requests/SetupDataRequest-Discards-1.xml
branches/new-structure/trunk/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/DiscardsResponseGenerator.java
branches/new-structure/trunk/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/DiscardsStoreRequestProcess.java
Modified:
branches/new-structure/trunk/geant2_java-sql-ma/ant/test-targets.xml
branches/new-structure/trunk/geant2_java-sql-ma/conf/eventType-map.xml
branches/new-structure/trunk/geant2_java-sql-ma/conf/mysql-sqlma-dbremove.sql
branches/new-structure/trunk/geant2_java-sql-ma/conf/mysql-sqlma-dbsetup.sql
branches/new-structure/trunk/geant2_java-sql-ma/conf/objects.config
branches/new-structure/trunk/geant2_java-sql-ma/conf/psql-sqlma-dbremove.sql
branches/new-structure/trunk/geant2_java-sql-ma/conf/psql-sqlma-dbsetup.sql
branches/new-structure/trunk/geant2_java-sql-ma/conf/sql-database_TEST.xml
Log:
support of discards data
Added:
branches/new-structure/trunk/geant2_java-sql-ma/ant/ibatis-discards-jdbc-config/ibatis-jdbc-config-targets.xml
Property changes on:
branches/new-structure/trunk/geant2_java-sql-ma/ant/ibatis-discards-jdbc-config/ibatis-jdbc-config-targets.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: branches/new-structure/trunk/geant2_java-sql-ma/ant/test-targets.xml
===================================================================
--- branches/new-structure/trunk/geant2_java-sql-ma/ant/test-targets.xml
2007-08-24 14:21:36 UTC (rev 2726)
+++ branches/new-structure/trunk/geant2_java-sql-ma/ant/test-targets.xml
2007-08-27 10:50:10 UTC (rev 2727)
@@ -143,6 +143,32 @@
</target>
+ <!-- discards -->
+
+ <target name="discards-metadata-key-fetch-test-1"
+ depends="init-test">
+ <java classname="org.perfsonar.client.testHarness.SOAPClient"
+ classpathref="classpath"
+ fork="true">
+ <arg value="${ma.local}"/>
+ <arg
value="${basedir}/samples/requests/MetadataKeyRequest-Discards-1.xml"/>
+ <arg value="${basedir}/samples/requests/response-10.xml"/>
+ </java>
+ </target>
+
+
+ <target name="discards-data-fetch-test-1"
+ depends="init-test">
+ <java classname="org.perfsonar.client.testHarness.SOAPClient"
+ classpathref="classpath"
+ fork="true">
+ <arg value="${ma.local}"/>
+ <arg
value="${basedir}/samples/requests/SetupDataRequest-Discards-1.xml"/>
+ <arg value="${basedir}/samples/requests/response-11.xml"/>
+ </java>
+ </target>
+
+
<!-- L2 path status -->
<target name="L2status-metadata-key-fetch-test-1"
@@ -152,7 +178,7 @@
fork="true">
<arg value="${ma.local}"/>
<arg
value="${basedir}/samples/requests/MetadataKeyRequest-L2Status-1.xml"/>
- <arg value="${basedir}/samples/requests/response-10.xml"/>
+ <arg value="${basedir}/samples/requests/response-12.xml"/>
</java>
</target>
@@ -164,7 +190,7 @@
fork="true">
<arg value="${ma.local}"/>
<arg
value="${basedir}/samples/requests/MetadataKeyRequest-L2Status-2.xml"/>
- <arg value="${basedir}/samples/requests/response-11.xml"/>
+ <arg value="${basedir}/samples/requests/response-13.xml"/>
</java>
</target>
@@ -176,7 +202,7 @@
fork="true">
<arg value="${ma.local}"/>
<arg
value="${basedir}/samples/requests/MetadataKeyRequest-L2Status-3.xml"/>
- <arg value="${basedir}/samples/requests/response-12.xml"/>
+ <arg value="${basedir}/samples/requests/response-14.xml"/>
</java>
</target>
@@ -188,7 +214,7 @@
fork="true">
<arg value="${ma.local}"/>
<arg
value="${basedir}/samples/requests/SetupDataRequest-L2Status-1.xml"/>
- <arg value="${basedir}/samples/requests/response-13.xml"/>
+ <arg value="${basedir}/samples/requests/response-15.xml"/>
</java>
</target>
@@ -200,7 +226,7 @@
fork="true">
<arg value="${ma.local}"/>
<arg
value="${basedir}/samples/requests/SetupDataRequest-L2Status-2.xml"/>
- <arg value="${basedir}/samples/requests/response-14.xml"/>
+ <arg value="${basedir}/samples/requests/response-16.xml"/>
</java>
</target>
@@ -212,7 +238,7 @@
fork="true">
<arg value="${ma.local}"/>
<arg
value="${basedir}/samples/requests/SetupDataRequest-L2Status-3.xml"/>
- <arg value="${basedir}/samples/requests/response-15.xml"/>
+ <arg value="${basedir}/samples/requests/response-17.xml"/>
</java>
</target>
@@ -224,7 +250,7 @@
fork="true">
<arg value="${ma.local}"/>
<arg
value="${basedir}/samples/requests/SetupDataRequest-L2Status-4.xml"/>
- <arg value="${basedir}/samples/requests/response-16.xml"/>
+ <arg value="${basedir}/samples/requests/response-18.xml"/>
</java>
</target>
@@ -236,7 +262,7 @@
fork="true">
<arg value="${ma.local}"/>
<arg
value="${basedir}/samples/requests/SetupDataRequest-L2Status-5.xml"/>
- <arg value="${basedir}/samples/requests/response-17.xml"/>
+ <arg value="${basedir}/samples/requests/response-19.xml"/>
</java>
</target>
@@ -248,7 +274,7 @@
fork="true">
<arg value="${ma.local}"/>
<arg
value="${basedir}/samples/requests/SetupDataRequest-L2Status-6.xml"/>
- <arg value="${basedir}/samples/requests/response-18.xml"/>
+ <arg value="${basedir}/samples/requests/response-20.xml"/>
</java>
</target>
@@ -260,7 +286,7 @@
fork="true">
<arg value="${ma.local}"/>
<arg
value="${basedir}/samples/requests/MeasurementArchiveStore-L2status-Req-1.xml"/>
- <arg value="${basedir}/samples/requests/response-18.xml"/>
+ <arg value="${basedir}/samples/requests/response-21.xml"/>
</java>
</target>
@@ -282,6 +308,9 @@
<antcall target="errors-metadata-key-fetch-test-1"/>
<antcall target="errors-data-fetch-test-1"/>
+ <antcall target="discards-metadata-key-fetch-test-1"/>
+ <antcall target="discards-data-fetch-test-1"/>
+
<antcall target="L2status-metadata-key-fetch-test-1"/>
<antcall target="L2status-metadata-key-fetch-test-2"/>
<antcall target="L2status-metadata-key-fetch-test-3"/>
Modified:
branches/new-structure/trunk/geant2_java-sql-ma/conf/eventType-map.xml
===================================================================
--- branches/new-structure/trunk/geant2_java-sql-ma/conf/eventType-map.xml
2007-08-24 14:21:36 UTC (rev 2726)
+++ branches/new-structure/trunk/geant2_java-sql-ma/conf/eventType-map.xml
2007-08-27 10:50:10 UTC (rev 2727)
@@ -22,6 +22,13 @@
</eventType>
<eventType>
+ <name>http://ggf.org/ns/nmwg/characteristic/discards/2.0</name>
+
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.DiscardsQueryGenerator</metadataQueryGenerator>
+
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.DiscardsResponseGenerator</responseGenerator>
+
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.DiscardsStoreRequestProcess</storeRequestProcess>
+ </eventType>
+
+ <eventType>
<name>http://ggf.org/ns/nmwg/topology/l2/3.0/link/status</name>
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.L2PathStatusQueryGenerator</metadataQueryGenerator>
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.L2PathStatusResponseGenerator</responseGenerator>
Added:
branches/new-structure/trunk/geant2_java-sql-ma/conf/ibatis-SqlMapConfig-discards.template.xml
Property changes on:
branches/new-structure/trunk/geant2_java-sql-ma/conf/ibatis-SqlMapConfig-discards.template.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added:
branches/new-structure/trunk/geant2_java-sql-ma/conf/ibatis-discards.xml
Property changes on:
branches/new-structure/trunk/geant2_java-sql-ma/conf/ibatis-discards.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified:
branches/new-structure/trunk/geant2_java-sql-ma/conf/mysql-sqlma-dbremove.sql
===================================================================
---
branches/new-structure/trunk/geant2_java-sql-ma/conf/mysql-sqlma-dbremove.sql
2007-08-24 14:21:36 UTC (rev 2726)
+++
branches/new-structure/trunk/geant2_java-sql-ma/conf/mysql-sqlma-dbremove.sql
2007-08-27 10:50:10 UTC (rev 2727)
@@ -26,6 +26,10 @@
DROP TABLE
+ perfsonar_discards;
+
+
+DROP TABLE
domain_link;
Modified:
branches/new-structure/trunk/geant2_java-sql-ma/conf/mysql-sqlma-dbsetup.sql
===================================================================
---
branches/new-structure/trunk/geant2_java-sql-ma/conf/mysql-sqlma-dbsetup.sql
2007-08-24 14:21:36 UTC (rev 2726)
+++
branches/new-structure/trunk/geant2_java-sql-ma/conf/mysql-sqlma-dbsetup.sql
2007-08-27 10:50:10 UTC (rev 2727)
@@ -50,6 +50,15 @@
CREATE TABLE
+ perfsonar_discards
+ (metadataId VARCHAR(30) NOT NULL,
+ value FLOAT (16,4) NOT NULL,
+ valueUnits VARCHAR(30) NULL,
+ timeValue INT NOT NULL,
+ ts TIMESTAMP DEFAULT NOW());
+
+
+CREATE TABLE
domain_link
(id VARCHAR(255) NOT NULL,
time TIMESTAMP DEFAULT NOW(),
@@ -134,6 +143,28 @@
+# insert statements for testing perfsonar_discards table
+
+INSERT
+ INTO perfsonar_discards
+ VALUES ('meta1-discards-test', 1, 'Dps', 1187948870, default);
+
+INSERT
+ INTO
+ perfsonar_discards
+ VALUES ('meta1-discards-test', 0, 'Dps', 1187948875, default);
+
+INSERT
+ INTO
+ perfsonar_discards
+ VALUES ('meta1-discards-test', 4, 'Dps', 1187948882, default);
+
+INSERT
+ INTO
+ perfsonar_discards
+ VALUES ('meta1-discards-test', 2, 'Dps', 1187948888, default);
+
+
# insert statements for testing domain_link table
INSERT
Modified: branches/new-structure/trunk/geant2_java-sql-ma/conf/objects.config
===================================================================
--- branches/new-structure/trunk/geant2_java-sql-ma/conf/objects.config
2007-08-24 14:21:36 UTC (rev 2726)
+++ branches/new-structure/trunk/geant2_java-sql-ma/conf/objects.config
2007-08-27 10:50:10 UTC (rev 2727)
@@ -15,6 +15,9 @@
http://ggf.org/ns/nmwg/characteristic/errors/2.0/subject/
org.ggf.ns.nmwg.characteristic.errors.v2_0.Subject
http://ggf.org/ns/nmwg/characteristic/errors/2.0/parameters/
org.ggf.ns.nmwg.characteristic.errors.v2_0.Parameters
http://ggf.org/ns/nmwg/characteristic/errors/2.0/datum/
org.ggf.ns.nmwg.characteristic.errors.v2_0.Datum
+http://ggf.org/ns/nmwg/characteristic/discards/2.0/subject/
org.ggf.ns.nmwg.characteristic.discards.v2_0.Subject
+http://ggf.org/ns/nmwg/characteristic/discards/2.0/parameters/
org.ggf.ns.nmwg.characteristic.discards.v2_0.Parameters
+http://ggf.org/ns/nmwg/characteristic/discards/2.0/datum/
org.ggf.ns.nmwg.characteristic.discards.v2_0.Datum
http://ggf.org/ns/nmwg/event/status/base/2.0/stateOper/
org.ggf.ns.nmwg.event.status.base.v2_0.StateOper
http://ggf.org/ns/nmwg/event/status/base/2.0/stateAdmin/
org.ggf.ns.nmwg.event.status.base.v2_0.StateAdmin
http://ggf.org/ns/nmwg/event/status/base/2.0/datum/
org.ggf.ns.nmwg.event.status.base.v2_0.Datum
Modified:
branches/new-structure/trunk/geant2_java-sql-ma/conf/psql-sqlma-dbremove.sql
===================================================================
---
branches/new-structure/trunk/geant2_java-sql-ma/conf/psql-sqlma-dbremove.sql
2007-08-24 14:21:36 UTC (rev 2726)
+++
branches/new-structure/trunk/geant2_java-sql-ma/conf/psql-sqlma-dbremove.sql
2007-08-27 10:50:10 UTC (rev 2727)
@@ -21,6 +21,8 @@
drop table perfsonar_errors;
+drop table perfsonar_discards;
+
drop table domain_link;
drop table interdomain_link;
Modified:
branches/new-structure/trunk/geant2_java-sql-ma/conf/psql-sqlma-dbsetup.sql
===================================================================
---
branches/new-structure/trunk/geant2_java-sql-ma/conf/psql-sqlma-dbsetup.sql
2007-08-24 14:21:36 UTC (rev 2726)
+++
branches/new-structure/trunk/geant2_java-sql-ma/conf/psql-sqlma-dbsetup.sql
2007-08-27 10:50:10 UTC (rev 2727)
@@ -64,6 +64,15 @@
);
create table
+ perfsonar_discards
+ (metadataId varchar(30) not null,
+ value double precision not null,
+ valueUnits varchar(30) null,
+ timeValue integer not null,
+ ts timestamp default now()
+ );
+
+create table
domain_link
(id varchar(255) not null,
time timestamp default now(),
@@ -114,13 +123,32 @@
insert
into perfsonar_errors
- values ('meta1--errors-test', 4, 'Eps', 1187948882);
+ values ('meta1-errors-test', 4, 'Eps', 1187948882);
insert
into perfsonar_errors
values ('meta1-errors-test', 2, 'Eps', 1187948888);
+-- insert statements for testing perfsonar_discards table
+
+insert
+ into perfsonar_discards
+ values ('meta1-discards-test', 1, 'Dps', 1187948870);
+
+insert
+ into perfsonar_discards
+ values ('meta1-discards-test', 0, 'Dps', 1187948875);
+
+insert
+ into perfsonar_discards
+ values ('meta1-discards-test', 4, 'Dps', 1187948882);
+
+insert
+ into perfsonar_discards
+ values ('meta1-discards-test', 2, 'Dps', 1187948888);
+
+
-- insert statements for testing domain_link table
insert
Modified:
branches/new-structure/trunk/geant2_java-sql-ma/conf/sql-database_TEST.xml
===================================================================
---
branches/new-structure/trunk/geant2_java-sql-ma/conf/sql-database_TEST.xml
2007-08-24 14:21:36 UTC (rev 2726)
+++
branches/new-structure/trunk/geant2_java-sql-ma/conf/sql-database_TEST.xml
2007-08-27 10:50:10 UTC (rev 2727)
@@ -8,6 +8,7 @@
xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
xmlns:errors="http://ggf.org/ns/nmwg/characteristic/errors/2.0/";
+ xmlns:discards="http://ggf.org/ns/nmwg/characteristic/discards/2.0/";
xmlns="http://ggf.org/ns/nmwg/base/2.0/";>
@@ -69,6 +70,34 @@
</nmwg:data>
+ <!-- discards metadata section -->
+
+
+ <nmwg:metadata id="meta1-discards-test">
+ <discards:subject id="subj1">
+ <nmwgt:interface>
+ <nmwgt:hostName>test-hostName</nmwgt:hostName>
+ <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
+ <nmwgt:ifName>test-0</nmwgt:ifName>
+ <nmwgt:ifIndex>2</nmwgt:ifIndex>
+ <nmwgt:direction>in</nmwgt:direction>
+ <nmwgt:capacity>1000000000</nmwgt:capacity>
+ </nmwgt:interface>
+ </discards:subject>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/discards/2.0</nmwg:eventType>
+ </nmwg:metadata>
+
+
+ <nmwg:data id="data1-discards-test" metadataIdRef="meta1-discards-test">
+ <nmwg:key>
+ <nmwg:parameters>
+ <nmwg:parameter
name="metadataId">meta1-discards-test</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-discards.xml</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:data>
+
+
<!-- L2 status section -->
Added:
branches/new-structure/trunk/geant2_java-sql-ma/conf/sql-database_discards_TEST.xml
Property changes on:
branches/new-structure/trunk/geant2_java-sql-ma/conf/sql-database_discards_TEST.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added:
branches/new-structure/trunk/geant2_java-sql-ma/samples/requests/MetadataKeyRequest-Discards-1.xml
Property changes on:
branches/new-structure/trunk/geant2_java-sql-ma/samples/requests/MetadataKeyRequest-Discards-1.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added:
branches/new-structure/trunk/geant2_java-sql-ma/samples/requests/SetupDataRequest-Discards-1.xml
Property changes on:
branches/new-structure/trunk/geant2_java-sql-ma/samples/requests/SetupDataRequest-Discards-1.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added:
branches/new-structure/trunk/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/DiscardsResponseGenerator.java
Property changes on:
branches/new-structure/trunk/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/DiscardsResponseGenerator.java
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added:
branches/new-structure/trunk/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/DiscardsStoreRequestProcess.java
Property changes on:
branches/new-structure/trunk/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/DiscardsStoreRequestProcess.java
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
- perfsonar: r2727 - in branches/new-structure/trunk/geant2_java-sql-ma: ant ant/ibatis-discards-jdbc-config conf samples/requests src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch src/main/java/org/perfsonar/service/measurementArchive/sqlType/store, svnlog, 08/27/2007
Archive powered by MHonArc 2.6.16.