perfsonar-dev - nmwg: r330 - trunk/nmwg/schema/rnc
Subject: perfsonar development work
List archive
- From:
- To: ,
- Subject: nmwg: r330 - trunk/nmwg/schema/rnc
- Date: Mon, 14 Jan 2008 15:16:47 -0500
Author: ytl
Date: 2008-01-14 15:16:46 -0500 (Mon, 14 Jan 2008)
New Revision: 330
Modified:
trunk/nmwg/schema/rnc/pinger-landmarks.rnc
trunk/nmwg/schema/rnc/pinger.rnc
Log:
updated schemas to be correct
added comments
Modified: trunk/nmwg/schema/rnc/pinger-landmarks.rnc
===================================================================
--- trunk/nmwg/schema/rnc/pinger-landmarks.rnc 2008-01-14 05:36:02 UTC (rev
329)
+++ trunk/nmwg/schema/rnc/pinger-landmarks.rnc 2008-01-14 20:16:46 UTC (rev
330)
@@ -10,9 +10,8 @@
# Namespace definitions
# ##############################################################
namespace pingertopo =
- "http://namespaces.slac.stanford.edu/schema/pinger/20071120"
+ "http://ggf.org/ns/nmwg/tools/pinger-landmarks/1.0/"
-
# external schema files
include "topo/nmtypes.rnc"
include "topo/nmtopo_base.rnc"
@@ -22,59 +21,125 @@
start |= Topology
Topology = element pingertopo:topology {
- Domain*
+ Domain+
}
Domain = element pingertopo:domain {
Identifier?
- & IdReference?
& element nmtb:comments { xsd:string }?
- & Node*
+ & Node+
}
-## ########################
-## generic node
-## ########################
+# ########################
+# generic node
+#
+# Example:
+# <pingertopo:node
xmlns:nmwg="http://ggf.org/ns/nmwg/tools/pinger-landmarks/1.0/">
+# <nmtb:name>TEXT</nmtb:name>
+# <nmtb:hostName>DNS NAME OF NODE</nmtb:hostName>
+# <nmtb:location/>
+# <nmtb:contact/>
+# <nmtb:comments/>
+# <nmtb:parameters/>
+# </pingertopo:node>
+#
+# ########################
Node = element pingertopo:node { BaseNodeContent }
BaseNodeContent =
Identifier?
- & IdReference?
& BaseName?
- & element nmtb:hostName { xsd:string }?
+ & element nmtb:hostName { xsd:string }+
& element nmtb:description { xsd:string }?
- & PingERTest+
+ & element nmtb:location { LocationContent }?
+ & element nmtb:contact { ContactInformationContent }?
+ & element nmtb:comments { xsd:string }?
+ & PingERParameters+
& Port*
-## ########################
-## test
-## ########################
-PingERTest = element pingertopo:test { PingERTestContent }
-PingERTestContent =
+# ########################
+# Parameters
+#
+# This element block defines the measurement to be conducted
+#
+# packetSize specifies the packet size to use for pings
+# count specifies the number
of packets to send
+# packetInterval specifies the interpacket time in sec between
singleton pings
+# ttl specifies the time to
live to use for pings
+# measurementPeriod specifies the period of time in seconds between
measurments
+# measurementOffset specifies the offset of time in seconds between
measurments
+#
+# Therefore, a test with the parameters are run every
+# measurementPeriod +/- rand( measurementOffset )
+# seconds.
+#
+# Example
+#
+# <nmwg:parameters xmlns:nmwg="http://ggf.org/ns/nmwg/tools/base/2.0/">
+# <nmwg:parameter name="packetSize">1000</nmwg:parameter>
+# <nmwg:parameter name="count">10</nmwg:parameter>
+# <nmwg:parameter name="packetInterval">1000</nmwg:parameter>
+# <nmwg:parameter name="ttl">255</nmwg:parameter>
+# <nmwg:parameter name="measurementPeriod">300</nmwg:parameter>
+# <nmwg:parameter name="measurementOffset">30</nmwg:parameter>
+# </nmwg:parameters>
+#
+# ########################
+PingERParameters = element nmwg:parameters { PingERParametersContent }
+PingERParametersContent =
Identifier?
- & element pingertopo:packetSize { xsd:integer }
- & element pingertopo:count { xsd:integer }
- & element pingertopo:interval { xsd:integer }
- & element pingertopo:ttl { xsd:integer }
- & element pingertopo:period { xsd:integer }
- & element pingertopo:offset { xsd:integer }
+ & element nmwg:parameter {
+ attribute name { "packetSize" } &
+ (
+ attribute value { text } |
+ text
+ )
+ & element nmwg:parameter {
+ attribute name { "count" } &
+ (
+ attribute value { text } |
+ text
+ )
+ & element nmwg:parameter {
+ attribute name { "packetInterval" } &
+ (
+ attribute value { text } |
+ text
+ )
+ & element nmwg:parameter {
+ attribute name { "ttl" } &
+ (
+ attribute value { text } |
+ text
+ )
+ & element nmwg:parameter {
+ attribute name { "measurementPeriod" } &
+ (
+ attribute value { text } |
+ text
+ )
+ & element nmwg:parameter {
+ attribute name { "measurementOffset" } &
+ (
+ attribute value { text } |
+ text
+ )
-## ########################
-## misc
-## ########################
+# ########################
+# misc
+# ########################
BaseName =
element nmtb:name {
attribute type { xsd:string }?
& xsd:string
}
-## ########################
-## layer3 port
-## ########################
+# ########################
+# layer3 port
+# ########################
Port = element nmtl3:port { BasePortContent }
BasePortContent =
Identifier?
- & IdReference?
& element nmtl3:ipAddress {
L3Address
- }+
+ }
Modified: trunk/nmwg/schema/rnc/pinger.rnc
===================================================================
--- trunk/nmwg/schema/rnc/pinger.rnc 2008-01-14 05:36:02 UTC (rev 329)
+++ trunk/nmwg/schema/rnc/pinger.rnc 2008-01-14 20:16:46 UTC (rev 330)
@@ -14,7 +14,7 @@
# ##############################################################
namespace nmwg = "http://ggf.org/ns/nmwg/base/2.0/"
namespace nmwgr = "http://ggf.org/ns/nmwg/result/2.0/"
-namespace pinger = "http://ggf.org/ns/nmwg/tools/pinger/1.0/"
+namespace pinger = "http://ggf.org/ns/nmwg/tools/pinger/2.0/"
# ##############################################################
# Include additional functionality from other files
@@ -98,10 +98,10 @@
#
# The parameter set is typically used for on-demand measurements.
#
-# count specifies the number fo packets sent (not necessarily recieved)
-# interval specifies the interpacket delay between packets
-# packetSize specifies the size of the icmp packets
-# ttl specifies the maximum ttl fo the icmp packets
+# count specifies the number fo packets sent (not necessarily
recieved)
+# packetInterval specifies the interpacket delay between packets
+# packetSize specifies the size of the icmp packets
+# ttl specifies the maximum ttl fo the icmp packets
#
# Example:
#
@@ -130,7 +130,7 @@
PingERParameter =
element nmwg:parameter {
attribute name {
- "count" | "interval" |
+ "count" | "packetInterval" |
"packetSize" | "ttl" |
"valueUnits"
} &
- nmwg: r330 - trunk/nmwg/schema/rnc, svnlog, 01/14/2008
Archive powered by MHonArc 2.6.16.