Commit fa0313b5 authored by Jonathon Duerig's avatar Jonathon Duerig

Bugfixes in rspec

parent 320c7d8a
......@@ -59,7 +59,7 @@
<xs:attribute name="component_name"/>
<xs:attribute name="exclusive" type="xs:boolean"/>
<xs:attribute name="colocate"/>
<xs:attribute name="sliver_id" use="required"/>
<xs:attribute name="sliver_id"/>
</xs:complexType>
<xs:element name="relation" type="rspec:RelationContents"/>
<xs:element name="location" type="rspec:LocationContents"/>
......@@ -127,6 +127,7 @@
<xs:attributeGroup ref="rspec:AnyExtension"/>
<xs:attribute name="component_id"/>
<xs:attribute name="client_id" use="required"/>
<xs:attribute name="sliver_id"/>
<xs:attribute name="mac_address"/>
</xs:complexType>
<xs:element name="ip" type="rspec:IpContents"/>
......@@ -152,7 +153,7 @@
</xs:choice>
<xs:attributeGroup ref="rspec:AnyExtension"/>
<xs:attribute name="client_id" use="required"/>
<xs:attribute name="sliver_id" use="required"/>
<xs:attribute name="sliver_id"/>
<xs:attribute name="vlantag" use="required"/>
</xs:complexType>
<xs:element name="property" type="rspec:LinkPropertyContents"/>
......@@ -161,6 +162,8 @@
<xs:group ref="rspec:AnyExtension"/>
<xs:attributeGroup ref="rspec:AnyExtension"/>
<xs:attribute name="client_id" use="required"/>
<xs:attribute name="sliver_id"/>
<xs:attribute name="component_id"/>
</xs:complexType>
<!-- The unidirectional network properties of a link. -->
<xs:complexType name="LinkPropertyContents">
......
......@@ -11,24 +11,29 @@
include "request.rnc"
NodeContents &=
attribute sliver_id { text } &
attribute sliver_id { text }? &
# List of all hostnames that can be used to access the node on the
# control network. These may be accessible only by other nodes local
# to the same CM.
element host { attribute name { text } }*
LinkContents &=
attribute sliver_id { text } &
attribute sliver_id { text }? &
# vlan tag number used for stitching
attribute vlantag { text }
InterfaceContents &=
attribute sliver_id { text }? &
attribute mac_address { text } ? &
# List of all hostnames associated with a particular
# interface. These may be names associated with an experimental
# interface that can be used to transit experimental traffic.
element host { attribute name { text } }*
InterfaceRefContents &=
attribute sliver_id { text }? &
attribute component_id { text }?
LoginServiceContents &=
# Default username. Used when there is only one username or one
# username should be used by default.
......
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