From fbcfbcec59c36e310ea45a60620b510855f1903c Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Fri, 29 Jun 2012 11:41:02 -0400 Subject: [PATCH] renmed NovaShell to Shell --- sfa/openstack/nova_driver.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sfa/openstack/nova_driver.py b/sfa/openstack/nova_driver.py index c65ca484..7a2dd47f 100644 --- 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 -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 @@ -40,14 +39,14 @@ def list_to_dict(recs, key): # 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): - 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: -- 2.47.0