Merge branch 'nocomponent' into geni-v3

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

diff --git a/sfa/managers/eucalyptus/eucalyptus.rnc b/sfa/managers/eucalyptus/eucalyptus.rnc
index 49c1f33..ead2a36 100644 (file)
--- a/sfa/managers/eucalyptus/eucalyptus.rnc
+++ b/sfa/managers/eucalyptus/eucalyptus.rnc
@@ -1,10 +1,12 @@
 start = RSpec
 RSpec = element RSpec {
+    attribute expires { xsd:NMTOKEN },
+    attribute generated { xsd:NMTOKEN },
     attribute type { xsd:NMTOKEN },
-    cloud
+    network
 }
-cloud = element cloud {
-    attribute id { xsd:NMTOKEN },
+network = element network {
+    attribute name { xsd:NMTOKEN },
     user_info?,
     ipv4,
     bundles,
@@ -48,8 +50,8 @@ vm_type = element vm_type {
    cores,
    memory,
    disk_space,
-   request?,
-   euca_instances?
+   euca_instances?,
+   request?
 }
 
 request = element request {
@@ -74,7 +76,7 @@ euca_instance = element euca_instance {
    attribute id { xsd:ID },
    state,
    public_dns,
-   keypair
+   keypair?
 }
 ipv4 = element ipv4 { text }
 type = element type { text }