Commit 26d24b40 authored by Jonathon Duerig's avatar Jonathon Duerig

A number of minor changes suggested by Leigh and Rob

parent e401c0f1
......@@ -39,7 +39,7 @@ NodeContents =
# Link types
LinkTypeList &
# The interfaces which this link spans.
element interface {
element interface_ref {
InterfaceRef
}*
......@@ -58,11 +58,11 @@ ComponentName =
# The uuid of the physical component.
attribute component_uuid { text }
ComponentInterfaceDeclName = attribute component_name { text }
ComponentInterfaceDeclName = attribute component_id { text }
ComponentInterfaceRefName =
attribute component_node_uuid { text } &
attribute component_interface_name { text }
attribute component_interface_id { text }
SliverName =
# The sliver_uuid is an annotation added when a ticket is
......
......@@ -18,11 +18,7 @@
<xs:complexType name="NodeContents">
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:group ref="rspec:NodeTypeList"/>
<xs:element name="interface">
<xs:complexType>
<xs:attributeGroup ref="rspec:InterfaceDecl"/>
</xs:complexType>
</xs:element>
<xs:element ref="rspec:interface"/>
</xs:choice>
<xs:attribute name="virtualization_type">
<xs:simpleType>
......@@ -39,12 +35,18 @@
<xs:attribute name="component_name"/>
<xs:attribute name="component_uuid"/>
<xs:attributeGroup ref="rspec:SliverName"/>
<xs:attribute name="colocate"/>
</xs:complexType>
<xs:element name="interface">
<xs:complexType>
<xs:attributeGroup ref="rspec:InterfaceDecl"/>
</xs:complexType>
</xs:element>
<xs:complexType name="LinkContents">
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:choice>
<xs:group ref="rspec:LinkTypeList"/>
<xs:element name="interface">
<xs:element name="interface_ref">
<xs:complexType>
<xs:attributeGroup ref="rspec:InterfaceRef"/>
</xs:complexType>
......@@ -118,24 +120,22 @@
<xs:attribute name="component_uuid" use="required"/>
</xs:attributeGroup>
<xs:attributeGroup name="ComponentInterfaceDeclName">
<xs:attribute name="component_name" use="required"/>
<xs:attribute name="component_id" use="required"/>
</xs:attributeGroup>
<xs:attributeGroup name="ComponentInterfaceRefName">
<xs:attribute name="component_node_uuid" use="required"/>
<xs:attribute name="component_interface_name" 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_name"/>
<xs:attribute name="component_id"/>
<xs:attributeGroup ref="rspec:VirtualName"/>
</xs:attributeGroup>
<xs:attributeGroup name="InterfaceRef">
<xs:attribute name="component_node_uuid"/>
<xs:attribute name="component_interface_name"/>
<xs:attribute name="virtual_node_id" use="required"/>
<xs:attribute name="virtual_interface_name" use="required"/>
<xs:attribute name="virtual_interface_id" use="required"/>
</xs:attributeGroup>
<xs:element name="location">
<xs:complexType>
......
......@@ -17,7 +17,8 @@ include "protogeni-rspec-common.rnc"
NodeContents &=
VirtualName &
ComponentName? &
SliverName?
SliverName? &
attribute colocate { text }?
# The LinkMapping will only be available after an assignment
# The SliverName will be available only after the request has been redeemed.
......@@ -35,9 +36,8 @@ InterfaceDecl &=
# The ComponentInterfaceRefName will only be available after an assignment
InterfaceRef &=
ComponentInterfaceRefName? &
attribute virtual_node_id { text } &
attribute virtual_interface_name { text }
attribute virtual_interface_id { text }
RSpecContents &=
attribute type { "request" }
......@@ -52,9 +52,11 @@ LinkMapping =
# Each interface represents a particular physical interface. If that
# interface is one of the link end points, it is also mapped to that
# virtual interface name.
InterfaceMapping = element interface {
ComponentInterfaceRefName &
VirtualName ?
InterfaceMapping = element interface_ref {
ComponentInterfaceRefName |
(attribute virtual_node_id { text } &
attribute virtual_interface_id { text })
# VirtualName ?
}
start = RSpec
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