Commit 242c58f6 authored by Jonathon Duerig's avatar Jonathon Duerig Committed by Jonathon Duerig

Minor rspec 2 bugfixes and tweaks.

parent d3bc2282
......@@ -46,6 +46,14 @@ NodeContents &=
}*
}*
SliverType &=
element disk_image {
DiskImageContents &
attribute default { text }?
}* &
attribute default { text }?
RelationContents &=
attribute component_id { text }
......
......@@ -30,7 +30,7 @@ RSpecContents =
# how long the holder may use the resources. For a resource request, it's
# how long we want the resources. For an advertisement, it might be a hint
# as to how long it's okay to cache this rspec.
attribute valid_until { xsd:dateTime }? &
attribute expires { xsd:dateTime }? &
# One or more nodes/links
Node* &
Link*
......@@ -47,7 +47,7 @@ NodeContents =
element relation { RelationContents }* &
# Information about the nodes physical location
element location { LocationContents } &
element location { LocationContents }? &
# Services set up by the CM provided on this node.
element services { ServiceContents }? &
......
......@@ -18,3 +18,6 @@ LinkContents &=
InterfaceContents &=
attribute mac_address { text } ?
LoginServiceContents &=
attribute username { text }?
......@@ -42,6 +42,9 @@ ServiceContents &=
element install { InstallServiceContents }* &
element execute { ExecuteServiceContents }*
RelationContents &=
attribute client_id { text }
InstallServiceContents &=
AnyExtension &
attribute url { text } &
......@@ -77,8 +80,8 @@ RSpecContents &=
ComponentHopContents &=
AnyExtension &
# Component ID of the link
attribute component_id { text } &
attribute component_manager_id { text } &
attribute component_id { text }? &
element component_manager { attribute name { text } }* &
InterfaceMapping*
# Each interface represents a particular physical interface. If that
......
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