From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Thu, 2 Feb 2012 17:39:29 +0000 (-0500)
Subject: - renaming OpenstackDriver to NovaDriver and OpenstackShell to NovaShell
X-Git-Tag: merged-in-sfa-2.1-2~40
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=8906c2d49e82a9cef2dc31615c9ce4926ffb148e;p=sfa.git

- renaming OpenstackDriver to NovaDriver and OpenstackShell to NovaShell
---

diff --git a/sfa/openstack/openstack_driver.py b/sfa/openstack/nova_driver.py
similarity index 99%
rename from sfa/openstack/openstack_driver.py
rename to sfa/openstack/nova_driver.py
index 1edbde0e..109f8332 100644
--- a/sfa/openstack/openstack_driver.py
+++ b/sfa/openstack/nova_driver.py
@@ -14,7 +14,7 @@ from sfa.rspecs.version_manager import VersionManager
 from sfa.rspecs.rspec import RSpec
 # the driver interface, mostly provides default behaviours
 from sfa.managers.driver import Driver
-from sfa.openstack.openstack_shell import OpenstackShell
+from sfa.openstack.nova_shell import NovaShell
 from sfa.openstack.osaggregate import OSAggregate
 from sfa.plc.plslices import PlSlices
 from sfa.util.osxrn import OSXrn
@@ -39,7 +39,7 @@ class OpenstackDriver (Driver):
 
     def __init__ (self, config):
         Driver.__init__ (self, config)
-        self.shell = OpenstackShell (config)
+        self.shell = NovaShell (config)
         self.cache=None
         if config.SFA_AGGREGATE_CACHING:
             if OpenstackDriver.cache is None:
diff --git a/sfa/openstack/openstack_shell.py b/sfa/openstack/nova_shell.py
similarity index 88%
rename from sfa/openstack/openstack_shell.py
rename to sfa/openstack/nova_shell.py
index a4636ae7..8d20e9bb 100644
--- a/sfa/openstack/openstack_shell.py
+++ b/sfa/openstack/nova_shell.py
@@ -4,14 +4,15 @@ import socket
 from urlparse import urlparse
 from sfa.util.sfalogging import logger
 try:
-    from nova import flags
-    from nova import context 
-    from nova import db
-    has_nova = True  
+    from nova.auth.manager import AuthManager
+    from nova.compute.manager import ComputeManager
+    from nova.network.manager import NetworkManager
+    from nova.scheduler.manager import SchedulerManager
+    has_nova = True
 except:
     has_nova = False
  
-class OpenstackShell:
+class NovaShell:
     """
     A simple xmlrpc shell to a myplc instance
     This class can receive all Openstack calls to the underlying testbed