summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Santa Barbara <justin@fathomdb.com>2011-03-23 16:49:50 -0700
committerJustin Santa Barbara <justin@fathomdb.com>2011-03-23 16:49:50 -0700
commit7a93455f41e5198fdce8aa1b3091efd956e1c186 (patch)
tree1fef8389762855d98e06907e4b2c32d0cb82aadf
parentb69a63c5d7458610b6e8931b4955c0b5b2b468f5 (diff)
Doh! Missed two places which were importing the old driver location
-rw-r--r--nova/virt/connection.py2
-rw-r--r--nova/virt/xenapi/vmops.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/virt/connection.py b/nova/virt/connection.py
index 4ba31c7a7..af7001715 100644
--- a/nova/virt/connection.py
+++ b/nova/virt/connection.py
@@ -24,7 +24,7 @@ import sys
from nova import flags
from nova import log as logging
from nova import utils
-from nova.compute import driver
+from nova.virt import driver
from nova.virt import fake
from nova.virt import libvirt_conn
from nova.virt import xenapi_conn
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index 2a9694f45..3fd98be67 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -35,8 +35,8 @@ from nova import exception
from nova import utils
from nova.auth.manager import AuthManager
-from nova.compute import driver
from nova.compute import power_state
+from nova.virt import driver
from nova.virt.xenapi.network_utils import NetworkHelper
from nova.virt.xenapi.vm_utils import VMHelper
from nova.virt.xenapi.vm_utils import ImageType