From: Andy Bavier <acb@cs.princeton.edu>
Date: Wed, 6 Jul 2011 18:03:22 +0000 (-0400)
Subject: Update RelaxNG schemas for PL RSpec changes
X-Git-Tag: sfa-1.0-27~24^2~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=f67085b8ddda9988e16c60c723642c29f45b2c5f;p=sfa.git

Update RelaxNG schemas for PL RSpec changes
---

diff --git a/sfa/managers/eucalyptus/eucalyptus.rnc b/sfa/managers/eucalyptus/eucalyptus.rnc
index bc61ce3f..670a01e5 100644
--- a/sfa/managers/eucalyptus/eucalyptus.rnc
+++ b/sfa/managers/eucalyptus/eucalyptus.rnc
@@ -1,5 +1,7 @@
 start = RSpec
 RSpec = element RSpec {
+    attribute expires { xsd:NMTOKEN },
+    attribute generated { xsd:NMTOKEN },
     attribute type { xsd:NMTOKEN },
     network
 }
diff --git a/sfa/managers/eucalyptus/eucalyptus.rng b/sfa/managers/eucalyptus/eucalyptus.rng
index d7a85b49..d8be05eb 100644
--- a/sfa/managers/eucalyptus/eucalyptus.rng
+++ b/sfa/managers/eucalyptus/eucalyptus.rng
@@ -5,10 +5,18 @@
   </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="network"/>
+      <oneOrMore>
+        <ref name="network"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="network">