Skip to Content.
Sympa Menu

perfsonar-dev - r2081 - in trunk/perfsonar/schema/example-instances/perfSONAR: . LS/test TOPS/test nmsTypeMP snmpTypeMP

Subject: perfsonar development work

List archive

r2081 - in trunk/perfsonar/schema/example-instances/perfSONAR: . LS/test TOPS/test nmsTypeMP snmpTypeMP


Chronological Thread 
  • From:
  • To:
  • Subject: r2081 - in trunk/perfsonar/schema/example-instances/perfSONAR: . LS/test TOPS/test nmsTypeMP snmpTypeMP
  • Date: Thu, 15 Feb 2007 13:19:26 -0500
Author: zurawski
Date: 2007-02-15 13:19:25 -0500 (Thu, 15 Feb 2007)
New Revision: 2081

Modified:

trunk/perfsonar/schema/example-instances/perfSONAR/CommandLineMP-Ping-Request.xml
trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/EchoRequest.xml

trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/LSDeregisterRequest.xml

trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/LSKeepaliveRequest.xml

trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/LSQueryRequest.xml

trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/LSRegisterRequest-Update.xml

trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/LSRegisterRequest.xml

trunk/perfsonar/schema/example-instances/perfSONAR/MeasurementArchiveStore-L2status-Req-1.xml

trunk/perfsonar/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-2.xml
trunk/perfsonar/schema/example-instances/perfSONAR/TOPS/test/Void.xml
trunk/perfsonar/schema/example-instances/perfSONAR/link-status-store.xml

trunk/perfsonar/schema/example-instances/perfSONAR/nmsTypeMP/nmsTypeMP-store-beta1.xml

trunk/perfsonar/schema/example-instances/perfSONAR/snmpTypeMP/DataRequest-withKey.xml

trunk/perfsonar/schema/example-instances/perfSONAR/snmpTypeMP/snmpTypeMP-store-beta1.xml
Log:
Syntax/style changes to the examples to ensure they validate to the
schemas.

-jason



Modified:
trunk/perfsonar/schema/example-instances/perfSONAR/CommandLineMP-Ping-Request.xml
===================================================================
---
trunk/perfsonar/schema/example-instances/perfSONAR/CommandLineMP-Ping-Request.xml
2007-02-15 16:03:49 UTC (rev 2080)
+++
trunk/perfsonar/schema/example-instances/perfSONAR/CommandLineMP-Ping-Request.xml
2007-02-15 18:19:25 UTC (rev 2081)
@@ -1,24 +1,44 @@
+<!--
+XXX jason:2/14/07
+
+Verify against sonar.rnc (FAILURE)
+ Error at line:24, column:29 of
file:///home/jason/Desktop/rnc/svn/new/nmwg/schema/example_instances_pS/CommandLineMP-Ping-Request.xml
+ Probably namespace URI of tag "subject" is wrong (correct one is
"http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/sql/1.0/";)
+
+ Error at line:34, column:34 of
file:///home/jason/Desktop/rnc/svn/new/nmwg/schema/example_instances_pS/CommandLineMP-Ping-Request.xml
+ Probably namespace URI of tag "parameters" is wrong (correct one is
"http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/sql/1.0/";)
+
+Verify against ping.rnc (Success w/ correction [below]
+
+Questions for Author: Which schema did you originally test this against,
does my fix alter
+ the behavior of your module?
+
+-->
<nmwg:message type="MeasurementRequest"
- id="msg1"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
- xmlns:ping="http://ggf.org/ns/nmwg/tools/ping/2.0/";>
+ id="msg1"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
+ xmlns:ping="http://ggf.org/ns/nmwg/tools/ping/2.0/";>

+ <nmwg:metadata id="test">
+ <ping:subject id="sub1">
+ <nmwgt:endPointPair>
+
+ <!-- XXX jason:2/14/07 Added dummy source to verify against ping.rnc
-->
+
+ <nmwgt:src type="dummy"/>
+ <nmwgt:dst type="ipv4" value="www.perfsonar.net"/>
+ </nmwgt:endPointPair>
+ </ping:subject>
+ <nmwg:eventType>ping</nmwg:eventType>
+ <ping:parameters id="param1">
+ <nmwg:parameter name="count">10</nmwg:parameter>
+ <nmwg:parameter name="interval">1</nmwg:parameter>
+ <nmwg:parameter name="packetSize">64</nmwg:parameter>
+ <nmwg:parameter name="ttl">255</nmwg:parameter>
+ </ping:parameters>
+ </nmwg:metadata>
+
+ <nmwg:data id="1" metadataIdRef="test" />

-<nmwg:metadata id="test">
- <ping:subject id="sub1">
- <nmwgt:endPointPair>
- <nmwgt:dst type="ipv4" value="www.perfsonar.net"/>
- </nmwgt:endPointPair>
- </ping:subject>
- <nmwg:eventType>ping</nmwg:eventType>
- <ping:parameters id="param1">
- <nmwg:parameter name="count">10</nmwg:parameter>
- <nmwg:parameter name="interval">1</nmwg:parameter>
- <nmwg:parameter name="packetSize">64</nmwg:parameter>
- <nmwg:parameter name="ttl">255</nmwg:parameter>
- </ping:parameters>
-
-</nmwg:metadata>
-<nmwg:data id="1" metadataIdRef="test" />
</nmwg:message>

Modified:
trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/EchoRequest.xml
===================================================================
---
trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/EchoRequest.xml
2007-02-15 16:03:49 UTC (rev 2080)
+++
trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/EchoRequest.xml
2007-02-15 18:19:25 UTC (rev 2081)
@@ -4,15 +4,13 @@
<!-- Version: $Id$ -->

<nmwg:message type="EchoRequest"
- id="msg1"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+ id="msg1"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>

- <nmwg:metadata id="meta">
- <nmwg:eventType>echo</nmwg:eventType>
- </nmwg:metadata>
+ <nmwg:metadata id="meta">
+ <nmwg:eventType>echo</nmwg:eventType>
+ </nmwg:metadata>

- <nmwg:data id="data" metadataIdRef="meta"/>
+ <nmwg:data id="data" metadataIdRef="meta"/>

-
-
</nmwg:message>

Modified:
trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/LSDeregisterRequest.xml
===================================================================
---
trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/LSDeregisterRequest.xml
2007-02-15 16:03:49 UTC (rev 2080)
+++
trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/LSDeregisterRequest.xml
2007-02-15 18:19:25 UTC (rev 2081)
@@ -4,17 +4,17 @@
<!-- Version: $Id$ -->

<nmwg:message type="LSDeregisterRequest"
- id="msg1"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+ id="msg1"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>

- <nmwg:metadata id="deregister">
- <nmwg:key>
- <nmwg:parameters id="keys">
- <nmwg:parameter
name="lsKey">http://reed.man.poznan.pl:8080/axis/services/MA</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>
- </nmwg:metadata>
+ <nmwg:metadata id="deregister">
+ <nmwg:key>
+ <nmwg:parameters id="keys">
+ <nmwg:parameter
name="lsKey">http://reed.man.poznan.pl:8080/axis/services/MA</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:metadata>

- <nmwg:data metadataIdRef="deregister"/>
+ <nmwg:data metadataIdRef="deregister" id="d1"/>

</nmwg:message>

Modified:
trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/LSKeepaliveRequest.xml
===================================================================
---
trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/LSKeepaliveRequest.xml
2007-02-15 16:03:49 UTC (rev 2080)
+++
trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/LSKeepaliveRequest.xml
2007-02-15 18:19:25 UTC (rev 2081)
@@ -4,17 +4,17 @@
<!-- Version: $Id$ -->

<nmwg:message type="LSKeepaliveRequest"
- id="msg1"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+ id="msg1"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>

- <nmwg:metadata id="key_to_keepalive">
- <nmwg:key>
- <nmwg:parameters id="keys">
- <nmwg:parameter
name="lsKey">http://reed.man.poznan.pl:8080/axis/services/MA</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>
- </nmwg:metadata>
+ <nmwg:metadata id="key_to_keepalive">
+ <nmwg:key>
+ <nmwg:parameters id="keys">
+ <nmwg:parameter
name="lsKey">http://reed.man.poznan.pl:8080/axis/services/MA</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:metadata>

- <nmwg:data metadataIdRef="key_to_keepalive"/>
+ <nmwg:data metadataIdRef="key_to_keepalive" id="d1"/>

</nmwg:message>

Modified:
trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/LSQueryRequest.xml
===================================================================
---
trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/LSQueryRequest.xml
2007-02-15 16:03:49 UTC (rev 2080)
+++
trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/LSQueryRequest.xml
2007-02-15 18:19:25 UTC (rev 2081)
@@ -14,12 +14,10 @@
<!-- response. -->
<!-- ___________________________________________________ -->

-
-<nmwg:message
- type="LSQueryRequest"
- id="msg1"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
-
xmlns:xquery="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/xquery/1.0/";>
+<nmwg:message type="LSQueryRequest"
+ id="msg1"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+
xmlns:xquery="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/xquery/1.0/";>


<nmwg:metadata id="meta1">

@@ -36,6 +34,6 @@

</nmwg:metadata>

- <nmwg:data metadataIdRef="meta1"/>
+ <nmwg:data metadataIdRef="meta1" id="d1"/>

</nmwg:message>

Modified:
trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/LSRegisterRequest-Update.xml
===================================================================
---
trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/LSRegisterRequest-Update.xml
2007-02-15 16:03:49 UTC (rev 2080)
+++
trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/LSRegisterRequest-Update.xml
2007-02-15 18:19:25 UTC (rev 2081)
@@ -8,96 +8,86 @@

xmlns:psservice="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";

xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";>
+
+ <nmwg:metadata id="serviceLookupInfo">

-
+ <!-- lsKey to be updated -->
+ <nmwg:key>
+ <nmwg:parameters id="param1">
+ <nmwg:parameter
name="lsKey">http://reed.man.poznan.pl:8080/axis/services/MA</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>



-

- <nmwg:metadata id="serviceLookupInfo">
+ <!-- just registration message -->
+ <perfsonar:subject id="commonParameters"
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";>
+ <psservice:service id="serviceParameters"
xmlns:psservice="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";>
+ <psservice:serviceName>My_test_MA</psservice:serviceName>
+
<psservice:accessPoint>http://reed.man.poznan.pl:8080/axis/services/MA</psservice:accessPoint>
+ <psservice:serviceType>MA</psservice:serviceType>
+ <psservice:serviceDescription>This is my testing
MA</psservice:serviceDescription>
+ </psservice:service>
+ </perfsonar:subject>
+ </nmwg:metadata>
+
+ <nmwg:data id="data0" metadataIdRef="serviceLookupInfo">
+ <nmwg:metadata id="meta1">
+ <perfsonar:subject id="subj1"
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";>
+ <nmwgt:interface xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
+ <nmwgt:hostName>atlang-hstnng.abilene.ucaid.edu</nmwgt:hostName>
+ <nmwgt:ifName>unknown</nmwgt:ifName>
+
<nmwgt:ifDescription>hstn:oc192(p2p)::show:intracloud</nmwgt:ifDescription>
+ <nmwgt:ifAddress type="ipv4">198.32.8.34</nmwgt:ifAddress>
+ <nmwgt:direction>in</nmwgt:direction>
+ <nmwgt:capacity>10000000000</nmwgt:capacity>
+ </nmwgt:interface>
+ </perfsonar:subject>
+ <nmwg:eventType>utilization</nmwg:eventType>
+ </nmwg:metadata>
+ </nmwg:data>

- <!-- lsKey to be updated -->
- <nmwg:key>
- <nmwg:parameters id="param1">
- <nmwg:parameter name="lsKey">
- http://reed.man.poznan.pl:8080/axis/services/MA
- </nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>


-
- <!-- just registration message -->
-
- <perfsonar:subject id="commonParameters"
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";>
- <psservice:service id="serviceParameters"
xmlns:psservice="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";>
- <psservice:serviceName>My_test_MA</psservice:serviceName>
-
<psservice:accessPoint>http://reed.man.poznan.pl:8080/axis/services/MA</psservice:accessPoint>
- <psservice:serviceType>MA</psservice:serviceType>
- <psservice:serviceDescription>This is my testing
MA</psservice:serviceDescription>
- </psservice:service>
- </perfsonar:subject>
+ <nmwg:data id="data1" metadataIdRef="serviceLookupInfo">
+ <nmwg:metadata id="meta2">
+ <perfsonar:subject id="subj1"
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";>
+ <nmwgt:interface xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
+ <nmwgt:hostName>atlang22-hstnng.abilene.ucaid.edu</nmwgt:hostName>
+ <nmwgt:ifName>unknown</nmwgt:ifName>
+
<nmwgt:ifDescription>hstn:oc192(p2p)::show:intracloud</nmwgt:ifDescription>
+ <nmwgt:ifAddress type="ipv4">198.32.8.34</nmwgt:ifAddress>
+ <nmwgt:direction>in</nmwgt:direction>
+ <nmwgt:capacity>10000000000</nmwgt:capacity>
+ </nmwgt:interface>
+ </perfsonar:subject>
+ <nmwg:eventType>utilization</nmwg:eventType>
</nmwg:metadata>
-
- <nmwg:data id="data0" metadataIdRef="serviceLookupInfo">
- <nmwg:metadata id="meta1">
- <perfsonar:subject id="subj1"
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";>
- <nmwgt:interface
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
-
<nmwgt:hostName>atlang-hstnng.abilene.ucaid.edu</nmwgt:hostName>
- <nmwgt:ifName>unknown</nmwgt:ifName>
-
<nmwgt:ifDescription>hstn:oc192(p2p)::show:intracloud</nmwgt:ifDescription>
- <nmwgt:ifAddress
type="ipv4">198.32.8.34</nmwgt:ifAddress>
- <nmwgt:direction>in</nmwgt:direction>
- <nmwgt:capacity>10000000000</nmwgt:capacity>
- </nmwgt:interface>
- </perfsonar:subject>
- <nmwg:eventType>utilization</nmwg:eventType>
- </nmwg:metadata>
- </nmwg:data>
+ </nmwg:data>

- <nmwg:data id="data1" metadataIdRef="serviceLookupInfo">
- <nmwg:metadata id="meta2">
- <perfsonar:subject id="subj1"
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";>
- <nmwgt:interface
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
-
<nmwgt:hostName>atlang22-hstnng.abilene.ucaid.edu</nmwgt:hostName>
- <nmwgt:ifName>unknown</nmwgt:ifName>
-
<nmwgt:ifDescription>hstn:oc192(p2p)::show:intracloud</nmwgt:ifDescription>
- <nmwgt:ifAddress
type="ipv4">198.32.8.34</nmwgt:ifAddress>
- <nmwgt:direction>in</nmwgt:direction>
- <nmwgt:capacity>10000000000</nmwgt:capacity>
- </nmwgt:interface>
- </perfsonar:subject>
- <nmwg:eventType>utilization</nmwg:eventType>
- </nmwg:metadata>
- </nmwg:data>
-
-
<!--
- <nmwg:metadata id="serviceLookupInfo2">
- <perfsonar:subject id="commonParameters"
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";>
- <psservice:service id="serviceParameters"
xmlns:psservice="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";>
- <psservice:serviceName>My_test_MA</psservice:serviceName>
-
<psservice:accessPoint>http://reed.man.poznan.pl:8080/axis/services/MA</psservice:accessPoint>
- <psservice:serviceType>MA</psservice:serviceType>
- <psservice:serviceDescription>This is my testing
MA</psservice:serviceDescription>
- </psservice:service>
- </perfsonar:subject>
- </nmwg:metadata>
+ <nmwg:metadata id="serviceLookupInfo2">
+ <perfsonar:subject id="commonParameters"
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";>
+ <psservice:service id="serviceParameters"
xmlns:psservice="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";>
+ <psservice:serviceName>My_test_MA</psservice:serviceName>
+
<psservice:accessPoint>http://reed.man.poznan.pl:8080/axis/services/MA</psservice:accessPoint>
+ <psservice:serviceType>MA</psservice:serviceType>
+ <psservice:serviceDescription>This is my testing
MA</psservice:serviceDescription>
+ </psservice:service>
+ </perfsonar:subject>
+ </nmwg:metadata>

-
- <nmwg:data id="data2" metadataIdRef="serviceLookupInfo2">
- <nmwg:metadata id="meta2">
- <perfsonar:subject id="subj1"
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";>
- <nmwgt:interface
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
-
<nmwgt:hostName>atlang22-hstnng.abilene.ucaid.edu</nmwgt:hostName>
- <nmwgt:ifName>unknown</nmwgt:ifName>
-
<nmwgt:ifDescription>hstn:oc192(p2p)::show:intracloud</nmwgt:ifDescription>
- <nmwgt:ifAddress
type="ipv4">198.32.8.34</nmwgt:ifAddress>
- <nmwgt:direction>in</nmwgt:direction>
- <nmwgt:capacity>10000000000</nmwgt:capacity>
- </nmwgt:interface>
- </perfsonar:subject>
- <nmwg:eventType>utilization</nmwg:eventType>
- </nmwg:metadata>
- </nmwg:data>
-
+ <nmwg:data id="data2" metadataIdRef="serviceLookupInfo2">
+ <nmwg:metadata id="meta2">
+ <perfsonar:subject id="subj1"
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";>
+ <nmwgt:interface xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
+ <nmwgt:hostName>atlang22-hstnng.abilene.ucaid.edu</nmwgt:hostName>
+ <nmwgt:ifName>unknown</nmwgt:ifName>
+
<nmwgt:ifDescription>hstn:oc192(p2p)::show:intracloud</nmwgt:ifDescription>
+ <nmwgt:ifAddress type="ipv4">198.32.8.34</nmwgt:ifAddress>
+ <nmwgt:direction>in</nmwgt:direction>
+ <nmwgt:capacity>10000000000</nmwgt:capacity>
+ </nmwgt:interface>
+ </perfsonar:subject>
+ <nmwg:eventType>utilization</nmwg:eventType>
+ </nmwg:metadata>
+ </nmwg:data>
-->

-
</nmwg:message>

Modified:
trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/LSRegisterRequest.xml
===================================================================
---
trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/LSRegisterRequest.xml
2007-02-15 16:03:49 UTC (rev 2080)
+++
trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/LSRegisterRequest.xml
2007-02-15 18:19:25 UTC (rev 2081)
@@ -9,80 +9,76 @@
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";

xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";>


- <nmwg:metadata id="serviceLookupInfo">
- <perfsonar:subject id="commonParameters"
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";>
- <psservice:service id="serviceParameters"
xmlns:psservice="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";>
- <psservice:serviceName>My_test_MA</psservice:serviceName>
-
<psservice:accessPoint>http://reed.man.poznan.pl:8080/axis/services/MA</psservice:accessPoint>
- <psservice:serviceType>MA</psservice:serviceType>
- <psservice:serviceDescription>This is my testing
MA</psservice:serviceDescription>
- </psservice:service>
- </perfsonar:subject>
- </nmwg:metadata>
+ <nmwg:metadata id="serviceLookupInfo">
+ <perfsonar:subject id="commonParameters"
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";>
+ <psservice:service id="serviceParameters"
xmlns:psservice="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";>
+ <psservice:serviceName>My_test_MA</psservice:serviceName>
+
<psservice:accessPoint>http://reed.man.poznan.pl:8080/axis/services/MA</psservice:accessPoint>
+ <psservice:serviceType>MA</psservice:serviceType>
+ <psservice:serviceDescription>This is my testing
MA</psservice:serviceDescription>
+ </psservice:service>
+ </perfsonar:subject>
+ </nmwg:metadata>

- <nmwg:data id="data0" metadataIdRef="serviceLookupInfo">
- <nmwg:metadata id="meta1">
- <perfsonar:subject id="subj1"
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";>
- <nmwgt:interface
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
-
<nmwgt:hostName>atlang-hstnng.abilene.ucaid.edu</nmwgt:hostName>
- <nmwgt:ifName>unknown</nmwgt:ifName>
-
<nmwgt:ifDescription>hstn:oc192(p2p)::show:intracloud</nmwgt:ifDescription>
- <nmwgt:ifAddress
type="ipv4">198.32.8.34</nmwgt:ifAddress>
- <nmwgt:direction>in</nmwgt:direction>
- <nmwgt:capacity>10000000000</nmwgt:capacity>
- </nmwgt:interface>
- </perfsonar:subject>
- <nmwg:eventType>utilization</nmwg:eventType>
- </nmwg:metadata>
- </nmwg:data>
+ <nmwg:data id="data0" metadataIdRef="serviceLookupInfo">
+ <nmwg:metadata id="meta1">
+ <perfsonar:subject id="subj1"
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";>
+ <nmwgt:interface xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
+ <nmwgt:hostName>atlang-hstnng.abilene.ucaid.edu</nmwgt:hostName>
+ <nmwgt:ifName>unknown</nmwgt:ifName>
+
<nmwgt:ifDescription>hstn:oc192(p2p)::show:intracloud</nmwgt:ifDescription>
+ <nmwgt:ifAddress type="ipv4">198.32.8.34</nmwgt:ifAddress>
+ <nmwgt:direction>in</nmwgt:direction>
+ <nmwgt:capacity>10000000000</nmwgt:capacity>
+ </nmwgt:interface>
+ </perfsonar:subject>
+ <nmwg:eventType>utilization</nmwg:eventType>
+ </nmwg:metadata>
+ </nmwg:data>

- <nmwg:data id="data1" metadataIdRef="serviceLookupInfo">
- <nmwg:metadata id="meta2">
- <perfsonar:subject id="subj1"
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";>
- <nmwgt:interface
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
-
<nmwgt:hostName>atlang22-hstnng.abilene.ucaid.edu</nmwgt:hostName>
- <nmwgt:ifName>unknown</nmwgt:ifName>
-
<nmwgt:ifDescription>hstn:oc192(p2p)::show:intracloud</nmwgt:ifDescription>
- <nmwgt:ifAddress
type="ipv4">198.32.8.34</nmwgt:ifAddress>
- <nmwgt:direction>in</nmwgt:direction>
- <nmwgt:capacity>10000000000</nmwgt:capacity>
- </nmwgt:interface>
- </perfsonar:subject>
- <nmwg:eventType>utilization</nmwg:eventType>
- </nmwg:metadata>
- </nmwg:data>
+ <nmwg:data id="data1" metadataIdRef="serviceLookupInfo">
+ <nmwg:metadata id="meta2">
+ <perfsonar:subject id="subj1"
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";>
+ <nmwgt:interface xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
+ <nmwgt:hostName>atlang22-hstnng.abilene.ucaid.edu</nmwgt:hostName>
+ <nmwgt:ifName>unknown</nmwgt:ifName>
+
<nmwgt:ifDescription>hstn:oc192(p2p)::show:intracloud</nmwgt:ifDescription>
+ <nmwgt:ifAddress type="ipv4">198.32.8.34</nmwgt:ifAddress>
+ <nmwgt:direction>in</nmwgt:direction>
+ <nmwgt:capacity>10000000000</nmwgt:capacity>
+ </nmwgt:interface>
+ </perfsonar:subject>
+ <nmwg:eventType>utilization</nmwg:eventType>
+ </nmwg:metadata>
+ </nmwg:data>

-
<!--
- <nmwg:metadata id="serviceLookupInfo2">
- <perfsonar:subject id="commonParameters"
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";>
- <psservice:service id="serviceParameters"
xmlns:psservice="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";>
- <psservice:serviceName>My_test_MA</psservice:serviceName>
-
<psservice:accessPoint>http://reed.man.poznan.pl:8080/axis/services/MA</psservice:accessPoint>
- <psservice:serviceType>MA</psservice:serviceType>
- <psservice:serviceDescription>This is my testing
MA</psservice:serviceDescription>
- </psservice:service>
- </perfsonar:subject>
+ <nmwg:metadata id="serviceLookupInfo2">
+ <perfsonar:subject id="commonParameters"
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";>
+ <psservice:service id="serviceParameters"
xmlns:psservice="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";>
+ <psservice:serviceName>My_test_MA</psservice:serviceName>
+
<psservice:accessPoint>http://reed.man.poznan.pl:8080/axis/services/MA</psservice:accessPoint>
+ <psservice:serviceType>MA</psservice:serviceType>
+ <psservice:serviceDescription>This is my testing
MA</psservice:serviceDescription>
+ </psservice:service>
+ </perfsonar:subject>
+ </nmwg:metadata>
+
+ <nmwg:data id="data2" metadataIdRef="serviceLookupInfo2">
+ <nmwg:metadata id="meta2">
+ <perfsonar:subject id="subj1"
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";>
+ <nmwgt:interface xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
+ <nmwgt:hostName>atlang22-hstnng.abilene.ucaid.edu</nmwgt:hostName>
+ <nmwgt:ifName>unknown</nmwgt:ifName>
+
<nmwgt:ifDescription>hstn:oc192(p2p)::show:intracloud</nmwgt:ifDescription>
+ <nmwgt:ifAddress type="ipv4">198.32.8.34</nmwgt:ifAddress>
+ <nmwgt:direction>in</nmwgt:direction>
+ <nmwgt:capacity>10000000000</nmwgt:capacity>
+ </nmwgt:interface>
+ </perfsonar:subject>
+ <nmwg:eventType>utilization</nmwg:eventType>
</nmwg:metadata>
-
-
- <nmwg:data id="data2" metadataIdRef="serviceLookupInfo2">
- <nmwg:metadata id="meta2">
- <perfsonar:subject id="subj1"
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";>
- <nmwgt:interface
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
-
<nmwgt:hostName>atlang22-hstnng.abilene.ucaid.edu</nmwgt:hostName>
- <nmwgt:ifName>unknown</nmwgt:ifName>
-
<nmwgt:ifDescription>hstn:oc192(p2p)::show:intracloud</nmwgt:ifDescription>
- <nmwgt:ifAddress
type="ipv4">198.32.8.34</nmwgt:ifAddress>
- <nmwgt:direction>in</nmwgt:direction>
- <nmwgt:capacity>10000000000</nmwgt:capacity>
- </nmwgt:interface>
- </perfsonar:subject>
- <nmwg:eventType>utilization</nmwg:eventType>
- </nmwg:metadata>
- </nmwg:data>
-
+ </nmwg:data>
-->
-
-
+
</nmwg:message>

Modified:
trunk/perfsonar/schema/example-instances/perfSONAR/MeasurementArchiveStore-L2status-Req-1.xml
===================================================================
---
trunk/perfsonar/schema/example-instances/perfSONAR/MeasurementArchiveStore-L2status-Req-1.xml
2007-02-15 16:03:49 UTC (rev 2080)
+++
trunk/perfsonar/schema/example-instances/perfSONAR/MeasurementArchiveStore-L2status-Req-1.xml
2007-02-15 18:19:25 UTC (rev 2081)
@@ -4,7 +4,6 @@
may be be multiple blocks) for storage into a
MeasurementArchive -->
<!-- Version: $Id: MeasurementArchiveStoreRequest-1.xml,v 1.4 2006/02/24
13:57:53 romradz Exp $ -->
-
<nmwg:message id="msg4"
type="MeasurementArchiveStoreRequest"
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
@@ -12,7 +11,6 @@
xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
xmlns:ifevt="http://ggf.org/ns/nmwg/event/status/base/2.0/";>

-
<nmwg:metadata id="meta1">
<nmwg:subject id="subject1">
<nmtl2:link>
@@ -22,7 +20,6 @@
<nmwg:eventType>Path.Status</nmwg:eventType>
</nmwg:metadata>

-
<nmwg:data id="data1" metadataIdRef="meta1">
<ifevt:datum timeType="unix" timeValue="1157107685">
<ifevt:stateAdmin>TEST2</ifevt:stateAdmin>
@@ -30,5 +27,4 @@
</ifevt:datum>
</nmwg:data>

-
</nmwg:message>

Modified:
trunk/perfsonar/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-2.xml
===================================================================
---
trunk/perfsonar/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-2.xml
2007-02-15 16:03:49 UTC (rev 2080)
+++
trunk/perfsonar/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-2.xml
2007-02-15 18:19:25 UTC (rev 2081)
@@ -26,7 +26,6 @@
<nmwgt:direction>in</nmwgt:direction>
<nmwgt:hostName>test-hostName</nmwgt:hostName>
<nmwgt:ifName>test-0</nmwgt:ifName>
- <nmwgt:direction>in</nmwgt:direction>
<nmwgt:authRealm>TestRealm</nmwgt:authRealm>
<nmwgt:capacity>1000BaseT</nmwgt:capacity>


Modified:
trunk/perfsonar/schema/example-instances/perfSONAR/TOPS/test/Void.xml
===================================================================
--- trunk/perfsonar/schema/example-instances/perfSONAR/TOPS/test/Void.xml
2007-02-15 16:03:49 UTC (rev 2080)
+++ trunk/perfsonar/schema/example-instances/perfSONAR/TOPS/test/Void.xml
2007-02-15 18:19:25 UTC (rev 2081)
@@ -4,10 +4,12 @@
and register the Topology Service in the LS.
-->

-<nmwg:message
- type="TopsVoid"
- id="msg1"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
-

+<nmwg:message type="TopsVoid" id="msg1"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+
+ <nmwg:metadata id="void0" />
+
+ <nmwg:data id="void1" metadataIdRef="void0"/>
+

</nmwg:message>


Modified:
trunk/perfsonar/schema/example-instances/perfSONAR/link-status-store.xml
===================================================================
--- trunk/perfsonar/schema/example-instances/perfSONAR/link-status-store.xml
2007-02-15 16:03:49 UTC (rev 2080)
+++ trunk/perfsonar/schema/example-instances/perfSONAR/link-status-store.xml
2007-02-15 18:19:25 UTC (rev 2081)
@@ -1,92 +1,92 @@
<nmwg:store type="E2E_Link_status_information"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
-
xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
- xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
- xmlns:nmtl3="http://ggf.org/ns/nmwg/topology/l3/3.0/";>
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
+ xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
+ xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
+ xmlns:nmtl3="http://ggf.org/ns/nmwg/topology/l3/3.0/";>

<nmwg:parameters id="storeId">
- <nmwg:parameter name="DomainName">DFN</nmwg:parameter>
+ <nmwg:parameter name="DomainName">DFN</nmwg:parameter>
</nmwg:parameters>

<nmwg:metadata id="md1">
- <nmwg:subject id="sub-DFN-LRZ">
- <nmwgtopo3:node id="DFN-LRZ">
- <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
- <nmwgtopo3:name type="logical">DFN-LRZ</nmwgtopo3:name>
- <nmwgtopo3:country>Germany</nmwgtopo3:country>
- <nmwgtopo3:city>Munich</nmwgtopo3:city>
- <nmwgtopo3:institution>Leibniz
Rechenzentrum</nmwgtopo3:institution>
- <nmwgtopo3:latitude>X</nmwgtopo3:latitude>
- <nmwgtopo3:longitude>Y</nmwgtopo3:longitude>
- </nmwgtopo3:node>
- </nmwg:subject>
+ <nmwg:subject id="sub-DFN-LRZ">
+ <nmwgtopo3:node id="DFN-LRZ">
+ <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
+ <nmwgtopo3:name type="logical">DFN-LRZ</nmwgtopo3:name>
+ <nmwgtopo3:country>Germany</nmwgtopo3:country>
+ <nmwgtopo3:city>Munich</nmwgtopo3:city>
+ <nmwgtopo3:institution>Leibniz Rechenzentrum</nmwgtopo3:institution>
+ <nmwgtopo3:latitude>1.11</nmwgtopo3:latitude>
+ <nmwgtopo3:longitude>1.11</nmwgtopo3:longitude>
+ </nmwgtopo3:node>
+ </nmwg:subject>
</nmwg:metadata>

<nmwg:metadata id="md2">
- <nmwg:subject id="sub-DFN-MUE">
- <nmwgtopo3:node id="DFN-MUE">
- <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
- <nmwgtopo3:name type="logical">DFN-MUE</nmwgtopo3:name>
- <nmwgtopo3:country>Germany</nmwgtopo3:country>
- <nmwgtopo3:city>Muenster</nmwgtopo3:city>
- <nmwgtopo3:institution>DFN-Verein</nmwgtopo3:institution>
- <nmwgtopo3:latitude>X</nmwgtopo3:latitude>
- <nmwgtopo3:longitude>Y</nmwgtopo3:longitude>
- </nmwgtopo3:node>
- </nmwg:subject>
+ <nmwg:subject id="sub-DFN-MUE">
+ <nmwgtopo3:node id="DFN-MUE">
+ <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
+ <nmwgtopo3:name type="logical">DFN-MUE</nmwgtopo3:name>
+ <nmwgtopo3:country>Germany</nmwgtopo3:country>
+ <nmwgtopo3:city>Muenster</nmwgtopo3:city>
+ <nmwgtopo3:institution>DFN-Verein</nmwgtopo3:institution>
+ <nmwgtopo3:latitude>1.11</nmwgtopo3:latitude>
+ <nmwgtopo3:longitude>1.11</nmwgtopo3:longitude>
+ </nmwgtopo3:node>
+ </nmwg:subject>
</nmwg:metadata>

<nmwg:metadata id="md-link-LRZ-SARA-DEISA-001">
- <nmwg:subject id="sub1">
- <nmtl2:link>
- <nmtl2:name type="logical">DFN-link-1234</nmtl2:name>
- <nmtl2:globalName
type="logical">LRZ-SARA-DEISA-001</nmtl2:globalName>
- <nmtl2:type>NREN_Link</nmtl2:type>
+ <nmwg:subject id="sub1">
+ <nmtl2:link>
+ <nmtl2:name type="logical">DFN-link-1234</nmtl2:name>
+ <nmtl2:globalName type="logical">LRZ-SARA-DEISA-001</nmtl2:globalName>
+ <nmtl2:type>NREN_Link</nmtl2:type>

- <nmwgtopo3:node nodeIdRef="DFN-LRZ">
- <nmwgtopo3:role>EndPoint</nmwgtopo3:role>
- </nmwgtopo3:node>
+ <nmwgtopo3:node nodeIdRef="DFN-LRZ">
+ <nmwgtopo3:role>EndPoint</nmwgtopo3:role>
+ </nmwgtopo3:node>

- <nmwgtopo3:node nodeIdRef="DFN-MUE">
- <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
- </nmwgtopo3:node>
-
- </nmtl2:link>
- </nmwg:subject>
+ <nmwgtopo3:node nodeIdRef="DFN-MUE">
+ <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+ </nmwgtopo3:node>
+
+ </nmtl2:link>
+ </nmwg:subject>
</nmwg:metadata>

<nmwg:metadata id="md-link-LRZ-SARA-DEISA-002">
- <nmwg:subject id="sub1">
- <nmtl2:link>
- <nmtl2:name type="logical">DFN-Surfnet-Link-5678</nmtl2:name>
- <nmtl2:globalName
type="logical">LRZ-SARA-DEISA-002</nmtl2:globalName>
- <nmtl2:type>ID_Link</nmtl2:type>
+ <nmwg:subject id="sub1">
+ <nmtl2:link>
+ <nmtl2:name type="logical">DFN-Surfnet-Link-5678</nmtl2:name>
+ <nmtl2:globalName type="logical">LRZ-SARA-DEISA-002</nmtl2:globalName>
+ <nmtl2:type>ID_Link</nmtl2:type>

- <nmwgtopo3:node nodeIdRef="DFN-MUE">
- <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
- </nmwgtopo3:node>
+ <nmwgtopo3:node nodeIdRef="DFN-MUE">
+ <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+ </nmwgtopo3:node>

- <nmwgtopo3:node nodeIdRef="SURFnet-MUE">
- <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
- </nmwgtopo3:node>
+ <nmwgtopo3:node nodeIdRef="SURFnet-MUE">
+ <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+ </nmwgtopo3:node>

- </nmtl2:link>
- </nmwg:subject>
+ </nmtl2:link>
+ </nmwg:subject>
</nmwg:metadata>

<nmwg:data id="d1" metadataIdRef="md-link-LRZ-SARA-DEISA-001">
- <nmwg:datum timeType="ISO" time="2006-04-20T17:20:00.0+1:00">
- <nmwg:stateOper>Up</nmwg:stateOper>
- <nmwg:stateAdmin>NormalOperation</nmwg:stateAdmin>
- </nmwg:datum>
+ <nmwg:datum timeType="ISO" time="2006-04-20T17:20:00.0+1:00">
+ <nmwg:stateOper>Up</nmwg:stateOper>
+ <nmwg:stateAdmin>NormalOperation</nmwg:stateAdmin>
+ </nmwg:datum>
</nmwg:data>

<nmwg:data id="d2" metadataIdRef="md-link-LRZ-SARA-DEISA-002">
- <nmwg:datum timeType="ISO" time="2006-04-20T17:20:00.0+1:00">
- <nmwg:stateOper>Down</nmwg:stateOper>
- <nmwg:stateAdmin>Maintenance</nmwg:stateAdmin>
- </nmwg:datum>
+ <nmwg:datum timeType="ISO" time="2006-04-20T17:20:00.0+1:00">
+ <nmwg:stateOper>Down</nmwg:stateOper>
+ <nmwg:stateAdmin>Maintenance</nmwg:stateAdmin>
+ </nmwg:datum>
</nmwg:data>

</nmwg:store>

Modified:
trunk/perfsonar/schema/example-instances/perfSONAR/nmsTypeMP/nmsTypeMP-store-beta1.xml
===================================================================
---
trunk/perfsonar/schema/example-instances/perfSONAR/nmsTypeMP/nmsTypeMP-store-beta1.xml
2007-02-15 16:03:49 UTC (rev 2080)
+++
trunk/perfsonar/schema/example-instances/perfSONAR/nmsTypeMP/nmsTypeMP-store-beta1.xml
2007-02-15 18:19:25 UTC (rev 2081)
@@ -1,4 +1,4 @@
-<perfsonar:store id="msg1"
+<nmwg:store type="sometype" id="msg1"
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
@@ -24,7 +24,7 @@

<nmwg:data id="data1" metadataIdRef="meta1">
<nmwg:key>
- <nmwg:parameters>
+ <nmwg:parameters id="someid">
<nmwg:parameter name="wavelength_descr">

ter.fra-ams.fra.de/(odu2TTPId,11160102),(ochgdcCTPId,1),(rsTrailMonitorId,2),(scannerId,3)
</nmwg:parameter>
@@ -51,7 +51,7 @@

<nmwg:data id="data2" metadataIdRef="meta2">
<nmwg:key>
- <nmwg:parameters>
+ <nmwg:parameters id="someid">
<nmwg:parameter name="wavelength_descr">

ter.ams-fra.ams.nl/(odu2TTPId,11160102),(ochgdcCTPId,1),(rsTrailMonitorId,2),(scannerId,3)
</nmwg:parameter>
@@ -79,7 +79,7 @@

<nmwg:data id="data3" metadataIdRef="meta3">
<nmwg:key>
- <nmwg:parameters>
+ <nmwg:parameters id="someid">
<nmwg:parameter name="wavelength_descr">

ter.par-gen.par.fr/(odu2TTPId,11160102),(ochgdcCTPId,1),(rsTrailMonitorId,2),(scannerId,3)
</nmwg:parameter>
@@ -106,7 +106,7 @@

<nmwg:data id="data4" metadataIdRef="meta4">
<nmwg:key>
- <nmwg:parameters>
+ <nmwg:parameters id="someid">
<nmwg:parameter name="wavelength_descr">

ter.gen-par.gen.ch/(odu2TTPId,11160102),(ochgdcCTPId,1),(rsTrailMonitorId,2),(scannerId,3)
</nmwg:parameter>
@@ -134,7 +134,7 @@

<nmwg:data id="data5" metadataIdRef="meta5">
<nmwg:key>
- <nmwg:parameters>
+ <nmwg:parameters id="someid">
<nmwg:parameter name="wavelength_descr">

ter.par-lon.par.fr/(odu2TTPId,11160102),(ochgdcCTPId,1),(rsTrailMonitorId,2),(scannerId,3)
</nmwg:parameter>
@@ -161,7 +161,7 @@

<nmwg:data id="data6" metadataIdRef="meta6">
<nmwg:key>
- <nmwg:parameters>
+ <nmwg:parameters id="someid">
<nmwg:parameter name="wavelength_descr">

ter.lon-par.lon.uk/(odu2TTPId,11160102),(ochgdcCTPId,1),(rsTrailMonitorId,2),(scannerId,3)
</nmwg:parameter>
@@ -189,7 +189,7 @@

<nmwg:data id="data7" metadataIdRef="meta7">
<nmwg:key>
- <nmwg:parameters>
+ <nmwg:parameters id="someid">
<nmwg:parameter name="wavelength_descr">

ter.bud-bra.bud.hu/(odu2TTPId,11160102),(ochgdcCTPId,1),(rsTrailMonitorId,2),(scannerId,3)
</nmwg:parameter>
@@ -216,7 +216,7 @@

<nmwg:data id="data8" metadataIdRef="meta8">
<nmwg:key>
- <nmwg:parameters>
+ <nmwg:parameters id="someid">
<nmwg:parameter name="wavelength_descr">

ter.bra-bud.bra.sk/(odu2TTPId,11160102),(ochgdcCTPId,1),(rsTrailMonitorId,2),(scannerId,3)
</nmwg:parameter>
@@ -244,7 +244,7 @@

<nmwg:data id="data9" metadataIdRef="meta9">
<nmwg:key>
- <nmwg:parameters>
+ <nmwg:parameters id="someid">
<nmwg:parameter name="wavelength_descr">

ter.pra-fra.pra.cz/(odu2TTPId,11170102),(ochgdcCTPId,1),(rsTrailMonitorId,2),(scannerId,3)
</nmwg:parameter>
@@ -271,7 +271,7 @@

<nmwg:data id="data10" metadataIdRef="meta10">
<nmwg:key>
- <nmwg:parameters>
+ <nmwg:parameters id="someid">
<nmwg:parameter name="wavelength_descr">

ter.fra-pra.fra.de/(odu2TTPId,11170102),(ochgdcCTPId,1),(rsTrailMonitorId,2),(scannerId,3)
</nmwg:parameter>
@@ -299,7 +299,7 @@

<nmwg:data id="data11" metadataIdRef="meta11">
<nmwg:key>
- <nmwg:parameters>
+ <nmwg:parameters id="someid">
<nmwg:parameter name="wavelength_descr">

ter.mil-gen.mil.it/(odu2TTPId,11180102),(ochgdcCTPId,1),(rsTrailMonitorId,2),(scannerId,3)
</nmwg:parameter>
@@ -326,7 +326,7 @@

<nmwg:data id="data12" metadataIdRef="meta12">
<nmwg:key>
- <nmwg:parameters>
+ <nmwg:parameters id="someid">
<nmwg:parameter name="wavelength_descr">

ter.gen-mil.gen.ch/(odu2TTPId,11180102),(ochgdcCTPId,1),(rsTrailMonitorId,2),(scannerId,3)
</nmwg:parameter>
@@ -354,7 +354,7 @@

<nmwg:data id="data13" metadataIdRef="meta13">
<nmwg:key>
- <nmwg:parameters>
+ <nmwg:parameters id="someid">
<nmwg:parameter name="wavelength_descr">

ter.mil-gen.mil.it/(odu2TTPId,11160102),(ochgdcCTPId,1),(rsTrailMonitorId,2),(scannerId,3)
</nmwg:parameter>
@@ -381,7 +381,7 @@

<nmwg:data id="data14" metadataIdRef="meta14">
<nmwg:key>
- <nmwg:parameters>
+ <nmwg:parameters id="someid">
<nmwg:parameter name="wavelength_descr">

ter.gen-mil.gen.ch/(odu2TTPId,11160102),(ochgdcCTPId,1),(rsTrailMonitorId,2),(scannerId,3)
</nmwg:parameter>
@@ -390,4 +390,4 @@
</nmwg:data>


-</perfsonar:store>
+</nmwg:store>

Modified:
trunk/perfsonar/schema/example-instances/perfSONAR/snmpTypeMP/DataRequest-withKey.xml
===================================================================
---
trunk/perfsonar/schema/example-instances/perfSONAR/snmpTypeMP/DataRequest-withKey.xml
2007-02-15 16:03:49 UTC (rev 2080)
+++
trunk/perfsonar/schema/example-instances/perfSONAR/snmpTypeMP/DataRequest-withKey.xml
2007-02-15 18:19:25 UTC (rev 2081)
@@ -8,7 +8,7 @@
<!-- empty metadata will not work for snmp mp service -->

<nmwg:key>
- <nmwg:parameters>
+ <nmwg:parameters id="someid">
<nmwg:parameter
name="OIDNumeric">.1.3.6.1.2.1.2.2.1.10</nmwg:parameter>
<nmwg:parameter
name="ifIndex">42</nmwg:parameter>
<nmwg:parameter
name="SNMPAgent">uk1.uk.geant.net</nmwg:parameter>

Modified:
trunk/perfsonar/schema/example-instances/perfSONAR/snmpTypeMP/snmpTypeMP-store-beta1.xml
===================================================================
---
trunk/perfsonar/schema/example-instances/perfSONAR/snmpTypeMP/snmpTypeMP-store-beta1.xml
2007-02-15 16:03:49 UTC (rev 2080)
+++
trunk/perfsonar/schema/example-instances/perfSONAR/snmpTypeMP/snmpTypeMP-store-beta1.xml
2007-02-15 18:19:25 UTC (rev 2081)
@@ -1,4 +1,4 @@
-<perfsonar:store id="msg1"
+<nmwg:store id="msg1" type="sometype"
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
@@ -27,7 +27,7 @@

<nmwg:data id="data1" metadataIdRef="meta1">
<nmwg:key>
- <nmwg:parameters>
+ <nmwg:parameters id="someid">
<nmwg:parameter
name="OIDNumeric">.1.3.6.1.2.1.2.2.1.10</nmwg:parameter>
<nmwg:parameter
name="ifIndex">42</nmwg:parameter>
<nmwg:parameter
name="SNMPAgent">uk1.uk.geant.net</nmwg:parameter>
@@ -59,7 +59,7 @@

<nmwg:data id="data2" metadataIdRef="meta2">
<nmwg:key>
- <nmwg:parameters>
+ <nmwg:parameters id="someid">
<nmwg:parameter
name="OIDNumeric">.1.3.6.1.2.1.2.2.1.10</nmwg:parameter>
<nmwg:parameter
name="ifIndex">58</nmwg:parameter>
<nmwg:parameter
name="SNMPAgent">uk1.uk.geant.net</nmwg:parameter>
@@ -69,4 +69,4 @@
</nmwg:data>


-</perfsonar:store>
+</nmwg:store>


  • r2081 - in trunk/perfsonar/schema/example-instances/perfSONAR: . LS/test TOPS/test nmsTypeMP snmpTypeMP, svnlog, 02/15/2007

Archive powered by MHonArc 2.6.16.

Top of Page