git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Apply dbsession changes on dummy driver
[sfa.git]
/
sfa
/
dummy
/
dummyaggregate.py
diff --git
a/sfa/dummy/dummyaggregate.py
b/sfa/dummy/dummyaggregate.py
index
dca47b5
..
c6381a6
100644
(file)
--- a/
sfa/dummy/dummyaggregate.py
+++ b/
sfa/dummy/dummyaggregate.py
@@
-19,7
+19,6
@@
from sfa.rspecs.version_manager import VersionManager
from sfa.dummy.dummyxrn import DummyXrn, hostname_to_urn, hrn_to_dummy_slicename, slicename_to_hrn
from sfa.dummy.dummyxrn import DummyXrn, hostname_to_urn, hrn_to_dummy_slicename, slicename_to_hrn
-from sfa.storage.alchemy import dbsession
from sfa.storage.model import SliverAllocation
import time
from sfa.storage.model import SliverAllocation
import time
@@
-243,7
+242,7
@@
class DummyAggregate:
geni_urn = urns[0]
sliver_ids = [sliver['sliver_id'] for sliver in slivers]
constraint = SliverAllocation.sliver_id.in_(sliver_ids)
geni_urn = urns[0]
sliver_ids = [sliver['sliver_id'] for sliver in slivers]
constraint = SliverAllocation.sliver_id.in_(sliver_ids)
- sliver_allocations =
dbsession
.query(SliverAllocation).filter(constraint)
+ sliver_allocations =
self.driver.api.dbsession()
.query(SliverAllocation).filter(constraint)
sliver_allocation_dict = {}
for sliver_allocation in sliver_allocations:
geni_urn = sliver_allocation.slice_urn
sliver_allocation_dict = {}
for sliver_allocation in sliver_allocations:
geni_urn = sliver_allocation.slice_urn