Skip to Content.
Sympa Menu

perfsonar-dev - r1723 - trunk/perfsonar/schema/nmwg

Subject: perfsonar development work

List archive

r1723 - trunk/perfsonar/schema/nmwg


Chronological Thread 
  • From:
  • To:
  • Subject: r1723 - trunk/perfsonar/schema/nmwg
  • Date: Mon, 30 Oct 2006 11:36:27 -0500

Author: zurawski
Date: 2006-10-30 11:36:26 -0500 (Mon, 30 Oct 2006)
New Revision: 1723

Modified:
trunk/perfsonar/schema/nmwg/nmtopo-l2.rnc
trunk/perfsonar/schema/nmwg/nmtopo-l3.rnc
trunk/perfsonar/schema/nmwg/nmtopo_ver3.rnc
Log:
Small changes (Removal of AuthRealm, clarification of other elements) to
reflect the Java classes.

-jason



Modified: trunk/perfsonar/schema/nmwg/nmtopo-l2.rnc
===================================================================
--- trunk/perfsonar/schema/nmwg/nmtopo-l2.rnc 2006-10-30 16:27:47 UTC (rev
1722)
+++ trunk/perfsonar/schema/nmwg/nmtopo-l2.rnc 2006-10-30 16:36:26 UTC (rev
1723)
@@ -32,7 +32,10 @@
L2Role? &
element nmtl2:type { xsd:string }? &
element nmtl2:address { L2Address }? &
- element nmtl2:name { xsd:string }? &
+ element nmtl2:name {
+ attribute type { xsd:string }? &
+ xsd:string
+ }? &
element nmtl2:description { xsd:string }? &
element nmtl2:ifHostName { xsd:string }? &
element nmtl2:ifIndex { xsd:string }? &
@@ -66,10 +69,7 @@
element nmtl2:globalName {
attribute type { xsd:string }? &
xsd:string
- }? &
- element nmtl2:authRealm {
- xsd:string
- }? &
+ }? &
L2Interface* &
L2Link* &
Node*
@@ -85,7 +85,10 @@
L2NetworkContent =
Identifier? &
L2NetworkIdRef? &
- element nmtl2:name { xsd:string }? &
+ element nmtl2:name {
+ attribute type { xsd:string }? &
+ xsd:string
+ }? &
element nmtl2:type { xsd:string }? &
element nmtl2:vlan { xsd:string }? &
L2Interface* &

Modified: trunk/perfsonar/schema/nmwg/nmtopo-l3.rnc
===================================================================
--- trunk/perfsonar/schema/nmwg/nmtopo-l3.rnc 2006-10-30 16:27:47 UTC (rev
1722)
+++ trunk/perfsonar/schema/nmwg/nmtopo-l3.rnc 2006-10-30 16:36:26 UTC (rev
1723)
@@ -74,10 +74,7 @@
element nmtl3:globalName {
attribute type { xsd:string }? &
xsd:string
- }? &
- element nmtl3:authRealm {
- xsd:string
- }? &
+ }? &
(
L3Interface |
L2Interface
@@ -99,7 +96,10 @@
L3NetworkContent =
Identifier? &
L3NetworkIdRef? &
- element nmtl3:name { xsd:string }? &
+ element nmtl3:name {
+ attribute type { xsd:string }? &
+ xsd:string
+ }? &
element nmtl3:type { xsd:string }? &
element nmtl3:subnet { xsd:string }? &
element nmtl3:netmask { xsd:string }? &

Modified: trunk/perfsonar/schema/nmwg/nmtopo_ver3.rnc
===================================================================
--- trunk/perfsonar/schema/nmwg/nmtopo_ver3.rnc 2006-10-30 16:27:47 UTC (rev
1722)
+++ trunk/perfsonar/schema/nmwg/nmtopo_ver3.rnc 2006-10-30 16:36:26 UTC (rev
1723)
@@ -38,9 +38,11 @@
element nmwgtopo3:ifDescription { xsd:string }? &
element nmwgtopo3:ifIndex { xsd:string }? &
element nmwgtopo3:capacity { xsd:string }? &
- element nmwgtopo3:name { xsd:string}?
+ element nmwgtopo3:name {
+ attribute type { xsd:string }? &
+ xsd:string
+ }?

-
## ########################
## generic link
## ########################
@@ -84,7 +86,10 @@
BaseNetworkContent =
Identifier? &
BaseNetworkIdRef? &
- element nmwgtopo3:name { xsd:string }? &
+ element nmwgtopo3:name {
+ attribute type { xsd:string }? &
+ xsd:string
+ }? &
element nmwgtopo3:type { xsd:string }? &
(
BaseInterface |
@@ -153,6 +158,13 @@
## misc
## ########################

+BaseAddress =
+ (
+ attribute value { xsd:string } |
+ text
+ ) &
+ attribute type { xsd:string }
+
BaseRole =
(
attribute role { xsd:string } |



  • r1723 - trunk/perfsonar/schema/nmwg, svnlog, 10/30/2006

Archive powered by MHonArc 2.6.16.

Top of Page