Commit 7b49346d authored by Jonathon Duerig's avatar Jonathon Duerig

<trivial_bandwidth> is now optional like it should be.

parent 1d8a37d1
......@@ -11,7 +11,7 @@
Description of a physical topology
-->
<grammar ns="http://emulab.net/resources/ptop/0.1" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" ns="http://emulab.net/resources/ptop/0.1" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
<include href="top.rng"/>
<define name="TypeLimitSpec">
<a:documentation>A simple policy specification - it may end up that policy does not belong in
......
......@@ -110,7 +110,7 @@ NodeFlagSpec =
## interface. In the future, we will make the loopback interface/link
## explicit in the topology
## Valid only for physical nodes
element trivial_bandwidth { xsd:integer },
(element trivial_bandwidth { xsd:integer })?,
## Specify that this node is a subnode of another node. We MIGHT
## try to do this with properties in the future
## Valid for both virtual and physical nodes
......
......@@ -196,13 +196,17 @@ a feature is a constraint violation</a:documentation>
<define name="NodeFlagSpec">
<a:documentation>"Legacy" assign node flags - will be replaced with properties, and in some
cases, explicit links</a:documentation>
<element name="trivial_bandwidth">
<a:documentation>Gives the amount of bandwidth this node can forward through its loopback
<optional>
<group>
<a:documentation>Gives the amount of bandwidth this node can forward through its loopback
interface. In the future, we will make the loopback interface/link
explicit in the topology
Valid only for physical nodes</a:documentation>
<data type="integer"/>
</element>
<element name="trivial_bandwidth">
<data type="integer"/>
</element>
</group>
</optional>
<optional>
<element name="subnode_of">
<a:documentation>Specify that this node is a subnode of another node. We MIGHT
......
......@@ -192,7 +192,7 @@
</xs:element>
<xs:group name="NodeFlagSpec">
<xs:sequence>
<xs:element ref="trivial_bandwidth"/>
<xs:element minOccurs="0" ref="trivial_bandwidth"/>
<xs:element minOccurs="0" ref="subnode_of"/>
<xs:element minOccurs="0" ref="unique"/>
<xs:element minOccurs="0" ref="disallow_trivial_mix"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment