pep8 fixes and further round of refactoring

8 files changed, 9 insertions, 7 deletions

diff --git a/nova/virt/connection.py b/nova/virt/connection.py
index 11f0fa8ce..c40bb4bb4 100644
--- a/nova/virt/connection.py
+++ b/nova/virt/connection.py
@@ -25,7 +25,7 @@ import sys
 from nova import flags
 from nova.virt import fake
 from nova.virt import libvirt_conn
-from nova.virt import xenapi
+from nova.virt import xenapi_conn
 
 
 FLAGS = flags.FLAGS
@@ -61,7 +61,7 @@ def get_connection(read_only=False):
     elif t == 'libvirt':
         conn = libvirt_conn.get_connection(read_only)
     elif t == 'xenapi':
-        conn = xenapi.get_connection(read_only)
+        conn = xenapi_conn.get_connection(read_only)
     else:
         raise Exception('Unknown connection type "%s"' % t)
 
diff --git a/nova/virt/xapi/__init__.py b/nova/virt/xenapi/__init__.py
index 3d598c463..3d598c463 100644
--- a/nova/virt/xapi/__init__.py
+++ b/nova/virt/xenapi/__init__.py
diff --git a/nova/virt/xapi/network_utils.py b/nova/virt/xenapi/network_utils.py
index b58b9159c..b58b9159c 100644
--- a/nova/virt/xapi/network_utils.py
+++ b/nova/virt/xenapi/network_utils.py
diff --git a/nova/virt/xapi/novadeps.py b/nova/virt/xenapi/novadeps.py
index 8cb5e3246..ba62468fb 100644
--- a/nova/virt/xapi/novadeps.py
+++ b/nova/virt/xenapi/novadeps.py
@@ -18,6 +18,7 @@ from nova import db
 from nova import flags
 from nova import process
 from nova import utils
+from nova import context
 
 from nova.compute import power_state
 from nova.auth.manager import AuthManager
@@ -64,7 +65,9 @@ class Instance(object):
 
     @classmethod
     def get_network(self, instance):
-        return db.project_get_network(None, instance.project_id)
+        # TODO: is ge_admin_context the right context to retrieve?
+        return db.project_get_network(context.get_admin_context(),
+                                      instance.project_id)
 
     @classmethod
     def get_mac(self, instance):
diff --git a/nova/virt/xapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index 41f687ccb..b68df2791 100644
--- a/nova/virt/xapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -33,7 +33,7 @@ from novadeps import User
 class VMHelper():
     def __init__(self, session):
         return
-    
+
     @classmethod
     @defer.inlineCallbacks
     def create_vm(self, session, instance, kernel, ramdisk):
diff --git a/nova/virt/xapi/vmops.py b/nova/virt/xenapi/vmops.py
index d6ea5e7db..d6ea5e7db 100644
--- a/nova/virt/xapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
diff --git a/nova/virt/xapi/volumeops.py b/nova/virt/xenapi/volumeops.py
index 23f79adf7..23f79adf7 100644
--- a/nova/virt/xapi/volumeops.py
+++ b/nova/virt/xenapi/volumeops.py
diff --git a/nova/virt/xenapi.py b/nova/virt/xenapi_conn.py
index 613f19f82..0a73b4774 100644
--- a/nova/virt/xenapi.py
+++ b/nova/virt/xenapi_conn.py
@@ -52,13 +52,12 @@ import xmlrpclib
 
 from twisted.internet import defer
 from twisted.internet import reactor
-#from twisted.internet import task
 
 from nova import flags
 from nova import utils
 
-from xapi.vmops import VMOps
-from xapi.volumeops import VolumeOps
+from xenapi.vmops import VMOps
+from xenapi.volumeops import VolumeOps
 
 XenAPI = None