diff options
| author | Sean Dague <sdague@linux.vnet.ibm.com> | 2012-07-05 17:38:06 -0400 |
|---|---|---|
| committer | Sean Dague <sdague@linux.vnet.ibm.com> | 2012-07-10 11:43:17 -0400 |
| commit | 5dd9e6150c0bebaef53e23fff7e55a17ef694537 (patch) | |
| tree | 8486862b87f53924dbc1f18c5dafefa77a6194fa /nova/virt | |
| parent | 89bfdc2715b5192a3ad06da8ea113605626c227b (diff) | |
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
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/connection.py | 2 | ||||
| -rw-r--r-- | nova/virt/xenapi/__init__.py | 1 | ||||
| -rw-r--r-- | nova/virt/xenapi/driver.py (renamed from nova/virt/xenapi/connection.py) | 2 | ||||
| -rw-r--r-- | nova/virt/xenapi/vm_utils.py | 2 |
4 files changed, 3 insertions, 4 deletions
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 |