From: Sapan Bhatia <sapanb@cs.princeton.edu>
Date: Fri, 17 Jul 2009 20:19:21 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: sfa-0.9-0@14641~11
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=88c1bbd080caaa7088cf75cbbd164cdfa71b98ba;p=sfa.git

---

diff --git a/sfa/rspecs/aggregates/max.xml b/sfa/rspecs/aggregates/max.xml
index 16967b69..54456217 100644
--- a/sfa/rspecs/aggregates/max.xml
+++ b/sfa/rspecs/aggregates/max.xml
@@ -1,6 +1,5 @@
-<rspec name="max" targetNamespace="http://www.maxgigapop.net/sfa/rspec/vlanspec.rspec"
-                  xmlns:tns="http://www.maxgigapop.net/sfa/rspec/vlanspec.rspec"
-                  xmlns="http://www.planet-lab.org/sfa/rspec/">
+<rspec name="max" 
+    xmlns="http://www.maxgigapop.net/sfa/rspec/07/09">
     <capacity>
         <netspec name="predefined_physical_topology">
             <nodespec name="planetlab2">
diff --git a/sfa/rspecs/aggregates/rspec_manager_max.py b/sfa/rspecs/aggregates/rspec_manager_max.py
index b8e09202..6d54f7d4 100644
--- a/sfa/rspecs/aggregates/rspec_manager_max.py
+++ b/sfa/rspecs/aggregates/rspec_manager_max.py
@@ -18,6 +18,7 @@ import xml.dom.minidom
 
 SFA_MAX_CONF_FILE = '/etc/sfa/max_allocations'
 SFA_MAX_DEFAULT_RSPEC = '/etc/sfa/max_physical.xml'
+SFA_MAX_CANNED_RSPEC = '/etc/sfa/max_physical_canned.xml'
 
 topology = {}
 
@@ -251,7 +252,7 @@ def get_rspec(api, hrn):
     if (hrn and allocations.has_key(hrn)):
             ret_rspec = allocations_to_rspec(allocations[hrn])
     else:
-        ret_rspec = open(SFA_MAX_DEFAULT_RSPEC).read()
+        ret_rspec = open(SFA_MAX_CANNED_RSPEC).read()
 
     return (ret_rspec)