Final version of rspecv2 as handed down by trang. *GONG*

protogeni/rspec/2/manifest-common.xsd

@@ -25,13 +25,7 @@
     <xs:attribute name="generated" type="xs:dateTime"/>
     <xs:attribute name="generated_by"/>
     <xs:attribute name="expires" type="xs:dateTime"/>
-    <xs:attribute name="type" use="required">
-      <xs:simpleType>
-        <xs:restriction base="xs:token">
-          <xs:enumeration value="request"/>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>
+    <xs:attribute name="type" use="required" type="rspec:RspecTypeContents"/>
   </xs:complexType>
   <xs:element name="node" type="rspec:NodeContents"/>
   <xs:element name="link" type="rspec:LinkContents"/>
@@ -56,6 +50,7 @@
           </xs:complexType>
         </xs:element>
       </xs:choice>
+      <xs:element ref="rspec:host"/>
     </xs:choice>
     <xs:attributeGroup ref="rspec:AnyExtension"/>
     <xs:attribute name="client_id" use="required"/>
@@ -71,6 +66,11 @@
   <xs:element name="services" type="rspec:ServiceContents"/>
   <xs:element name="interface" type="rspec:InterfaceContents"/>
   <xs:element name="disk_image" type="rspec:DiskImageContents"/>
+  <xs:element name="host">
+    <xs:complexType>
+      <xs:attribute name="name" use="required"/>
+    </xs:complexType>
+  </xs:element>
   <xs:complexType name="ServiceContents">
     <xs:choice minOccurs="0" maxOccurs="unbounded">
       <xs:choice>
@@ -88,13 +88,21 @@
   <xs:element name="install" type="rspec:InstallServiceContents"/>
   <xs:element name="execute" type="rspec:ExecuteServiceContents"/>
   <xs:complexType name="LoginServiceContents">
-    <xs:group ref="rspec:AnyExtension"/>
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:group ref="rspec:AnyExtension"/>
+      <xs:element ref="rspec:user"/>
+    </xs:choice>
     <xs:attributeGroup ref="rspec:AnyExtension"/>
     <xs:attribute name="authentication" use="required"/>
     <xs:attribute name="hostname"/>
     <xs:attribute name="port"/>
     <xs:attribute name="username"/>
   </xs:complexType>
+  <xs:element name="user">
+    <xs:complexType>
+      <xs:attribute name="name" use="required"/>
+    </xs:complexType>
+  </xs:element>
   <xs:complexType name="RelationContents">
     <xs:group ref="rspec:AnyExtension"/>
     <xs:attributeGroup ref="rspec:AnyExtension"/>
@@ -110,8 +118,11 @@
   </xs:complexType>
   <xs:complexType name="InterfaceContents">
     <xs:choice minOccurs="0" maxOccurs="unbounded">
-      <xs:group ref="rspec:AnyExtension"/>
-      <xs:element ref="rspec:ip"/>
+      <xs:choice>
+        <xs:group ref="rspec:AnyExtension"/>
+        <xs:element ref="rspec:ip"/>
+      </xs:choice>
+      <xs:element ref="rspec:host"/>
     </xs:choice>
     <xs:attributeGroup ref="rspec:AnyExtension"/>
     <xs:attribute name="component_id"/>
@@ -142,6 +153,7 @@
     <xs:attributeGroup ref="rspec:AnyExtension"/>
     <xs:attribute name="client_id" use="required"/>
     <xs:attribute name="sliver_id" use="required"/>
+    <xs:attribute name="vlantag" use="required"/>
   </xs:complexType>
   <xs:element name="property" type="rspec:LinkPropertyContents"/>
   <xs:element name="component_hop" type="rspec:ComponentHopContents"/>

protogeni/rspec/2/manifest-request.xsd

@@ -30,6 +30,12 @@
   <!-- The LinkMapping will only be available after an assignment -->
   <!-- The ComponentInterfaceDeclName will only be available after an assignment -->
   <!-- The ComponentInterfaceRefName will only be available after an assignment -->
+  <xs:simpleType name="RspecTypeContents">
+    <xs:restriction base="xs:token">
+      <xs:enumeration value="request"/>
+      <xs:enumeration value="manifest"/>
+    </xs:restriction>
+  </xs:simpleType>
   <!--
     A request link is mapped to an arbitrary topology which represents
     the virtual LAN/link which embodies it. Note that nodes do not

protogeni/rspec/2/manifest.rnc

@@ -35,3 +35,5 @@ LoginServiceContents &=
   attribute username { text }? &
   # List of all usernames that can be used to log into the node.
   element user { attribute name { text } }*
+
+RspecTypeContents |= "manifest"

protogeni/rspec/2/request-common.xsd

@@ -25,13 +25,7 @@
     <xs:attribute name="generated" type="xs:dateTime"/>
     <xs:attribute name="generated_by"/>
     <xs:attribute name="expires" type="xs:dateTime"/>
-    <xs:attribute name="type" use="required">
-      <xs:simpleType>
-        <xs:restriction base="xs:token">
-          <xs:enumeration value="request"/>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>
+    <xs:attribute name="type" use="required" type="rspec:RspecTypeContents"/>
   </xs:complexType>
   <xs:element name="node" type="rspec:NodeContents"/>
   <xs:element name="link" type="rspec:LinkContents"/>

protogeni/rspec/2/request.rnc

@@ -71,7 +71,9 @@ InterfaceRefContents &=
   attribute client_id { text }
 
 RSpecContents &=
-  attribute type { "request" }
+  attribute type { RspecTypeContents }
+
+RspecTypeContents = "request"
 
 # A request link is mapped to an arbitrary topology which represents
 # the virtual LAN/link which embodies it. Note that nodes do not

protogeni/rspec/2/request.xsd

@@ -30,6 +30,11 @@
   <!-- The LinkMapping will only be available after an assignment -->
   <!-- The ComponentInterfaceDeclName will only be available after an assignment -->
   <!-- The ComponentInterfaceRefName will only be available after an assignment -->
+  <xs:simpleType name="RspecTypeContents">
+    <xs:restriction base="xs:token">
+      <xs:enumeration value="request"/>
+    </xs:restriction>
+  </xs:simpleType>
   <!--
     A request link is mapped to an arbitrary topology which represents
     the virtual LAN/link which embodies it. Note that nodes do not