Commit ab0a70cc authored by Jonathon Duerig's avatar Jonathon Duerig

Removed sliver_uuids. R.I.P. Added virtualization_subtype as a quick hack to help Leigh integrate

parent 26d24b40
......@@ -64,12 +64,6 @@ ComponentInterfaceRefName =
attribute component_node_uuid { text } &
attribute component_interface_id { text }
SliverName =
# The sliver_uuid is an annotation added when a ticket is
# redeemed to notify the client of the association between the
# virtual_id requests and the actual slivers instantiated.
attribute sliver_uuid { text }?
InterfaceDecl = empty
InterfaceRef = empty
......
......@@ -34,8 +34,8 @@
<xs:attribute name="component_manager_uuid"/>
<xs:attribute name="component_name"/>
<xs:attribute name="component_uuid"/>
<xs:attributeGroup ref="rspec:SliverName"/>
<xs:attribute name="colocate"/>
<xs:attribute name="virtualization_subtype"/>
</xs:complexType>
<xs:element name="interface">
<xs:complexType>
......@@ -71,8 +71,8 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
<xs:attribute name="link_type"/>
<xs:attributeGroup ref="rspec:VirtualName"/>
<xs:attributeGroup ref="rspec:SliverName"/>
</xs:complexType>
<xs:element name="bandwidth">
<xs:annotation>
......@@ -126,14 +126,12 @@
<xs:attribute name="component_node_uuid" use="required"/>
<xs:attribute name="component_interface_id" use="required"/>
</xs:attributeGroup>
<xs:attributeGroup name="SliverName">
<xs:attribute name="sliver_uuid"/>
</xs:attributeGroup>
<xs:attributeGroup name="InterfaceDecl">
<xs:attribute name="component_id"/>
<xs:attributeGroup ref="rspec:VirtualName"/>
</xs:attributeGroup>
<xs:attributeGroup name="InterfaceRef">
<xs:attribute name="tunnel_ip"/>
<xs:attribute name="virtual_node_id" use="required"/>
<xs:attribute name="virtual_interface_id" use="required"/>
</xs:attributeGroup>
......
......@@ -13,19 +13,18 @@ default namespace = "http://www.protogeni.net/resources/rspec/0.1"
include "protogeni-rspec-common.rnc"
# The ComponentName will only be available after an assignment
# The SliverName will be available only after the request has been redeemed.
NodeContents &=
VirtualName &
ComponentName? &
SliverName? &
attribute colocate { text }?
attribute colocate { text }? &
# TODO: Remove and replace with something more exensible
attribute virtualization_subtype { text }?
# The LinkMapping will only be available after an assignment
# The SliverName will be available only after the request has been redeemed.
LinkContents &=
attribute link_type { text }? &
VirtualName &
LinkMapping? &
SliverName? &
# Characteristics (bandwidth, latency, loss) which affect traffic.
LinkCharacteristics?
......@@ -36,6 +35,7 @@ InterfaceDecl &=
# The ComponentInterfaceRefName will only be available after an assignment
InterfaceRef &=
attribute tunnel_ip { text }? &
attribute virtual_node_id { text } &
attribute virtual_interface_id { text }
......
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