Attribute renaming in network element

Renamed the 'id' attribute of the 'network' element to 'name',
for compatibility with the PlanetLab RSpec.

diff --git a/sfa/managers/aggregate_manager_eucalyptus.py b/sfa/managers/aggregate_manager_eucalyptus.py
index 42116e1..9a18046 100644 (file)
--- a/sfa/managers/aggregate_manager_eucalyptus.py
+++ b/sfa/managers/aggregate_manager_eucalyptus.py
@@ -546,7 +546,7 @@ def CreateSliver(api, slice_xrn, creds, xml, users, call_id):
     rspecValidator = ET.RelaxNG(schemaXML)
     rspecXML = ET.XML(xml)
     for network in rspecXML.iterfind("./network"):
-        if network.get('id') != cloud['name']:
+        if network.get('name') != cloud['name']:
             # Throw away everything except my own RSpec
             # sfa_logger().error("CreateSliver: deleting %s from rspec"%network.get('id'))
             network.getparent().remove(network)

diff --git a/sfa/managers/eucalyptus/eucalyptus.rnc b/sfa/managers/eucalyptus/eucalyptus.rnc
index 670a01e..ead2a36 100644 (file)
--- a/sfa/managers/eucalyptus/eucalyptus.rnc
+++ b/sfa/managers/eucalyptus/eucalyptus.rnc
@@ -6,7 +6,7 @@ RSpec = element RSpec {
     network
 }
 network = element network {
-    attribute id { xsd:NMTOKEN },
+    attribute name { xsd:NMTOKEN },
     user_info?,
     ipv4,
     bundles,

diff --git a/sfa/managers/eucalyptus/eucalyptus.rng b/sfa/managers/eucalyptus/eucalyptus.rng
index d8be05e..9f40a5e 100644 (file)
--- a/sfa/managers/eucalyptus/eucalyptus.rng
+++ b/sfa/managers/eucalyptus/eucalyptus.rng
@@ -21,7 +21,7 @@
   </define>
   <define name="network">
     <element name="network">
-      <attribute name="id">
+      <attribute name="name">
         <data type="NMTOKEN"/>
       </attribute>
       <optional>