From: Andy Bavier <acb@cs.princeton.edu>
Date: Thu, 16 Jul 2009 21:11:46 +0000 (+0000)
Subject: 'sfi resources' appears to work
X-Git-Tag: sfa-0.9-0@14641~32
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a6c7abd005411b9df5055be3514a608f4d96aaef;p=sfa.git

'sfi resources' appears to work
---

diff --git a/sfa/rspecs/aggregates/rspec_manager_vini.py b/sfa/rspecs/aggregates/rspec_manager_vini.py
index d48d05ea..a5d1fdbc 100644
--- a/sfa/rspecs/aggregates/rspec_manager_vini.py
+++ b/sfa/rspecs/aggregates/rspec_manager_vini.py
@@ -1,4 +1,6 @@
+from sfa.util.faults import *
 from sfa.util.rspec import Rspec
+from sfa.server.registry import Registries
 import sys
 import pdb
 
@@ -126,12 +128,16 @@ def get_rspec(api, hrn):
         # Return canned response for now...
         r = Rspec()
         r.parseFile(SFA_VINI_DEFAULT_RSPEC)
-        rspec = r.toGenDict()
+        rspec = r.toxml()
 
     return rspec
 
 
-def create_slice(api, hrn, rspec):
+def create_slice(api, hrn, xml):
+    r = Rspec()
+    r.parseString(xml)
+    rspec = r.toGenDict()
+
     # Check request against current allocations
     # Request OK