Skip to Content.
Sympa Menu

perfsonar-dev - [pS-dev] [GEANT/SA2/ps-java-services] r6257 - in trunk: . nmwg-sql-converter nmwg-sql-converter/src/main/java/org/perfsonar/nmwg/converter/parser nmwg-sql-converter/src/main/java/org/perfsonar/nmwg/logger nmwg-sql-converter/src/test/java/org/perfsonar/nmwg/converter nmwg-sql-converter/src/test/resources parent perfsonar-java-web-admin

Subject: perfsonar development work

List archive

[pS-dev] [GEANT/SA2/ps-java-services] r6257 - in trunk: . nmwg-sql-converter nmwg-sql-converter/src/main/java/org/perfsonar/nmwg/converter/parser nmwg-sql-converter/src/main/java/org/perfsonar/nmwg/logger nmwg-sql-converter/src/test/java/org/perfsonar/nmwg/converter nmwg-sql-converter/src/test/resources parent perfsonar-java-web-admin


Chronological Thread 
  • From:
  • To:
  • Subject: [pS-dev] [GEANT/SA2/ps-java-services] r6257 - in trunk: . nmwg-sql-converter nmwg-sql-converter/src/main/java/org/perfsonar/nmwg/converter/parser nmwg-sql-converter/src/main/java/org/perfsonar/nmwg/logger nmwg-sql-converter/src/test/java/org/perfsonar/nmwg/converter nmwg-sql-converter/src/test/resources parent perfsonar-java-web-admin
  • Date: Thu, 25 Apr 2013 18:57:31 +0100 (BST)
  • Authentication-results: sfpop-ironport07.merit.edu; dkim=neutral (message not signed) header.i=none
Author: dante.delvaux
Date: 2013-04-25 18:57:31 +0100 (Thu, 25 Apr 2013)
New Revision: 6257

Added:
trunk/RELEASES.txt

trunk/nmwg-sql-converter/src/test/java/org/perfsonar/nmwg/converter/OnePairConverterTest.java
trunk/nmwg-sql-converter/src/test/resources/metadata-test5.xml
trunk/nmwg-sql-converter/src/test/resources/metadata-test6.xml
Removed:

trunk/nmwg-sql-converter/src/test/java/org/perfsonar/nmwg/converter/OnePairCovnerterTest.java
Modified:
trunk/BUILDING.txt
trunk/nmwg-sql-converter/
trunk/nmwg-sql-converter/pom.xml

trunk/nmwg-sql-converter/src/main/java/org/perfsonar/nmwg/converter/parser/DataParser.java

trunk/nmwg-sql-converter/src/main/java/org/perfsonar/nmwg/converter/parser/MetadataParser.java

trunk/nmwg-sql-converter/src/main/java/org/perfsonar/nmwg/logger/Logger.java
trunk/parent/
trunk/perfsonar-java-web-admin/
Log:
nmwg-sql-converter: better error reporting in case the XML is badly formated.
See PSSERVICES-669

Modified: trunk/BUILDING.txt
===================================================================
--- trunk/BUILDING.txt 2013-04-24 20:40:01 UTC (rev 6256)
+++ trunk/BUILDING.txt 2013-04-25 17:57:31 UTC (rev 6257)
@@ -125,16 +125,6 @@
tests, findbugs, and pmd can be inspected in Jenkins.


-Releasing perfSONAR
--------------------
-
-There is currently no procedure for branching, tagging, and producing
-non-SNAPSHOT builds. Such a procedure is being developed.
-
-See mvn-settings.xml if you have some issues finding a released parent
-pom.xml
-
-
Legacy stuff
------------


Added: trunk/RELEASES.txt
===================================================================
--- trunk/RELEASES.txt (rev 0)
+++ trunk/RELEASES.txt 2013-04-25 17:57:31 UTC (rev 6257)
@@ -0,0 +1,26 @@
+Releasing perfSONAR
+-------------------
+
+There are 2 parts to releasing the perfSONAR Java Services:
+ - releasing java/maven artifacts
+ - releasing war, deb and rpm packages of a service
+
+Even though all the java artifacts share the same parent and the same
+aggragator (see BUILDING.txt), they're not released together, not even
+at the same time. Each java artifact has its own life cycle.
+
+Releasing a java artifact
+-------------------------
+The perfSONAR java services each contain a few different java artifacts.
+Each of those artifacts have their own release cycles, depending on the
+need for them to change (some are very stable, others less).
+
+Releasing a perfSONAR service
+-----------------------------
+When releasing a full perfSONAR service, this one must depend on released
+java artifacts, no SNAPSHOT package should be used!
+
+Notes
+-----
+See mvn-settings.xml if you have some issues finding a released parent
+pom.xml


Property changes on: trunk/RELEASES.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain


Property changes on: trunk/nmwg-sql-converter
___________________________________________________________________
Modified: svn:ignore
- target

.settings

.project
nmwg-converter.log*

+ target

.settings

.project
nmwg-converter.log*

.classpath


Modified: trunk/nmwg-sql-converter/pom.xml
===================================================================
--- trunk/nmwg-sql-converter/pom.xml 2013-04-24 20:40:01 UTC (rev 6256)
+++ trunk/nmwg-sql-converter/pom.xml 2013-04-25 17:57:31 UTC (rev 6257)
@@ -18,6 +18,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>


Modified:
trunk/nmwg-sql-converter/src/main/java/org/perfsonar/nmwg/converter/parser/DataParser.java
===================================================================
---
trunk/nmwg-sql-converter/src/main/java/org/perfsonar/nmwg/converter/parser/DataParser.java
2013-04-24 20:40:01 UTC (rev 6256)
+++
trunk/nmwg-sql-converter/src/main/java/org/perfsonar/nmwg/converter/parser/DataParser.java
2013-04-25 17:57:31 UTC (rev 6257)
@@ -13,6 +13,7 @@
import org.perfsonar.nmwg.converter.helper.Interfaces;
import org.perfsonar.nmwg.logger.Logger;
import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
import org.xml.sax.helpers.DefaultHandler;
import org.xml.sax.Attributes;

@@ -43,11 +44,15 @@
try {
SAXParser sp = spf.newSAXParser();
sp.parse(file, this);
- }catch(SAXException se) {
+ } catch (SAXParseException se) {
+ logger.error("Error parsing the incoming XML in the data
section, check that input is a valid XML file.", false);
+ logger.error("Line " + se.getLineNumber() + ": " +
se.getMessage(), false);
+ logger.warning("The conversion of the XML configuration file is
probably not complete.", false);
+ } catch(SAXException se) {
se.printStackTrace();
- }catch(ParserConfigurationException pce) {
+ } catch(ParserConfigurationException pce) {
pce.printStackTrace();
- }catch (IOException ie) {
+ } catch (IOException ie) {
ie.printStackTrace();
}


Modified:
trunk/nmwg-sql-converter/src/main/java/org/perfsonar/nmwg/converter/parser/MetadataParser.java
===================================================================
---
trunk/nmwg-sql-converter/src/main/java/org/perfsonar/nmwg/converter/parser/MetadataParser.java
2013-04-24 20:40:01 UTC (rev 6256)
+++
trunk/nmwg-sql-converter/src/main/java/org/perfsonar/nmwg/converter/parser/MetadataParser.java
2013-04-25 17:57:31 UTC (rev 6257)
@@ -12,9 +12,14 @@
import org.perfsonar.nmwg.converter.helper.Interfaces;
import org.perfsonar.nmwg.logger.Logger;
import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
import org.xml.sax.helpers.DefaultHandler;
import org.xml.sax.Attributes;

+/**
+ * Metadata parser: converts XML metadata elements to SQL
+ *
+ */
public class MetadataParser extends DefaultHandler {

private String tempVal ="";
@@ -32,11 +37,15 @@
try {
SAXParser sp = spf.newSAXParser();
sp.parse(file, this);
- }catch(SAXException se) {
+ } catch (SAXParseException se) {
+ logger.error("Error parsing the incoming XML in the
Metadata section, check that input is a valid XML file.", false);
+ logger.error("Line " + se.getLineNumber() + ": " +
se.getMessage(), false);
+ logger.warning("The conversion of the XML configuration file is
probably not complete.", false);
+ } catch(SAXException se) {
se.printStackTrace();
- }catch(ParserConfigurationException pce) {
+ } catch(ParserConfigurationException pce) {
pce.printStackTrace();
- }catch (IOException ie) {
+ } catch (IOException ie) {
ie.printStackTrace();
}


Modified:
trunk/nmwg-sql-converter/src/main/java/org/perfsonar/nmwg/logger/Logger.java
===================================================================
---
trunk/nmwg-sql-converter/src/main/java/org/perfsonar/nmwg/logger/Logger.java
2013-04-24 20:40:01 UTC (rev 6256)
+++
trunk/nmwg-sql-converter/src/main/java/org/perfsonar/nmwg/logger/Logger.java
2013-04-25 17:57:31 UTC (rev 6257)
@@ -30,7 +30,7 @@

public void error(String message, boolean debug){
if(!debug){
- System.out.println("WARNING: " + message);
+ System.out.println("ERROR: " + message);
}else{
debug(message,debug);
}

Copied:
trunk/nmwg-sql-converter/src/test/java/org/perfsonar/nmwg/converter/OnePairConverterTest.java
(from rev 6254,
trunk/nmwg-sql-converter/src/test/java/org/perfsonar/nmwg/converter/OnePairCovnerterTest.java)
===================================================================
---
trunk/nmwg-sql-converter/src/test/java/org/perfsonar/nmwg/converter/OnePairConverterTest.java
(rev 0)
+++
trunk/nmwg-sql-converter/src/test/java/org/perfsonar/nmwg/converter/OnePairConverterTest.java
2013-04-25 17:57:31 UTC (rev 6257)
@@ -0,0 +1,174 @@
+package org.perfsonar.nmwg.converter;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.perfsonar.nmwg.converter.helper.Interfaces;
+import org.perfsonar.nmwg.converter.helper.InterfacesHelper;
+import org.perfsonar.nmwg.converter.parser.DataParser;
+import org.perfsonar.nmwg.converter.parser.MetadataParser;
+import org.perfsonar.nmwg.logger.Logger;
+
+
+public class OnePairConverterTest {
+
+ protected Logger logger;
+
+ private final String TEST_FILE = "metadata-test1.xml";
+ private final String TEST2_FILE = "metadata-test4.xml";
+ private final String TEST5_FILE = "metadata-test5.xml";
+ private final String TEST6_FILE = "metadata-test6.xml";
+
+ @Before
+ public void init(){
+ logger = new Logger();
+ }
+
+ @Test
+ public void shouldListSizeEqualsOne(){
+ //given
+ URL url = getClass().getClassLoader().getResource(TEST_FILE);
+ MetadataParser parser = new MetadataParser();
+
+ //when
+ List<Interfaces> list = parser.parseMetadata(url.getPath(),
false, logger);
+
+ //then
+ assertEquals(1, list.size());
+ }
+
+ @Test
+ public void shouldParseMetadata(){
+ //given
+ Interfaces intf = new Interfaces();
+ intf.setMetadataId("meta1");
+ intf.setHostName("test-hostName");
+ intf.setIfAddress("10.1.2.3");
+ intf.setIfAddressType("ipv4");
+ intf.setIfName("test-0");
+ intf.setIfDescription("test description");
+ intf.setDirection("in");
+ intf.setCapacity("1000BaseT");
+
intf.setEventType("http://ggf.org/ns/nmwg/characteristic/utilization/2.0";);
+ intf.setKeyword("project:geant3");
+
+ URL url = getClass().getClassLoader().getResource(TEST_FILE);
+ MetadataParser parser = new MetadataParser();
+
+ //when
+ List<Interfaces> list = parser.parseMetadata(url.getPath(),
false, logger);
+
+ //then
+ assertEquals(intf.toString(), list.get(0).toString());
+ }
+
+ @Test
+ public void shouldWarnExoticMetadata(){
+ //parse a bogus file
+ URL url = getClass().getClassLoader().getResource(TEST5_FILE);
+ MetadataParser parser = new MetadataParser();
+
+ //when
+ List<Interfaces> list = parser.parseMetadata(url.getPath(), false,
logger);
+
+ //then we must have an empty list and an error must be out
+ logger.info("An error about line 17 should be read above.", false);
+ assertEquals(new ArrayList<Interfaces>(), list);
+ }
+
+ @Test
+ public void shouldParseData(){
+ //given
+ Interfaces intf = new Interfaces();
+ intf.setMetadataId("meta1");
+ intf.setDataId("data1");
+
intf.setFile("/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/samples/rrd/test.rrd");
+ intf.setDataSource("inoctets");
+ intf.setValueUnits("Bps");
+ intf.setDataSourceStep("300");
+ intf.setDataSourceType("ABSOLUTE");
+ intf.setDataSourceHeartbeat("400");
+ intf.setDataSourceMinValue("0");
+ intf.setDataSourceMaxValue("10000000");
+
+ Interfaces intf2 = new Interfaces();
+ intf2.setMetadataId("meta1");
+ List<Interfaces> list = new ArrayList<Interfaces>();
+ list.add(intf2);
+
+ URL url = getClass().getClassLoader().getResource(TEST_FILE);
+ DataParser parser = new DataParser();
+
+ //when
+ list = parser.parseDocument(url.getPath(), list, false,
logger);
+
+ //then
+ assertEquals(intf.toString(), list.get(0).toString());
+ }
+
+ @Test
+ public void shouldWarnExoticData(){
+ //given
+ Interfaces intf = new Interfaces();
+ intf.setMetadataId("meta1");
+ intf.setHostName("test-hostName-1-2-3");
+ intf.setIfAddress("2001:a:b:c::1");
+ intf.setIfAddressType("ipv6");
+ intf.setIfName("test-0");
+ intf.setIfDescription("test description");
+ intf.setDirection("in");
+ intf.setCapacity("1000BaseT");
+
intf.setEventType("http://ggf.org/ns/nmwg/characteristic/utilization/2.0";);
+ intf.setKeyword("project:geant3");
+
+ //parse a bogus file
+ URL url = getClass().getClassLoader().getResource(TEST6_FILE);
+ MetadataParser parser = new MetadataParser();
+
+ //when
+ List<Interfaces> list = parser.parseMetadata(url.getPath(), false,
logger);
+
+ //then an error must be out
+ logger.info("An error about line 33 should be read above.", false);
+ assertEquals(intf.toString(), list.get(0).toString());
+ }
+
+ @Test
+ public void shouldParseMetadataDataPair(){
+ InterfacesHelper ih = new InterfacesHelper();
+ Interfaces intf = ih.createInterfce("meta1", "data1");
+ //given
+
+ URL url = getClass().getClassLoader().getResource(TEST_FILE);
+ Converter converter = new Converter();
+
+ //when
+ List<Interfaces> list =
converter.createInterfacesList(url.getPath(), false);
+
+ //then
+ assertEquals(intf.toString(), list.get(0).toString());
+ }
+
+ @Test
+ public void shouldIgnoreDataWithWrongMetadataIdRef(){
+ //given
+ InterfacesHelper ih = new InterfacesHelper();
+ Interfaces intf = ih.createInterfce("meta1", "data1");
+
+ URL url = getClass().getClassLoader().getResource(TEST2_FILE);
+ Converter converter = new Converter();
+
+ //when
+ List<Interfaces> list =
converter.createInterfacesList(url.getPath(), false);
+
+ //then
+ assertEquals(1, list.size());
+ }
+
+
+}

Deleted:
trunk/nmwg-sql-converter/src/test/java/org/perfsonar/nmwg/converter/OnePairCovnerterTest.java
===================================================================
---
trunk/nmwg-sql-converter/src/test/java/org/perfsonar/nmwg/converter/OnePairCovnerterTest.java
2013-04-24 20:40:01 UTC (rev 6256)
+++
trunk/nmwg-sql-converter/src/test/java/org/perfsonar/nmwg/converter/OnePairCovnerterTest.java
2013-04-25 17:57:31 UTC (rev 6257)
@@ -1,123 +0,0 @@
-package org.perfsonar.nmwg.converter;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-import org.perfsonar.nmwg.converter.helper.Interfaces;
-import org.perfsonar.nmwg.converter.helper.InterfacesHelper;
-import org.perfsonar.nmwg.converter.parser.DataParser;
-import org.perfsonar.nmwg.converter.parser.MetadataParser;
-import org.perfsonar.nmwg.logger.Logger;
-
-
-public class OnePairCovnerterTest {
-
- private final String TEST_FILE = "metadata-test1.xml";
- private final String TEST2_FILE = "metadata-test4.xml";
-
- @Test
- public void shouldListSizeEqualsOne(){
- //given
- URL url = getClass().getClassLoader().getResource(TEST_FILE);
- MetadataParser parser = new MetadataParser();
-
- //when
- List<Interfaces> list = parser.parseMetadata(url.getPath(),
false, new Logger());
-
- //then
- assertEquals(1, list.size());
- }
-
- @Test
- public void shouldParseMetadata(){
- //given
- Interfaces intf = new Interfaces();
- intf.setMetadataId("meta1");
- intf.setHostName("test-hostName");
- intf.setIfAddress("10.1.2.3");
- intf.setIfAddressType("ipv4");
- intf.setIfName("test-0");
- intf.setIfDescription("test description");
- intf.setDirection("in");
- intf.setCapacity("1000BaseT");
-
intf.setEventType("http://ggf.org/ns/nmwg/characteristic/utilization/2.0";);
- intf.setKeyword("project:geant3");
-
- URL url = getClass().getClassLoader().getResource(TEST_FILE);
- MetadataParser parser = new MetadataParser();
-
- //when
- List<Interfaces> list =
parser.parseMetadata(url.getPath(),false, new Logger());
-
- //then
- assertEquals(intf.toString(), list.get(0).toString());
- }
-
- @Test
- public void shouldParseData(){
- //given
- Interfaces intf = new Interfaces();
- intf.setMetadataId("meta1");
- intf.setDataId("data1");
-
intf.setFile("/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/samples/rrd/test.rrd");
- intf.setDataSource("inoctets");
- intf.setValueUnits("Bps");
- intf.setDataSourceStep("300");
- intf.setDataSourceType("ABSOLUTE");
- intf.setDataSourceHeartbeat("400");
- intf.setDataSourceMinValue("0");
- intf.setDataSourceMaxValue("10000000");
-
- Interfaces intf2 = new Interfaces();
- intf2.setMetadataId("meta1");
- List<Interfaces> list = new ArrayList<Interfaces>();
- list.add(intf2);
-
- URL url = getClass().getClassLoader().getResource(TEST_FILE);
- DataParser parser = new DataParser();
-
- //when
- list = parser.parseDocument(url.getPath(), list, false, new
Logger());
-
- //then
- assertEquals(intf.toString(), list.get(0).toString());
- }
-
- @Test
- public void shouldParseMetadataDataPair(){
- InterfacesHelper ih = new InterfacesHelper();
- Interfaces intf = ih.createInterfce("meta1", "data1");
- //given
-
- URL url = getClass().getClassLoader().getResource(TEST_FILE);
- Converter converter = new Converter();
-
- //when
- List<Interfaces> list =
converter.createInterfacesList(url.getPath(), false);
-
- //then
- assertEquals(intf.toString(), list.get(0).toString());
- }
-
- @Test
- public void shouldIgnoreDataWithWrongMetadataIdRef(){
- //given
- InterfacesHelper ih = new InterfacesHelper();
- Interfaces intf = ih.createInterfce("meta1", "data1");
-
- URL url = getClass().getClassLoader().getResource(TEST2_FILE);
- Converter converter = new Converter();
-
- //when
- List<Interfaces> list =
converter.createInterfacesList(url.getPath(), false);
-
- //then
- assertEquals(1, list.size());
- }
-
-
-}

Added: trunk/nmwg-sql-converter/src/test/resources/metadata-test5.xml
===================================================================
--- trunk/nmwg-sql-converter/src/test/resources/metadata-test5.xml
(rev 0)
+++ trunk/nmwg-sql-converter/src/test/resources/metadata-test5.xml
2013-04-25 17:57:31 UTC (rev 6257)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<nmwg:store xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
+ xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
+
xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.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/";>
+
+ <nmwg:metadata id="meta1">
+ <netutil:subject id="subj1">
+ <nmwgt:interface>
+ <nmwgt:hostName>test-hostName-1-2-3</nmwgt:hostName>
+ <nmwgt:ifAddress type="ipv6">2001:a:b:c::1</nmwgt:ifAddress>
+ <nmwgt:ifName>test-0</nmwgt:ifName>
+ <nmwgt:ifDescription>test description & bad chars < " >
</nmwgt:ifDescription>
+ <nmwgt:direction>in</nmwgt:direction>
+ <nmwgt:capacity>1000BaseT</nmwgt:capacity>
+ </nmwgt:interface>
+ </netutil:subject>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
+ <nmwg:parameters id="params1">
+ <nmwg:parameter name="keyword">project:geant3</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:metadata>
+
+ <nmwg:data id="data1" metadataIdRef="meta1">
+ <nmwg:key>
+ <nmwg:parameters>
+ <nmwg:parameter
name="file">/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter name="dataSource">inoctets</nmwg:parameter>
+ <nmwg:parameter name="valueUnits">Bps & others bad
chars</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>
+ <nmwg:parameter
name="dataSourceType">ABSOLUTE</nmwg:parameter>
+ <nmwg:parameter
name="dataSourceHeartbeat">400</nmwg:parameter>
+ <nmwg:parameter name="dataSourceMinValue">0</nmwg:parameter>
+ <nmwg:parameter
name="dataSourceMaxValue">10000000</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:data>
+ </nmwg:store>
\ No newline at end of file


Property changes on:
trunk/nmwg-sql-converter/src/test/resources/metadata-test5.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain

Added: trunk/nmwg-sql-converter/src/test/resources/metadata-test6.xml
===================================================================
--- trunk/nmwg-sql-converter/src/test/resources/metadata-test6.xml
(rev 0)
+++ trunk/nmwg-sql-converter/src/test/resources/metadata-test6.xml
2013-04-25 17:57:31 UTC (rev 6257)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<nmwg:store xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
+ xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
+
xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.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/";>
+
+ <nmwg:metadata id="meta1">
+ <netutil:subject id="subj1">
+ <nmwgt:interface>
+ <nmwgt:hostName>test-hostName-1-2-3</nmwgt:hostName>
+ <nmwgt:ifAddress type="ipv6">2001:a:b:c::1</nmwgt:ifAddress>
+ <nmwgt:ifName>test-0</nmwgt:ifName>
+ <nmwgt:ifDescription>test description</nmwgt:ifDescription>
+ <nmwgt:direction>in</nmwgt:direction>
+ <nmwgt:capacity>1000BaseT</nmwgt:capacity>
+ </nmwgt:interface>
+ </netutil:subject>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
+ <nmwg:parameters id="params1">
+ <nmwg:parameter name="keyword">project:geant3</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:metadata>
+
+ <nmwg:data id="data1" metadataIdRef="meta1">
+ <nmwg:key>
+ <nmwg:parameters>
+ <nmwg:parameter
name="file">/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter name="dataSource">inoctets</nmwg:parameter>
+ <nmwg:parameter name="valueUnits">Bps & bad chars < " >
</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>
+ <nmwg:parameter
name="dataSourceType">ABSOLUTE</nmwg:parameter>
+ <nmwg:parameter
name="dataSourceHeartbeat">400</nmwg:parameter>
+ <nmwg:parameter name="dataSourceMinValue">0</nmwg:parameter>
+ <nmwg:parameter
name="dataSourceMaxValue">10000000</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:data>
+ </nmwg:store>
\ No newline at end of file


Property changes on:
trunk/nmwg-sql-converter/src/test/resources/metadata-test6.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain


Property changes on: trunk/parent
___________________________________________________________________
Modified: svn:ignore
- .settings

.project

+ .settings

.project

target



Property changes on: trunk/perfsonar-java-web-admin
___________________________________________________________________
Modified: svn:ignore
- .project
.settings

logs

+ .project
.settings

logs

target



  • [pS-dev] [GEANT/SA2/ps-java-services] r6257 - in trunk: . nmwg-sql-converter nmwg-sql-converter/src/main/java/org/perfsonar/nmwg/converter/parser nmwg-sql-converter/src/main/java/org/perfsonar/nmwg/logger nmwg-sql-converter/src/test/java/org/perfsonar/nmwg/converter nmwg-sql-converter/src/test/resources parent perfsonar-java-web-admin, svn-noreply, 04/25/2013

Archive powered by MHonArc 2.6.16.

Top of Page