refactor xenapi/connection => xenapi/driver

Part of bp:virt-driver-cleanup

Make the xenapi driver consistent in naming as a driver
instead of a connection.

Change-Id: Ibb1485515ff073dd0265969fdcfbfc2665b93fb7

8 files changed, 7 insertions, 8 deletions

diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index aeacf1fa6..301c78d69 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -40,7 +40,7 @@ from nova.tests import fake_network
 from nova.tests import fake_utils
 import nova.tests.image.fake as fake_image
 from nova.tests.xenapi import stubs
-from nova.virt.xenapi import connection as xenapi_conn
+from nova.virt.xenapi import driver as xenapi_conn
 from nova.virt.xenapi import fake as xenapi_fake
 from nova.virt.xenapi import vm_utils
 from nova.virt.xenapi import vmops
diff --git a/nova/tests/test_xensm.py b/nova/tests/test_xensm.py
index 659a7b92f..ae9d5de97 100644
--- a/nova/tests/test_xensm.py
+++ b/nova/tests/test_xensm.py
@@ -25,7 +25,7 @@ from nova import flags
 from nova.openstack.common import log as logging
 from nova import test
 from nova.tests.xenapi import stubs
-from nova.virt.xenapi import connection as xenapi_conn
+from nova.virt.xenapi import driver as xenapi_conn
 from nova.virt.xenapi import fake as xenapi_fake
 from nova.virt.xenapi import volume_utils
 from nova.volume import xensm
diff --git a/nova/tests/xenapi/stubs.py b/nova/tests/xenapi/stubs.py
index 275e3ce63..01766e745 100644
--- a/nova/tests/xenapi/stubs.py
+++ b/nova/tests/xenapi/stubs.py
@@ -21,7 +21,7 @@ import sys
 from nova.openstack.common import jsonutils
 from nova import test
 import nova.tests.image.fake
-from nova.virt.xenapi import connection as xenapi_conn
+from nova.virt.xenapi import driver as xenapi_conn
 from nova.virt.xenapi import fake
 from nova.virt.xenapi import vm_utils
 from nova.virt.xenapi import vmops
diff --git a/nova/virt/connection.py b/nova/virt/connection.py
index c96c7d92c..f4a978d17 100644
--- a/nova/virt/connection.py
+++ b/nova/virt/connection.py
@@ -37,7 +37,7 @@ known_drivers = {
     'fake': 'fake.FakeDriver',
     'libvirt': 'libvirt.LibvirtDriver',
     'vmwareapi': 'vmwareapi.VMWareESXDriver',
-    'xenapi': 'xenapi.connection.XenAPIDriver'
+    'xenapi': 'xenapi.XenAPIDriver'
     }
 
 
diff --git a/nova/virt/xenapi/__init__.py b/nova/virt/xenapi/__init__.py
index d9abe54c5..6a56a918c 100644
--- a/nova/virt/xenapi/__init__.py
+++ b/nova/virt/xenapi/__init__.py
@@ -18,3 +18,4 @@
 :mod:`xenapi` -- Nova support for XenServer and XCP through XenAPI
 ==================================================================
 """
+from nova.virt.xenapi.driver import XenAPIDriver
diff --git a/nova/virt/xenapi/connection.py b/nova/virt/xenapi/driver.py
index 41c54127e..fd2f82106 100644
--- a/nova/virt/xenapi/connection.py
+++ b/nova/virt/xenapi/driver.py
@@ -16,7 +16,7 @@
 #    under the License.
 
 """
-A connection to XenServer or Xen Cloud Platform.
+A driver for XenServer or Xen Cloud Platform.
 
 **Related Flags**
 
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index 81ba95b36..d28da3ca8 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -47,8 +47,6 @@ from nova.openstack.common import jsonutils
 from nova.openstack.common import log as logging
 from nova import utils
 from nova.virt.disk import api as disk
-from nova.virt import driver
-from nova.virt import xenapi
 from nova.virt.xenapi import volume_utils
 
 
diff --git a/nova/volume/xensm.py b/nova/volume/xensm.py
index db3a1d793..bde69e60d 100644
--- a/nova/volume/xensm.py
+++ b/nova/volume/xensm.py
@@ -16,7 +16,7 @@ from nova import exception
 from nova import flags
 from nova.openstack.common import log as logging
 from nova import utils
-from nova.virt.xenapi import connection as xenapi_conn
+from nova.virt.xenapi import driver as xenapi_conn
 from nova.virt.xenapi import volumeops
 import nova.volume.driver