Skip to Content.
Sympa Menu

perfsonar-dev - r1328 - in branches/release/perfsonar/releng/perfSONAR-1.0: client scripts

Subject: perfsonar development work

List archive

r1328 - in branches/release/perfsonar/releng/perfSONAR-1.0: client scripts


Chronological Thread 
  • From:
  • To:
  • Subject: r1328 - in branches/release/perfsonar/releng/perfSONAR-1.0: client scripts
  • Date: Mon, 26 Jun 2006 01:49:23 -0400
Author: zurawski
Date: 2006-06-26 01:49:22 -0400 (Mon, 26 Jun 2006)
New Revision: 1328

Added:
branches/release/perfsonar/releng/perfSONAR-1.0/client/MAStoreRequest.xml
Removed:
branches/release/perfsonar/releng/perfSONAR-1.0/client/MAStore.xml
Modified:
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/ma-store-key.sh
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/test_ma.sh
Log:
Should be following the same naming convention. This is a minor issue,
so will just so up in the next release.

-jason



Deleted: branches/release/perfsonar/releng/perfSONAR-1.0/client/MAStore.xml

Added:
branches/release/perfsonar/releng/perfSONAR-1.0/client/MAStoreRequest.xml

Modified:
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/ma-store-key.sh
===================================================================
--- branches/release/perfsonar/releng/perfSONAR-1.0/scripts/ma-store-key.sh
2006-06-26 05:13:01 UTC (rev 1327)
+++ branches/release/perfsonar/releng/perfSONAR-1.0/scripts/ma-store-key.sh
2006-06-26 05:49:22 UTC (rev 1328)
@@ -1,36 +1,36 @@
#!/bin/sh

-echo "" > ${1}/xml/MAStoreKey.xml
-echo "<!-- Purpose: Submitting a measurement's key (either metadata or
data, there" >> ${1}/xml/MAStoreKey.xml
-echo " may be be multiple blocks) for storage into a " >>
${1}/xml/MAStoreKey.xml
-echo " MeasurementArchive -->" >> ${1}/xml/MAStoreKey.xml
-echo "" >> ${1}/xml/MAStoreKey.xml
-echo "<nmwg:message id=\"msg5\"" >> ${1}/xml/MAStoreKey.xml
-echo " type=\"MeasurementArchiveStoreRequest\"" >>
${1}/xml/MAStoreKey.xml
-echo " xmlns:nmwg=\"http://ggf.org/ns/nmwg/base/2.0/\""; >>
${1}/xml/MAStoreKey.xml
-echo " xmlns:nmwgt=\"http://ggf.org/ns/nmwg/topology/2.0/\";>"
>> ${1}/xml/MAStoreKey.xml
-echo "" >> ${1}/xml/MAStoreKey.xml
-echo " <!-- Optional message level parameters -->" >>
${1}/xml/MAStoreKey.xml
-echo "" >> ${1}/xml/MAStoreKey.xml
-echo " <nmwg:parameters id=\"msgparam1\">" >> ${1}/xml/MAStoreKey.xml
-echo " <nmwg:parameter name=\"authToken\">Internet2</nmwg:parameter>" >>
${1}/xml/MAStoreKey.xml
-echo " <nmwg:parameter name=\"timeValue\">1138699961</nmwg:parameter>" >>
${1}/xml/MAStoreKey.xml
-echo " <nmwg:parameter name=\"timeType\">unix</nmwg:parameter>" >>
${1}/xml/MAStoreKey.xml
-echo " </nmwg:parameters>" >> ${1}/xml/MAStoreKey.xml
-echo "" >> ${1}/xml/MAStoreKey.xml
-echo " <nmwg:metadata id=\"meta1\">" >> ${1}/xml/MAStoreKey.xml
-echo " <nmwg:key id=\"keyid\">" >> ${1}/xml/MAStoreKey.xml
-echo " <nmwg:parameters id=\"param1\">" >> ${1}/xml/MAStoreKey.xml
-echo " <nmwg:parameter name=\"file\">${2}/test2.rrd</nmwg:parameter>"
>> ${1}/xml/MAStoreKey.xml
-echo " <nmwg:parameter name=\"dataSource\">output</nmwg:parameter>"
>> ${1}/xml/MAStoreKey.xml
-echo " </nmwg:parameters>" >> ${1}/xml/MAStoreKey.xml
-echo " </nmwg:key>" >> ${1}/xml/MAStoreKey.xml
-echo " </nmwg:metadata>" >> ${1}/xml/MAStoreKey.xml
-echo "" >> ${1}/xml/MAStoreKey.xml
-echo " <nmwg:data id=\"data1\" metadataIdRef=\"meta1\">" >>
${1}/xml/MAStoreKey.xml
+echo "" > ${1}/xml/MAStoreKeyRequest.xml
+echo "<!-- Purpose: Submitting a measurement's key (either metadata or
data, there" >> ${1}/xml/MAStoreKeyRequest.xml
+echo " may be be multiple blocks) for storage into a " >>
${1}/xml/MAStoreKeyRequest.xml
+echo " MeasurementArchive -->" >> ${1}/xml/MAStoreKeyRequest.xml
+echo "" >> ${1}/xml/MAStoreKeyRequest.xml
+echo "<nmwg:message id=\"msg5\"" >> ${1}/xml/MAStoreKeyRequest.xml
+echo " type=\"MeasurementArchiveStoreRequest\"" >>
${1}/xml/MAStoreKeyRequest.xml
+echo " xmlns:nmwg=\"http://ggf.org/ns/nmwg/base/2.0/\""; >>
${1}/xml/MAStoreKeyRequest.xml
+echo " xmlns:nmwgt=\"http://ggf.org/ns/nmwg/topology/2.0/\";>"
>> ${1}/xml/MAStoreKeyRequest.xml
+echo "" >> ${1}/xml/MAStoreKeyRequest.xml
+echo " <!-- Optional message level parameters -->" >>
${1}/xml/MAStoreKeyRequest.xml
+echo "" >> ${1}/xml/MAStoreKeyRequest.xml
+echo " <nmwg:parameters id=\"msgparam1\">" >> ${1}/xml/MAStoreKeyRequest.xml
+echo " <nmwg:parameter name=\"authToken\">Internet2</nmwg:parameter>" >>
${1}/xml/MAStoreKeyRequest.xml
+echo " <nmwg:parameter name=\"timeValue\">1138699961</nmwg:parameter>" >>
${1}/xml/MAStoreKeyRequest.xml
+echo " <nmwg:parameter name=\"timeType\">unix</nmwg:parameter>" >>
${1}/xml/MAStoreKeyRequest.xml
+echo " </nmwg:parameters>" >> ${1}/xml/MAStoreKeyRequest.xml
+echo "" >> ${1}/xml/MAStoreKeyRequest.xml
+echo " <nmwg:metadata id=\"meta1\">" >> ${1}/xml/MAStoreKeyRequest.xml
+echo " <nmwg:key id=\"keyid\">" >> ${1}/xml/MAStoreKeyRequest.xml
+echo " <nmwg:parameters id=\"param1\">" >>
${1}/xml/MAStoreKeyRequest.xml
+echo " <nmwg:parameter name=\"file\">${2}/test2.rrd</nmwg:parameter>"
>> ${1}/xml/MAStoreKeyRequest.xml
+echo " <nmwg:parameter name=\"dataSource\">output</nmwg:parameter>"
>> ${1}/xml/MAStoreKeyRequest.xml
+echo " </nmwg:parameters>" >> ${1}/xml/MAStoreKeyRequest.xml
+echo " </nmwg:key>" >> ${1}/xml/MAStoreKeyRequest.xml
+echo " </nmwg:metadata>" >> ${1}/xml/MAStoreKeyRequest.xml
+echo "" >> ${1}/xml/MAStoreKeyRequest.xml
+echo " <nmwg:data id=\"data1\" metadataIdRef=\"meta1\">" >>
${1}/xml/MAStoreKeyRequest.xml
i=`date -dtoday '+%s'`
j=`expr $i \+ 240`
-echo " <nmwg:datum value=\"12345\" timeValue=\"$j\" timeType=\"unix\"/>"
>> ${1}/xml/MAStoreKey.xml
-echo " </nmwg:data>" >> ${1}/xml/MAStoreKey.xml
-echo "" >> ${1}/xml/MAStoreKey.xml
-echo "</nmwg:message>" >> ${1}/xml/MAStoreKey.xml
+echo " <nmwg:datum value=\"12345\" timeValue=\"$j\" timeType=\"unix\"/>"
>> ${1}/xml/MAStoreKeyRequest.xml
+echo " </nmwg:data>" >> ${1}/xml/MAStoreKeyRequest.xml
+echo "" >> ${1}/xml/MAStoreKeyRequest.xml
+echo "</nmwg:message>" >> ${1}/xml/MAStoreKeyRequest.xml

Modified: branches/release/perfsonar/releng/perfSONAR-1.0/scripts/test_ma.sh
===================================================================
--- branches/release/perfsonar/releng/perfSONAR-1.0/scripts/test_ma.sh
2006-06-26 05:13:01 UTC (rev 1327)
+++ branches/release/perfsonar/releng/perfSONAR-1.0/scripts/test_ma.sh
2006-06-26 05:49:22 UTC (rev 1328)
@@ -11,10 +11,10 @@
echo "" >> ${1}/scripts/test-ma.sh

echo "echo \"Store Test\"" >> ${1}/scripts/test-ma.sh
-echo "${2} -cp ${4} org.perfsonar.client.testHarness.SOAPClient ${3}
../xml/MAStore.xml ../xml/MAStoreResponse.xml" >> ${1}/scripts/test-ma.sh
+echo "${2} -cp ${4} org.perfsonar.client.testHarness.SOAPClient ${3}
../xml/MAStoreRequest.xml ../xml/MAStoreResponse.xml" >>
${1}/scripts/test-ma.sh
echo "" >> ${1}/scripts/test-ma.sh

echo "echo \"Store Test (Key)\"" >> ${1}/scripts/test-ma.sh
-echo "${2} -cp ${4} org.perfsonar.client.testHarness.SOAPClient ${3}
../xml/MAStoreKey.xml ../xml/MAStoreKeyResponse.xml" >>
${1}/scripts/test-ma.sh
+echo "${2} -cp ${4} org.perfsonar.client.testHarness.SOAPClient ${3}
../xml/MAStoreKeyRequest.xml ../xml/MAStoreKeyResponse.xml" >>
${1}/scripts/test-ma.sh
echo "" >> ${1}/scripts/test-ma.sh
chmod 755 ${1}/scripts/test-ma.sh


  • r1328 - in branches/release/perfsonar/releng/perfSONAR-1.0: client scripts, svnlog, 06/26/2006

Archive powered by MHonArc 2.6.16.

Top of Page