perfsonar development work

Author: fernandes
Date: 2007-12-12 21:14:11 -0500 (Wed, 12 Dec 2007)
New Revision: 3119

Added:
   
branches/sql-ma-clmp-changes/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/BwctlResponseGenerator.java
   
branches/sql-ma-clmp-changes/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/PingResponseGenerator.java
   
branches/sql-ma-clmp-changes/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/BwctlStoreRequestProcess.java
   
branches/sql-ma-clmp-changes/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/PingStoreRequestProcess.java
   
branches/sql-ma-clmp-changes/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/MeasurementArchiveStoreKeyRequest.java
   
branches/sql-ma-clmp-changes/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/BwctlQueryGenerator.java
   
branches/sql-ma-clmp-changes/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/PingQueryGenerator.java
Modified:
   
branches/sql-ma-clmp-changes/geant2_java-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
   
branches/sql-ma-clmp-changes/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
   
branches/sql-ma-clmp-changes/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/OwampResponseGenerator.java
   
branches/sql-ma-clmp-changes/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/OwampStoreRequestProcess.java
   
branches/sql-ma-clmp-changes/perfsonar_base/src/main/java/org/perfsonar/service/base/engine/ActionType.java
   
branches/sql-ma-clmp-changes/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/OwampQueryGenerator.java
Log:


Modified: 
branches/sql-ma-clmp-changes/geant2_java-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
===================================================================
--- 
branches/sql-ma-clmp-changes/geant2_java-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
  2007-12-12 14:49:37 UTC (rev 3118)
+++ 
branches/sql-ma-clmp-changes/geant2_java-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
  2007-12-13 02:14:11 UTC (rev 3119)
@@ -164,7 +164,7 @@
 
     }
 
-
+    
     /**
      *  Method to accept requests for action. It implements 
      *  the method definition in ServiceEngine Interface. 
@@ -235,6 +235,38 @@
                 response = storeData(request, true);
             }
 
+        } else if (actionType.equals(ActionType.STORE_KEY)) {
+
+            // handle STORE_KEY
+
+            String storeStatus =
+                configuration.getProperty("service.ma.xmldb.db_store");
+            String dbStatus =
+                configuration.getProperty("component.ma.xmldb.db_status");
+
+            if (!storeStatus.trim().equalsIgnoreCase("on")) {
+
+                response = storeData(request, false);
+
+                logger.debug(
+                    "RRDTypeMAServiceEngine.takeAction: "
+                    + "writing data into MA is switched off "
+                    + "(see 'service.ma.xmldb.db_store' property)");
+
+            } else if (!dbStatus.trim().equalsIgnoreCase("on")) {
+
+                response = storeData(request, false);
+
+                logger.debug(
+                    "RRDTypeMAServiceEngine.takeAction: "
+                    + "xmldb is not setup in the configuration "
+                    + "(see 'component.ma.xmldb.db_status' property)");
+
+            } else {
+
+                response = storeKey(request);
+            }
+
         } else if (actionType.equals(ActionType.ECHO)) {
 
             response = getEcho(request);
@@ -886,7 +918,26 @@
     }
 
 
+    /**
+     *  Method used by SQL-MA to store dynamic metadata keys.
+     *
+     *  @throws PerfSONARException
+     */
+    protected Message storeKey(Message request)
+               throws PerfSONARException{
+       
+       Message response = new Message();
 
+        PerfSONARException pex =
+            new PerfSONARException(
+                    "error.request",
+                    "This functionality isn't implemented in RRD-MA yet.");
+
+        ResultCodesUtil.createResultCodeMetadata(response, pex);
+
+        return response;
+    }
+
     //---------------------------------- private methods
 
 

Modified: 
branches/sql-ma-clmp-changes/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
===================================================================
--- 
branches/sql-ma-clmp-changes/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
  2007-12-12 14:49:37 UTC (rev 3118)
+++ 
branches/sql-ma-clmp-changes/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
  2007-12-13 02:14:11 UTC (rev 3119)
@@ -23,6 +23,8 @@
 import 
org.perfsonar.service.measurementArchive.metadataConfig.MetadataConfigurationStorageManager;
 import 
org.perfsonar.service.measurementArchive.rrdType.RRDTypeMAServiceEngine;
 
+import org.perfsonar.service.commons.util.ResultCodesUtil;
+
 /**
  *  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: 
branches/sql-ma-clmp-changes/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/BwctlResponseGenerator.java

Modified: 
branches/sql-ma-clmp-changes/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/OwampResponseGenerator.java
===================================================================
--- 
branches/sql-ma-clmp-changes/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/OwampResponseGenerator.java
    2007-12-12 14:49:37 UTC (rev 3118)
+++ 
branches/sql-ma-clmp-changes/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/OwampResponseGenerator.java
    2007-12-13 02:14:11 UTC (rev 3119)
@@ -9,8 +9,12 @@
 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;
+import org.perfsonar.commons.auxiliary.AuxiliaryComponentManager;
+import org.perfsonar.commons.auxiliary.ComponentNames;
+import org.perfsonar.commons.auxiliary.components.logger.LoggerComponent;
 
+import org.perfsonar.service.commons.exceptions.SystemException;
+
 /**
  *  Creates the response of service for owamp data.
  *
@@ -25,7 +29,7 @@
 
 
 
-    public OwampResponseGenerator() throws PerfSONARException {
+    public OwampResponseGenerator() throws SystemException {
 
        super();
 
@@ -82,6 +86,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: 
branches/sql-ma-clmp-changes/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/PingResponseGenerator.java

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

Modified: 
branches/sql-ma-clmp-changes/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/OwampStoreRequestProcess.java
===================================================================
--- 
branches/sql-ma-clmp-changes/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/OwampStoreRequestProcess.java
  2007-12-12 14:49:37 UTC (rev 3118)
+++ 
branches/sql-ma-clmp-changes/geant2_java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/OwampStoreRequestProcess.java
  2007-12-13 02:14:11 UTC (rev 3119)
@@ -10,7 +10,7 @@
 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;
+import org.perfsonar.service.commons.exceptions.PerfSONARException;
 
 /**
  *  Moves data from nmwg data element into ibatis map structure

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

Modified: 
branches/sql-ma-clmp-changes/perfsonar_base/src/main/java/org/perfsonar/service/base/engine/ActionType.java
===================================================================
--- 
branches/sql-ma-clmp-changes/perfsonar_base/src/main/java/org/perfsonar/service/base/engine/ActionType.java
 2007-12-12 14:49:37 UTC (rev 3118)
+++ 
branches/sql-ma-clmp-changes/perfsonar_base/src/main/java/org/perfsonar/service/base/engine/ActionType.java
 2007-12-13 02:14:11 UTC (rev 3119)
@@ -39,7 +39,12 @@
     public static final String STORE_DATA = "STORE_DATA";
 
 
-
+    /**
+     *  Action type to store keys
+     */
+    public static final String STORE_KEY = "STORE_KEY";
+    
+    
     // --------------------------------------------- Lookup Service Actions
 
 

Added: 
branches/sql-ma-clmp-changes/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/MeasurementArchiveStoreKeyRequest.java

Added: 
branches/sql-ma-clmp-changes/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/BwctlQueryGenerator.java

Modified: 
branches/sql-ma-clmp-changes/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/OwampQueryGenerator.java
===================================================================
--- 
branches/sql-ma-clmp-changes/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/OwampQueryGenerator.java
   2007-12-12 14:49:37 UTC (rev 3118)
+++ 
branches/sql-ma-clmp-changes/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/OwampQueryGenerator.java
   2007-12-13 02:14:11 UTC (rev 3119)
@@ -1,17 +1,23 @@
 package 
org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator;
 
 
+import org.perfsonar.commons.auxiliary.AuxiliaryComponentManager;
+import org.perfsonar.commons.auxiliary.ComponentNames;
+import org.perfsonar.commons.auxiliary.components.logger.LoggerComponent;
+
+import org.perfsonar.service.commons.exceptions.SystemException;
+import org.perfsonar.service.commons.exceptions.RequestException;
+
 import org.ggf.ns.nmwg.base.v2_0.Message;
-import org.ggf.ns.nmwg.base.v2_0.Metadata;
+import org.ggf.ns.nmwg.base.v2_0.Metadata;       
+import org.ggf.ns.nmwg.base.v2_0.Parameters;
 import org.ggf.ns.nmwg.base.v2_0.Parameter;
-import org.ggf.ns.nmwg.base.v2_0.Parameters;
-import org.ggf.ns.nmwg.tools.owamp.v2_0.Subject;
+
 import org.ggf.ns.nmwg.topology.v2_0.EndPointPair;
+import org.ggf.ns.nmwg.topology.v2_0.Dst;
+import org.ggf.ns.nmwg.topology.v2_0.Src; 
 
-import org.perfsonar.base.auxiliary.AuxiliaryComponentManager;
-import org.perfsonar.base.auxiliary.ComponentNames;
-import org.perfsonar.base.auxiliary.components.logger.LoggerComponent;
-import org.perfsonar.base.exceptions.PerfSONARException;
+import org.ggf.ns.nmwg.tools.owamp.v2_0.Subject;
 
 
 
@@ -39,7 +45,7 @@
 
 
 
-    public OwampQueryGenerator() throws PerfSONARException {
+    public OwampQueryGenerator() throws SystemException {
 
        try {
 
@@ -47,9 +53,9 @@
                AuxiliaryComponentManager.
                        getInstance().
                        getComponent(ComponentNames.LOGGER);
-       } catch (PerfSONARException e) {
+       } catch (SystemException e) {
 
-            throw new PerfSONARException(
+            throw new SystemException(
                        "error.common.no_logger",
                        "OwampQueryGenerator.constructor: "
                        + "Cannot get logger component");
@@ -69,11 +75,11 @@
      *  stored in Message object.
      */
     public String getMetadataQuery(Message query)
-        throws PerfSONARException, PerfSONARException {
+        throws SystemException, RequestException {
 
 
         if (query == null)
-            throw new PerfSONARException(
+            throw new SystemException(
                     "error.ma.query",
                     "OwampQueryGenerator.getMetadataQuery: "
                     + "Input message is null");
@@ -92,7 +98,7 @@
             logger.error(
                        "OwampQueryGenerator.getMetadataQuery: "
                        + "Unable to get metadata from the message");
-            throw new PerfSONARException(
+            throw new RequestException(
                     "error.ma.query",
                     "OwampQueryGenerator.getMetadataQuery: "
                     + "Unable to get metadata from the message; "

Added: 
branches/sql-ma-clmp-changes/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/PingQueryGenerator.java