first stab at a design where each incoming API call has its own dbsession

[sfa.git] / sfa / managers / v2_to_v3_adapter.py

diff --git a/sfa/managers/v2_to_v3_adapter.py b/sfa/managers/v2_to_v3_adapter.py
index ebbefc0..069ef69 100644 (file)
--- a/sfa/managers/v2_to_v3_adapter.py
+++ b/sfa/managers/v2_to_v3_adapter.py
@@ -7,6 +7,7 @@ from sfa.util.xrn import Xrn, urn_to_hrn, hrn_to_urn, get_leaf, get_authority
 from sfa.util.cache import Cache
 from sfa.rspecs.rspec import RSpec
 from sfa.storage.model import SliverAllocation
+# xxx 1-dbsession-per-request
 from sfa.storage.alchemy import dbsession
 
 class V2ToV3Adapter:
@@ -14,10 +15,7 @@ class V2ToV3Adapter:
     def __init__ (self, config):
         flavour = config.SFA_GENERIC_FLAVOUR
         # to be cleaned
-        if flavour == "pl":
-            from sfa.planetlab.pldriver import PlDriver
-            self.driver = PlDriver(config)
-        elif flavour == "nitos":
+        if flavour == "nitos":
             from sfa.nitos.nitosdriver import NitosDriver
             self.driver = NitosDriver(config)
         elif flavour == "fd":
@@ -91,7 +89,7 @@ class V2ToV3Adapter:
                 (slice_urn, rspec_string, expiration, options) = args
                 slice_hrn, type = urn_to_hrn(slice_urn)
                 creds = []
-                users = options.get('geni_users', [])
+                users = options.get('sfa_users', [])
                 manifest_string = getattr(self.driver, "create_sliver")(slice_urn, slice_hrn, creds, rspec_string, users, options)
                 
                 # slivers allocation