perfsonar development work

Author: dante.delvaux
Date: 2013-02-28 19:13:24 +0000 (Thu, 28 Feb 2013)
New Revision: 6172

Added:
   
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/Discards.java
   
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/Errors.java
   
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/Interface.java
   
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/RRDKey.java
   
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/RRDSelect.java
   
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/Utilization.java
Modified:
   trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/sbin/nmwg-sql-converter
Log:
RRD MA with psBase3: first implementation of the RRD MA model

Modified: 
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/sbin/nmwg-sql-converter
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/sbin/nmwg-sql-converter  
  2013-02-26 19:03:45 UTC (rev 6171)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/sbin/nmwg-sql-converter  
  2013-02-28 19:13:24 UTC (rev 6172)
@@ -1,3 +1,7 @@
 #!/bin/sh
+# This script converts an RRD MA metadata from XML syntax to SQL syntax.
+# It is intended to be used when migrating RRD MA from the 3.3 series
+# (with eXist DB backend) to 3.4 series (with MySQL backend).
+# This script should only be run once.
 
 java -jar 
/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/lib/nmwg-sql-converter-${version.nmwg-sql-converter}-jar-with-dependencies.jar
 "$@"

Added: 
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/Discards.java
===================================================================
--- 
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/Discards.java
                            (rev 0)
+++ 
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/Discards.java
    2013-02-28 19:13:24 UTC (rev 6172)
@@ -0,0 +1,30 @@
+package net.geant.perfsonar.ma.rrd;
+
+/**
+ * @author Antoine Delvaux - 

+ *
+ */
+public class Discards {
+    /**
+     * Fields of eventType 
"http://ggf.org/ns/nmwg/characteristic/discards/2.0/";
+     * @see not sure an schema exist
+     */
+
+    
+    public Interface iface;
+
+    /**
+     * All Getters
+     */
+    public Interface getIface() {
+        return iface;
+    }
+
+    /**
+     * All Setters
+     */
+    public void setIface(Interface iface) {
+        this.iface = iface;
+    }
+
+}


Property changes on: 
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/Discards.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Added: 
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/Errors.java
===================================================================
--- 
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/Errors.java
                              (rev 0)
+++ 
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/Errors.java
      2013-02-28 19:13:24 UTC (rev 6172)
@@ -0,0 +1,30 @@
+package net.geant.perfsonar.ma.rrd;
+
+/**
+ * @author Antoine Delvaux - 

+ *
+ */
+public class Errors {
+    /**
+     * Fields of eventType 
"http://ggf.org/ns/nmwg/characteristic/errors/2.0/";
+     * @see 
http://anonsvn.internet2.edu/svn/nmwg/trunk/nmwg/schema/rnc/errors.rnc
+     */
+
+    
+    public Interface iface;
+
+    /**
+     * All Getters
+     */
+    public Interface getIface() {
+        return iface;
+    }
+
+    /**
+     * All Setters
+     */
+    public void setIface(Interface iface) {
+        this.iface = iface;
+    }
+
+}


Property changes on: 
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/Errors.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Added: 
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/Interface.java
===================================================================
--- 
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/Interface.java
                           (rev 0)
+++ 
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/Interface.java
   2013-02-28 19:13:24 UTC (rev 6172)
@@ -0,0 +1,127 @@
+package net.geant.perfsonar.ma.rrd;
+
+import java.net.InetAddress;
+
+import net.geant.perfsonar.annotations.XPath;
+
+/**
+ * @author Antoine Delvaux - 

+ *
+ */
+public class Interface {
+    /**
+     * Fields of <nmwgt:interface> object from 
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
+     * @see 
http://anonsvn.internet2.edu/svn/nmwg/trunk/nmwg/schema/rnc/nmtopo.rnc
+     */
+    private InetAddress ipAddress;
+    private String hostName;
+    private String ifName;
+    private String ifDescription;
+    private InetAddress ifAddress;
+    private Integer ifIndex;
+    private String type;
+    private String direction;
+    private String authRealm;
+    private String classOfService;
+    private String capacity;
+
+    // Any need for this?
+    private String localName = "interface";
+    private String uri = "http://ggf.org/ns/nmwg/topology/2.0/";;
+    private String qName = "nmwgtopo:interface";   
+    private String prefix = "nmwgtopo";
+    
+    /**
+     * All Getters
+     */
+    public InetAddress getIpAddress() {
+        return ipAddress;
+    }
+    public String getHostName() {
+        return hostName;
+    }
+    public String getIfName() {
+        return ifName;
+    }
+    public String getIfDescription() {
+        return ifDescription;
+    }
+    public InetAddress getIfAddress() {
+        return ifAddress;
+    }
+    public Integer getIfIndex() {
+        return ifIndex;
+    }
+    public String getType() {
+        return type;
+    }
+    public String getDirection() {
+        return direction;
+    }
+    public String getAuthRealm() {
+        return authRealm;
+    }
+    public String getClassOfService() {
+        return classOfService;
+    }
+    public String getCapacity() {
+        return capacity;
+    }
+    
+    /**
+     * All Setters with their @XPath annotations
+     */
+    
+    public void setIpAddress(InetAddress ipAddress) {
+        this.ipAddress = ipAddress;
+    }
+
+    @XPath(xpath = 
"nmwg:message/nmwg:metadata/*/nmwgt:interface/nmwgt:hostName/text()")
+    public void setHostName(String hostName) {
+        this.hostName = hostName;
+    }
+
+    @XPath(xpath = 
"nmwg:message/nmwg:metadata/*/nmwgt:interface/nmwgt:ifName/text()")
+    public void setIfName(String ifName) {
+        this.ifName = ifName;
+    }
+
+    @XPath(xpath = 
"nmwg:message/nmwg:metadata/*/nmwgt:interface/nmwgt:ifDescription/text()")
+    public void setIfDescription(String ifDescription) {
+        this.ifDescription = ifDescription;
+    }
+
+    public void setIfAddress(InetAddress ifAddress) {
+        this.ifAddress = ifAddress;
+    }
+
+    public void setIfIndex(Integer ifIndex) {
+        this.ifIndex = ifIndex;
+    }
+
+    @XPath(xpath = 
"nmwg:message/nmwg:metadata/*/nmwgt:interface/nmwgt:type/text()")
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    @XPath(xpath = 
"nmwg:message/nmwg:metadata/*/nmwgt:interface/nmwgt:direction/text()")
+    public void setDirection(String direction) {
+        this.direction = direction;
+    }
+
+    @XPath(xpath = 
"nmwg:message/nmwg:metadata/*/nmwgt:interface/nmwgt:authRealm/text()")
+    public void setAuthRealm(String authRealm) {
+        this.authRealm = authRealm;
+    }
+
+    @XPath(xpath = 
"nmwg:message/nmwg:metadata/*/nmwgt:interface/nmwgt:classOfService/text()")
+    public void setClassOfService(String classOfService) {
+        this.classOfService = classOfService;
+    }
+
+    @XPath(xpath = 
"nmwg:message/nmwg:metadata/*/nmwgt:interface/nmwgt:capacity/text()")
+    public void setCapacity(String capacity) {
+        this.capacity = capacity;
+    }
+    
+}


Property changes on: 
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/Interface.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Added: 
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/RRDKey.java
===================================================================
--- 
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/RRDKey.java
                              (rev 0)
+++ 
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/RRDKey.java
      2013-02-28 19:13:24 UTC (rev 6172)
@@ -0,0 +1,58 @@
+package net.geant.perfsonar.ma.rrd;
+
+import net.geant.perfsonar.annotations.XPath;
+
+/**
+ * @author Antoine Delvaux - 

+ *
+ */
+public class RRDKey {
+
+    public String file;
+    public String dataSource;
+    public String valueUnits;
+    public String eventType;
+    
+    
+    /**
+     * All getters
+     */
+    public String getFile() {
+        return file;
+    }
+    public String getDataSource() {
+        return dataSource;
+    }
+    public String getValueUnits() {
+        return valueUnits;
+    }
+    public String getEventType() {
+        return eventType;
+    }
+    
+    
+    /**
+     * All setters with their @XPath annotations
+     */
+
+    @XPath(xpath = 
"nmwg:message/nmwg:metadata/nmwg:key/nmwg:parameters/nmwg:parameter[name=file]/text()")
+    public void setFile(String file) {
+        this.file = file;
+    }
+
+    @XPath(xpath = 
"nmwg:message/nmwg:metadata/nmwg:key/nmwg:parameters/nmwg:parameter[name=dataSource]/text()")
+    public void setDataSource(String dataSource) {
+        this.dataSource = dataSource;
+    }
+
+    @XPath(xpath = 
"nmwg:message/nmwg:metadata/nmwg:key/nmwg:parameters/nmwg:parameter[name=valueUnits]/text()")
+    public void setValueUnits(String valueUnits) {
+        this.valueUnits = valueUnits;
+    }
+
+    @XPath(xpath = 
"nmwg:message/nmwg:metadata/nmwg:key/nmwg:parameters/nmwg:parameter[name=eventType]/text()")
+    public void setEventType(String eventType) {
+        this.eventType = eventType;
+    }
+    
+}


Property changes on: 
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/RRDKey.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Added: 
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/RRDSelect.java
===================================================================
--- 
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/RRDSelect.java
                           (rev 0)
+++ 
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/RRDSelect.java
   2013-02-28 19:13:24 UTC (rev 6172)
@@ -0,0 +1,61 @@
+package net.geant.perfsonar.ma.rrd;
+
+import net.geant.perfsonar.annotations.XPath;
+
+/**
+ * @author Antoine Delvaux - 

+ *
+ */
+public class RRDSelect {
+    /**
+     * Fields of eventType "http://ggf.org/ns/nmwg/ops/select/2.0"; for RRD MA
+     * @see not sure a proper schema exist
+     */
+
+    public String startTime;
+    public String endTime;
+    public String consolidationFunction;
+    public String resolution;
+    
+    
+    /**
+     * All getters
+     */
+    public String getStartTime() {
+        return startTime;
+    }
+    public String getEndTime() {
+        return endTime;
+    }
+    public String getConsolidationFunction() {
+        return consolidationFunction;
+    }
+    public String getResolution() {
+        return resolution;
+    }
+    
+    
+    /**
+     * All setters with their @XPath annotations
+     */
+
+    @XPath(xpath = 
"nmwg:message/nmwg:metadata/select:parameters/nmwg:parameter[name=startTime]/text()")
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    @XPath(xpath = 
"nmwg:message/nmwg:metadata/select:parameters/nmwg:parameter[name=endTime]/text()")
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+    
+    @XPath(xpath = 
"nmwg:message/nmwg:metadata/select:parameters/nmwg:parameter[name=consolidationFunction]/text()")
+    public void setConsolidationFunction(String consolidationFunction) {
+        this.consolidationFunction = consolidationFunction;
+    }
+    
+    @XPath(xpath = 
"nmwg:message/nmwg:metadata/select:parameters/nmwg:parameter[name=resolution]/text()")
+    public void setResolution(String resolution) {
+        this.resolution = resolution;
+    }
+}


Property changes on: 
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/RRDSelect.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Added: 
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/Utilization.java
===================================================================
--- 
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/Utilization.java
                         (rev 0)
+++ 
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/Utilization.java
 2013-02-28 19:13:24 UTC (rev 6172)
@@ -0,0 +1,30 @@
+package net.geant.perfsonar.ma.rrd;
+
+/**
+ * @author Antoine Delvaux - 

+ *
+ */
+public class Utilization {
+    /**
+     * Fields of eventType 
"http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";
+     * @see 
http://anonsvn.internet2.edu/svn/nmwg/trunk/nmwg/schema/rnc/utilization.rnc
+     */
+    
+    
+    public Interface iface;
+
+    /**
+     * All Getters
+     */
+    public Interface getIface() {
+        return iface;
+    }
+
+    /**
+     * All Setters
+     */
+    public void setIface(Interface iface) {
+        this.iface = iface;
+    }
+
+}


Property changes on: 
trunk/perfsonar-java-rrd-ma-base3/src/main/java/net/geant/perfsonar/ma/rrd/Utilization.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain