Commit a30ffc59 authored by Jonathon Duerig's avatar Jonathon Duerig

Added component_manager information to links in both versions 0.1 and 2 of the...

Added component_manager information to links in both versions 0.1 and 2 of the rspec. The request-tunnel.xml example uses component_manager tags on links.
parent 3c346bd1
......@@ -21,6 +21,8 @@
</node>
<link virtual_id="link0"
link_type="tunnel">
<component_manager name="urn:publicid:IDN+emulab.net+authority+cm" />
<component_manager name="urn:publicid:IDN+uky.emulab.net+authority+cm" />
<interface_ref virtual_node_id="pc10"
virtual_interface_id="control"
tunnel_ip="192.168.0.1" />
......
......@@ -57,6 +57,7 @@
</xs:element>
</xs:choice>
<xs:choice>
<xs:element ref="rspec:component_manager"/>
<xs:group ref="rspec:LinkMapping"/>
<xs:choice>
<xs:element ref="rspec:bandwidth"/>
......@@ -79,6 +80,11 @@
<xs:attributeGroup ref="rspec:VirtualName"/>
<xs:attribute name="sliver_id" use="required"/>
</xs:complexType>
<xs:element name="component_manager">
<xs:complexType>
<xs:attribute name="name" use="required"/>
</xs:complexType>
</xs:element>
<xs:element name="bandwidth">
<xs:annotation>
<xs:documentation>Bandwidth of the link in kbps</xs:documentation>
......
......@@ -56,6 +56,7 @@
</xs:element>
</xs:choice>
<xs:choice>
<xs:element ref="rspec:component_manager"/>
<xs:group ref="rspec:LinkMapping"/>
<xs:choice>
<xs:element ref="rspec:bandwidth"/>
......@@ -77,6 +78,11 @@
<xs:attribute name="link_type"/>
<xs:attributeGroup ref="rspec:VirtualName"/>
</xs:complexType>
<xs:element name="component_manager">
<xs:complexType>
<xs:attribute name="name" use="required"/>
</xs:complexType>
</xs:element>
<xs:element name="bandwidth">
<xs:annotation>
<xs:documentation>Bandwidth of the link in kbps</xs:documentation>
......
......@@ -25,6 +25,7 @@ NodeContents &=
# The LinkMapping will only be available after an assignment
LinkContents &=
attribute link_type { text }? &
element component_manager { attribute name { text } }* &
VirtualName &
LinkMapping? &
# Characteristics (bandwidth, latency, loss) which affect traffic.
......
......@@ -85,13 +85,21 @@
<xs:element ref="rspec:link_type"/>
<xs:element name="interface_ref" type="rspec:InterfaceRefContents"/>
</xs:choice>
<xs:element ref="rspec:component_hop"/>
<xs:choice>
<xs:element ref="rspec:component_manager"/>
<xs:element ref="rspec:component_hop"/>
</xs:choice>
</xs:choice>
<xs:attributeGroup ref="rspec:AnyExtension"/>
<xs:attribute name="client_id" use="required"/>
<xs:attribute name="sliver_id" use="required"/>
</xs:complexType>
<xs:element name="property" type="rspec:LinkPropertyContents"/>
<xs:element name="component_manager">
<xs:complexType>
<xs:attribute name="name" use="required"/>
</xs:complexType>
</xs:element>
<xs:element name="component_hop" type="rspec:ComponentHopContents"/>
<xs:complexType name="InterfaceRefContents">
<xs:group ref="rspec:AnyExtension"/>
......
......@@ -84,12 +84,20 @@
<xs:element ref="rspec:link_type"/>
<xs:element name="interface_ref" type="rspec:InterfaceRefContents"/>
</xs:choice>
<xs:element ref="rspec:component_hop"/>
<xs:choice>
<xs:element ref="rspec:component_manager"/>
<xs:element ref="rspec:component_hop"/>
</xs:choice>
</xs:choice>
<xs:attributeGroup ref="rspec:AnyExtension"/>
<xs:attribute name="client_id" use="required"/>
</xs:complexType>
<xs:element name="property" type="rspec:LinkPropertyContents"/>
<xs:element name="component_manager">
<xs:complexType>
<xs:attribute name="name" use="required"/>
</xs:complexType>
</xs:element>
<xs:element name="component_hop" type="rspec:ComponentHopContents"/>
<xs:complexType name="InterfaceRefContents">
<xs:group ref="rspec:AnyExtension"/>
......
......@@ -38,6 +38,7 @@ NodeContents &=
# The LinkMapping will only be available after an assignment
LinkContents &=
attribute client_id { text } &
element component_manager { attribute name { text } }* &
element component_hop { ComponentHopContents }*
# The ComponentInterfaceDeclName will only be available after an assignment
......
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