perfsonar development work

Author: roman
Date: 2009-02-26 10:49:07 -0500 (Thu, 26 Feb 2009)
New Revision: 4994

Added:
   
branches/new-structure-with-base2/ps-mdm-rrd-ma/samples/requests/MetadataKeyRequest-SNMP-1.xml
   
branches/new-structure-with-base2/ps-mdm-rrd-ma/samples/requests/MetadataKeyResponse-SNMP-1.xml
   
branches/new-structure-with-base2/ps-mdm-rrd-ma/samples/responses/MetadataKeyResponse-Discards-1.xml
   
branches/new-structure-with-base2/ps-mdm-rrd-ma/samples/responses/MetadataKeyResponse-Discards-2.xml
   
branches/new-structure-with-base2/ps-mdm-rrd-ma/samples/responses/MetadataKeyResponse-Errors-1.xml
   
branches/new-structure-with-base2/ps-mdm-rrd-ma/samples/responses/MetadataKeyResponse-Errors-2.xml
   
branches/new-structure-with-base2/ps-mdm-rrd-ma/samples/responses/MetadataKeyResponse-SNMP-1.xml
   
branches/new-structure-with-base2/ps-mdm-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/exist/query/SNMPQueryGenerator.java
Modified:
   branches/new-structure-with-base2/ps-mdm-rrd-ma/conf/configuration-ma.xml
   
branches/new-structure-with-base2/ps-mdm-rrd-ma/samples/metadata_configuration_files/rrd_database_test.xml
Log:
- some example requests and responses added
- snmp event type added



Modified: 
branches/new-structure-with-base2/ps-mdm-rrd-ma/conf/configuration-ma.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-rrd-ma/conf/configuration-ma.xml 
  2009-02-26 14:25:40 UTC (rev 4993)
+++ branches/new-structure-with-base2/ps-mdm-rrd-ma/conf/configuration-ma.xml 
  2009-02-26 15:49:07 UTC (rev 4994)
@@ -77,6 +77,9 @@
         <option name="http://ggf.org/ns/nmwg/characteristic/discards/2.0";
                 
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.DiscardsQueryGenerator"/>
 
+        <option name="http://ggf.org/ns/nmwg/tools/snmp/2.0";
+                
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.SNMPQueryGenerator"/>
+
       </component>
 
       <component name="metadataStorageDAO" 
@@ -171,6 +174,8 @@
       <element name="{http://ggf.org/ns/nmwg/base/2.0/}key"; 
                mapping="org.perfsonar.base2.xml.nmwg.Key"/>
 
+      <element name="{http://ggf.org/ns/nmwg/base/2.0/}subject"; 
+               mapping="org.perfsonar.base2.xml.nmwg.Subject"/>
       <element 
name="{http://ggf.org/ns/nmwg/characteristic/utilization/2.0/}subject"; 
                mapping="org.perfsonar.base2.xml.nmwg.Subject"/>
       <element 
name="{http://ggf.org/ns/nmwg/characteristic/errors/2.0/}subject"; 

Modified: 
branches/new-structure-with-base2/ps-mdm-rrd-ma/samples/metadata_configuration_files/rrd_database_test.xml
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-rrd-ma/samples/metadata_configuration_files/rrd_database_test.xml
  2009-02-26 14:25:40 UTC (rev 4993)
+++ 
branches/new-structure-with-base2/ps-mdm-rrd-ma/samples/metadata_configuration_files/rrd_database_test.xml
  2009-02-26 15:49:07 UTC (rev 4994)
@@ -22,6 +22,7 @@
             </nmwgt:interface>
         </netutil:subject>
         
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
+        
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/snmp/2.0</nmwg:eventType>
         <nmwg:parameters id="params1">
             <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
         </nmwg:parameters>
@@ -35,6 +36,7 @@
                 <nmwg:parameter name="valueUnits">Bps</nmwg:parameter>
 
                 <nmwg:parameter 
name="eventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:parameter>
+                <nmwg:parameter 
name="eventType">http://ggf.org/ns/nmwg/tools/snmp/2.0</nmwg:parameter>
 
                 <!-- those below are optional parameters describing rrd 
file-->
                 <nmwg:parameter name="dataSourceStep">300</nmwg:parameter>
@@ -59,6 +61,7 @@
             </nmwgt:interface>
         </netutil:subject>
         
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
+        
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/snmp/2.0</nmwg:eventType>
         <nmwg:parameters id="params1">
             <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
         </nmwg:parameters>
@@ -72,6 +75,7 @@
                 <nmwg:parameter name="valueUnits">Bps</nmwg:parameter>
 
                 <nmwg:parameter 
name="eventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:parameter>
+                <nmwg:parameter 
name="eventType">http://ggf.org/ns/nmwg/tools/snmp/2.0</nmwg:parameter>
 
                 <!-- those below are optional parameters describing rrd 
file-->
                 <nmwg:parameter name="dataSourceStep">300</nmwg:parameter>
@@ -98,6 +102,7 @@
             </nmwgt:interface>
         </errors:subject>
         
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/errors/2.0</nmwg:eventType>
+        
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/snmp/2.0</nmwg:eventType>
         <nmwg:parameters id="params1">
             <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
         </nmwg:parameters>
@@ -112,6 +117,7 @@
                 <nmwg:parameter name="valueUnits">Eps</nmwg:parameter>
 
                 <nmwg:parameter 
name="eventType">http://ggf.org/ns/nmwg/characteristic/errors/2.0</nmwg:parameter>
+                <nmwg:parameter 
name="eventType">http://ggf.org/ns/nmwg/tools/snmp/2.0</nmwg:parameter>
 
                 <!-- those below are optional parameters describing rrd 
file-->
                 <nmwg:parameter name="dataSourceStep">300</nmwg:parameter>
@@ -138,6 +144,7 @@
             </nmwgt:interface>
         </discards:subject>
         
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/discards/2.0</nmwg:eventType>
+        
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/snmp/2.0</nmwg:eventType>
         <nmwg:parameters id="params1">
             <nmwg:parameter name="keyword">project:geant2</nmwg:parameter>
         </nmwg:parameters>
@@ -152,6 +159,7 @@
                 <nmwg:parameter name="valueUnits">Dps</nmwg:parameter>
 
                 <nmwg:parameter 
name="eventType">http://ggf.org/ns/nmwg/characteristic/discards/2.0</nmwg:parameter>
+                <nmwg:parameter 
name="eventType">http://ggf.org/ns/nmwg/tools/snmp/2.0</nmwg:parameter>
 
                 <!-- those below are optional parameters describing rrd 
file-->
                 <nmwg:parameter name="dataSourceStep">300</nmwg:parameter>

Added: 
branches/new-structure-with-base2/ps-mdm-rrd-ma/samples/requests/MetadataKeyRequest-SNMP-1.xml

Added: 
branches/new-structure-with-base2/ps-mdm-rrd-ma/samples/requests/MetadataKeyResponse-SNMP-1.xml

Added: 
branches/new-structure-with-base2/ps-mdm-rrd-ma/samples/responses/MetadataKeyResponse-Discards-1.xml

Added: 
branches/new-structure-with-base2/ps-mdm-rrd-ma/samples/responses/MetadataKeyResponse-Discards-2.xml

Added: 
branches/new-structure-with-base2/ps-mdm-rrd-ma/samples/responses/MetadataKeyResponse-Errors-1.xml

Added: 
branches/new-structure-with-base2/ps-mdm-rrd-ma/samples/responses/MetadataKeyResponse-Errors-2.xml

Added: 
branches/new-structure-with-base2/ps-mdm-rrd-ma/samples/responses/MetadataKeyResponse-SNMP-1.xml

Added: 
branches/new-structure-with-base2/ps-mdm-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/exist/query/SNMPQueryGenerator.java