Commit c3a7ee9b authored by Jonathon Duerig's avatar Jonathon Duerig

Modified rspec to use virtual_id and to add a couple of CMU fields.

parent 750527e0
...@@ -18,7 +18,7 @@ include "../../assign/top.rnc" { ...@@ -18,7 +18,7 @@ include "../../assign/top.rnc" {
# The primary key must be globally unique. # The primary key must be globally unique.
# The primary key is used when identifying link inputs, for example. # The primary key is used when identifying link inputs, for example.
attribute virtual_name { text }?, attribute virtual_name { text }?,
attribute virtual_uuid { text }?, attribute virtual_id { text }?,
# The mapping to components/slivers. Required for advertisements. # The mapping to components/slivers. Required for advertisements.
ComponentSpec?, ComponentSpec?,
...@@ -43,7 +43,7 @@ include "../../assign/top.rnc" { ...@@ -43,7 +43,7 @@ include "../../assign/top.rnc" {
# Semantic change - the 'name' of a link is now # Semantic change - the 'name' of a link is now
# solely for human-readability. # solely for human-readability.
attribute virtual_name { text }?, attribute virtual_name { text }?,
attribute virtual_uuid { text }?, attribute virtual_id { text }?,
attribute virtualization_type { "raw" | "trellis-vserver" | attribute virtualization_type { "raw" | "trellis-vserver" |
"planetlab-vserver" | "emulab-vnode" }?, "planetlab-vserver" | "emulab-vnode" }?,
(SingleHopComponentSpec | MultiHopComponentSpec)?, (SingleHopComponentSpec | MultiHopComponentSpec)?,
...@@ -57,8 +57,8 @@ include "../../assign/top.rnc" { ...@@ -57,8 +57,8 @@ include "../../assign/top.rnc" {
InterfaceContents = InterfaceContents =
# In an advertisement, the component_uuid is mandatory. # In an advertisement, the component_uuid is mandatory.
# In a request, the virtual_uuid is mandatory. # In a request, the virtual_id is mandatory.
element virtual_node_uuid { text }?, element virtual_node_id { text }?,
element virtual_interface_name { text }?, element virtual_interface_name { text }?,
element component_node_uuid { text }?, element component_node_uuid { text }?,
element component_interface_name { text }? element component_interface_name { text }?
...@@ -75,7 +75,8 @@ LocationSpec = element location { ...@@ -75,7 +75,8 @@ LocationSpec = element location {
InterfaceDecl = element interface { InterfaceDecl = element interface {
attribute virtual_name { text }?, attribute virtual_name { text }?,
attribute component_name { text }? attribute component_name { text }?,
element monitoring { attribute user_traffic { text }? }?
} }
ComponentSpec = ComponentSpec =
...@@ -88,7 +89,7 @@ ComponentSpec = ...@@ -88,7 +89,7 @@ ComponentSpec =
attribute component_uuid { text }, attribute component_uuid { text },
# The sliver_uuid is an annotation added when a ticket is # The sliver_uuid is an annotation added when a ticket is
# redeemed to notify the client of the association between the # redeemed to notify the client of the association between the
# virtual_uuid requests and the actual slivers instantiated. # virtual_id requests and the actual slivers instantiated.
attribute sliver_uuid { text }? attribute sliver_uuid { text }?
SingleHopComponentSpec = element single_hop_link { element link {ComponentSpec, LinkEndPoints } } SingleHopComponentSpec = element single_hop_link { element link {ComponentSpec, LinkEndPoints } }
......
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