perfsonar-dev - perfsonar: r3962 - in branches/perfsonarui/src/org/perfsonar/perfsonarui: . ippm test test/ippm
Subject: perfsonar development work
List archive
perfsonar: r3962 - in branches/perfsonarui/src/org/perfsonar/perfsonarui: . ippm test test/ippm
Chronological Thread
- From:
- To:
- Subject: perfsonar: r3962 - in branches/perfsonarui/src/org/perfsonar/perfsonarui: . ippm test test/ippm
- Date: Fri, 6 Jun 2008 06:26:43 -0400
Author: nina
Date: 2008-06-06 06:26:42 -0400 (Fri, 06 Jun 2008)
New Revision: 3962
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractMARequest.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/IPPMRequest.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/AbstractRequestTest.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ippm/IPPMRequestTest.java
Log:
Update for new Hades schema support
https://bugzilla.perfsonar.net/show_bug.cgi?id=422
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractMARequest.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractMARequest.java
2008-06-05 15:45:48 UTC (rev 3961)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractMARequest.java
2008-06-06 10:26:42 UTC (rev 3962)
@@ -434,6 +434,7 @@
format.setIndent(2);
XMLSerializer output = new XMLSerializer(outWriter, format);
+ output.setNamespaces(true);
output.serialize(doc);
return outWriter.toString();
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/IPPMRequest.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/IPPMRequest.java
2008-06-05 15:45:48 UTC (rev 3961)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/IPPMRequest.java
2008-06-06 10:26:42 UTC (rev 3962)
@@ -153,7 +153,7 @@
Element message = document.getDocumentElement();
//document.createElementNS(NMWG2, E_MESSAGE);
- message.setAttribute(E_TYPE,MA_MetadataKeyRequest);
+ message.setAttribute(E_TYPE,MA_SetupDataRequest);
message.setAttribute(E_ID,"id");
message.setPrefix(URI_nmwg[version][0]);
@@ -162,9 +162,7 @@
metadata1.setAttribute(E_ID, metadataid1);
metadata1.setPrefix(URI_nmwg[version][0]);
- Element endpointpair =
document.createElementNS(URI_nmwgt[version][1], E_SUBJECT);
- String subjectid = "subject1";
- endpointpair.setAttribute(E_ID, subjectid);
+ Element endpointpair =
document.createElementNS(URI_nmwgt[version][1], IPPMUserData.ENDPOINT_PAIR);
endpointpair.setPrefix(URI_nmwgt[version][0]);
Element src = document.createElementNS(URI_nmwgt[version][1],
IPPMUserData.IFNAME_SRC);
@@ -208,38 +206,41 @@
}
}
else {
- Element hadesParam =
document.createElementNS(URI_nmwg[version][1], E_PARAMETER);
+ Element hadesParam =
document.createElementNS(URI_nmwg[version][1], E_PARAMETER);
+ hadesParam.setPrefix(URI_nmwg[version][0]);
hadesParam.setAttribute(E_PARAMETERNAME, "mid");
hadesParam.setAttribute("value", userData.getQuery("mid"));
hadesParams.appendChild(hadesParam);
}
hades.appendChild(endpointpair);
- metadata1.appendChild(eventtype);
+
metadata1.appendChild(hades);
metadata1.appendChild(hadesParams);
-
+ metadata1.appendChild(eventtype);
//metadata2
Element metadata2 =
document.createElementNS(URI_nmwg[version][1],E_METADATA);
- String metadataid2 = "meta1";
+ String metadataid2 = "meta2";
metadata2.setAttribute(E_ID, metadataid2);
- metadata2.setAttribute(E_METADATAIDREF, metadataid1);
metadata2.setPrefix(URI_nmwg[version][0]);
Element select1 =
document.createElementNS(URI_nmwgs[version][1], E_SUBJECT);
select1.setAttribute(E_ID, "subject2");
+ select1.setAttribute(E_METADATAIDREF, metadataid1);
select1.setPrefix(URI_nmwgs[version][0]);
Element select2 =
document.createElementNS(URI_nmwgs[version][1], E_PARAMETERS);
- select2.setAttribute(E_ID, "param1");
+ select2.setAttribute(E_ID, "param2");
select2.setPrefix(URI_nmwgs[version][0]);
- Element param1 = document.createElementNS(URI_nmwg[version][1],
E_PARAMETERS);
- param1.setAttribute(E_STARTTIME, userData.getStartTime());
+ Element param1 = document.createElementNS(URI_nmwg[version][1],
E_PARAMETER);
+ param1.setAttribute("name",E_STARTTIME);
+ param1.setTextContent(userData.getStartTime());
param1.setPrefix(URI_nmwg[version][0]);
- Element param2 = document.createElementNS(URI_nmwg[version][1],
E_PARAMETERS);
- param2.setAttribute(E_ENDTIME, userData.getEndTime());
+ Element param2 = document.createElementNS(URI_nmwg[version][1],
E_PARAMETER);
+ param2.setAttribute("name",E_ENDTIME);
+ param2.setTextContent(userData.getEndTime());
param2.setPrefix(URI_nmwg[version][0]);
Element eventtype1=
document.createElementNS(URI_nmwg[version][1],"eventType" );
@@ -250,11 +251,12 @@
select2.appendChild(param2);
metadata2.appendChild(select1);
+ metadata2.appendChild(eventtype1);
metadata2.appendChild(select2);
- metadata2.appendChild(eventtype1);
+
Element data =
document.createElementNS(URI_nmwg[version][1],E_DATA);
- data.setAttribute(E_ID, "data");
+ data.setAttribute(E_ID, "data1");
data.setAttribute(E_METADATAIDREF, metadataid2);
data.setPrefix(URI_nmwg[version][0]);
@@ -615,7 +617,7 @@
Element message = document.getDocumentElement();
//document.createElementNS(NMWG2, E_MESSAGE);
message.setAttribute(E_TYPE,MA_MetadataKeyRequest);
- message.setAttribute(E_ID,"id");
+ message.setAttribute(E_ID,"id1");
message.setPrefix(URI_nmwg[version][0]);
Element metadata1 =
document.createElementNS(URI_nmwg[version][1],E_METADATA);
@@ -623,9 +625,7 @@
metadata1.setAttribute(E_ID, metadataid1);
metadata1.setPrefix(URI_nmwg[version][0]);
- Element endpointpair =
document.createElementNS(URI_nmwgt[version][1], E_SUBJECT);
- String subjectid = "subject1";
- endpointpair.setAttribute(E_ID, subjectid);
+ Element endpointpair =
document.createElementNS(URI_nmwgt[version][1], IPPMUserData.ENDPOINT_PAIR);
endpointpair.setPrefix(URI_nmwgt[version][0]);
Element hades = document.createElementNS(URI_hades[version][1],
E_SUBJECT);
@@ -643,7 +643,7 @@
//metadata2
Element metadata2 =
document.createElementNS(URI_nmwg[version][1],E_METADATA);
- String metadataid2 = "meta1";
+ String metadataid2 = "meta2";
metadata2.setAttribute(E_ID, metadataid2);
metadata2.setAttribute(E_METADATAIDREF, metadataid1);
metadata2.setPrefix(URI_nmwg[version][0]);
@@ -656,12 +656,14 @@
select2.setAttribute(E_ID, "param1");
select2.setPrefix(URI_nmwgs[version][0]);
- Element param1 = document.createElementNS(URI_nmwg[version][1],
E_PARAMETERS);
- param1.setAttribute(E_STARTTIME, userData.getStartTime());
+ Element param1 = document.createElementNS(URI_nmwg[version][1],
E_PARAMETER);
+ param1.setAttribute("name",E_STARTTIME);
+ param1.setTextContent(userData.getStartTime());
param1.setPrefix(URI_nmwg[version][0]);
- Element param2 = document.createElementNS(URI_nmwg[version][1],
E_PARAMETERS);
- param2.setAttribute(E_ENDTIME, userData.getEndTime());
+ Element param2 = document.createElementNS(URI_nmwg[version][1],
E_PARAMETER);
+ param2.setAttribute("name",E_ENDTIME);
+ param2.setTextContent(userData.getEndTime());
param2.setPrefix(URI_nmwg[version][0]);
Element eventtype1=
document.createElementNS(URI_nmwg[version][1],"eventType" );
@@ -676,7 +678,7 @@
metadata2.appendChild(eventtype1);
Element data = document.createElementNS(URI_nmwg[version][1],E_DATA);
- data.setAttribute(E_ID, "data");
+ data.setAttribute(E_ID, "data1");
data.setAttribute(E_METADATAIDREF, metadataid2);
data.setPrefix(URI_nmwg[version][0]);
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/AbstractRequestTest.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/AbstractRequestTest.java
2008-06-05 15:45:48 UTC (rev 3961)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/AbstractRequestTest.java
2008-06-06 10:26:42 UTC (rev 3962)
@@ -78,6 +78,7 @@
public void testMetadataKeyRequest() throws Exception {
Document doc = request.createRequest(getData4MetadataRequest(),
IPerfsonarRequest.MA_MetadataKeyRequest);
String msg = AbstractMARequest.document2string(doc);
+ //System.out.println(msg);
logger.debug(msg);
assertEquals(getExampleMetadataRequest(),msg);
}
@@ -89,6 +90,7 @@
public void testSetupdataRequest() throws Exception {
Document doc = request.createRequest(getData4SetupdataRequest(),
IPerfsonarRequest.MA_SetupDataRequest);
String msg = AbstractMARequest.document2string(doc);
+ //System.out.println(msg);
logger.debug(msg);
assertEquals(getExampleSetupdataRequest(),msg);
}
@@ -115,6 +117,7 @@
File response = new File(filename);
assertNotNull(response);
assertTrue(response.exists());
+ response.delete();
}
@@ -130,7 +133,7 @@
File response = new File(filename);
assertNotNull(response);
assertTrue(response.exists());
-
+ response.delete();
}
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ippm/IPPMRequestTest.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ippm/IPPMRequestTest.java
2008-06-05 15:45:48 UTC (rev 3961)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ippm/IPPMRequestTest.java
2008-06-06 10:26:42 UTC (rev 3962)
@@ -81,43 +81,75 @@
udata.setQuery(IPPMUserData.NMWG_EVENTTYPE,
"ippm_aggregated");
udata.setQuery("startTime", "1208296800");
udata.setQuery("endTime", "1208383200");
- //udata.setEndpoint(new MAEndpoint(HadesURL));
+ udata.setEndpoint(new MAEndpoint(HadesURL));
return udata;
}
-
+
+/*
+ <nmwg:message xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:nmwgm="http://ggf.org/ns/nmwg/time/2.0/";
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
+ xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
+ xmlns:hades="http://ggf.org/ns/nmwg/tools/hades/";
+ id="1208356112" type="MetadataKeyRequest">
+ <nmwg:metadata id="meta1">
+ <hades:subject id="subject1">
+ <nmwgt:endpointPair/>
+ </hades:subject>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/tools/hades/</nmwg:eventType>
+ </nmwg:metadata>
+ <nmwg:metadata id="meta2" metadataIdRef="meta1">
+ <select:subject id="subject2"/>
+ <select:parameters id="param1">
+ <nmwg:parameter name="startTime">1208296800</nmwg:parameter>
+ <nmwg:parameter name="endTime">1208383200</nmwg:parameter>
+ </select:parameters>
+ <nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/</nmwg:eventType>
+ </nmwg:metadata>
+ <nmwg:data id="data1" metadataIdRef="meta2"/>
+ </nmwg:message>
+
+ */
+/*
+ * (non-Javadoc)
+ * @see
org.perfsonar.perfsonarui.test.AbstractRequestTest#getExampleMetadataRequest()
+ */
protected String getExampleMetadataRequest() {
return
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"+
- "<nmwg:message id=\"id\" type=\"MetadataKeyRequest\">\n"+
+ "<nmwg:message xmlns:nmwg=\"http://ggf.org/ns/nmwg/base/2.0/\";
id=\"id1\" type=\"MetadataKeyRequest\">\n"+
" <nmwg:metadata id=\"meta1\">\n"+
"
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/hades/</nmwg:eventType>\n"+
- " <hades:subject id=\"subject1\">\n"+
- " <nmwgt:subject id=\"subject1\"/>\n"+
+ " <hades:subject
xmlns:hades=\"http://ggf.org/ns/nmwg/tools/hades/\"; id=\"subject1\">\n"+
+ " <nmwgt:endPointPair
xmlns:nmwgt=\"http://ggf.org/ns/nmwg/topology/2.0/\"/>\n"+
" </hades:subject>\n"+
" </nmwg:metadata>\n"+
- " <nmwg:metadata id=\"meta1\" metadataIdRef=\"meta1\">\n"+
- " <select:subject id=\"subject2\"/>\n"+
- " <select:parameters id=\"param1\">\n"+
- " <nmwg:parameters startTime=\"1208296800\"/>\n"+
- " <nmwg:parameters endTime=\"1208383200\"/>\n"+
+ " <nmwg:metadata id=\"meta2\" metadataIdRef=\"meta1\">\n"+
+ " <select:subject\n"+
+ " xmlns:select=\"http://ggf.org/ns/nmwg/ops/select/2.0/\";
id=\"subject2\"/>\n"+
+ " <select:parameters\n"+
+ " xmlns:select=\"http://ggf.org/ns/nmwg/ops/select/2.0/\";
id=\"param1\">\n"+
+ " <nmwg:parameter
name=\"startTime\">1208296800</nmwg:parameter>\n"+
+ " <nmwg:parameter
name=\"endTime\">1208383200</nmwg:parameter>\n"+
" </select:parameters>\n"+
"
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/</nmwg:eventType>\n"+
" </nmwg:metadata>\n"+
- " <nmwg:data id=\"data\" metadataIdRef=\"meta1\"/>\n"+
- "</nmwg:message>\n";
+ " <nmwg:data id=\"data1\" metadataIdRef=\"meta2\"/>\n"+
+ "</nmwg:message>\n";
+
}
@Override
protected IUserData getData4SetupdataRequest() {
AbstractUserData udata = new IPPMUserData();
- udata.setQuery("dst", "Budapest_GEANT");
- udata.setQuery("src", "Milan_GEANT");
+ udata.setQuery("dst", "Amsterdam_SURFnet");
+ udata.setQuery("src", "Ljubljana_ARNES");
udata.setQuery(IPPMUserData.NMWG_EVENTTYPE, "ippm_aggregated");
udata.setQuery("mid", "6461");
// udata.lastHour();
udata.setQuery("startTime", "1208296800");
udata.setQuery("endTime", "1208383200");
- //udata.setEndpoint(new MAEndpoint(HadesURL));
+ udata.setEndpoint(new MAEndpoint(HadesURL));
return udata;
}
@@ -125,29 +157,35 @@
protected String getExampleSetupdataRequest() {
return
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"+
- "<nmwg:message id=\"id\" type=\"MetadataKeyRequest\">\n"+
+ "<nmwg:message xmlns:nmwg=\"http://ggf.org/ns/nmwg/base/2.0/\";
id=\"id\" type=\"SetupDataRequest\">\n"+
" <nmwg:metadata id=\"meta1\">\n"+
+ " <hades:subject
xmlns:hades=\"http://ggf.org/ns/nmwg/tools/hades/\"; id=\"subject1\">\n"+
+ " <nmwgt:endPointPair
xmlns:nmwgt=\"http://ggf.org/ns/nmwg/topology/2.0/\";>\n"+
+ " <nmwgt:src type=\"IFname\" value=\"Ljubljana_ARNES\"/>\n"+
+ " <nmwgt:dst type=\"IFname\" value=\"Amsterdam_SURFnet\"/>\n"+
+ " </nmwgt:endPointPair>\n"+
+ " </hades:subject>\n"+
+ " <hades:parameters
xmlns:hades=\"http://ggf.org/ns/nmwg/tools/hades/\"; id=\"params1\">\n"+
+ " <nmwg:parameter name=\"mid\" value=\"6461\"/>\n"+
+ " </hades:parameters>\n"+
"
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/hades/</nmwg:eventType>\n"+
- " <hades:subject id=\"subject1\">\n"+
- " <nmwgt:subject id=\"subject1\">\n"+
- " <nmwgt:src type=\"IFname\" value=\"Milan_GEANT\"/>\n"+
- " <nmwgt:dst type=\"IFname\" value=\"Budapest_GEANT\"/>\n"+
- " </nmwgt:subject>\n"+
- " </hades:subject>\n"+
- " <hades:parameters id=\"params1\">\n"+
- " <parameter name=\"mid\" value=\"6461\"/>\n"+
- " </hades:parameters>\n"+
" </nmwg:metadata>\n"+
- " <nmwg:metadata id=\"meta1\" metadataIdRef=\"meta1\">\n"+
- " <select:subject id=\"subject2\"/>\n"+
- " <select:parameters id=\"param1\">\n"+
- " <nmwg:parameters startTime=\"1208296800\"/>\n"+
- " <nmwg:parameters endTime=\"1208383200\"/>\n"+
+ " <nmwg:metadata id=\"meta2\">\n"+
+ " <select:subject\n"+
+ " xmlns:select=\"http://ggf.org/ns/nmwg/ops/select/2.0/\"\n"+
+ " id=\"subject2\" metadataIdRef=\"meta1\"/>\n"+
+ "
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/</nmwg:eventType>\n"+
+ " <select:parameters\n"+
+ " xmlns:select=\"http://ggf.org/ns/nmwg/ops/select/2.0/\";
id=\"param2\">\n"+
+ " <nmwg:parameter
name=\"startTime\">1208296800</nmwg:parameter>\n"+
+ " <nmwg:parameter
name=\"endTime\">1208383200</nmwg:parameter>\n"+
" </select:parameters>\n"+
- "
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/</nmwg:eventType>\n"+
" </nmwg:metadata>\n"+
- " <nmwg:data id=\"data\" metadataIdRef=\"meta1\"/>\n"+
+ " <nmwg:data id=\"data1\" metadataIdRef=\"meta2\"/>\n"+
"</nmwg:message>\n";
+
+
+
}
/*
- perfsonar: r3962 - in branches/perfsonarui/src/org/perfsonar/perfsonarui: . ippm test test/ippm, svnlog, 06/06/2008
Archive powered by MHonArc 2.6.16.