diff options
| author | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2012-04-12 14:41:53 +0000 |
|---|---|---|
| committer | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2012-04-12 14:41:53 +0000 |
| commit | 6d750971fde9be564dafe6c4ca25fa8872bf44f3 (patch) | |
| tree | faa249a4f49f9711d85d248a28765d10c6111a86 | |
| parent | 42f3bec10c7f7374ad4e9752b275b02ca2b2fdb9 (diff) | |
| download | nova-6d750971fde9be564dafe6c4ca25fa8872bf44f3.tar.gz nova-6d750971fde9be564dafe6c4ca25fa8872bf44f3.tar.xz nova-6d750971fde9be564dafe6c4ca25fa8872bf44f3.zip | |
xenapi_conn -> xenapi.connection
This keeps all of the XenAPI related code together in one directory,
like libvirt.
Change-Id: I1de51eb8bcead0695e9f8ede466416e0257d0148
| -rw-r--r-- | nova/tests/test_xenapi.py | 2 | ||||
| -rw-r--r-- | nova/tests/xenapi/stubs.py | 2 | ||||
| -rw-r--r-- | nova/virt/connection.py | 2 | ||||
| -rw-r--r-- | nova/virt/xenapi/connection.py (renamed from nova/virt/xenapi_conn.py) | 0 | ||||
| -rw-r--r-- | nova/volume/xensm.py | 2 | ||||
| -rwxr-xr-x | tools/xenserver/vm_vdi_cleaner.py | 2 |
6 files changed, 5 insertions, 5 deletions
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py index 5438db5cb..8d6780f67 100644 --- a/nova/tests/test_xenapi.py +++ b/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 diff --git a/nova/tests/xenapi/stubs.py b/nova/tests/xenapi/stubs.py index 58e6cf278..b13d2b0e3 100644 --- a/nova/tests/xenapi/stubs.py +++ b/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 diff --git a/nova/virt/connection.py b/nova/virt/connection.py index 2a13f192b..b8a8c26cc 100644 --- a/nova/virt/connection.py +++ b/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__) diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi/connection.py index d47aaf7f3..d47aaf7f3 100644 --- a/nova/virt/xenapi_conn.py +++ b/nova/virt/xenapi/connection.py diff --git a/nova/volume/xensm.py b/nova/volume/xensm.py index bf390cafb..f998dae28 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 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 diff --git a/tools/xenserver/vm_vdi_cleaner.py b/tools/xenserver/vm_vdi_cleaner.py index 6b9213e40..e99b90367 100755 --- a/tools/xenserver/vm_vdi_cleaner.py +++ b/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") |