perfsonar development work

Author: aaron
Date: 2008-05-20 11:55:47 -0400 (Tue, 20 May 2008)
New Revision: 347

Added:
   trunk/nmwg/schema/rnc/topo/nmtopo_tcp.rnc
   trunk/nmwg/schema/rnc/topo/nmtopo_udt.rnc
Removed:
   trunk/nmwg/schema/rnc/topo/nmtopo_ethernet.rnc
   trunk/nmwg/schema/rnc/topo/nmtopo_ipv4.rnc
   trunk/nmwg/schema/rnc/topo/nmtopo_ipv6.rnc
   trunk/nmwg/schema/rnc/topo/nmtopo_sonet.rnc
   trunk/nmwg/schema/rnc/topo/nmtopo_transport.rnc
Modified:
   trunk/nmwg/schema/rnc/topo/nmtopo_base.rnc
   trunk/nmwg/schema/rnc/topo/nmtopo_l2.rnc
   trunk/nmwg/schema/rnc/topo/nmtopo_l3.rnc
   trunk/nmwg/schema/rnc/topo/nmtopo_l4.rnc
   trunk/nmwg/schema/rnc/topo/nmtypes.rnc
Log:
Major modifications to the next version topology schemas to bring them more in
line with the control plane topology schema and the work going on in the
Network Markup Language group.



Modified: trunk/nmwg/schema/rnc/topo/nmtopo_base.rnc
===================================================================
--- trunk/nmwg/schema/rnc/topo/nmtopo_base.rnc  2008-05-19 01:18:31 UTC (rev 
346)
+++ trunk/nmwg/schema/rnc/topo/nmtopo_base.rnc  2008-05-20 15:55:47 UTC (rev 
347)
@@ -1,170 +1,189 @@
 # ##############################################################
-# 
+#
 # File:    nmtopo_base.rnc - Schema to describe network elements
 # Version: $Id$
-#                         
+#
 # ##############################################################
 
 # ##############################################################
 # Namespace definitions
 # ##############################################################
-namespace nmtb =
-  "http://ogf.org/schema/network/topology/base/20070707/";
+ default namespace nmtb =
+   "http://ogf.org/schema/network/topology/base/20070707/";
 
 # External schema files
-include "nmtypes.rnc"
+ include "nmtypes.rnc"
 
 # generic Topology can be a root element
-start |= Topology
+ start |= Topology
 
-Topology = element nmtb:topology { 
-    Domain*
-    & Node*
-    & Link*
-    & Port*
-    & Network*
-    & Path*
-  }
+ Topology = element topology {
+     Domain*
+     & BaseNode*
+     & BaseLink*
+     & BasePort*
+     & BaseNetwork*
+     & BasePath*
+   }
 
-Domain = element nmtb:domain {
-    Identifier?
-    & IdReference?
-    & element nmtb:comments { xsd:string }?
-    & Node*
-    & Link*
-    & Network*
-    & Path*
-  }
+ Domain = element domain {
+     Identifier?
+     & IdReference?
+     & BaseNode*
+     & BaseLink*
+     & BaseNetwork*
+     & BasePath*
+   }
 
 ## ########################
 ## generic node
-## ########################        
-Node = element nmtb:node { BaseNodeContent }
-BaseNodeContent =
-  Identifier?
-  & IdReference?
-  & BaseName?
-  & BaseRelation*
-  & element nmtb:role { xsd:string }?
-  & element nmtb:type { xsd:string }?
-  & element nmtb:description { xsd:string }?
-  & element nmtb:hostName { xsd:string }?
-  & element nmtb:location { LocationContent }?
-  & element nmtb:contact { ContactInformationContent }?
-  & element nmtb:comments { xsd:string }?
-  & Port*
+## ########################
+ BaseNode = element node { BaseNodeContent }
+ BaseNodeContent =
+   Identifier?
+   & IdReference?
+   & Name*
+   & Address*
+   & Relation*
+   & Lifetime?
+   & element role { xsd:string }?
+   & element type { xsd:string }?
+   & element description { xsd:string }?
+   & element location { LocationContent }?
+   & element contact { ContactInformationContent }*
+   & element comments { xsd:string }*
+   & BasePort*
+   & BaseService*
 
-ContactInformationContent =
-  element nmtb:email { xsd:string }?
-  & element nmtb:phoneNumber { xsd:string }?
-  & element nmtb:administrator { xsd:string }?
-  & element nmtb:institution { xsd:string }?
+ ContactInformationContent =
+   attribute priority { xsd:integer }?
+   & element email { xsd:string }?
+   & element phoneNumber { xsd:string }?
+   & element administrator { xsd:string }?
+   & element institution { xsd:string }?
 
-LocationContent =
-  element nmtb:continent { xsd:string }?
-  & element nmtb:country { xsd:string }?
-  & element nmtb:zipcode { xsd:integer }?
-  & element nmtb:state { xsd:string }?
-  & element nmtb:institution { xsd:string }?
-  & element nmtb:city { xsd:string }?
-  & element nmtb:streetAddress { xsd:string }?
-  & element nmtb:floor { xsd:string }?
-  & element nmtb:room { xsd:string }?
-  & element nmtb:cage { xsd:string }?
-  & element nmtb:rack { xsd:string }?
-  & element nmtb:shelf { xsd:string }?
-  & element nmtb:latitude { xsd:float }?
-  & element nmtb:longitude { xsd:float }?
+ LocationContent =
+   element continent { xsd:string }?
+   & element country { xsd:string }?
+   & element zipcode { xsd:integer }?
+   & element state { xsd:string }?
+   & element institution { xsd:string }?
+   & element city { xsd:string }?
+   & element streetAddress { xsd:string }?
+   & element floor { xsd:string }?
+   & element room { xsd:string }?
+   & element cage { xsd:string }?
+   & element rack { xsd:string }?
+   & element shelf { xsd:string }?
+   & element latitude { xsd:float }?
+   & element longitude { xsd:float }?
 
 ## ########################
 ## generic port
 ## ########################
-Port = element nmtb:port { BasePortContent }
-BasePortContent =
-  Identifier?
-  & IdReference?
-  & BaseName?
-  & BaseRelation*
-  & element nmtb:role { xsd:string }?
-  & element nmtb:type { xsd:string }?
-  & element nmtb:description { xsd:string }?
-  & element nmtb:capacity { xsd:string }?
-  & element nmtb:comments { xsd:string }?
-  & Link*
+ BasePort = element port { BasePortContent }
+ BasePortContent =
+   Identifier?
+   & IdReference?
+   & Name*
+   & Address*
+   & Relation*
+   & Lifetime?
+   & element type { xsd:string }?
+   & element description { xsd:string }?
+   & element capacity { xsd:string }?
+   & element mtu { xsd:string }?
+   & element comments { xsd:string }*
+   & BaseLink*
 
 ## ########################
 ## generic link
 ## ########################
-Link = element nmtb:link { BaseLinkContent }
-BaseLinkContent =
-  Identifier?
-  & IdReference?
-  & BaseName?
-  & BaseRelation*
-  & element nmtb:role { xsd:string }?
-  & element nmtb:type { xsd:string }?
-  & element nmtb:description { xsd:string }?
-  & element nmtb:globalName {
-      attribute type { xsd:string }?
-      & xsd:string
-    }?
-  & element nmtb:comments { xsd:string }?
+ BaseLink = element link { BaseLinkContent }
+ BaseLinkContent =
+   Identifier?
+   & IdReference?
+   & Name*
+   & Relation*
+   & Lifetime?
+   & element remoteLinkId { xsd:string }
+   & element type { xsd:string }?
+   & element description { xsd:string }?
+   & element globalName {
+       attribute type { xsd:string }?
+       & xsd:string
+     }?
+   & element comments { xsd:string }*
 
 ## ########################
 ## generic network
-## ########################        
-Network = element nmtb:network { BaseNetworkContent }
-BaseNetworkContent =
-  Identifier?
-  & IdReference?
-  & NodeIdRef*
-  & PortIdRef*
-  & LinkIdRef*
-  & BaseName?
-  & BaseRelation*
-  & element nmtb:type { xsd:string }?
-  & element nmtb:description { xsd:string }?
-  & element nmtb:comments { xsd:string }?
+## ########################
+ BaseNetwork = element network { BaseNetworkContent }
+ BaseNetworkContent =
+   Identifier?
+   & IdReference?
+   & NodeIdRef*
+   & PortIdRef*
+   & LinkIdRef*
+   & Name*
+   & Relation*
+   & Lifetime?
+   & element type { xsd:string }?
+   & element description { xsd:string }?
+   & element comments { xsd:string }*
 
 ## ########################
 ## generic path
 ## ########################
-Path =
-  element nmtb:path { BasePathContent }
+ BasePath =
+   element path { BasePathContent }
 
 # a path consists of a list of hops
-BasePathContent =
-  Identifier
-  & BaseRelation*
-  & element nmtb:comments { xsd:string }?
-  & element nmtb:hop { BaseHopContent }*
+ BasePathContent =
+   Identifier
+   & Relation*
+   & Lifetime?
+   & element comments { xsd:string }*
+   & element hop { HopContent }*
 
-BaseHopContent =
-  Identifier,
-  (
-    DomainIdRef
-    | NodeIdRef
-    | LinkIdRef
-    | PathIdRef
-    | NetworkIdRef
-  )
- 
+ HopContent =
+   Identifier,
+   (
+     DomainIdRef
+     | NodeIdRef
+     | PortIdRef
+     | LinkIdRef
+     | PathIdRef
+     | NetworkIdRef
+   )
+
 ## ########################
-## misc
+## generic endpoint pair
 ## ########################
-BaseName =
-  element nmtb:name {
-    attribute type { xsd:string }?
-    & xsd:string
-  }
+ BaseEndPointPair =
+   element endPointPair { BaseEndPointPairContent }
 
-BaseRelation = 
-  element nmtb:relation {
-    attribute type { xsd:string }
-    & DomainIdRef*
-    & NodeIdRef*
-    & PortIdRef*
-    & LinkIdRef*
-    & PathIdRef*
-    & NetworkIdRef*
-  }
+# an endpoint pair consists of two endpoints in the form of ports
+ BaseEndPointPairContent =
+   Name*
+   & element type { xsd:string }?
+   & element description { xsd:string }?
+   & element comments { xsd:string }*
+   & element src { (BasePortContent | PortIdRef) }
+   & element dst { (BasePortContent | PortIdRef) }
+
+## ########################
+## generic service
+## ########################
+ BaseService =
+   element service { BaseServiceContent }
+
+ BaseServiceContent =
+   Identifier?
+   & IdReference?
+   & Name*
+   & element type { xsd:string }?
+   & element description { xsd:string }?
+   & element comments { xsd:string }*
+   & Relation*
+   & Lifetime?

Deleted: trunk/nmwg/schema/rnc/topo/nmtopo_ethernet.rnc

Deleted: trunk/nmwg/schema/rnc/topo/nmtopo_ipv4.rnc

Deleted: trunk/nmwg/schema/rnc/topo/nmtopo_ipv6.rnc

Modified: trunk/nmwg/schema/rnc/topo/nmtopo_l2.rnc
===================================================================
--- trunk/nmwg/schema/rnc/topo/nmtopo_l2.rnc    2008-05-19 01:18:31 UTC (rev 
346)
+++ trunk/nmwg/schema/rnc/topo/nmtopo_l2.rnc    2008-05-20 15:55:47 UTC (rev 
347)
@@ -1,138 +1,90 @@
 # ##############################################################
-# 
-# File:    nmtopo_l2.rnc - Schema for Layer2 Entities
-# Version: $Id: nmtopo-l2.rnc 189 2007-01-31 20:46:21Z boote $
-#                         
+#
+# File:    nmtopo_l2.rnc - Schema to describe L2 network elements
+# Version: $Id$
+#
 # ##############################################################
 
-
 # ##############################################################
 # Namespace definitions
 # ##############################################################
-namespace nmtl2 = "http://ogf.org/schema/network/topology/l2/20070707/";
-namespace nmtopo = "http://ogf.org/schema/network/topology/base/20070707/";
+ default namespace nmtl2 =
+           "http://ogf.org/schema/network/topology/l2/20070707/";
 
-include "nmtypes.rnc"
-#include "nmtopo_base.rnc"
+# External schema files
+ include "nmtypes.rnc"
 
 ## ########################
-## l2 interface
+## layer 2 port
 ## ########################
+ L2Port = element port { L2PortContent }
+ L2PortContent =
+   Identifier?
+   & IdReference?
+   & Name*
+   & Address*
+   & Relation*
+   & Lifetime?
+   & element type { xsd:string }?
+   & element description { xsd:string }?
+   & element capacity { xsd:string }?
+   & element mtu { xsd:string }?
+   & element comments { xsd:string }*
+   & element ifName {xsd:string }?
+   & element ifIndex {xsd:integer }?
+   & element vlan {xsd:integer }?
+   & element vlanRangeAvailability { xsd:string }
+   & L2Link*
 
-L2Interface = 
-        element nmtl2:interface {
-                L2InterfaceContent
-        }
-
-L2InterfaceContent = 
-        Identifier? &
-        L2InterfaceIdRef? &
-        L2Role? &
-        element nmtl2:type { xsd:string }? &
-        element nmtl2:address {
-                L2Address
-        }? &
-        element nmtl2:name { 
-                attribute type { xsd:string }? &
-                xsd:string
-        }? &
-        element nmtl2:description { xsd:string }? &
-        element nmtl2:ifHostName { xsd:string }? &
-        element nmtl2:ifIndex { xsd:string }? &
-        element nmtl2:capacity { xsd:string }?
-
-L2Address = 
-        (
-                attribute value { xsd:string } |
-                text
-        ) &
-        attribute type { xsd:string }
-
-
 ## ########################
-## l2 link
+## layer 2 link
 ## ########################
+ L2Link = element link { L2LinkContent }
+ L2LinkContent =
+   Identifier?
+   & IdReference?
+   & Name*
+   & Relation*
+   & Lifetime?
+   & element remoteLinkId { xsd:string }
+   & element type { xsd:string }?
+   & element description { xsd:string }?
+   & element globalName {
+       attribute type { xsd:string }?
+       & xsd:string
+     }?
+   & element comments { xsd:string }*
+   & element vlan {xsd:integer }?
 
-L2Link = 
-        element nmtl2:link {
-                L2LinkContent
-        }
-
-L2LinkContent =
-        Identifier? &
-        L2LinkIdRef? &
-        element nmtl2:index { xsd:string }? &                
-        element nmtl2:type { xsd:string }? &        
-        element nmtl2:name { 
-                attribute type { xsd:string }? &
-                xsd:string
-        }? &
-        element nmtl2:globalName { 
-                attribute type { xsd:string }? &
-                xsd:string
-        }? &        
-        L2Interface* &
-        L2Link* &        
-        Node*
-        
-
 ## ########################
-## l2 network
-## ########################        
-        
-L2Network =
-        element nmtl2:network {
-                L2NetworkContent
-        }
-
-L2NetworkContent =
-        Identifier? &
-        L2NetworkIdRef? &
-        element nmtl2:name { 
-                attribute type { xsd:string }? &
-                xsd:string
-        }? &
-        element nmtl2:type { xsd:string }? &                        
-        element nmtl2:vlan { xsd:string }? &
-        L2Interface* &
-        L2Link* &
-        Node*
-
-
+## layer 2 network
 ## ########################
-## l2 path
-## ########################
+ L2Network = element network { L2NetworkContent }
+ L2NetworkContent =
+   Identifier?
+   & IdReference?
+   & NodeIdRef*
+   & PortIdRef*
+   & LinkIdRef*
+   & Name*
+   & Relation*
+   & Lifetime?
+   & element type { xsd:string }?
+   & element description { xsd:string }?
+   & element comments { xsd:string }*
+   & element vlan {xsd:integer }?
 
-L2Path = 
-        element nmtl2:path {
-                L2PathContent
-        }
-
-L2PathContent = 
-        Identifier &
-        L2PathIdRef? &        
-        L2Link*
-
-
 ## ########################
-## l2 misc
+## layer 2 endpoint pair
 ## ########################
+ L2EndPointPair =
+   element endPointPair { L2EndPointPairContent }
 
-L2Role = 
-        (
-                attribute role { xsd:string } |
-                element nmtl2:role { xsd:string }
-        )
-
-L2InterfaceIdRef =
-            attribute interfaceIdRef { xsd:string }        
-
-L2LinkIdRef =
-            attribute linkIdRef { xsd:string }
-
-L2NetworkIdRef =
-            attribute networkIdRef { xsd:string }
-
-L2PathIdRef =
-            attribute pathIdRef { xsd:string }
-
+# an endpoint pair consists of two endpoints in the form of ports
+ L2EndPointPairContent =
+   Name*
+   & element type { xsd:string }?
+   & element description { xsd:string }?
+   & element comments { xsd:string }*
+   & element src { (L2PortContent | PortIdRef | Address) }
+   & element dst { (L2PortContent | PortIdRef | Address) }

Modified: trunk/nmwg/schema/rnc/topo/nmtopo_l3.rnc
===================================================================
--- trunk/nmwg/schema/rnc/topo/nmtopo_l3.rnc    2008-05-19 01:18:31 UTC (rev 
346)
+++ trunk/nmwg/schema/rnc/topo/nmtopo_l3.rnc    2008-05-20 15:55:47 UTC (rev 
347)
@@ -1,155 +1,91 @@
 # ##############################################################
-# 
-# File:         nmtopo_l3.rnc - Schema for Layer 3 entities 
-# Version:      $Id: nmtopo-l3.rnc 189 2007-01-31 20:46:21Z boote $
-#                         
+#
+# File:    nmtopo_l3.rnc - Schema to describe L3 network elements
+# Version: $Id$
+#
 # ##############################################################
 
-
 # ##############################################################
 # Namespace definitions
 # ##############################################################
-namespace nmtl3 = "http://ogf.org/schema/network/topology/l3/20070707/";
-namespace nmtl2 = "http://ogf.org/schema/network/topology/l2/20070707/";
-namespace nmtopo = "http://ogf.org/schema/network/topology/base/20070707/";
+ default namespace nmtl3 =
+           "http://ogf.org/schema/network/topology/l3/20070707/";
 
-include "nmtypes.rnc"
+# External schema files
+ include "nmtypes.rnc"
 
 ## ########################
-## l3 interface
+## layer 3 port
 ## ########################
+ L3Port = element port { L3PortContent }
+ L3PortContent =
+   Identifier?
+   & IdReference?
+   & Name*
+   & Address*
+   & Relation*
+   & Lifetime?
+   & element type { xsd:string }?
+   & element description { xsd:string }?
+   & element capacity { xsd:string }?
+   & element mtu { xsd:string }?
+   & element comments { xsd:string }*
+   & element netmask { xsd:string }?
+   & L3Link*
 
-L3Interface = 
-        element nmtl3:interface {
-                L3InterfaceContent
-        }
-
-L3InterfaceContent = 
-        Identifier? &
-        L3InterfaceIdRef? &
-        element nmtl3:ipAddress {
-                L3Address
-        }? &
-        element nmtl3:netmask { xsd:string }? &
-        element nmtl3:ifName { xsd:string }? &
-        element nmtl3:ifDescription { xsd:string }? &
-        element nmtl3:ifAddress {
-                L3Address
-        }? &
-        element nmtl3:ifHostName { xsd:string }? &
-        element nmtl3:ifIndex { xsd:string }? &
-        element nmtl3:type { xsd:string }? &
-        element nmtl3:capacity { xsd:string }?
-
-L3Address = 
-        (
-                attribute value { xsd:string } |
-                text
-        ) &
-        attribute type { xsd:string }
-
-
 ## ########################
-## l3 link
+## layer 3 link
 ## ########################
+ L3Link = element link { L3LinkContent }
+ L3LinkContent =
+   Identifier?
+   & IdReference?
+   & Name*
+   & Relation*
+   & Lifetime?
+   & element remoteLinkId { xsd:string }
+   & element type { xsd:string }?
+   & element description { xsd:string }?
+   & element globalName {
+       attribute type { xsd:string }?
+       & xsd:string
+     }?
+   & element comments { xsd:string }*
+   & element netmask { xsd:string }?
 
-L3Link = 
-        element nmtl3:link {
-                L3LinkContent
-        }
-
-L3LinkContent =
-        Identifier? &
-        L3LinkIdRef? &
-        element nmtl3:index { xsd:string }? &        
-        element nmtl3:type { xsd:string }? &                
-        element nmtl3:name { 
-                attribute type { xsd:string }? &
-                xsd:string
-        }? &
-        element nmtl3:globalName { 
-                attribute type { xsd:string }? &
-                xsd:string
-        }? &        
-        (
-                L3Interface |
-                PortIdRef
-        )* &
-        (
-                L3Link |
-                LinkIdRef
-        )* &
-        Node*
-        
-
 ## ########################
-## l3 network
+## layer 3 network
 ## ########################
+ L3Network = element network { L3NetworkContent }
+ L3NetworkContent =
+   Identifier?
+   & IdReference?
+   & NodeIdRef*
+   & PortIdRef*
+   & LinkIdRef*
+   & Name*
+   & Relation*
+   & Lifetime?
+   & element type { xsd:string }?
+   & element description { xsd:string }?
+   & element comments { xsd:string }*
+   & element subnet {
+        Address
+        & element netmask { xsd:string }
+     }?
+   & element asn { xsd:integer }
 
-L3Network =
-        element nmtl3:network{
-                L3NetworkContent
-        }
-
-L3NetworkContent =
-        Identifier? &
-        L3NetworkIdRef? &
-        element nmtl3:name { 
-                attribute type { xsd:string }? &
-                xsd:string
-        }? &
-        element nmtl3:type { xsd:string }? &        
-        element nmtl3:subnet { xsd:string }? &        
-        element nmtl3:netmask { xsd:string }? &        
-        element nmtl3:asn { xsd:string }? &
-        (
-                L3Interface |
-                PortIdRef
-        )* &
-        (
-                L3Link |
-                LinkIdRef
-        )* &
-        Node*
-                
-
 ## ########################
-## l3 path
+## layer 3 endpoint pair
 ## ########################
+ L3EndPointPair =
+   element endPointPair { L3EndPointPairContent }
 
-L3Path = 
-        element nmtl3:path {
-                L3PathContent
-        }
-
-L3PathContent = 
-        Identifier &
-        L3PathIdRef? &        
-        (
-                L3Link |
-                LinkIdRef
-        )*
-
-
-## ########################
-## l3 misc
-## ########################
-
-L3Role = 
-        (
-                attribute role { xsd:string } |
-                element nmtl3:role { xsd:string }
-        )
-
-L3InterfaceIdRef =
-            attribute interfaceIdRef { xsd:string }        
-
-L3LinkIdRef =
-            attribute linkIdRef { xsd:string }
-
-L3NetworkIdRef =
-            attribute networkIdRef { xsd:string }
-
-L3PathIdRef =
-            attribute pathIdRef { xsd:string }
-
+# an endpoint pair consists of two endpoints in the form of ports
+ L3EndPointPairContent =
+   Name*
+   & element type { xsd:string }?
+   & element description { xsd:string }?
+   & element comments { xsd:string }*
+   & element src { (L3PortContent | PortIdRef | Address) }
+   & element dst { (L3PortContent | PortIdRef | Address) }

Modified: trunk/nmwg/schema/rnc/topo/nmtopo_l4.rnc
===================================================================
--- trunk/nmwg/schema/rnc/topo/nmtopo_l4.rnc    2008-05-19 01:18:31 UTC (rev 
346)
+++ trunk/nmwg/schema/rnc/topo/nmtopo_l4.rnc    2008-05-20 15:55:47 UTC (rev 
347)
@@ -1,98 +1,85 @@
 # ##############################################################
-# 
-# File:         nmtopo_l4.rnc - Layer 4 Network entities
-#                           
-# Version:      $Id$
-#           
+#
+# File:    nmtopo_l4.rnc - Schema to describe L4 network elements
+# Version: $Id$
+#
 # ##############################################################
 
-
 # ##############################################################
 # Namespace definitions
 # ##############################################################
-namespace nmtl4 = "http://ogf.org/schema/network/topology/l4/20070707/";
-namespace nmtl3 = "http://ogf.org/schema/network/topology/l3/20070707/";
-namespace nmtopo = "http://ogf.org/schema/network/topology/base/20070707/";
+ default namespace nmtl4 =
+           "http://ogf.org/schema/network/topology/l4/20070707/";
 
-include "nmtypes.rnc"
+# External schema files
+ include "nmtypes.rnc"
 
 ## ########################
-## endPoint pair stuff
+## layer 4 port
 ## ########################
+ L4Port = element port { L4PortContent }
+ L4PortContent =
+   Identifier?
+   & IdReference?
+   & Name*
+   & Address*
+   & Relation*
+   & Lifetime?
+   & element type { xsd:string }?
+   & element description { xsd:string }?
+   & element capacity { xsd:string }?
+   & element mtu { xsd:string }?
+   & element comments { xsd:string }*
+   & element portNum { xsd:integer }?
+   & L4Link*
 
-L4EndpointPair = 
-        element nmtl4:endPointPair {
-                L4EndpointPairContent
-        }
-
-#
-# In general, one endpoint should have a roll of 'src' and the other 'dst'.
-# (However, this is just text - and it is reasonable that something like
-# owd might use 'sender'/'receiver' in place of 'src'/'dst'.
-#
-L4EndpointPairContent =
-        (
-                L4Endpoint &
-                L4Endpoint
-        )
-
-
 ## ########################
-## endPoint stuff
+## layer 4 link
 ## ########################
+ L4Link = element link { L4LinkContent }
+ L4LinkContent =
+   Identifier?
+   & IdReference?
+   & Name*
+   & Relation*
+   & Lifetime?
+   & element remoteLinkId { xsd:string }
+   & element type { xsd:string }?
+   & element description { xsd:string }?
+   & element globalName {
+       attribute type { xsd:string }?
+       & xsd:string
+     }?
+   & element comments { xsd:string }*
 
-L4Endpoint = 
-        element nmtl4:endPoint {
-                L4EndpointContent
-        }
-
-L4EndpointContent = 
-        attribute port { xsd:string }? &
-        attribute protocol { xsd:string }? &
-        attribute index { xsd:string }? &
-        L4Role? &
-        (
-                element nmtl4:address {
-                        L4Address
-                } |
-                element nmtl3:interface {
-                        anyThing
-                }
-        )
-
-
 ## ########################
-## generic path
+## layer 4 network
 ## ########################
+ L4Network = element network { L4NetworkContent }
+ L4NetworkContent =
+   Identifier?
+   & IdReference?
+   & NodeIdRef*
+   & PortIdRef*
+   & LinkIdRef*
+   & Name*
+   & Relation*
+   & Lifetime?
+   & element type { xsd:string }?
+   & element description { xsd:string }?
+   & element comments { xsd:string }*
 
-L4Path = 
-        element nmtl4:path {
-                L4PathContent
-        }
-
-L4PathContent = 
-        Identifier &
-        PathIdRef? &        
-        L4Endpoint*
-
-
 ## ########################
-## misc stuff
+## layer 4 endpoint pair
 ## ########################
+ L4EndPointPair =
+   element endPointPair { L4EndPointPairContent }
 
-L4Address = 
-        (
-                attribute value { xsd:string } |
-                text
-        ) &
-        attribute type { xsd:string }
-
-L4Role = 
-        (
-                attribute role { xsd:string } |
-                element nmtopo:role { xsd:string }
-        )
-
-L4PathIdRef = 
-        attribute pathIdRef { xsd:string }
-
+# an endpoint pair consists of two endpoints in the form of ports
+ L4EndPointPairContent =
+   Name*
+   & element type { xsd:string }?
+   & element description { xsd:string }?
+   & element comments { xsd:string }*
+   & element src { (L4PortContent | PortIdRef | Address) }
+   & element dst { (L4PortContent | PortIdRef | Address) }

Deleted: trunk/nmwg/schema/rnc/topo/nmtopo_sonet.rnc

Added: trunk/nmwg/schema/rnc/topo/nmtopo_tcp.rnc

Deleted: trunk/nmwg/schema/rnc/topo/nmtopo_transport.rnc

Added: trunk/nmwg/schema/rnc/topo/nmtopo_udt.rnc

Modified: trunk/nmwg/schema/rnc/topo/nmtypes.rnc
===================================================================
--- trunk/nmwg/schema/rnc/topo/nmtypes.rnc      2008-05-19 01:18:31 UTC (rev 
346)
+++ trunk/nmwg/schema/rnc/topo/nmtypes.rnc      2008-05-20 15:55:47 UTC (rev 
347)
@@ -69,3 +69,52 @@
   
 DomainIdRef = 
   element domainIdRef { xsd:string }
+
+ Name =
+   element name {
+     attribute type { xsd:string }?
+     & xsd:string
+   }
+
+ Address =
+   element address {
+     attribute type { xsd:string }?
+     & xsd:string
+   }
+
+ Relation =
+   element relation {
+     attribute type { xsd:string }
+     & DomainIdRef*
+     & NodeIdRef*
+     & PortIdRef*
+     & LinkIdRef*
+     & PathIdRef*
+     & NetworkIdRef*
+   }
+
+Lifetime =
+        element lifetime {
+          StartTime
+          & (EndTime | Duration)?
+        }
+
+TimeContent = 
+        attribute type { text } &
+        xsd:string
+
+StartTime = 
+        element start {
+                TimeContent
+        }
+   
+EndTime = 
+        element end {
+                TimeContent
+        }
+
+Duration =
+        element duration {
+          attribute type { xsd:string }
+          & xsd:string
+        }