Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r3530 - in trunk/functional-testing/PingER: . metadataKey-req metadataKey-res setupData-req setupData-res

Subject: perfsonar development work

List archive

perfsonar: r3530 - in trunk/functional-testing/PingER: . metadataKey-req metadataKey-res setupData-req setupData-res


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r3530 - in trunk/functional-testing/PingER: . metadataKey-req metadataKey-res setupData-req setupData-res
  • Date: Tue, 18 Mar 2008 10:38:19 -0400
Author: maxim
Date: 2008-03-18 10:38:19 -0400 (Tue, 18 Mar 2008)
New Revision: 3530

Modified:
trunk/functional-testing/PingER/PingER_-soapui-project.xml
trunk/functional-testing/PingER/metadataKey-req/nmwg.xsd
trunk/functional-testing/PingER/metadataKey-req/pinger-mdkreq.rnc
trunk/functional-testing/PingER/metadataKey-req/pinger-mdkreq.rng
trunk/functional-testing/PingER/metadataKey-req/pinger.xsd
trunk/functional-testing/PingER/metadataKey-res/nmwg.xsd
trunk/functional-testing/PingER/metadataKey-res/pinger-mdkresp.rnc
trunk/functional-testing/PingER/metadataKey-res/pinger-mdkresp.rng
trunk/functional-testing/PingER/metadataKey-res/pinger.xsd
trunk/functional-testing/PingER/setupData-req/pinger-sdreq.rnc
trunk/functional-testing/PingER/setupData-res/nmwg.xsd
trunk/functional-testing/PingER/setupData-res/pinger-sdresp.rnc
trunk/functional-testing/PingER/setupData-res/pinger-sdresp.rng
trunk/functional-testing/PingER/setupData-res/pinger.xsd
Log:
updated test case with fixed md schema ( pinger parameters moved out of
subject )


Modified: trunk/functional-testing/PingER/PingER_-soapui-project.xml
===================================================================
--- trunk/functional-testing/PingER/PingER_-soapui-project.xml 2008-03-18
14:37:06 UTC (rev 3529)
+++ trunk/functional-testing/PingER/PingER_-soapui-project.xml 2008-03-18
14:38:19 UTC (rev 3530)
@@ -1152,11 +1152,8 @@
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>

<nmwg:metadata id="meta1">
- <pinger:subject xmlns:pinger="http://ggf.org/ns/nmwg/tools/pinger/2.0/";
id="subject1">
- <nmwgt:endPointPair xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
- <nmwgt:dst type="hostname" value="www.slac.stanford.edu"/>
- </nmwgt:endPointPair>
- </pinger:subject>
+ <pinger:parameters id="subject1"/>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/pinger/2.0/</nmwg:eventType>
</nmwg:metadata>

@@ -1299,14 +1296,14 @@
<nmwg:metadata id="meta1">
<pinger:subject xmlns:pinger="http://ggf.org/ns/nmwg/tools/pinger/2.0/";
id="subject1">
<nmwgt:endPointPair xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
- <nmwgt:src type="hostname" value="lhcopnmon1-mgm.fnal.gov"/>
- <nmwgt:dst type="hostname" value="www.slac.stanford.edu"/>
+ <nmwgt:src type="hostname" value="tukki.fnal.gov"/>
+ <nmwgt:dst type="hostname" value="pinger.slac.stanford.edu"/>
</nmwgt:endPointPair>
+ </pinger:subject>
<pinger:parameters>
<nmwg:parameter name="packetSize">1000</nmwg:parameter>
<nmwg:parameter name="count">10</nmwg:parameter>
</pinger:parameters>
- </pinger:subject>
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/pinger/2.0/</nmwg:eventType>
</nmwg:metadata>

@@ -1338,6 +1335,55 @@
declare namespace nmwg='http://ggf.org/ns/nmwg/base/2.0/';
declare namespace soapenv='http://schemas.xmlsoap.org/soap/envelope/';

+//nmwg:message/@type</path><content>MetadataKeyResponse</content><allowWildcards>false</allowWildcards></con:configuration></con:assertion></con:request></con:config></con:testStep><con:testStep
type="request" name="No endPoint pair, just pinger
parameters"><con:settings/><con:config xsi:type="con:RequestStep"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:interface>MetadataBinding</con:interface><con:operation>HandleMetadata</con:operation><con:request
name="No endPoint pair, just pinger
parameters"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://tukki.fnal.gov:8075/perfSONAR_PS/services/pinger/ma</con:endpoint><con:request><![CDATA[
<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/";
+xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+ <soapenv:Header/>
+ <soapenv:Body>
+ <nmwg:message id="message1"
+ type="MetadataKeyRequest"
+ xmlns="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:pinger="http://ggf.org/ns/nmwg/tools/pinger/2.0/";
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+
+ <nmwg:metadata id="meta1">
+ <pinger:subject xmlns:pinger="http://ggf.org/ns/nmwg/tools/pinger/2.0/";
id="subject1"/>
+
+ <pinger:parameters>
+ <nmwg:parameter name="packetInterval">1</nmwg:parameter>
+ </pinger:parameters>
+
+ <nmwg:eventType>http://ggf.org/ns/nmwg/tools/pinger/2.0/</nmwg:eventType>
+ </nmwg:metadata>
+
+ <nmwg:data id="data1" metadataIdRef="meta1"/>
+
+</nmwg:message>
+ </soapenv:Body>
+</soapenv:Envelope>]]></con:request><con:assertion type="SOAP
Response"/><con:assertion type="SOAP Fault Assertion"/><con:assertion
type="GroovyScriptAssertion"><con:configuration><scriptText>import
java.io.File;
+import java.io.OutputStream;
+import java.io.StringWriter;
+import javax.xml.transform.*;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.XMLConstants;
+import javax.xml.validation.SchemaFactory;
+import java.io.StringWriter;
+
+
+def groovyUtils = new com.eviware.soapui.support.GroovyUtils( context );
+def holder = groovyUtils.getXmlHolder(messageExchange.getResponseContent());
+def factory = SchemaFactory.newInstance(XMLConstants.RELAXNG_NS_URI);
+def schema = factory.newSchema(new
File("/home/pinger/LHCOPN/perfSONAR-PS/branches/pinger/perfSONAR-PS-PingER-1.0/Functional_Testing/metadataKey-res/pinger-mdkresp.rng"));
+def validator = schema.newValidator();
+def node = holder.getDomNode("//nmwg:message");
+validator.validate(new
DOMSource(node));</scriptText></con:configuration></con:assertion><con:assertion
type="XPath Match"><con:configuration><path>declare namespace
nmwgt='http://ggf.org/ns/nmwg/topology/2.0/';
+declare namespace select='http://ggf.org/ns/nmwg/ops/select/2.0/';
+declare namespace pinger='http://ggf.org/ns/nmwg/tools/pinger/2.0/';
+declare namespace nmwg='http://ggf.org/ns/nmwg/base/2.0/';
+declare namespace soapenv='http://schemas.xmlsoap.org/soap/envelope/';
+

//nmwg:message/@type</path><content>MetadataKeyResponse</content><allowWildcards>false</allowWildcards></con:configuration></con:assertion></con:request></con:config></con:testStep><con:properties/></con:testCase><con:testCase
failOnError="false" failTestCaseOnErrors="true" keepSession="false" name="
Malformed requests" searchProperties="true"><con:settings/><con:testStep
type="request" name="Metadata - Not type in
message"><con:settings/><con:config xsi:type="con:RequestStep"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:interface>MetadataRequest</con:interface><con:operation>Metadata</con:operation><con:request
name="Metadata - Not type in message"
wssPasswordType=""><con:settings><con:setting
id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://tukki.fnal.gov:8075/perfSONAR_PS/services/pinger/ma</con:endpoint><con:request><![CDATA[
<soapenv:Envelope
xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
<soapenv:Header/>
@@ -1885,24 +1931,26 @@
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";>

- <nmwg:metadata id="meta2" metadataIdRef="meta1">
+ <nmwg:metadata id="metaBase">
<pinger:subject xmlns:pinger="http://ggf.org/ns/nmwg/tools/pinger/2.0/";
id="subject1">
<nmwgt:endPointPair xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
- <nmwgt:dst type="hostname" value="www.slac.stanford.edu"/>
- </nmwgt:endPointPair>
+ <nmwgt:dst type="hostname" value="pinger.slac.stanford.edu"/>
+ </nmwgt:endPointPair>
</pinger:subject>
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/pinger/2.0/</nmwg:eventType>
</nmwg:metadata>
- <nmwg:metadata id="meta1">
- <select:subject id="select1"/>
- <select:parameters id="param1c">
- <nmwg:parameter name="startTime">1193876292</nmwg:parameter>
- <nmwg:parameter name="endTime">1194045045</nmwg:parameter>
+
+ <nmwg:metadata id="metaTime">
+ <select:subject id="selectTime" metadataIdRef="metaBase"/>
+ <select:parameters id="param2c">
+ <nmwg:parameter name="startTime">1200176292</nmwg:parameter>
+ <nmwg:parameter name="endTime">1205194504</nmwg:parameter>
</select:parameters>
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0/</nmwg:eventType>
</nmwg:metadata>
- <nmwg:data id="data1" metadataIdRef="meta2"/>
+

+ <nmwg:data id="data1" metadataIdRef="metaTime"/>
</nmwg:message>
</soapenv:Body>
</soapenv:Envelope>]]></con:request><con:assertion type="SOAP
Response"/><con:assertion type="SOAP Fault Assertion"/><con:assertion
type="GroovyScriptAssertion"><con:configuration><scriptText>import
java.io.File;
@@ -1942,22 +1990,24 @@
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";>

- <nmwg:metadata id="meta2" metadataIdRef="meta1">
+ <nmwg:metadata id="meta2">
<pinger:subject xmlns:pinger="http://ggf.org/ns/nmwg/tools/pinger/2.0/";
id="subject1">
<nmwgt:endPointPair xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
- <nmwgt:src type="hostname" value="lhcopnmon1-mgm.fnal.gov"/>
+ <nmwgt:src type="hostname" value="tukki.fnal.gov"/>
</nmwgt:endPointPair>
</pinger:subject>
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/pinger/2.0/</nmwg:eventType>
</nmwg:metadata>
+
<nmwg:metadata id="meta1">
+ <select:subject id="sel1" metadataIdRef="meta2"/>
<select:parameters id="param2c">
- <nmwg:parameter name="startTime">1198076292</nmwg:parameter>
- <nmwg:parameter name="endTime">1199045045</nmwg:parameter>
+ <nmwg:parameter name="startTime">1205176292</nmwg:parameter>
+ <nmwg:parameter name="endTime">1205185045</nmwg:parameter>
</select:parameters>
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0/</nmwg:eventType>
</nmwg:metadata>
- <nmwg:data id="data1" metadataIdRef="meta2"/>
+ <nmwg:data id="data1" metadataIdRef="meta1"/>

</nmwg:message>
</soapenv:Body>
@@ -1998,23 +2048,24 @@
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";>

- <nmwg:metadata id="meta2" metadataIdRef="meta1">
+ <nmwg:metadata id="meta2">
<pinger:subject xmlns:pinger="http://ggf.org/ns/nmwg/tools/pinger/2.0/";
id="subject1">
<nmwgt:endPointPair xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
- <nmwgt:src type="hostname" value="lhcopnmon1-mgm.fnal.gov"/>
+ <nmwgt:src type="hostname" value="tukki.fnal.gov"/>
<nmwgt:dst type="hostname" value="pinger.slac.stanford.edu"/>
</nmwgt:endPointPair>
</pinger:subject>
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/pinger/2.0/</nmwg:eventType>
</nmwg:metadata>
<nmwg:metadata id="meta1">
- <select:parameters id="param2c">
- <nmwg:parameter name="startTime">1198076292</nmwg:parameter>
- <nmwg:parameter name="endTime">1198645045</nmwg:parameter>
+ <select:subject id="sel1" metadataIdRef="meta2"/>
+ <select:parameters id="param2c">
+ <nmwg:parameter name="startTime">1205176292</nmwg:parameter>
+ <nmwg:parameter name="endTime">1205186292</nmwg:parameter>
</select:parameters>
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0/</nmwg:eventType>
</nmwg:metadata>
- <nmwg:data id="data1" metadataIdRef="meta2"/>
+ <nmwg:data id="data1" metadataIdRef="meta1"/>

</nmwg:message>
</soapenv:Body>
@@ -2055,27 +2106,29 @@
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";>

- <nmwg:metadata id="meta2" metadataIdRef="meta1">
+ <nmwg:metadata id="meta2">
<pinger:subject
xmlns:pinger="http://ggf.org/ns/nmwg/tools/pinger/2.0/"; id="subject1">
<nmwgt:endPointPair xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
- <nmwgt:src type="hostname" value="lhcopnmon1-mgm.fnal.gov"/>
+ <nmwgt:src type="hostname" value="tukki.fnal.gov"/>
<nmwgt:dst type="hostname" value="pinger.slac.stanford.edu"/>
</nmwgt:endPointPair>
+ </pinger:subject>
<pinger:parameters>
<nmwg:parameter name="packetSize">1000</nmwg:parameter>
<nmwg:parameter name="count">10</nmwg:parameter>
</pinger:parameters>
- </pinger:subject>
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/pinger/2.0/</nmwg:eventType>
</nmwg:metadata>
- <nmwg:metadata id="meta1">
- <select:parameters id="param2c">
- <nmwg:parameter name="startTime">1198076292</nmwg:parameter>
- <nmwg:parameter name="endTime">1198745045</nmwg:parameter>
+
+ <nmwg:metadata id="meta1">
+ <select:subject id="sel1" metadataIdRef="meta2"/>
+ <select:parameters id="param2c">
+ <nmwg:parameter name="startTime">1205176292</nmwg:parameter>
+ <nmwg:parameter name="endTime">1205186292</nmwg:parameter>
</select:parameters>
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0/</nmwg:eventType>
</nmwg:metadata>
- <nmwg:data id="data1" metadataIdRef="meta2"/>
+ <nmwg:data id="data1" metadataIdRef="meta1"/>

</nmwg:message>
</soapenv:Body>
@@ -2119,7 +2172,7 @@
<nmwg:metadata id="metaBase">
<pinger:subject xmlns:pinger="http://ggf.org/ns/nmwg/tools/pinger/2.0/";
id="subject1">
<nmwgt:endPointPair xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
- <nmwgt:src type="hostname" value="lhcopnmon1-mgm.fnal.gov"/>
+ <nmwgt:src type="hostname" value="tukki.fnal.gov"/>
<nmwgt:dst type="hostname" value="pinger.slac.stanford.edu"/>
</nmwgt:endPointPair>
</pinger:subject>
@@ -2129,8 +2182,8 @@
<nmwg:metadata id="metaTime">
<select:subject id="selectTime"/>
<select:parameters id="param2c">
- <nmwg:parameter name="startTime">1198076292</nmwg:parameter>
- <nmwg:parameter name="endTime">1198645045</nmwg:parameter>
+ <nmwg:parameter name="startTime">1205176292</nmwg:parameter>
+ <nmwg:parameter name="endTime">1205186292</nmwg:parameter>
</select:parameters>
<nmwg:eventType>http://ggf.org/ns/nmwg/ops/select/2.0/</nmwg:eventType>
</nmwg:metadata>
@@ -2501,7 +2554,7 @@
<nmwg:metadata id="meta2" metadataIdRef="meta1">
<pinger:subject
xmlns:pinger="http://ggf.org/ns/nmwg/tools/pinger/2.0/"; id="subject1">
<nmwgt:endPointPair xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
- <nmwgt:src type="hostname" value="lhcopnmon1-mgm.fnal.gov"/>
+ <nmwgt:src type="hostname" value="tukki.fnal.gov"/>
</nmwgt:endPointPair>
</pinger:subject>
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/pinger/2.0/</nmwg:eventType>
@@ -2553,7 +2606,7 @@
<pinger:subject xmlns:pinger="http://ggf.org/ns/nmwg/tools/pinger/2.0/";
id="subject1">
<nmwgt:endPointPair xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
<nmwgt:dst type="hostname" value="www.slac.stanford.edu"/>
- <nmwgt:src type="hostname" value="lhcopnmon1-mgm.fnal.gov"/>
+ <nmwgt:src type="hostname" value="tukki.fnal.gov"/>
</nmwgt:endPointPair>
</pinger:subject>
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/pinger2/2.0/</nmwg:eventType>
@@ -2615,7 +2668,7 @@
<nmwg:metadata id="meta2" metadataIdRef="meta1">
<pinger:subject
xmlns:pinger="http://ggf.org/ns/nmwg/tools/pinger/2.0/"; id="subject1">
<nmwgt:endPointPair xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
- <nmwgt:src type="hostname" value="lhcopnmon1-mgm.fnal.gov"/>
+ <nmwgt:src type="hostname" value="tukki.fnal.gov"/>
</nmwgt:endPointPair>
</pinger:subject>
<nmwg:eventType>http://ggf.org/ns/nmwg/tools/pinger3/2.0/</nmwg:eventType>

Modified: trunk/functional-testing/PingER/metadataKey-req/nmwg.xsd
===================================================================
--- trunk/functional-testing/PingER/metadataKey-req/nmwg.xsd 2008-03-18
14:37:06 UTC (rev 3529)
+++ trunk/functional-testing/PingER/metadataKey-req/nmwg.xsd 2008-03-18
14:38:19 UTC (rev 3530)
@@ -32,6 +32,7 @@
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element ref="pinger:subject"/>
+ <xs:element ref="pinger:parameters"/>
<xs:element ref="nmwg:eventType"/>
<xs:element ref="nmwg:key"/>
</xs:choice>

Modified: trunk/functional-testing/PingER/metadataKey-req/pinger-mdkreq.rnc
===================================================================
--- trunk/functional-testing/PingER/metadataKey-req/pinger-mdkreq.rnc
2008-03-18 14:37:06 UTC (rev 3529)
+++ trunk/functional-testing/PingER/metadataKey-req/pinger-mdkreq.rnc
2008-03-18 14:38:19 UTC (rev 3530)
@@ -30,7 +30,8 @@
Identifier
& MetadataIdentifierRef?
&
- PingerSubject? &
+ PingerSubject? &
+ PingERParameters ? &
EventType &
MetadataKeyContent?
}
@@ -38,9 +39,7 @@
element pinger:subject { Identifier? & MetadataIdentifierRef? & (

EndpointPair |
L4EndpointPair
- ) &
- PingERParameters ?
-
+ )
}
PingERParameters = element pinger:parameters { Identifier? &
PingERParameter+ }
PingERParameter =

Modified: trunk/functional-testing/PingER/metadataKey-req/pinger-mdkreq.rng
===================================================================
--- trunk/functional-testing/PingER/metadataKey-req/pinger-mdkreq.rng
2008-03-18 14:37:06 UTC (rev 3529)
+++ trunk/functional-testing/PingER/metadataKey-req/pinger-mdkreq.rng
2008-03-18 14:38:19 UTC (rev 3530)
@@ -77,6 +77,9 @@
<optional>
<ref name="PingerSubject"/>
</optional>
+ <optional>
+ <ref name="PingERParameters"/>
+ </optional>
<ref name="EventType"/>
<optional>
<ref name="MetadataKeyContent"/>
@@ -97,9 +100,6 @@
<ref name="EndpointPair"/>
<ref name="L4EndpointPair"/>
</choice>
- <optional>
- <ref name="PingERParameters"/>
- </optional>
</interleave>
</element>
</define>

Modified: trunk/functional-testing/PingER/metadataKey-req/pinger.xsd
===================================================================
--- trunk/functional-testing/PingER/metadataKey-req/pinger.xsd 2008-03-18
14:37:06 UTC (rev 3529)
+++ trunk/functional-testing/PingER/metadataKey-req/pinger.xsd 2008-03-18
14:38:19 UTC (rev 3530)
@@ -6,12 +6,9 @@
<xs:import namespace="http://ggf.org/schema/network/topology/l4/20070707/";
schemaLocation="nmtl4.xsd"/>
<xs:element name="subject">
<xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:choice>
- <xs:element ref="nmwgt:endPointPair"/>
- <xs:element ref="nmtl4:endPointPair"/>
- </xs:choice>
- <xs:element ref="pinger:parameters"/>
+ <xs:choice>
+ <xs:element ref="nmwgt:endPointPair"/>
+ <xs:element ref="nmtl4:endPointPair"/>
</xs:choice>
<xs:attribute name="id" type="xs:string"/>
<xs:attribute name="metadataIdRef" type="xs:string"/>

Modified: trunk/functional-testing/PingER/metadataKey-res/nmwg.xsd
===================================================================
--- trunk/functional-testing/PingER/metadataKey-res/nmwg.xsd 2008-03-18
14:37:06 UTC (rev 3529)
+++ trunk/functional-testing/PingER/metadataKey-res/nmwg.xsd 2008-03-18
14:38:19 UTC (rev 3530)
@@ -33,6 +33,7 @@
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element ref="pinger:subject"/>
+ <xs:element ref="pinger:parameters"/>
<xs:element ref="nmwg:eventType"/>
<xs:element ref="nmwg:key"/>
</xs:choice>

Modified: trunk/functional-testing/PingER/metadataKey-res/pinger-mdkresp.rnc
===================================================================
--- trunk/functional-testing/PingER/metadataKey-res/pinger-mdkresp.rnc
2008-03-18 14:37:06 UTC (rev 3529)
+++ trunk/functional-testing/PingER/metadataKey-res/pinger-mdkresp.rnc
2008-03-18 14:38:19 UTC (rev 3530)
@@ -32,6 +32,7 @@
& MetadataIdentifierRef?
&
PingerSubject? &
+ PingERParameters ? &
EventType &
MetadataKeyContent?
}
@@ -39,9 +40,7 @@
element pinger:subject { Identifier? & MetadataIdentifierRef? & (

EndpointPair |
L4EndpointPair
- ) &
- PingERParameters ?
-
+ )
}
PingERParameters = element pinger:parameters { Identifier? &
PingERParameter+ }
PingERParameter =

Modified: trunk/functional-testing/PingER/metadataKey-res/pinger-mdkresp.rng
===================================================================
--- trunk/functional-testing/PingER/metadataKey-res/pinger-mdkresp.rng
2008-03-18 14:37:06 UTC (rev 3529)
+++ trunk/functional-testing/PingER/metadataKey-res/pinger-mdkresp.rng
2008-03-18 14:38:19 UTC (rev 3530)
@@ -78,6 +78,9 @@
<optional>
<ref name="PingerSubject"/>
</optional>
+ <optional>
+ <ref name="PingERParameters"/>
+ </optional>
<ref name="EventType"/>
<optional>
<ref name="MetadataKeyContent"/>
@@ -98,9 +101,6 @@
<ref name="EndpointPair"/>
<ref name="L4EndpointPair"/>
</choice>
- <optional>
- <ref name="PingERParameters"/>
- </optional>
</interleave>
</element>
</define>

Modified: trunk/functional-testing/PingER/metadataKey-res/pinger.xsd
===================================================================
--- trunk/functional-testing/PingER/metadataKey-res/pinger.xsd 2008-03-18
14:37:06 UTC (rev 3529)
+++ trunk/functional-testing/PingER/metadataKey-res/pinger.xsd 2008-03-18
14:38:19 UTC (rev 3530)
@@ -7,12 +7,9 @@
<xs:import namespace="http://ggf.org/schema/network/topology/l4/20070707/";
schemaLocation="nmtl4.xsd"/>
<xs:element name="subject">
<xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:choice>
- <xs:element ref="nmwgt:endPointPair"/>
- <xs:element ref="nmtl4:endPointPair"/>
- </xs:choice>
- <xs:element ref="pinger:parameters"/>
+ <xs:choice>
+ <xs:element ref="nmwgt:endPointPair"/>
+ <xs:element ref="nmtl4:endPointPair"/>
</xs:choice>
<xs:attribute name="id" type="xs:string"/>
<xs:attribute name="metadataIdRef" type="xs:string"/>

Modified: trunk/functional-testing/PingER/setupData-req/pinger-sdreq.rnc
===================================================================
--- trunk/functional-testing/PingER/setupData-req/pinger-sdreq.rnc
2008-03-18 14:37:06 UTC (rev 3529)
+++ trunk/functional-testing/PingER/setupData-req/pinger-sdreq.rnc
2008-03-18 14:38:19 UTC (rev 3530)
@@ -36,7 +36,10 @@
Identifier &
MetadataIdentifierRef? &
(
- PingerSubject ? |
+ (
+ PingerSubject ? &
+ PingERParameters ?
+ ) ? |
FilterMetadataContent ?
) &
EventType &
@@ -48,9 +51,7 @@
(
EndpointPair |
L4EndpointPair
- ) &
- PingERParameters ?
-
+ )
}
FilterMetadataContent = element select:subject {
Identifier? &

Modified: trunk/functional-testing/PingER/setupData-res/nmwg.xsd
===================================================================
--- trunk/functional-testing/PingER/setupData-res/nmwg.xsd 2008-03-18
14:37:06 UTC (rev 3529)
+++ trunk/functional-testing/PingER/setupData-res/nmwg.xsd 2008-03-18
14:38:19 UTC (rev 3530)
@@ -34,8 +34,11 @@
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:choice>
- <xs:element ref="pinger:subject"/>
<xs:choice>
+ <xs:element ref="pinger:subject"/>
+ <xs:element ref="pinger:parameters"/>
+ </xs:choice>
+ <xs:choice>
<xs:element ref="select:subject"/>
<xs:element ref="select:parameters"/>
</xs:choice>

Modified: trunk/functional-testing/PingER/setupData-res/pinger-sdresp.rnc
===================================================================
--- trunk/functional-testing/PingER/setupData-res/pinger-sdresp.rnc
2008-03-18 14:37:06 UTC (rev 3529)
+++ trunk/functional-testing/PingER/setupData-res/pinger-sdresp.rnc
2008-03-18 14:38:19 UTC (rev 3530)
@@ -33,8 +33,11 @@
Metadata = element nmwg:metadata {
Identifier &
MetadataIdentifierRef? &
- (
- PingerSubject ? |
+ (
+ (
+ PingerSubject ? &
+ PingERParameters ?
+ ) ? |
FilterMetadataContent ?
) &
EventType &
@@ -46,9 +49,7 @@
(
EndpointPair |
L4EndpointPair
- ) &
- PingERParameters ?
-
+ )
}
FilterMetadataContent = element select:subject {
Identifier? &

Modified: trunk/functional-testing/PingER/setupData-res/pinger-sdresp.rng
===================================================================
--- trunk/functional-testing/PingER/setupData-res/pinger-sdresp.rng
2008-03-18 14:37:06 UTC (rev 3529)
+++ trunk/functional-testing/PingER/setupData-res/pinger-sdresp.rng
2008-03-18 14:38:19 UTC (rev 3530)
@@ -77,7 +77,14 @@
</optional>
<choice>
<optional>
- <ref name="PingerSubject"/>
+ <interleave>
+ <optional>
+ <ref name="PingerSubject"/>
+ </optional>
+ <optional>
+ <ref name="PingERParameters"/>
+ </optional>
+ </interleave>
</optional>
<optional>
<ref name="FilterMetadataContent"/>
@@ -103,9 +110,6 @@
<ref name="EndpointPair"/>
<ref name="L4EndpointPair"/>
</choice>
- <optional>
- <ref name="PingERParameters"/>
- </optional>
</interleave>
</element>
</define>

Modified: trunk/functional-testing/PingER/setupData-res/pinger.xsd
===================================================================
--- trunk/functional-testing/PingER/setupData-res/pinger.xsd 2008-03-18
14:37:06 UTC (rev 3529)
+++ trunk/functional-testing/PingER/setupData-res/pinger.xsd 2008-03-18
14:38:19 UTC (rev 3530)
@@ -8,12 +8,9 @@
<xs:import namespace="http://ggf.org/schema/network/topology/l4/20070707/";
schemaLocation="nmtl4.xsd"/>
<xs:element name="subject">
<xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:choice>
- <xs:element ref="nmwgt:endPointPair"/>
- <xs:element ref="nmtl4:endPointPair"/>
- </xs:choice>
- <xs:element ref="pinger:parameters"/>
+ <xs:choice>
+ <xs:element ref="nmwgt:endPointPair"/>
+ <xs:element ref="nmtl4:endPointPair"/>
</xs:choice>
<xs:attribute name="id" type="xs:string"/>
<xs:attribute name="metadataIdRef" type="xs:string"/>


  • perfsonar: r3530 - in trunk/functional-testing/PingER: . metadataKey-req metadataKey-res setupData-req setupData-res, svnlog, 03/18/2008

Archive powered by MHonArc 2.6.16.

Top of Page