summaryrefslogtreecommitdiffstats
path: root/nova/virt
diff options
context:
space:
mode:
authorSean Dague <sdague@linux.vnet.ibm.com>2012-07-05 16:05:16 -0400
committerSean Dague <sdague@linux.vnet.ibm.com>2012-07-10 11:42:05 -0400
commit89bfdc2715b5192a3ad06da8ea113605626c227b (patch)
treee5a4acddae8505fa6ead858e9777823b9500eac7 /nova/virt
parentbda7c3e0b6863473a0202905cb5b41a7d33d2143 (diff)
refactor vmwareapi_conn => vmwareapi/driver
Part of bp:virt-driver-cleanup Make the vmwareapi driver consistent in naming as a driver instead of a connection. Get all the vmware driver parts into the same directory Change-Id: I7c7e7c391086cf2fc32e8cb85d557005d417042f
Diffstat (limited to 'nova/virt')
-rw-r--r--nova/virt/connection.py2
-rw-r--r--nova/virt/vmwareapi/__init__.py2
-rw-r--r--nova/virt/vmwareapi/driver.py (renamed from nova/virt/vmwareapi_conn.py)0
3 files changed, 3 insertions, 1 deletions
diff --git a/nova/virt/connection.py b/nova/virt/connection.py
index d7a0f56de..c96c7d92c 100644
--- a/nova/virt/connection.py
+++ b/nova/virt/connection.py
@@ -36,7 +36,7 @@ known_drivers = {
'baremetal': 'baremetal.proxy.ProxyConnection',
'fake': 'fake.FakeDriver',
'libvirt': 'libvirt.LibvirtDriver',
- 'vmwareapi': 'vmwareapi_conn.VMWareESXDriver',
+ 'vmwareapi': 'vmwareapi.VMWareESXDriver',
'xenapi': 'xenapi.connection.XenAPIDriver'
}
diff --git a/nova/virt/vmwareapi/__init__.py b/nova/virt/vmwareapi/__init__.py
index d9b27de08..fa6f6ceb5 100644
--- a/nova/virt/vmwareapi/__init__.py
+++ b/nova/virt/vmwareapi/__init__.py
@@ -17,3 +17,5 @@
"""
:mod:`vmwareapi` -- Nova support for VMware ESX/ESXi Server through VMware API.
"""
+# NOTE(sdague) for nicer compute_driver specification
+from nova.virt.vmwareapi.driver import VMWareESXDriver
diff --git a/nova/virt/vmwareapi_conn.py b/nova/virt/vmwareapi/driver.py
index 2b1d4cedf..2b1d4cedf 100644
--- a/nova/virt/vmwareapi_conn.py
+++ b/nova/virt/vmwareapi/driver.py