refactor libvirt from connection -> driver

part of bp:virt-driver-cleanup

part d) of the blueprint is to get rid of the connection terminology
and use driver instead. This does this for the libvirt driver and
associated tests.

Also add LibvirtDriver import to __init__ so that
nova.virt.libvirt.LibvirtDriver can be used as the compute_driver
string

Change-Id: I13c701c390784fa1f7809705741abb46e40973be

4 files changed, 19 insertions, 2 deletions

diff --git a/nova/virt/connection.py b/nova/virt/connection.py
index 0c7c3bd0a..079675da3 100644
--- a/nova/virt/connection.py
+++ b/nova/virt/connection.py
@@ -35,7 +35,7 @@ FLAGS = flags.FLAGS
 known_drivers = {
     'baremetal': 'nova.virt.baremetal.proxy.ProxyConnection',
     'fake': 'nova.virt.fake.FakeDriver',
-    'libvirt': 'nova.virt.libvirt.connection.LibvirtDriver',
+    'libvirt': 'nova.virt.libvirt.LibvirtDriver',
     'vmwareapi': 'nova.virt.vmwareapi_conn.VMWareESXDriver',
     'xenapi': 'nova.virt.xenapi.connection.XenAPIDriver'
     }
diff --git a/nova/virt/libvirt/__init__.py b/nova/virt/libvirt/__init__.py
index e69de29bb..00f4fd6b0 100644
--- a/nova/virt/libvirt/__init__.py
+++ b/nova/virt/libvirt/__init__.py
@@ -0,0 +1,17 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2012 IBM
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from nova.virt.libvirt.driver import LibvirtDriver
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/driver.py
index 4f81ed7b8..4f81ed7b8 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/driver.py
diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py
index 5333e0992..3a93cf3c8 100644
--- a/nova/virt/libvirt/vif.py
+++ b/nova/virt/libvirt/vif.py
@@ -43,7 +43,7 @@ libvirt_vif_opts = [
 
 FLAGS = flags.FLAGS
 FLAGS.register_opts(libvirt_vif_opts)
-flags.DECLARE('libvirt_type', 'nova.virt.libvirt.connection')
+flags.DECLARE('libvirt_type', 'nova.virt.libvirt.driver')
 
 
 class LibvirtBridgeDriver(vif.VIFDriver):