perfsonar development work

Author: fernandes
Date: 2008-01-30 20:33:54 -0500 (Wed, 30 Jan 2008)
New Revision: 3283

Added:
   trunk/geant2_java-sql-ma/conf/ibatis-SqlMapConfig-clmp-bwctl.template.xml
   trunk/geant2_java-sql-ma/conf/ibatis-SqlMapConfig-clmp-owamp.template.xml
   trunk/geant2_java-sql-ma/conf/ibatis-SqlMapConfig-clmp-ping.template.xml
   trunk/geant2_java-sql-ma/conf/ibatis-clmp-bwctl.xml
   trunk/geant2_java-sql-ma/conf/ibatis-clmp-ping.xml
   
trunk/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/BwctlResponseGenerator.java
   
trunk/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/PingResponseGenerator.java
   
trunk/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/BwctlStoreRequestProcess.java
   
trunk/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/PingStoreRequestProcess.java
Removed:
   trunk/geant2_java-sql-ma/conf/ibatis-SqlMapConfig-clmp-owamp.xml
Modified:
   trunk/geant2_java-sql-ma/
   trunk/geant2_java-sql-ma/conf/eventType-map.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/service.properties.template
   
trunk/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
   
trunk/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/OwampResponseGenerator.java
   
trunk/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/OwampStoreRequestProcess.java
Log:
Modifications for SQL-MA to support OWAMP, BWCTL and Ping namespaces.
SQL-MA now has the MeasurementArchiveStoreKeyRequest functionality which 
allows dynamic addition of metadatas to the metadata configuration database.
Table creation statements for mysql have been added but are commented out.
Ant targets weren't modified yet.


Property changes on: trunk/geant2_java-sql-ma
___________________________________________________________________
Name: svn:ignore
   + .project


Modified: trunk/geant2_java-sql-ma/conf/eventType-map.xml
===================================================================
--- trunk/geant2_java-sql-ma/conf/eventType-map.xml     2008-01-31 01:32:38 
UTC (rev 3282)
+++ trunk/geant2_java-sql-ma/conf/eventType-map.xml     2008-01-31 01:33:54 
UTC (rev 3283)
@@ -43,10 +43,24 @@
     </eventType>
 
     <eventType>
-        <name>owamp</name>
+        <name>http://ggf.org/ns/nmwg/tools/owamp/2.0</name>
         
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.OwampQueryGenerator</metadataQueryGenerator>
         
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.OwampResponseGenerator</responseGenerator>
         
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.OwampStoreRequestProcess</storeRequestProcess>
     </eventType>
 
+    <eventType>
+        <name>http://ggf.org/ns/nmwg/tools/bwctl/2.0</name>
+        
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.BwctlQueryGenerator</metadataQueryGenerator>
+        
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.BwctlResponseGenerator</responseGenerator>
+        
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.BwctlStoreRequestProcess</storeRequestProcess>
+    </eventType>
+    
+    <eventType>
+        <name>http://ggf.org/ns/nmwg/tools/ping/2.0</name>
+        
<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>
+    </eventType>
+
 </eventType-config>

Added: 
trunk/geant2_java-sql-ma/conf/ibatis-SqlMapConfig-clmp-bwctl.template.xml

Copied: 
trunk/geant2_java-sql-ma/conf/ibatis-SqlMapConfig-clmp-owamp.template.xml 
(from rev 3276, 
trunk/geant2_java-sql-ma/conf/ibatis-SqlMapConfig-clmp-owamp.xml)

Deleted: trunk/geant2_java-sql-ma/conf/ibatis-SqlMapConfig-clmp-owamp.xml

Added: 
trunk/geant2_java-sql-ma/conf/ibatis-SqlMapConfig-clmp-ping.template.xml

Added: trunk/geant2_java-sql-ma/conf/ibatis-clmp-bwctl.xml

Added: trunk/geant2_java-sql-ma/conf/ibatis-clmp-ping.xml

Modified: trunk/geant2_java-sql-ma/conf/mysql-sqlma-dbremove.sql
===================================================================
--- trunk/geant2_java-sql-ma/conf/mysql-sqlma-dbremove.sql      2008-01-31 
01:32:38 UTC (rev 3282)
+++ trunk/geant2_java-sql-ma/conf/mysql-sqlma-dbremove.sql      2008-01-31 
01:33:54 UTC (rev 3283)
@@ -37,10 +37,18 @@
        interdomain_link;
 
 
-DROP DATABASE
-    perfsonar_ma;
+#DROP TABLE
+#    clmp_owamp;
 
 
+#DROP TABLE
+#    clmp_bwctl;
+
+
+#DROP TABLE
+#    clmp_ping;
+
+
 DROP USER
     perfsonar_ma;
 

Modified: trunk/geant2_java-sql-ma/conf/mysql-sqlma-dbsetup.sql
===================================================================
--- trunk/geant2_java-sql-ma/conf/mysql-sqlma-dbsetup.sql       2008-01-31 
01:32:38 UTC (rev 3282)
+++ trunk/geant2_java-sql-ma/conf/mysql-sqlma-dbsetup.sql       2008-01-31 
01:33:54 UTC (rev 3283)
@@ -82,7 +82,7 @@
 #
 #CREATE TABLE
 #        clmp_owamp
-#           (metadataId VARCHAR(30)  NOT NULL,
+#           (metadataId VARCHAR(255)  NOT NULL,
 #            receiveSynchronized INT(1)  NULL DEFAULT 0,
 #            receiveTime VARCHAR(21) NOT NULL,
 #            receiveTimeError FLOAT  NULL DEFAULT 0,
@@ -97,6 +97,50 @@
 #
 ############################################################
 
+############### Create table for BWCTL data ################
+#CREATE TABLE `clmp_bwctl` (
+#  `metadataId` varchar(255) NOT NULL,
+#  `intervalEnd` varchar(30) default NULL,
+#  `intervalStart` varchar(30) default NULL,
+#  `intervalUnit` varchar(30) default NULL,
+#  `numBytes` varchar(30) default NULL,
+#  `numBytesUnits` varchar(30) default NULL,
+#  `tcpAdapterType` varchar(30) default NULL,
+#  `tcpMSSSize` varchar(30) default NULL,
+#  `timeType` varchar(30) default NULL,
+#  `timeValue` mediumtext NOT NULL,
+#  `value` mediumtext NOT NULL,
+#  `valueUnits` varchar(30) default NULL,
+#  `tcpMSSUnit` varchar(30) default NULL,
+#  `tcpMTUSize` varchar(30) default NULL,
+#  `tcpMTUUnit` varchar(30) default NULL,
+#  `tcpWindowSize` varchar(30) default NULL,
+#  `tcpWindowUnit` varchar(30) default NULL,
+#  `udpBufferSize` varchar(30) default NULL,
+#  `udpBufferUnit` varchar(30) default NULL,
+#  `udpJitter` varchar(30) default NULL,
+#  `udpJitterUnit` varchar(30) default NULL,
+#  `udpPacketLoss` varchar(30) default NULL,
+#  `udpPacketLossPercentage` varchar(30) default NULL,
+#  `udpPacketSent` varchar(30) default NULL,
+#  `ts` timestamp NOT NULL default CURRENT_TIMESTAMP);
+###########################################################
+
+############### 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());
+############################################################
+
 # insert statements for testing perfsonar_utilization table
 
 INSERT

Modified: trunk/geant2_java-sql-ma/conf/service.properties.template
===================================================================
--- trunk/geant2_java-sql-ma/conf/service.properties.template   2008-01-31 
01:32:38 UTC (rev 3282)
+++ trunk/geant2_java-sql-ma/conf/service.properties.template   2008-01-31 
01:33:54 UTC (rev 3283)
@@ -2,7 +2,7 @@
 service.r.type=ma
 
 
service.ma.class_name=org.perfsonar.service.measurementArchive.sqlType.SQLTypeMAServiceEngine
-service.ma.message_types=MetadataKeyRequest,SetupDataRequest,MeasurementArchiveStoreRequest,EchoRequest,LookupInfoRequest
+service.ma.message_types=MetadataKeyRequest,SetupDataRequest,MeasurementArchiveStoreRequest,MeasurementArchiveStoreKeyRequest,EchoRequest,LookupInfoRequest
 
 
service.ma.base_chaining_mergers=org.perfsonar.service.measurementArchive.rrdType.NMWGInterfaceBaseChaining
 

Modified: 
trunk/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
===================================================================
--- 
trunk/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
 2008-01-31 01:32:38 UTC (rev 3282)
+++ 
trunk/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
 2008-01-31 01:33:54 UTC (rev 3283)
@@ -20,9 +20,11 @@
 
 import org.perfsonar.base.exceptions.PerfSONARException;
 
+import org.perfsonar.service.base.util.ResultCodesUtil;
 import 
org.perfsonar.service.measurementArchive.metadataConfig.MetadataConfigurationStorageManager;
 import 
org.perfsonar.service.measurementArchive.rrdType.RRDTypeMAServiceEngine;
 
+
 /**
  *  Class implementing the Measurement Archive Service Engine which deals 
with
  *  SQL database
@@ -190,7 +192,23 @@
 
     }
 
+    public Message storeKey(Message request) 
+       throws PerfSONARException {
 
+//     logger.debug("SQLTypeMAServiceEngine.storeKey: Request: 
"+request.toString());
+
+       metadataConfig.store(request);
+
+       Message response = new Message();
+       
+       PerfSONARException pex = new PerfSONARException("success.ma.write",
+               "Key has been stored");
+       
+       response = ResultCodesUtil.createResultCodeMetadata(response, pex);
+       
+       return response;
+    }
+    
     protected Key getStoreKey(Metadata metadata)
         throws PerfSONARException {
 

Added: 
trunk/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/BwctlResponseGenerator.java

Modified: 
trunk/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/OwampResponseGenerator.java
===================================================================
--- 
trunk/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/OwampResponseGenerator.java
   2008-01-31 01:32:38 UTC (rev 3282)
+++ 
trunk/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/OwampResponseGenerator.java
   2008-01-31 01:33:54 UTC (rev 3283)
@@ -2,13 +2,12 @@
 
 
 import java.util.Collection;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.Date;
 
 import org.ggf.ns.nmwg.base.v2_0.Data;
 import org.ggf.ns.nmwg.tools.owamp.v2_0.Datum;
-
 import org.perfsonar.base.exceptions.PerfSONARException;
 
 /**
@@ -82,6 +81,9 @@
                    else if (column.equals("timeType")) 
datum.setTimeType(strValue);
                    else if (column.equals("timeValue")) 
datum.setTimeValue(strValue);
  
+                   //logger.debug("SQLStorageManager.fetch: "
+                      //  + "column: " + column + ", value: " + strValue );
+
                 }
 
             }

Added: 
trunk/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/PingResponseGenerator.java

Added: 
trunk/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/BwctlStoreRequestProcess.java

Modified: 
trunk/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/OwampStoreRequestProcess.java
===================================================================
--- 
trunk/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/OwampStoreRequestProcess.java
 2008-01-31 01:32:38 UTC (rev 3282)
+++ 
trunk/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/OwampStoreRequestProcess.java
 2008-01-31 01:33:54 UTC (rev 3283)
@@ -9,7 +9,6 @@
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
 import org.ggf.ns.nmwg.tools.owamp.v2_0.Datum;
-
 import org.perfsonar.base.exceptions.PerfSONARException;
 
 /**

Added: 
trunk/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/PingStoreRequestProcess.java