xenapi_conn -> xenapi.connection

This keeps all of the XenAPI related code together in one directory,
like libvirt.

Change-Id: I1de51eb8bcead0695e9f8ede466416e0257d0148

nova/tests/test_xenapi.py

@@ -43,7 +43,7 @@ from nova.tests.glance import stubs as glance_stubs
 from nova.tests import fake_network
 from nova.tests import fake_utils
 from nova import utils
-from nova.virt import xenapi_conn
+from nova.virt.xenapi import connection as xenapi_conn
 from nova.virt.xenapi import fake as xenapi_fake
 from nova.virt.xenapi import volume_utils
 from nova.virt.xenapi import vmops

nova/tests/xenapi/stubs.py

@@ -20,7 +20,7 @@ import random
 
 from eventlet import tpool
 
-from nova.virt import xenapi_conn
+from nova.virt.xenapi import connection as xenapi_conn
 from nova.virt.xenapi import fake
 from nova.virt.xenapi import volume_utils
 from nova.virt.xenapi import vm_utils

nova/virt/connection.py

@@ -28,7 +28,7 @@ from nova.virt import driver
 from nova.virt import fake
 from nova.virt.libvirt import connection as libvirt_conn
 from nova.virt import vmwareapi_conn
-from nova.virt import xenapi_conn
+from nova.virt.xenapi import connection as xenapi_conn
 
 
 LOG = logging.getLogger(__name__)

nova/volume/xensm.py

@@ -16,7 +16,7 @@ from nova import exception
 from nova import flags
 from nova import log as logging
 from nova import utils
-from nova.virt import xenapi_conn
+from nova.virt.xenapi import connection as xenapi_conn
 from nova.virt.xenapi import volumeops
 import nova.volume.driver
 

tools/xenserver/vm_vdi_cleaner.py

@@ -27,7 +27,7 @@ from nova import exception
 from nova import flags
 from nova import utils
 
-from nova.virt import xenapi_conn
+from nova.virt.xenapi import connection as xenapi_conn
 
 
 flags.DECLARE("resize_confirm_window", "nova.compute.manager")