avoid publishing non-relevant entries in GetVersion

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

diff --git a/sfa/managers/eucalyptus/eucalyptus.rng b/sfa/managers/eucalyptus/eucalyptus.rng
index ec91e05..9f40a5e 100644 (file)
--- a/sfa/managers/eucalyptus/eucalyptus.rng
+++ b/sfa/managers/eucalyptus/eucalyptus.rng
@@ -5,15 +5,23 @@
   </start>
   <define name="RSpec">
     <element name="RSpec">
+      <attribute name="expires">
+        <data type="NMTOKEN"/>
+      </attribute>
+      <attribute name="generated">
+        <data type="NMTOKEN"/>
+      </attribute>
       <attribute name="type">
         <data type="NMTOKEN"/>
       </attribute>
-      <ref name="cloud"/>
+      <oneOrMore>
+        <ref name="network"/>
+      </oneOrMore>
     </element>
   </define>
-  <define name="cloud">
-    <element name="cloud">
-      <attribute name="id">
+  <define name="network">
+    <element name="network">
+      <attribute name="name">
         <data type="NMTOKEN"/>
       </attribute>
       <optional>
@@ -106,10 +114,10 @@
       <ref name="memory"/>
       <ref name="disk_space"/>
       <optional>
-        <ref name="request"/>
+        <ref name="euca_instances"/>
       </optional>
       <optional>
-        <ref name="euca_instances"/>
+        <ref name="request"/>
       </optional>
     </element>
   </define>
@@ -144,7 +152,9 @@
       </attribute>
       <ref name="state"/>
       <ref name="public_dns"/>
-      <ref name="keypair"/>
+      <optional>
+        <ref name="keypair"/>
+      </optional>
     </element>
   </define>
   <define name="ipv4">