2to3 -f print

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

diff --git a/sfa/managers/eucalyptus/eucalyptus.rnc b/sfa/managers/eucalyptus/eucalyptus.rnc
index 271ca81..ead2a36 100644 (file)
--- a/sfa/managers/eucalyptus/eucalyptus.rnc
+++ b/sfa/managers/eucalyptus/eucalyptus.rnc
@@ -1,20 +1,34 @@
 start = RSpec
 RSpec = element RSpec {
-   attribute type { xsd:NMTOKEN },
-   cloud
+    attribute expires { xsd:NMTOKEN },
+    attribute generated { xsd:NMTOKEN },
+    attribute type { xsd:NMTOKEN },
+    network
 }
-cloud = element cloud {
-   attribute id { xsd:NMTOKEN },
-   user_info?,
-   ipv4,
-   keypairs,
-   images,
-   cluster+
+network = element network {
+    attribute name { xsd:NMTOKEN },
+    user_info?,
+    ipv4,
+    bundles,
+    #keypairs,
+    #images,
+    cluster+
 }
+
 user_info = element user_info { 
-   credential 
+    element credential { text }
 }
+
 keypairs = element keypairs { keypair+ }
+keypair = element keypair { text }
+
+bundles = element bundles {
+    element bundle {
+        attribute id { xsd:ID },
+        empty
+    }+
+}
+
 images = element images { image+ }
 image = element image {
    attribute id { xsd:ID },
@@ -36,16 +50,25 @@ vm_type = element vm_type {
    cores,
    memory,
    disk_space,
-   request?,
-   euca_instances?
+   euca_instances?,
+   request?
 }
+
 request = element request {
+    instances,
+    element bundle {
+        xsd:IDREF
+    }
+}
+
+oldrequest = element oldrequest {
    instances,
    kernel_image,
    ramdisk,
    disk_image,
    keypair
 }
+
 euca_instances = element euca_instances {
    euca_instance+
 }
@@ -53,11 +76,9 @@ euca_instance = element euca_instance {
    attribute id { xsd:ID },
    state,
    public_dns,
-   keypair
+   keypair?
 }
-credential = element credential { text }
 ipv4 = element ipv4 { text }
-keypair = element keypair { text }
 type = element type { text }
 arch = element arch { text }
 state = element state { text }