Final tweaks to rspecv2 manifest. The doom bell ringeth.

protogeni/rspec/2/manifest.rnc

@@ -11,7 +11,11 @@
 include "request.rnc"
 
 NodeContents &=
-  attribute sliver_id { text }
+  attribute sliver_id { text } &
+  # List of all hostnames that can be used to access the node on the
+  # control network. These may be accessible only by other nodes local
+  # to the same CM.
+  element host { attribute name { text } }*
 
 LinkContents &=
   attribute sliver_id { text } &
@@ -19,7 +23,15 @@ LinkContents &=
   attribute vlantag { text }
 
 InterfaceContents &=
-  attribute mac_address { text } ?
+  attribute mac_address { text } ? &
+  # List of all hostnames associated with a particular
+  # interface. These may be names associated with an experimental
+  # interface that can be used to transit experimental traffic.
+  element host { attribute name { text } }*
 
 LoginServiceContents &=
-  attribute username { text }?
+  # Default username. Used when there is only one username or one
+  # username should be used by default.
+  attribute username { text }? &
+  # List of all usernames that can be used to log into the node.
+  element user { attribute name { text } }*