Return information about instances bound to a slice

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

diff --git a/sfa/managers/eucalyptus/eucalyptus.rnc b/sfa/managers/eucalyptus/eucalyptus.rnc
index 469e77d..271ca81 100644 (file)
--- a/sfa/managers/eucalyptus/eucalyptus.rnc
+++ b/sfa/managers/eucalyptus/eucalyptus.rnc
@@ -5,13 +5,13 @@ RSpec = element RSpec {
 }
 cloud = element cloud {
    attribute id { xsd:NMTOKEN },
-   user-info?,
+   user_info?,
    ipv4,
    keypairs,
    images,
    cluster+
 }
-user-info = element user-info { 
+user_info = element user_info { 
    credential 
 }
 keypairs = element keypairs { keypair+ }
@@ -26,23 +26,33 @@ image = element image {
 cluster = element cluster {
    attribute id { xsd:ID },
    ipv4,
-   vm-types
+   vm_types
 }
-vm-types = element vm-types { vm-type+ }
-vm-type = element vm-type {
+vm_types = element vm_types { vm_type+ }
+vm_type = element vm_type {
    attribute name { xsd:ID },
-   free-slots,
-   max-instances,
+   free_slots,
+   max_instances,
    cores,
    memory,
-   disk-space,
-   request?
+   disk_space,
+   request?,
+   euca_instances?
 }
 request = element request {
    instances,
-   kernel-image,
+   kernel_image,
    ramdisk,
-   disk-image,
+   disk_image,
+   keypair
+}
+euca_instances = element euca_instances {
+   euca_instance+
+}
+euca_instance = element euca_instance {
+   attribute id { xsd:ID },
+   state,
+   public_dns,
    keypair
 }
 credential = element credential { text }
@@ -52,19 +62,20 @@ type = element type { text }
 arch = element arch { text }
 state = element state { text }
 location = element location { text }
-free-slots = element free-slots { text }
-max-instances = element max-instances { text }
+free_slots = element free_slots { text }
+max_instances = element max_instances { text }
 cores = element cores { text }
+public_dns = element public_dns { text }
 memory = element memory {
    attribute unit { xsd:NMTOKEN },
    text
 }
-disk-space = element disk-space {
+disk_space = element disk_space {
    attribute unit { xsd:NMTOKEN },
    text
 }
-instances = element instances { text }
-kernel-image = element kernel-image {
+instances = element instances { xsd:unsignedInt }
+kernel_image = element kernel_image {
    attribute id { xsd:IDREF },
    empty
 }
@@ -72,7 +83,7 @@ ramdisk = element ramdisk {
    attribute id { xsd:IDREF }?,
    empty
 }
-disk-image = element disk-image {
+disk_image = element disk_image {
    attribute id { xsd:IDREF },
    empty
 }