Commit 2391a137 authored by Jonathon Duerig's avatar Jonathon Duerig

Allow either _uuid or _urn attributes for naming.

parent 0f97e8cb
......@@ -63,16 +63,19 @@ VirtualName = attribute virtual_id { text }
ComponentName =
# This is the uuid of the aggregate that this node or link belongs
# to. It is required in an advertisement.
attribute component_manager_uuid { text } &
attribute component_manager_uuid { text }? &
attribute component_manager_urn { text }? &
# User-readable name for the component
attribute component_name { text }? &
# The uuid of the physical component.
attribute component_uuid { text }
attribute component_uuid { text }? &
attribute component_urn { text }?
ComponentInterfaceDeclName = attribute component_id { text }
ComponentInterfaceRefName =
attribute component_node_uuid { text } &
attribute component_node_uuid { text }? &
attribute component_node_urn { text }? &
attribute component_interface_id { text }
InterfaceDecl = empty
......
......@@ -131,15 +131,18 @@
<xs:attribute name="virtual_id" use="required"/>
</xs:attributeGroup>
<xs:attributeGroup name="ComponentName">
<xs:attribute name="component_manager_uuid" use="required"/>
<xs:attribute name="component_manager_uuid"/>
<xs:attribute name="component_manager_urn"/>
<xs:attribute name="component_name"/>
<xs:attribute name="component_uuid" use="required"/>
<xs:attribute name="component_uuid"/>
<xs:attribute name="component_urn"/>
</xs:attributeGroup>
<xs:attributeGroup name="ComponentInterfaceDeclName">
<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_node_uuid"/>
<xs:attribute name="component_node_urn"/>
<xs:attribute name="component_interface_id" use="required"/>
</xs:attributeGroup>
<xs:complexType name="InterfaceDecl">
......
......@@ -56,7 +56,8 @@ InterfaceRef &=
# length restrictions on URNs end.
ExternalReference = element external_ref {
ComponentInterfaceRefName &
attribute component_manager_uuid { text }
attribute component_manager_uuid { text }? &
attribute component_manager_urn { text }?
}
RSpecContents &=
......
......@@ -21,7 +21,8 @@
<xs:element name="external_ref">
<xs:complexType>
<xs:attributeGroup ref="rspec:ComponentInterfaceRefName"/>
<xs:attribute name="component_manager_uuid" use="required"/>
<xs:attribute name="component_manager_uuid"/>
<xs:attribute name="component_manager_urn"/>
</xs:complexType>
</xs:element>
<xs:element name="bgp_prefix">
......
......@@ -32,9 +32,7 @@
</xs:simpleType>
</xs:attribute>
<xs:attributeGroup ref="rspec:VirtualName"/>
<xs:attribute name="component_manager_uuid"/>
<xs:attribute name="component_name"/>
<xs:attribute name="component_uuid"/>
<xs:attributeGroup ref="rspec:ComponentName"/>
<xs:attribute name="colocate"/>
<xs:attribute name="virtualization_subtype"/>
<xs:attribute name="exclusive"/>
......@@ -130,15 +128,18 @@
<xs:attribute name="virtual_id" use="required"/>
</xs:attributeGroup>
<xs:attributeGroup name="ComponentName">
<xs:attribute name="component_manager_uuid" use="required"/>
<xs:attribute name="component_manager_uuid"/>
<xs:attribute name="component_manager_urn"/>
<xs:attribute name="component_name"/>
<xs:attribute name="component_uuid" use="required"/>
<xs:attribute name="component_uuid"/>
<xs:attribute name="component_urn"/>
</xs:attributeGroup>
<xs:attributeGroup name="ComponentInterfaceDeclName">
<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_node_uuid"/>
<xs:attribute name="component_node_urn"/>
<xs:attribute name="component_interface_id" use="required"/>
</xs:attributeGroup>
<xs:attributeGroup name="InterfaceDecl">
......
......@@ -44,6 +44,7 @@
<xs:element name="interface_ref">
<xs:complexType>
<xs:attribute name="component_node_uuid"/>
<xs:attribute name="component_node_urn"/>
<xs:attribute name="component_interface_id"/>
<xs:attribute name="virtual_node_id"/>
<xs:attribute name="virtual_interface_id"/>
......
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