git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
bc9b16a
)
use default aggregate manager. OpenstackDriver renamed to NovaDriver
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Fri, 3 Feb 2012 19:10:30 +0000
(14:10 -0500)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Fri, 3 Feb 2012 19:10:30 +0000
(14:10 -0500)
sfa/generic/openstack.py
patch
|
blob
|
history
diff --git
a/sfa/generic/openstack.py
b/sfa/generic/openstack.py
index
5c99d23
..
590bb57
100644
(file)
--- a/
sfa/generic/openstack.py
+++ b/
sfa/generic/openstack.py
@@
-1,10
+1,10
@@
from sfa.generic import Generic
import sfa.server.sfaapi
from sfa.generic import Generic
import sfa.server.sfaapi
-import sfa.openstack.
openstack
_driver
+import sfa.openstack.
nova
_driver
import sfa.managers.registry_manager_openstack
import sfa.managers.registry_manager_openstack
+import sfa.managers.aggregate_manager
import sfa.managers.slice_manager
import sfa.managers.slice_manager
-import sfa.managers.aggregate_manager_openstack
class openstack (Generic):
class openstack (Generic):
@@
-18,11
+18,11
@@
class openstack (Generic):
def slicemgr_manager_class (self) :
return sfa.managers.slice_manager.SliceManager
def aggregate_manager_class (self) :
def slicemgr_manager_class (self) :
return sfa.managers.slice_manager.SliceManager
def aggregate_manager_class (self) :
- return sfa.managers.aggregate_manager
_openstack
.AggregateManager
+ return sfa.managers.aggregate_manager.AggregateManager
# driver class for server-side services, talk to the whole testbed
def driver_class (self):
# driver class for server-side services, talk to the whole testbed
def driver_class (self):
- return sfa.openstack.
openstack_driver.Openstack
Driver
+ return sfa.openstack.
nova_driver.Nova
Driver
# for the component mode, to be run on board planetlab nodes
# manager class
# for the component mode, to be run on board planetlab nodes
# manager class