Update RSpec, and create_slice()

[sfa.git] / sfa / managers / eucalyptus / eucalyptus.rng

diff --git a/sfa/managers/eucalyptus/eucalyptus.rng b/sfa/managers/eucalyptus/eucalyptus.rng
index 43c3f9a..ec91e05 100644 (file)
--- a/sfa/managers/eucalyptus/eucalyptus.rng
+++ b/sfa/managers/eucalyptus/eucalyptus.rng
@@ -20,16 +20,21 @@
         <ref name="user_info"/>
       </optional>
       <ref name="ipv4"/>
-      <ref name="keypairs"/>
-      <ref name="images"/>
+      <ref name="bundles"/>
       <oneOrMore>
+        <!--
+          keypairs,
+          images,
+        -->
         <ref name="cluster"/>
       </oneOrMore>
     </element>
   </define>
   <define name="user_info">
     <element name="user_info">
-      <ref name="credential"/>
+      <element name="credential">
+        <text/>
+      </element>
     </element>
   </define>
   <define name="keypairs">
@@ -39,6 +44,23 @@
       </oneOrMore>
     </element>
   </define>
+  <define name="keypair">
+    <element name="keypair">
+      <text/>
+    </element>
+  </define>
+  <define name="bundles">
+    <element name="bundles">
+      <oneOrMore>
+        <element name="bundle">
+          <attribute name="id">
+            <data type="ID"/>
+          </attribute>
+          <empty/>
+        </element>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="images">
     <element name="images">
       <oneOrMore>
@@ -93,6 +115,14 @@
   </define>
   <define name="request">
     <element name="request">
+      <ref name="instances"/>
+      <element name="bundle">
+        <data type="IDREF"/>
+      </element>
+    </element>
+  </define>
+  <define name="oldrequest">
+    <element name="oldrequest">
       <ref name="instances"/>
       <ref name="kernel_image"/>
       <ref name="ramdisk"/>
@@ -117,21 +147,11 @@
       <ref name="keypair"/>
     </element>
   </define>
-  <define name="credential">
-    <element name="credential">
-      <text/>
-    </element>
-  </define>
   <define name="ipv4">
     <element name="ipv4">
       <text/>
     </element>
   </define>
-  <define name="keypair">
-    <element name="keypair">
-      <text/>
-    </element>
-  </define>
   <define name="type">
     <element name="type">
       <text/>