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

5 files changed, 8 insertions, 6 deletions

diff --git a/nova/tests/test_vmwareapi.py b/nova/tests/test_vmwareapi.py
index 647a9d0a0..7b9ad38e5 100644
--- a/nova/tests/test_vmwareapi.py
+++ b/nova/tests/test_vmwareapi.py
@@ -28,8 +28,8 @@ from nova import test
 import nova.tests.image.fake
 from nova.tests.vmwareapi import db_fakes
 from nova.tests.vmwareapi import stubs
+from nova.virt.vmwareapi import driver
 from nova.virt.vmwareapi import fake as vmwareapi_fake
-from nova.virt import vmwareapi_conn
 
 
 FLAGS = flags.FLAGS
@@ -50,7 +50,7 @@ class VMWareAPIVMTestCase(test.TestCase):
         vmwareapi_fake.reset()
         db_fakes.stub_out_db_instance_api(self.stubs)
         stubs.set_stubs(self.stubs)
-        self.conn = vmwareapi_conn.VMWareESXDriver(False)
+        self.conn = driver.VMWareESXDriver(False)
         # NOTE(vish): none of the network plugging code is actually
         #             being tested
         self.network_info = [({'bridge': 'fa0',
diff --git a/nova/tests/vmwareapi/stubs.py b/nova/tests/vmwareapi/stubs.py
index e4d7a25d5..494b201d0 100644
--- a/nova/tests/vmwareapi/stubs.py
+++ b/nova/tests/vmwareapi/stubs.py
@@ -19,11 +19,11 @@
 Stubouts for the test suite
 """
 
+from nova.virt.vmwareapi import driver
 from nova.virt.vmwareapi import fake
 from nova.virt.vmwareapi import network_utils
 from nova.virt.vmwareapi import vmops
 from nova.virt.vmwareapi import vmware_images
-from nova.virt import vmwareapi_conn
 
 
 def fake_get_vim_object(arg):
@@ -45,7 +45,7 @@ def set_stubs(stubs):
     stubs.Set(vmware_images, 'get_vmdk_size_and_properties',
               fake.fake_get_vmdk_size_and_properties)
     stubs.Set(vmware_images, 'upload_image', fake.fake_upload_image)
-    stubs.Set(vmwareapi_conn.VMWareAPISession, "_get_vim_object",
+    stubs.Set(driver.VMWareAPISession, "_get_vim_object",
               fake_get_vim_object)
-    stubs.Set(vmwareapi_conn.VMWareAPISession, "_is_vim_object",
+    stubs.Set(driver.VMWareAPISession, "_is_vim_object",
               fake_is_vim_object)
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