From: Andy Bavier <acb@cs.princeton.edu>
Date: Mon, 26 Sep 2011 19:58:48 +0000 (-0400)
Subject: Attribute renaming in network element
X-Git-Tag: sfa-1.1-1~187
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=df1f559efe9ef78ed2681b830546fe96c2772bfb;p=sfa.git

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 42116e12..9a180469 100644
--- 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 670a01e5..ead2a36e 100644
--- 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 d8be05eb..9f40a5e7 100644
--- 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>