X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Faggregates%2Frspec_manager_vini.py;h=cba6957459d06e1cb7d45a68f443e7899ec795d8;hb=16d8579938e0f71d1c3e4b5e611829812bad686b;hp=70131d75da165b70b585559e69edf9be573a505e;hpb=630954e4bb28511419355dbf1e2c1765b9c567b9;p=sfa.git

diff --git a/sfa/rspecs/aggregates/rspec_manager_vini.py b/sfa/rspecs/aggregates/rspec_manager_vini.py
index 70131d75..cba69574 100644
--- a/sfa/rspecs/aggregates/rspec_manager_vini.py
+++ b/sfa/rspecs/aggregates/rspec_manager_vini.py
@@ -1,6 +1,6 @@
 from sfa.util.faults import *
 from sfa.util.misc import *
-from sfa.util.rspec import Rspec
+from sfa.util.rspec import RSpec
 from sfa.server.registry import Registries
 from sfa.plc.nodes import *
 from sfa.rspecs.aggregates.vini.utils import *
@@ -20,8 +20,8 @@ def create_slice_vini_aggregate(api, hrn, nodes):
     credential = api.getCredential()
     records = registry.resolve(credential, hrn)
     for record in records:
-        if record.get_type() in ['slice']:
-            slice = record.as_dict()
+        if record['type'] in ['slice']:
+            slice = record
     if not slice:
         raise RecordNotFound(hrn)   
 
@@ -39,8 +39,7 @@ def create_slice_vini_aggregate(api, hrn, nodes):
             site_record = {}
             if not site_records:
                 raise RecordNotFound(authority)
-            site_record = site_records[0]
-            site = site_record.as_dict()
+            site = site_records[0]
                 
             # add the site
             site.pop('site_id')
@@ -66,11 +65,11 @@ def create_slice_vini_aggregate(api, hrn, nodes):
         person_record = {}
         person_records = registry.resolve(credential, researcher)
         for record in person_records:
-            if record.get_type() in ['user']:
+            if record['type'] in ['user']:
                 person_record = record
         if not person_record:
             pass
-        person_dict = person_record.as_dict()
+        person_dict = person_record
         persons = api.plshell.GetPersons(api.plauth, [person_dict['email']],
                                          ['person_id', 'key_ids'])
 
@@ -166,10 +165,10 @@ def create_slice(api, hrn, xml):
     else:
         raise PermissionError("%s not in VINI whitelist" % hrn)
         
-    rspec = Rspec(xml)
+    rspec = RSpec(xml)
     topo = Topology(api)
     
-    topo.nodeTopoFromRspec(rspec)
+    topo.nodeTopoFromRSpec(rspec)
 
     # Check request against current allocations
     topo.verifyNodeTopo(hrn, topo, maxbw)
@@ -187,12 +186,21 @@ def create_slice(api, hrn, xml):
 
     return True
 
+"""
+Returns the request context required by sfatables. At some point, this mechanism should be changed
+to refer to "contexts", which is the information that sfatables is requesting. But for now, we just
+return the basic information needed in a dict.
+"""
+def fetch_context(slice_hrn, user_hrn, contexts):
+    base_context = {'sfa':{'user':{'hrn':user_hrn},
+                           'slice':{'hrn':slice_hrn}}}
+    return base_context
 
 def main():
-    r = Rspec()
+    r = RSpec()
     r.parseFile(sys.argv[1])
     rspec = r.toDict()
     create_slice(None,'plc',rspec)
-    
+
 if __name__ == "__main__":
     main()