Skip to Content.
Sympa Menu

perfsonar-dev - r205 - in trunk/nmwg/schema: . example_instances rnc

Subject: perfsonar development work

List archive

r205 - in trunk/nmwg/schema: . example_instances rnc


Chronological Thread 
  • From:
  • To: ,
  • Subject: r205 - in trunk/nmwg/schema: . example_instances rnc
  • Date: Mon, 5 Feb 2007 12:33:02 -0500
Author: zurawski
Date: 2007-02-05 12:33:00 -0500 (Mon, 05 Feb 2007)
New Revision: 205

Added:
trunk/nmwg/schema/example_instances/PassiveAnomal.xml
trunk/nmwg/schema/example_instances/PassiveBand.xml
trunk/nmwg/schema/example_instances/PassiveLoss.xml
trunk/nmwg/schema/example_instances/PassiveTracefile.xml
trunk/nmwg/schema/example_instances/netflow.xml
trunk/nmwg/schema/example_instances/snmp.xml
trunk/nmwg/schema/rnc/service.rnc
Removed:
trunk/nmwg/schema/xpath_query1.xml
Modified:
trunk/nmwg/schema/example_instances/abw.xml
trunk/nmwg/schema/example_instances/abw2.xml
trunk/nmwg/schema/example_instances/bandwidth.xml
trunk/nmwg/schema/example_instances/delay.xml
trunk/nmwg/schema/example_instances/iperf.xml
trunk/nmwg/schema/example_instances/ping.xml
trunk/nmwg/schema/example_instances/traceroute.xml
trunk/nmwg/schema/example_instances/utilization.xml
trunk/nmwg/schema/rnc/PassiveAnomal.rnc
trunk/nmwg/schema/rnc/PassiveBand.rnc
trunk/nmwg/schema/rnc/PassiveLoss.rnc
trunk/nmwg/schema/rnc/PassiveTracefile.rnc
trunk/nmwg/schema/rnc/abw.rnc
trunk/nmwg/schema/rnc/bwctl.rnc
trunk/nmwg/schema/rnc/iperf.rnc
trunk/nmwg/schema/rnc/netflow.rnc
trunk/nmwg/schema/rnc/nmachbw.rnc
trunk/nmwg/schema/rnc/nmdelayrtt.rnc
trunk/nmwg/schema/rnc/ping.rnc
trunk/nmwg/schema/rnc/snmp.rnc
trunk/nmwg/schema/rnc/traceroute.rnc
trunk/nmwg/schema/rnc/utilization.rnc
trunk/nmwg/schema/test-instances.sh
Log:
Added references to result codes and the newer topology schemas. All
tool schema files now have an instance to validate against. BWCTL was
cleaned up a bit, but still requires some work.

-jason



Added: trunk/nmwg/schema/example_instances/PassiveAnomal.xml


Property changes on: trunk/nmwg/schema/example_instances/PassiveAnomal.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native

Added: trunk/nmwg/schema/example_instances/PassiveBand.xml


Property changes on: trunk/nmwg/schema/example_instances/PassiveBand.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native

Added: trunk/nmwg/schema/example_instances/PassiveLoss.xml


Property changes on: trunk/nmwg/schema/example_instances/PassiveLoss.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native

Added: trunk/nmwg/schema/example_instances/PassiveTracefile.xml


Property changes on: trunk/nmwg/schema/example_instances/PassiveTracefile.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native

Modified: trunk/nmwg/schema/example_instances/abw.xml
===================================================================
--- trunk/nmwg/schema/example_instances/abw.xml 2007-02-02 20:35:11 UTC (rev
204)
+++ trunk/nmwg/schema/example_instances/abw.xml 2007-02-05 17:33:00 UTC (rev
205)
@@ -8,7 +8,8 @@
xmlns:nmtl4="http://ggf.org/ns/nmwg/topology/l4/3.0/";
xmlns:nmtl3="http://ggf.org/ns/nmwg/topology/l3/3.0/";
xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
- xmlns:average="http://ggf.org/ns/nmwg/ops/average/2.0/";>
+ xmlns:average="http://ggf.org/ns/nmwg/ops/average/2.0/";
+ xmlns:nmwgr="http://ggf.org/ns/nmwg/result/2.0/";>

<!-- Metadata using original topology schema -->

@@ -138,5 +139,11 @@
</nmwg:commonTime>
</nmwg:data>

+
+ <!-- result datum elements -->
+ <nmwg:data id="data3" metadataIdRef="meta1">
+ <nmwgr:datum type="error">Some error message</nmwgr:datum>
+ </nmwg:data>
+
</nmwg:message>


Modified: trunk/nmwg/schema/example_instances/abw2.xml
===================================================================
--- trunk/nmwg/schema/example_instances/abw2.xml 2007-02-02 20:35:11
UTC (rev 204)
+++ trunk/nmwg/schema/example_instances/abw2.xml 2007-02-05 17:33:00
UTC (rev 205)
@@ -8,7 +8,8 @@
xmlns:nmtl4="http://ggf.org/ns/nmwg/topology/l4/3.0/";
xmlns:nmtl3="http://ggf.org/ns/nmwg/topology/l3/3.0/";
xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
- xmlns:average="http://ggf.org/ns/nmwg/ops/average/2.0/";>
+ xmlns:average="http://ggf.org/ns/nmwg/ops/average/2.0/";
+ xmlns:nmwgr="http://ggf.org/ns/nmwg/result/2.0/";>

<!-- Metadata using original topology schema -->

@@ -104,5 +105,10 @@
</nmwg:commonTime>
</nmwg:data>

+ <!-- result datum elements -->
+ <nmwg:data id="data3" metadataIdRef="meta1">
+ <nmwgr:datum type="error">Some error message</nmwgr:datum>
+ </nmwg:data>
+
</nmwg:message>


Modified: trunk/nmwg/schema/example_instances/bandwidth.xml
===================================================================
--- trunk/nmwg/schema/example_instances/bandwidth.xml 2007-02-02 20:35:11
UTC (rev 204)
+++ trunk/nmwg/schema/example_instances/bandwidth.xml 2007-02-05 17:33:00
UTC (rev 205)
@@ -8,7 +8,8 @@
xmlns:nmtl4="http://ggf.org/ns/nmwg/topology/l4/3.0/";
xmlns:nmtl3="http://ggf.org/ns/nmwg/topology/l3/3.0/";
xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
- xmlns:average="http://ggf.org/ns/nmwg/ops/average/2.0/";>
+ xmlns:average="http://ggf.org/ns/nmwg/ops/average/2.0/";
+ xmlns:nmwgr="http://ggf.org/ns/nmwg/result/2.0/";>

<!-- Metadata using original topology schema -->

@@ -161,4 +162,9 @@
</band:datum>
</nmwg:data>

+ <!-- result datum elements -->
+ <nmwg:data id="data10" metadataIdRef="bandmeta1">
+ <nmwgr:datum type="error.bandwidth">Some error message</nmwgr:datum>
+ </nmwg:data>
+
</nmwg:message>

Modified: trunk/nmwg/schema/example_instances/delay.xml
===================================================================
--- trunk/nmwg/schema/example_instances/delay.xml 2007-02-02 20:35:11
UTC (rev 204)
+++ trunk/nmwg/schema/example_instances/delay.xml 2007-02-05 17:33:00
UTC (rev 205)
@@ -8,7 +8,8 @@
xmlns:nmtl4="http://ggf.org/ns/nmwg/topology/l4/3.0/";
xmlns:nmtl3="http://ggf.org/ns/nmwg/topology/l3/3.0/";
xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
- xmlns:average="http://ggf.org/ns/nmwg/ops/average/2.0/";>
+ xmlns:average="http://ggf.org/ns/nmwg/ops/average/2.0/";
+ xmlns:nmwgr="http://ggf.org/ns/nmwg/result/2.0/";>

<!-- Metadata using original topology schema -->

@@ -217,4 +218,9 @@
</delay:datum>
</nmwg:data>

+ <!-- result datum elements -->
+ <nmwg:data id="data10" metadataIdRef="delaymeta1">
+ <nmwgr:datum type="error.delay">Some error message</nmwgr:datum>
+ </nmwg:data>
+
</nmwg:message>

Modified: trunk/nmwg/schema/example_instances/iperf.xml
===================================================================
--- trunk/nmwg/schema/example_instances/iperf.xml 2007-02-02 20:35:11
UTC (rev 204)
+++ trunk/nmwg/schema/example_instances/iperf.xml 2007-02-05 17:33:00
UTC (rev 205)
@@ -8,7 +8,8 @@
xmlns:nmtl4="http://ggf.org/ns/nmwg/topology/l4/3.0/";
xmlns:nmtl3="http://ggf.org/ns/nmwg/topology/l3/3.0/";
xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
- xmlns:average="http://ggf.org/ns/nmwg/ops/average/2.0/";>
+ xmlns:average="http://ggf.org/ns/nmwg/ops/average/2.0/";
+ xmlns:nmwgr="http://ggf.org/ns/nmwg/result/2.0/";>

<!-- Metadata using original topology schema -->

@@ -271,4 +272,9 @@
</iperf:datum>
</nmwg:data>

+ <!-- result datum elements -->
+ <nmwg:data id="data10" metadataIdRef="iperfmeta1">
+ <nmwgr:datum type="error.iperf.mp">write2 failed: Broken
pipe</nmwgr:datum>
+ </nmwg:data>
+
</nmwg:message>

Added: trunk/nmwg/schema/example_instances/netflow.xml


Property changes on: trunk/nmwg/schema/example_instances/netflow.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native

Modified: trunk/nmwg/schema/example_instances/ping.xml
===================================================================
--- trunk/nmwg/schema/example_instances/ping.xml 2007-02-02 20:35:11
UTC (rev 204)
+++ trunk/nmwg/schema/example_instances/ping.xml 2007-02-05 17:33:00
UTC (rev 205)
@@ -8,7 +8,8 @@
xmlns:nmtl4="http://ggf.org/ns/nmwg/topology/l4/3.0/";
xmlns:nmtl3="http://ggf.org/ns/nmwg/topology/l3/3.0/";
xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
- xmlns:average="http://ggf.org/ns/nmwg/ops/average/2.0/";>
+ xmlns:average="http://ggf.org/ns/nmwg/ops/average/2.0/";
+ xmlns:nmwgr="http://ggf.org/ns/nmwg/result/2.0/";>

<!-- Metadata using original topology schema -->

@@ -226,4 +227,9 @@
</ping:datum>
</nmwg:data>

+ <!-- result datum elements -->
+ <nmwg:data id="data10" metadataIdRef="pingmeta1">
+ <nmwgr:datum type="error.ping.mp">From lager (192.168.0.200) icmp_seq=1
Destination Host Unreachable</nmwgr:datum>
+ </nmwg:data>
+
</nmwg:message>

Added: trunk/nmwg/schema/example_instances/snmp.xml


Property changes on: trunk/nmwg/schema/example_instances/snmp.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native

Modified: trunk/nmwg/schema/example_instances/traceroute.xml
===================================================================
--- trunk/nmwg/schema/example_instances/traceroute.xml 2007-02-02 20:35:11
UTC (rev 204)
+++ trunk/nmwg/schema/example_instances/traceroute.xml 2007-02-05 17:33:00
UTC (rev 205)
@@ -8,7 +8,8 @@
xmlns:nmtl4="http://ggf.org/ns/nmwg/topology/l4/3.0/";
xmlns:nmtl3="http://ggf.org/ns/nmwg/topology/l3/3.0/";
xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
- xmlns:average="http://ggf.org/ns/nmwg/ops/average/2.0/";>
+ xmlns:average="http://ggf.org/ns/nmwg/ops/average/2.0/";
+ xmlns:nmwgr="http://ggf.org/ns/nmwg/result/2.0/";>

<!-- Metadata using original topology schema -->

@@ -263,6 +264,11 @@
</traceroute:datum>
<!-- ... -->
</nmwg:data>
+
+ <!-- result datum elements -->
+ <nmwg:data id="data10" metadataIdRef="traceroutemeta1">
+ <nmwgr:datum type="error.traceroute.mp">1 * * *</nmwgr:datum>
+ </nmwg:data>

</nmwg:message>


Modified: trunk/nmwg/schema/example_instances/utilization.xml
===================================================================
--- trunk/nmwg/schema/example_instances/utilization.xml 2007-02-02 20:35:11
UTC (rev 204)
+++ trunk/nmwg/schema/example_instances/utilization.xml 2007-02-05 17:33:00
UTC (rev 205)
@@ -7,7 +7,8 @@
xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
- xmlns:average="http://ggf.org/ns/nmwg/ops/average/2.0/";>
+ xmlns:average="http://ggf.org/ns/nmwg/ops/average/2.0/";
+ xmlns:nmwgr="http://ggf.org/ns/nmwg/result/2.0/";>

<!-- Metadata using original topology schema -->

@@ -226,5 +227,10 @@
</nmtm:time>
</netutil:datum>
</nmwg:data>
+
+ <!-- result datum elements -->
+ <nmwg:data id="data14" metadataIdRef="iumeta1">
+ <nmwgr:datum type="error.iu.mp">eth0: error fetching interface
information: Device not found</nmwgr:datum>
+ </nmwg:data>

</nmwg:message>

Modified: trunk/nmwg/schema/rnc/PassiveAnomal.rnc
===================================================================
--- trunk/nmwg/schema/rnc/PassiveAnomal.rnc 2007-02-02 20:35:11 UTC (rev
204)
+++ trunk/nmwg/schema/rnc/PassiveAnomal.rnc 2007-02-05 17:33:00 UTC (rev
205)
@@ -14,6 +14,7 @@
namespace nmwg = "http://ggf.org/ns/nmwg/base/2.0/";
namespace passiveanomal = "http://ggf.org/ns/nmwg/tools/passiveanomal/2.0/";
namespace nmtm = "http://ggf.org/ns/nmwg/time/2.0/";
+namespace nmwgr = "http://ggf.org/ns/nmwg/result/2.0/";


# ##############################################################
@@ -21,6 +22,7 @@
# ##############################################################
include "nmtopo.rnc"
include "nmtopo_ver3.rnc"
+include "result.rnc"
include "nmbase.rnc" {
Metadata |= PassiveAnomalMetadata
Data |= PassiveAnomalData
@@ -250,9 +252,15 @@
) |
(
PassiveAnomalCommonTime+ &
- PassiveAnomalDatum*
+ (
+ PassiveAnomalDatum* |
+ ResultDatum*
+ )
) |
- PassiveAnomalDatum* |
+ (
+ PassiveAnomalDatum* |
+ ResultDatum*
+ ) |
Key*
)
}
@@ -298,7 +306,10 @@
)
)
) &
- PassiveAnomalDatum*
+ (
+ PassiveAnomalDatum* |
+ ResultDatum*
+ )
}



Modified: trunk/nmwg/schema/rnc/PassiveBand.rnc
===================================================================
--- trunk/nmwg/schema/rnc/PassiveBand.rnc 2007-02-02 20:35:11 UTC (rev
204)
+++ trunk/nmwg/schema/rnc/PassiveBand.rnc 2007-02-05 17:33:00 UTC (rev
205)
@@ -13,6 +13,7 @@
# ##############################################################
namespace nmwg = "http://ggf.org/ns/nmwg/base/2.0/";
namespace passiveband = "http://ggf.org/ns/nmwg/tools/passiveband/2.0/";
+namespace nmwgr = "http://ggf.org/ns/nmwg/result/2.0/";


# ##############################################################
@@ -20,6 +21,7 @@
# ##############################################################
include "nmtopo.rnc"
include "nmtopo_ver3.rnc"
+include "result.rnc"
include "nmbase.rnc" {
Metadata |= PassiveBandMetadata
Data |= PassiveBandData
@@ -252,9 +254,15 @@
) |
(
PassiveBandCommonTime+ &
- PassiveBandDatum*
+ (
+ PassiveBandDatum* |
+ ResultDatum*
+ )
) |
- PassiveBandDatum* |
+ (
+ PassiveBandDatum* |
+ ResultDatum*
+ ) |
Key*
)
}
@@ -300,7 +308,10 @@
)
)
) &
- PassiveBandDatum*
+ (
+ PassiveBandDatum* |
+ ResultDatum*
+ )
}



Modified: trunk/nmwg/schema/rnc/PassiveLoss.rnc
===================================================================
--- trunk/nmwg/schema/rnc/PassiveLoss.rnc 2007-02-02 20:35:11 UTC (rev
204)
+++ trunk/nmwg/schema/rnc/PassiveLoss.rnc 2007-02-05 17:33:00 UTC (rev
205)
@@ -13,6 +13,7 @@
# ##############################################################
namespace nmwg = "http://ggf.org/ns/nmwg/base/2.0/";
namespace passiveloss = "http://ggf.org/ns/nmwg/tools/passiveloss/2.0/";
+namespace nmwgr = "http://ggf.org/ns/nmwg/result/2.0/";


# ##############################################################
@@ -20,6 +21,7 @@
# ##############################################################
include "nmtopo.rnc"
include "nmtopo_ver3.rnc"
+include "result.rnc"
include "nmbase.rnc" {
Metadata |= PassiveLossMetadata
Data |= PassiveLossData
@@ -212,9 +214,15 @@
) |
(
PassiveLossCommonTime+ &
- PassiveLossDatum*
+ (
+ PassiveLossDatum* |
+ ResultDatum*
+ )
) |
- PassiveLossDatum* |
+ (
+ PassiveLossDatum* |
+ ResultDatum*
+ ) |
Key*
)
}
@@ -260,7 +268,10 @@
)
)
) &
- PassiveLossDatum*
+ (
+ PassiveLossDatum* |
+ ResultDatum*
+ )
}



Modified: trunk/nmwg/schema/rnc/PassiveTracefile.rnc
===================================================================
--- trunk/nmwg/schema/rnc/PassiveTracefile.rnc 2007-02-02 20:35:11 UTC (rev
204)
+++ trunk/nmwg/schema/rnc/PassiveTracefile.rnc 2007-02-05 17:33:00 UTC (rev
205)
@@ -13,6 +13,7 @@
# ##############################################################
namespace nmwg = "http://ggf.org/ns/nmwg/base/2.0/";
namespace passivetracefile =
"http://ggf.org/ns/nmwg/tools/passivetracefile/2.0/";
+namespace nmwgr = "http://ggf.org/ns/nmwg/result/2.0/";


# ##############################################################
@@ -20,6 +21,7 @@
# ##############################################################
include "nmtopo.rnc"
include "nmtopo_ver3.rnc"
+include "result.rnc"
include "nmbase.rnc" {
Metadata |= PassiveTracefileMetadata
Data |= PassiveTracefileData
@@ -258,9 +260,15 @@
) |
(
PassiveTracefileCommonTime+ &
- PassiveTracefileDatum*
+ (
+ PassiveTracefileDatum* |
+ ResultDatum*
+ )
) |
- PassiveTracefileDatum* |
+ (
+ PassiveTracefileDatum* |
+ ResultDatum*
+ ) |
Key*
)
}
@@ -306,7 +314,10 @@
)
)
) &
- PassiveTracefileDatum*
+ (
+ PassiveTracefileDatum* |
+ ResultDatum*
+ )
}



Modified: trunk/nmwg/schema/rnc/abw.rnc
===================================================================
--- trunk/nmwg/schema/rnc/abw.rnc 2007-02-02 20:35:11 UTC (rev 204)
+++ trunk/nmwg/schema/rnc/abw.rnc 2007-02-05 17:33:00 UTC (rev 205)
@@ -13,6 +13,7 @@
# ##############################################################
namespace nmwg = "http://ggf.org/ns/nmwg/base/2.0/";
namespace abw = "http://ggf.org/ns/nmwg/tools/abw/2.0/";
+namespace nmwgr = "http://ggf.org/ns/nmwg/result/2.0/";


# ##############################################################
@@ -20,6 +21,7 @@
# ##############################################################
include "nmtopo.rnc"
include "nmtopo_ver3.rnc"
+include "result.rnc"
include "nmbase.rnc" {
Metadata |= AbwMetadata
Data |= AbwData
@@ -251,9 +253,15 @@
) |
(
AbwCommonTime+ &
- AbwDatum*
+ (
+ AbwDatum* |
+ ResultDatum*
+ )
) |
- AbwDatum* |
+ (
+ AbwDatum* |
+ ResultDatum*
+ ) |
Key*
)
}
@@ -299,7 +307,10 @@
)
)
) &
- AbwDatum*
+ (
+ AbwDatum* |
+ ResultDatum*
+ )
}



Modified: trunk/nmwg/schema/rnc/bwctl.rnc
===================================================================
--- trunk/nmwg/schema/rnc/bwctl.rnc 2007-02-02 20:35:11 UTC (rev 204)
+++ trunk/nmwg/schema/rnc/bwctl.rnc 2007-02-05 17:33:00 UTC (rev 205)
@@ -1,37 +1,69 @@
-# File: bwctl.rnc
-#
-# Version:
-# Purpose:
-# Reference:
-#
+# ##############################################################
+#
+# File: bwctl.rnc -
+# Version: $Id$
+# Purpose:
+# Reference: http://books.xmlschemata.org/relaxng/page2.html
+#
+# ##############################################################

+
+# ##############################################################
# Namespace definitions
-
+# ##############################################################
namespace nmwg = "http://ggf.org/ns/nmwg/base/2.0/";
namespace bwctl = "http://ggf.org/ns/nmwg/tools/bwctl/2.0/";
namespace nmwgtopo3 = "http://ggf.org/ns/nmwg/topology/base/3.0/";
namespace nmwgt = "http://ggf.org/ns/nmwg/topology/2.0/";

+
+# ##############################################################
# Include additional functionality from other files
-
+# ##############################################################
include "nmtopo.rnc"
include "nmtopo_ver3.rnc"
include "result.rnc"
-
-# any* is included here to allow tool specific versions (iperf/nuttcp/etc...)
include "nmbase.rnc" {
Metadata |= BwctlMetadata
Data |= BwctlData
}

+
+# ##############################################################
+# Metadata is the 'data' that describes physical measurements.
+# Metadata can be something such as a physical address, or
+# a geographical location; any form of static, re-usable
+# designation. It is important to note that the subject
+# namespace and parameters namespace MUST match (or the parameters
+# can be a generic NMWG) or bad things will occur.
+#
+# Example:
+#
+# <nmwg:metadata id="REQUIRED_ID"
+# metadataIdRef="OPTIONAL_REFERENCE_ID"
+# xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+#
+# <!-- TBD OPTIONAL SUBJECT -->
+#
+# <!-- TBD OPTIONAL PARAMETERS -->
+#
+# <!-- TBD OPTIONAL EVENTTYPE -->
+#
+# <!-- TBD OPTIONAL KEY -->
+#
+# <!-- ANY OPTIONAL (MULTIPLE) ELEMENT IN ANY NAMESPACE -->
+#
+# </nmwg:metadata>
+#
+# ##############################################################
BwctlMetadata =
element nmwg:metadata {
Identifier &
MetadataIdentifierRef? &
- (
- BwctlMetadataContent |
- anyElement*
- )
+ (
+ BwctlMetadataContent |
+ anyElement*
+ )
}

BwctlMetadataBlock =
@@ -48,6 +80,73 @@
EventType? &
Key?

+
+# ##############################################################
+# Redefined bwctl subject allows only an endPoint or endPointPair,
+# and the two id attributes.
+#
+# Example:
+#
+# <bwctl:subject id="REQUIRED_ID"
+# metadataIdRef="OPTIONAL_REFERENCE_ID"
+# xmlns:nmwg="http://ggf.org/ns/nmwg/tools/bwctl/2.0/";>
+#
+# <nmwgtopo:endPointPair
xmlns:nmwgtopo="http://ggf.org/ns/nmwg/topology/2.0/";>
+#
+# <nmwgtopo:src type="REQUIRED_TYPE" value="REQUIRED_VALUE"
+# port="OPTIONAL_PORT"/>
+#
+# <nmwgtopo:dst type="REQUIRED_TYPE" value="REQUIRED_VALUE"
+# port="OPTIONAL_PORT"/>
+#
+# </nmwgtopo:endPointPair>
+#
+#
+# <!-- OR -->
+#
+#
+# <nmtl4:endPointPair
xmlns:nmtl4="http://ggf.org/ns/nmwg/topology/l4/3.0/";>
+#
+# <nmtl4:endPoint role="OPTIONAL_ROLE" port="OPTIONAL_PORT"
+# protocol="OPTIONAL_PROTOCOL">
+#
+# <nmtl4:address value="REQUIRED_VALUE" type="REQUIRED_TYPE"/>
+#
+# </nmtl4:endPoint>
+#
+# <nmtl4:endPoint role="OPTIONAL_ROLE" port="OPTIONAL_PORT"
+# protocol="OPTIONAL_PROTOCOL">
+#
+# <nmtl4:address value="REQUIRED_VALUE" type="REQUIRED_TYPE"/>
+#
+# </nmtl4:endPoint>
+#
+# </nmtl4:endPointPair>
+#
+#
+# <!-- OR -->
+#
+#
+# <nmwgtopo:endPoint port="OPTIONAL_PORT"
+# value="REQUIRED_VALUE"
+# type="REQUIRED_TYPE"
+#
xmlns:nmwgtopo="http://ggf.org/ns/nmwg/topology/2.0/"/>
+#
+#
+# <!-- OR -->
+#
+#
+# <nmtl4:endPoint role="OPTIONAL_ROLE" port="OPTIONAL_PORT"
+# protocol="OPTIONAL_PROTOCOL"
+# xmlns:nmtl4="http://ggf.org/ns/nmwg/topology/l4/3.0/";>
+#
+# <nmtl4:address value="REQUIRED_VALUE" type="REQUIRED_TYPE"/>
+#
+# </nmtl4:endPoint>
+#
+# </ping:subject>
+#
+# ##############################################################
BwctlSubject =
element bwctl:subject {
Identifier &
@@ -55,15 +154,38 @@
(
(
EndpointPair |
- L4EndpointPair
+ L4EndpointPair
) |
(
Endpoint |
- L4Endpoint
+ L4Endpoint
)
)
}

+
+# ##############################################################
+# This is simply the regular method of doing parameters with an
+# enumeration to limit what 'names' are accepted and an outer
+# bwctl: namespace for the parameters.
+#
+# Example:
+#
+# <ping:parameters id="REQUIRED_ID"
+# xmlns:nmwg="http://ggf.org/ns/nmwg/tools/bwctl/2.0/";>
+#
+# <nmwg:parameter name="REQUIRED_ENUM_NAME" value="OPTIONAL_VALUE"
+# xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+#
+# <!-- ANY TEXT, (IF YOU DID NOT USE THE VALUE ATTRIBUTE) -->
+#
+# </nmwg:parameter>
+#
+# <!-- MORE PARAMETERS -->
+#
+# </ping:parameters>
+#
+# ##############################################################
BwctlParameters =
element bwctl:parameters {
Identifier &
@@ -82,8 +204,38 @@
)
}

-# Data Block, at the moment, only ResultCodes are used

+
+# ##############################################################
+# The data block is complex, and has the potential to contain
+# many things. The data block can be used to return a metadata
+# block from a request, commonTime or datum elements, keys,
+# or something that we have perhaps not defined as of yet.
+#
+# Example:
+#
+# <nmwg:data id="REQUIRED_ID"
+# metadataIdRef="OPTIONAL_REFERENCE_ID"
+# xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+#
+# <!-- OPTIONAL (MULTIPLE) METADATA -->
+#
+# <!-- OR -->
+#
+# <!-- TBD OPTIONAL (MULTIPLE) COMMON TIME ELEMENTS AND
+# OPTIONAL (MULTIPLE) RESULT DATUM ELEMENTS-->
+#
+# <!-- OR -->
+#
+# <!-- TBD OPTIONAL (MULTIPLE) RESULT DATUM ELEMENTS -->
+#
+# <!-- OR -->
+#
+# <!-- OPTIONAL (MULTIPLE) KEY ELEMENTS -->
+#
+# </nmwg:data>
+#
+# ##############################################################
BwctlData =
element nmwg:data {
Identifier &
@@ -102,6 +254,32 @@
)
}

+
+# ##############################################################
+# CommonTime is used a a shortcut able to 'factor out' a frequently
+# occurring time range that a bunch of datum (or other) elements
+# might share, thus reducing complexity of XML representation.
+# CommonTime is similar to the other NMWG time stamps (from
+# nmtime.rnc) in its potential time representations.
+#
+# Example:
+#
+# <nmwg:commonTime type="REQUIRED_TYPE" value="OPTIONAL_VALUE"
+# duration="OPTIONAL_DURATION"
+# inclusive="OPTIONAL_INCLUSIVE_FLAG"
+# xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+#
+# <!-- TBD OPTIONAL START TIME ELEMENT (USE END TIME OR DURATION) -->
+#
+# <!-- TBD OPTIONAL END TIME ELEMENT (ONLY WITH START TIME) -->
+#
+# <!-- TBD OPTIONAL TIME VALUE ELEMENT (USE IF NO VALUE ATTRIBUTE) -->
+#
+# <!-- TBD OPTIONAL (MULTIPLE) RESULT DATUM ELEMENTS -->
+#
+# </nmwg:commonTime>
+#
+# ##############################################################
BwctlCommonTime =
element nmwg:commonTime {
Type &

Modified: trunk/nmwg/schema/rnc/iperf.rnc
===================================================================
--- trunk/nmwg/schema/rnc/iperf.rnc 2007-02-02 20:35:11 UTC (rev 204)
+++ trunk/nmwg/schema/rnc/iperf.rnc 2007-02-05 17:33:00 UTC (rev 205)
@@ -16,6 +16,7 @@
# ##############################################################
namespace nmwg = "http://ggf.org/ns/nmwg/base/2.0/";
namespace iperf = "http://ggf.org/ns/nmwg/tools/iperf/2.0/";
+namespace nmwgr = "http://ggf.org/ns/nmwg/result/2.0/";


# ##############################################################
@@ -23,6 +24,7 @@
# ##############################################################
include "nmtopo.rnc"
include "nmtopo_ver3.rnc"
+include "result.rnc"
include "nmbase.rnc" {
Metadata |= IperfMetadata
Data |= IperfData
@@ -204,9 +206,15 @@
) |
(
IperfCommonTime+ &
- IperfDatum*
+ (
+ IperfDatum* |
+ ResultDatum*
+ )
) |
- IperfDatum* |
+ (
+ IperfDatum* |
+ ResultDatum*
+ ) |
Key*
)
}
@@ -252,7 +260,10 @@
)
)
) &
- IperfDatum*
+ (
+ IperfDatum* |
+ ResultDatum*
+ )
}



Modified: trunk/nmwg/schema/rnc/netflow.rnc
===================================================================
--- trunk/nmwg/schema/rnc/netflow.rnc 2007-02-02 20:35:11 UTC (rev 204)
+++ trunk/nmwg/schema/rnc/netflow.rnc 2007-02-05 17:33:00 UTC (rev 205)
@@ -24,7 +24,8 @@
# Include additional functionality from other files
# ##############################################################
include "nmtopo_ver3.rnc"
-include "../service.rnc"
+include "nmtopo.rnc"
+include "service.rnc"
include "nmbase.rnc" {
Metadata |= NetflowMetadata
}
@@ -64,7 +65,7 @@
Identifier &
MetadataIdentifierRef? &
(
- Endpoint |
+ L4Endpoint |
NetflowRouter
)
}

Modified: trunk/nmwg/schema/rnc/nmachbw.rnc
===================================================================
--- trunk/nmwg/schema/rnc/nmachbw.rnc 2007-02-02 20:35:11 UTC (rev 204)
+++ trunk/nmwg/schema/rnc/nmachbw.rnc 2007-02-05 17:33:00 UTC (rev 205)
@@ -16,6 +16,7 @@
# ##############################################################
namespace nmwg = "http://ggf.org/ns/nmwg/base/2.0/";
namespace bandwidth =
"http://ggf.org/ns/nmwg/characteristics/bandwidth/acheiveable/2.0/";
+namespace nmwgr = "http://ggf.org/ns/nmwg/result/2.0/";


# ##############################################################
@@ -23,6 +24,7 @@
# ##############################################################
include "nmtopo.rnc"
include "nmtopo_ver3.rnc"
+include "result.rnc"
include "nmbase.rnc" {
Metadata |= BandwidthMetadata
Data |= BandwidthData
@@ -200,9 +202,15 @@
) |
(
BandwidthCommonTime+ &
- BandwidthDatum*
+ (
+ BandwidthDatum* |
+ ResultDatum*
+ )
) |
- BandwidthDatum* |
+ (
+ BandwidthDatum* |
+ ResultDatum*
+ ) |
Key*
)
}
@@ -248,7 +256,10 @@
)
)
) &
- BandwidthDatum*
+ (
+ BandwidthDatum* |
+ ResultDatum*
+ )
}



Modified: trunk/nmwg/schema/rnc/nmdelayrtt.rnc
===================================================================
--- trunk/nmwg/schema/rnc/nmdelayrtt.rnc 2007-02-02 20:35:11 UTC (rev
204)
+++ trunk/nmwg/schema/rnc/nmdelayrtt.rnc 2007-02-05 17:33:00 UTC (rev
205)
@@ -16,6 +16,7 @@
# ##############################################################
namespace nmwg = "http://ggf.org/ns/nmwg/base/2.0/";
namespace nmdrt =
"http://ggf.org/ns/nmwg/characteristic/delay/roundTrip/2.0/";
+namespace nmwgr = "http://ggf.org/ns/nmwg/result/2.0/";


# ##############################################################
@@ -23,6 +24,7 @@
# ##############################################################
include "nmtopo.rnc"
include "nmtopo_ver3.rnc"
+include "result.rnc"
include "nmbase.rnc" {
Metadata |= DelayMetadata
Data |= DelayData
@@ -204,9 +206,15 @@
) |
(
DelayCommonTime+ &
- DelayDatum*
+ (
+ DelayDatum* |
+ ResultDatum*
+ )
) |
- DelayDatum* |
+ (
+ DelayDatum* |
+ ResultDatum*
+ ) |
Key*
)
}
@@ -252,7 +260,10 @@
)
)
) &
- DelayDatum*
+ (
+ DelayDatum* |
+ ResultDatum*
+ )
}



Modified: trunk/nmwg/schema/rnc/ping.rnc
===================================================================
--- trunk/nmwg/schema/rnc/ping.rnc 2007-02-02 20:35:11 UTC (rev 204)
+++ trunk/nmwg/schema/rnc/ping.rnc 2007-02-05 17:33:00 UTC (rev 205)
@@ -16,6 +16,7 @@
# ##############################################################
namespace nmwg = "http://ggf.org/ns/nmwg/base/2.0/";
namespace ping = "http://ggf.org/ns/nmwg/tools/ping/2.0/";
+namespace nmwgr = "http://ggf.org/ns/nmwg/result/2.0/";


# ##############################################################
@@ -23,6 +24,7 @@
# ##############################################################
include "nmtopo.rnc"
include "nmtopo_ver3.rnc"
+include "result.rnc"
include "nmbase.rnc" {
Metadata |= PingMetadata
Data |= PingData
@@ -203,9 +205,15 @@
) |
(
PingCommonTime+ &
- PingDatum*
+ (
+ PingDatum* |
+ ResultDatum*
+ )
) |
- PingDatum* |
+ (
+ PingDatum* |
+ ResultDatum*
+ ) |
Key*
)
}
@@ -237,7 +245,7 @@
# </nmwg:commonTime>
#
# ##############################################################
-
+
PingCommonTime =
element nmwg:commonTime {
Type &
@@ -251,7 +259,10 @@
)
)
) &
- PingDatum*
+ (
+ PingDatum* |
+ ResultDatum*
+ )
}



Added: trunk/nmwg/schema/rnc/service.rnc


Property changes on: trunk/nmwg/schema/rnc/service.rnc
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native

Modified: trunk/nmwg/schema/rnc/snmp.rnc
===================================================================
--- trunk/nmwg/schema/rnc/snmp.rnc 2007-02-02 20:35:11 UTC (rev 204)
+++ trunk/nmwg/schema/rnc/snmp.rnc 2007-02-05 17:33:00 UTC (rev 205)
@@ -15,6 +15,7 @@
# ##############################################################
namespace nmwg = "http://ggf.org/ns/nmwg/base/2.0/";
namespace snmp = "http://ggf.org/ns/nmwg/tools/snmp/2.0/";
+namespace nmwgr = "http://ggf.org/ns/nmwg/result/2.0/";


# ##############################################################
@@ -22,6 +23,7 @@
# ##############################################################
include "nmtopo.rnc"
include "nmtopo_ver3.rnc"
+include "result.rnc"
include "nmbase.rnc" {
Metadata |= SNMPMetadata
Data |= SNMPData
@@ -205,9 +207,15 @@
) |
(
SNMPCommonTime+ &
- SNMPDatum*
+ (
+ SNMPDatum* |
+ ResultDatum*
+ )
) |
- SNMPDatum* |
+ (
+ SNMPDatum* |
+ ResultDatum*
+ ) |
Key*
)
}
@@ -253,10 +261,13 @@
)
)
) &
- SNMPDatum*
+ (
+ SNMPDatum* |
+ ResultDatum*
+ )
}

-
+
# ##############################################################
# These are the basic elements we would expect to see in the
# specific snmp datum.

Modified: trunk/nmwg/schema/rnc/traceroute.rnc
===================================================================
--- trunk/nmwg/schema/rnc/traceroute.rnc 2007-02-02 20:35:11 UTC (rev
204)
+++ trunk/nmwg/schema/rnc/traceroute.rnc 2007-02-05 17:33:00 UTC (rev
205)
@@ -16,6 +16,7 @@
# ##############################################################
namespace nmwg = "http://ggf.org/ns/nmwg/base/2.0/";
namespace traceroute = "http://ggf.org/ns/nmwg/tools/traceroute/2.0/";
+namespace nmwgr = "http://ggf.org/ns/nmwg/result/2.0/";


# ##############################################################
@@ -23,6 +24,7 @@
# ##############################################################
include "nmtopo.rnc"
include "nmtopo_ver3.rnc"
+include "result.rnc"
include "nmbase.rnc" {
Metadata |= TracerouteMetadata
Data |= TracerouteData
@@ -202,9 +204,15 @@
) |
(
TracerouteCommonTime+ &
- TracerouteDatum*
+ (
+ TracerouteDatum* |
+ ResultDatum*
+ )
) |
- TracerouteDatum* |
+ (
+ TracerouteDatum* |
+ ResultDatum*
+ ) |
Key*
)
}
@@ -250,7 +258,10 @@
)
)
) &
- TracerouteDatum*
+ (
+ TracerouteDatum* |
+ ResultDatum*
+ )
}



Modified: trunk/nmwg/schema/rnc/utilization.rnc
===================================================================
--- trunk/nmwg/schema/rnc/utilization.rnc 2007-02-02 20:35:11 UTC (rev
204)
+++ trunk/nmwg/schema/rnc/utilization.rnc 2007-02-05 17:33:00 UTC (rev
205)
@@ -9,13 +9,14 @@
# Reference: http://books.xmlschemata.org/relaxng/page2.html
#
# ##############################################################
+

-
# ##############################################################
# Namespace definitions
# ##############################################################
namespace nmwg = "http://ggf.org/ns/nmwg/base/2.0/";
namespace utilization =
"http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";
+namespace nmwgr = "http://ggf.org/ns/nmwg/result/2.0/";


# ##############################################################
@@ -23,6 +24,7 @@
# ##############################################################
include "nmtopo.rnc"
include "nmtopo_ver3.rnc"
+include "result.rnc"
include "nmbase.rnc" {
Metadata |= UtilizationMetadata
Data |= UtilizationData
@@ -220,9 +222,15 @@
) |
(
UtilizationCommonTime+ &
- UtilizationDatum*
+ (
+ UtilizationDatum* |
+ ResultDatum*
+ )
) |
- UtilizationDatum* |
+ (
+ UtilizationDatum* |
+ ResultDatum*
+ ) |
Key*
)
}
@@ -268,7 +276,10 @@
)
)
) &
- UtilizationDatum*
+ (
+ UtilizationDatum* |
+ ResultDatum*
+ )
}



Modified: trunk/nmwg/schema/test-instances.sh
===================================================================
--- trunk/nmwg/schema/test-instances.sh 2007-02-02 20:35:11 UTC (rev 204)
+++ trunk/nmwg/schema/test-instances.sh 2007-02-05 17:33:00 UTC (rev 205)
@@ -76,25 +76,53 @@
$JAVA -jar $MSV -warning $SCHEMA_DIR/bwctl.rng $INSTANCE_DIR/bwctl.xml
$JAVA -jar $JING $SCHEMA_DIR/bwctl.rng $INSTANCE_DIR/bwctl.xml

+# test PassiveBand instance
+rm -f rnc/*rng rnc/*xsd

-#PassiveBand.rnc
-#PassiveLoss.rnc
-#PassiveTracefile.rnc
-#PassiveAnomal.rnc
-#snmp.rnc
-#netflow.rnc
+$JAVA -jar $TRANG -I rnc -O rng $SCHEMA_DIR/PassiveBand.rnc
$SCHEMA_DIR/PassiveBand.rng
+$JAVA -jar $TRANG -I rng -O xsd $SCHEMA_DIR/PassiveBand.rng
$SCHEMA_DIR/PassiveBand.xsd
+$JAVA -jar $MSV -warning $SCHEMA_DIR/PassiveBand.rng
$INSTANCE_DIR/PassiveBand.xml
+$JAVA -jar $JING $SCHEMA_DIR/PassiveBand.rng $INSTANCE_DIR/PassiveBand.xml

+# test PassiveLoss instance
+rm -f rnc/*rng rnc/*xsd

+$JAVA -jar $TRANG -I rnc -O rng $SCHEMA_DIR/PassiveLoss.rnc
$SCHEMA_DIR/PassiveLoss.rng
+$JAVA -jar $TRANG -I rng -O xsd $SCHEMA_DIR/PassiveLoss.rng
$SCHEMA_DIR/PassiveLoss.xsd
+$JAVA -jar $MSV -warning $SCHEMA_DIR/PassiveLoss.rng
$INSTANCE_DIR/PassiveLoss.xml
+$JAVA -jar $JING $SCHEMA_DIR/PassiveLoss.rng $INSTANCE_DIR/PassiveLoss.xml

+# test PassiveTracefile instance
+rm -f rnc/*rng rnc/*xsd

+$JAVA -jar $TRANG -I rnc -O rng $SCHEMA_DIR/PassiveTracefile.rnc
$SCHEMA_DIR/PassiveTracefile.rng
+$JAVA -jar $TRANG -I rng -O xsd $SCHEMA_DIR/PassiveTracefile.rng
$SCHEMA_DIR/PassiveTracefile.xsd
+$JAVA -jar $MSV -warning $SCHEMA_DIR/PassiveTracefile.rng
$INSTANCE_DIR/PassiveTracefile.xml
+$JAVA -jar $JING $SCHEMA_DIR/PassiveTracefile.rng
$INSTANCE_DIR/PassiveTracefile.xml

+# test PassiveAnomal instance
+rm -f rnc/*rng rnc/*xsd

+$JAVA -jar $TRANG -I rnc -O rng $SCHEMA_DIR/PassiveAnomal.rnc
$SCHEMA_DIR/PassiveAnomal.rng
+$JAVA -jar $TRANG -I rng -O xsd $SCHEMA_DIR/PassiveAnomal.rng
$SCHEMA_DIR/PassiveAnomal.xsd
+$JAVA -jar $MSV -warning $SCHEMA_DIR/PassiveAnomal.rng
$INSTANCE_DIR/PassiveAnomal.xml
+$JAVA -jar $JING $SCHEMA_DIR/PassiveAnomal.rng
$INSTANCE_DIR/PassiveAnomal.xml

+# test netflow instance
+rm -f rnc/*rng rnc/*xsd

+$JAVA -jar $TRANG -I rnc -O rng $SCHEMA_DIR/netflow.rnc
$SCHEMA_DIR/netflow.rng
+$JAVA -jar $TRANG -I rng -O xsd $SCHEMA_DIR/netflow.rng
$SCHEMA_DIR/netflow.xsd
+$JAVA -jar $MSV -warning $SCHEMA_DIR/netflow.rng $INSTANCE_DIR/netflow.xml
+$JAVA -jar $JING $SCHEMA_DIR/netflow.rng $INSTANCE_DIR/netflow.xml

+# test snmp instance
+rm -f rnc/*rng rnc/*xsd

+$JAVA -jar $TRANG -I rnc -O rng $SCHEMA_DIR/snmp.rnc $SCHEMA_DIR/snmp.rng
+$JAVA -jar $TRANG -I rng -O xsd $SCHEMA_DIR/snmp.rng $SCHEMA_DIR/snmp.xsd
+$JAVA -jar $MSV -warning $SCHEMA_DIR/snmp.rng $INSTANCE_DIR/snmp.xml
+$JAVA -jar $JING $SCHEMA_DIR/snmp.rng $INSTANCE_DIR/snmp.xml

+rm -f rnc/*rng rnc/*xsd

-
-
-rm -f rnc/*rng rnc/*xsd

Deleted: trunk/nmwg/schema/xpath_query1.xml


  • r205 - in trunk/nmwg/schema: . example_instances rnc, svnlog, 02/05/2007

Archive powered by MHonArc 2.6.16.

Top of Page