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 (parent:
ee90ec5
)
renmed NovaShell to Shell
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Fri, 29 Jun 2012 15:41:02 +0000
(11:41 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Fri, 29 Jun 2012 15:41:02 +0000
(11:41 -0400)
sfa/openstack/nova_driver.py
patch
|
blob
|
history
diff --git
a/sfa/openstack/nova_driver.py
b/sfa/openstack/nova_driver.py
index
c65ca48
..
7a2dd47
100644
(file)
--- a/
sfa/openstack/nova_driver.py
+++ b/
sfa/openstack/nova_driver.py
@@
-21,8
+21,7
@@
from sfa.rspecs.rspec import RSpec
# the driver interface, mostly provides default behaviours
from sfa.managers.driver import Driver
# the driver interface, mostly provides default behaviours
from sfa.managers.driver import Driver
-from sfa.openstack.nova_shell import NovaShell
-from sfa.openstack.euca_shell import EucaShell
+from sfa.openstack.nova_shell import Shell
from sfa.openstack.osaggregate import OSAggregate
from sfa.planetlab.plslices import PlSlices
from sfa.util.osxrn import OSXrn
from sfa.openstack.osaggregate import OSAggregate
from sfa.planetlab.plslices import PlSlices
from sfa.util.osxrn import OSXrn
@@
-40,14
+39,14
@@
def list_to_dict(recs, key):
# can be sent as-is; it takes care of authentication
# from the global config
#
# can be sent as-is; it takes care of authentication
# from the global config
#
-class NovaDriver
(Driver):
+class NovaDriver(Driver):
# the cache instance is a class member so it survives across incoming requests
cache = None
def __init__ (self, config):
# the cache instance is a class member so it survives across incoming requests
cache = None
def __init__ (self, config):
- Driver.__init__
(self, config)
- self.shell = Shell
(config)
+ Driver.__init__(self, config)
+ self.shell = Shell(config)
self.cache=None
if config.SFA_AGGREGATE_CACHING:
if NovaDriver.cache is None:
self.cache=None
if config.SFA_AGGREGATE_CACHING:
if NovaDriver.cache is None: