perfsonar development work

Author: swany
Date: 2007-09-14 13:56:01 -0400 (Fri, 14 Sep 2007)
New Revision: 267

Removed:
   trunk/nmwg/schema/rnc/nmtopo-l2.rnc
   trunk/nmwg/schema/rnc/nmtopo-l3.rnc
   trunk/nmwg/schema/rnc/nmtopo-l4.rnc
   trunk/nmwg/schema/rnc/nmtopo_ver3.rnc
Modified:
   trunk/nmwg/schema/rnc/topo/nmtopo_base.rnc
   trunk/nmwg/schema/rnc/topo/nmtopo_ctrlplane.rnc
   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_l2.rnc
   trunk/nmwg/schema/rnc/topo/nmtopo_l3.rnc
   trunk/nmwg/schema/rnc/topo/nmtopo_l4.rnc
   trunk/nmwg/schema/rnc/topo/nmtopo_sonet.rnc
   trunk/nmwg/schema/rnc/topo/nmtopo_transport.rnc
   trunk/nmwg/schema/rnc/topo/nmtypes.rnc
Log:
Remove some files and partial updates to the "new" topology schema.

The topo diretory contains the latest version of the topology
schema formerly known as version 3.  



Deleted: trunk/nmwg/schema/rnc/nmtopo-l2.rnc

Deleted: trunk/nmwg/schema/rnc/nmtopo-l3.rnc

Deleted: trunk/nmwg/schema/rnc/nmtopo-l4.rnc

Deleted: trunk/nmwg/schema/rnc/nmtopo_ver3.rnc

Modified: trunk/nmwg/schema/rnc/topo/nmtopo_base.rnc
===================================================================
--- trunk/nmwg/schema/rnc/topo/nmtopo_base.rnc  2007-09-14 17:27:04 UTC (rev 
266)
+++ trunk/nmwg/schema/rnc/topo/nmtopo_base.rnc  2007-09-14 17:56:01 UTC (rev 
267)
@@ -1,7 +1,7 @@
 # ##############################################################
 # 
 # File:    nmtopo_base.rnc - Schema to describe network elements
-# Version: $Id: $
+# Version: $Id$
 #                         
 # ##############################################################
 
@@ -18,11 +18,11 @@
 start |= Topology
 
 Topology = element nmtb:topology { 
-  Node* & 
-  Link* &
-  Port* &
-  Network* &
-  Path*
+    Node* & 
+    Link* &
+    Port* &
+    Network* &
+    Path*
   }
 
 ## ########################
@@ -40,6 +40,7 @@
   & element nmtb:description { xsd:string }?
   & element nmtb:index { xsd:string }?
   & element nmtb:capacity { xsd:string }?
+  & Link*
 
 ## ########################
 ## generic link


Property changes on: trunk/nmwg/schema/rnc/topo/nmtopo_base.rnc
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: trunk/nmwg/schema/rnc/topo/nmtopo_ctrlplane.rnc
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: trunk/nmwg/schema/rnc/topo/nmtopo_ethernet.rnc
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: trunk/nmwg/schema/rnc/topo/nmtopo_ipv4.rnc
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: trunk/nmwg/schema/rnc/topo/nmtopo_ipv6.rnc
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: trunk/nmwg/schema/rnc/topo/nmtopo_l2.rnc
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: trunk/nmwg/schema/rnc/topo/nmtopo_l3.rnc
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: trunk/nmwg/schema/rnc/topo/nmtopo_l4.rnc
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: trunk/nmwg/schema/rnc/topo/nmtopo_sonet.rnc
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: trunk/nmwg/schema/rnc/topo/nmtopo_transport.rnc
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: trunk/nmwg/schema/rnc/topo/nmtypes.rnc
===================================================================
--- trunk/nmwg/schema/rnc/topo/nmtypes.rnc      2007-09-14 17:27:04 UTC (rev 
266)
+++ trunk/nmwg/schema/rnc/topo/nmtypes.rnc      2007-09-14 17:56:01 UTC (rev 
267)
@@ -1,4 +1,7 @@
-# @version SVN: $Id$
+# ##############################################################
+# File: nmtypes.rnc
+# Version: $Id$
+# ##############################################################
 
 namespace nmtb =
   "http://ogf.org/schema/network/topology/base/20070707/";


Property changes on: trunk/nmwg/schema/rnc/topo/nmtypes.rnc
___________________________________________________________________
Name: svn:keywords
   + Id