Merge "libvirt: Moving tests under tests/virt/libvirt"

15 files changed, 30 insertions, 13 deletions

diff --git a/nova/tests/test_virt_drivers.py b/nova/tests/test_virt_drivers.py
index 395663600..c054b9624 100644
--- a/nova/tests/test_virt_drivers.py
+++ b/nova/tests/test_virt_drivers.py
@@ -25,9 +25,9 @@ from nova import exception
 from nova.openstack.common import importutils
 from nova.openstack.common import log as logging
 from nova import test
-from nova.tests import fake_libvirt_utils
 from nova.tests.image import fake as fake_image
 from nova.tests import utils as test_utils
+from nova.tests.virt.libvirt import fake_libvirt_utils
 from nova.virt import event as virtevent
 from nova.virt import fake
 
@@ -67,9 +67,9 @@ class _FakeDriverBackendTestCase(object):
         else:
             self.saved_libvirt = None
 
-        import nova.tests.fake_imagebackend as fake_imagebackend
-        import nova.tests.fake_libvirt_utils as fake_libvirt_utils
-        import nova.tests.fakelibvirt as fakelibvirt
+        import nova.tests.virt.libvirt.fake_imagebackend as fake_imagebackend
+        import nova.tests.virt.libvirt.fake_libvirt_utils as fake_libvirt_utils
+        import nova.tests.virt.libvirt.fakelibvirt as fakelibvirt
 
         sys.modules['libvirt'] = fakelibvirt
         import nova.virt.libvirt.driver
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index 45ebfaab3..2628f2582 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -2117,8 +2117,9 @@ class XenAPIBWCountersTestCase(stubs.XenAPITestBase):
 
 
 # TODO(salvatore-orlando): this class and
-# nova.tests.test_libvirt.IPTablesFirewallDriverTestCase share a lot of code.
-# Consider abstracting common code in a base class for firewall driver testing.
+# nova.tests.virt.test_libvirt.IPTablesFirewallDriverTestCase share a lot of
+# code.  Consider abstracting common code in a base class for firewall driver
+# testing.
 class XenAPIDom0IptablesFirewallTestCase(stubs.XenAPITestBase):
 
     _in_rules = [
diff --git a/nova/tests/virt/libvirt/__init__.py b/nova/tests/virt/libvirt/__init__.py
new file mode 100644
index 000000000..a02a20177
--- /dev/null
+++ b/nova/tests/virt/libvirt/__init__.py
@@ -0,0 +1,15 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright (c) 2013 OpenStack Foundation
+#
+#    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.
diff --git a/nova/tests/fake_imagebackend.py b/nova/tests/virt/libvirt/fake_imagebackend.py
index 48426505e..48426505e 100644
--- a/nova/tests/fake_imagebackend.py
+++ b/nova/tests/virt/libvirt/fake_imagebackend.py
diff --git a/nova/tests/fake_libvirt_utils.py b/nova/tests/virt/libvirt/fake_libvirt_utils.py
index ba00a7091..ba00a7091 100644
--- a/nova/tests/fake_libvirt_utils.py
+++ b/nova/tests/virt/libvirt/fake_libvirt_utils.py
diff --git a/nova/tests/fakelibvirt.py b/nova/tests/virt/libvirt/fakelibvirt.py
index 30c3e4d9c..30c3e4d9c 100644
--- a/nova/tests/fakelibvirt.py
+++ b/nova/tests/virt/libvirt/fakelibvirt.py
diff --git a/nova/tests/test_fakelibvirt.py b/nova/tests/virt/libvirt/test_fakelibvirt.py
index ee2008544..52183ab5f 100644
--- a/nova/tests/test_fakelibvirt.py
+++ b/nova/tests/virt/libvirt/test_fakelibvirt.py
@@ -18,7 +18,7 @@ from nova import test
 
 from lxml import etree
 
-import nova.tests.fakelibvirt as libvirt
+import nova.tests.virt.libvirt.fakelibvirt as libvirt
 
 
 def get_vm_xml(name="testname", uuid=None, source_type='file',
diff --git a/nova/tests/test_imagebackend.py b/nova/tests/virt/libvirt/test_imagebackend.py
index b5d64a218..6548ab76c 100644
--- a/nova/tests/test_imagebackend.py
+++ b/nova/tests/virt/libvirt/test_imagebackend.py
@@ -23,8 +23,8 @@ from oslo.config import cfg
 from nova import exception
 from nova.openstack.common import uuidutils
 from nova import test
-from nova.tests import fake_libvirt_utils
 from nova.tests import fake_processutils
+from nova.tests.virt.libvirt import fake_libvirt_utils
 from nova.virt.libvirt import imagebackend
 
 CONF = cfg.CONF
diff --git a/nova/tests/test_imagecache.py b/nova/tests/virt/libvirt/test_imagecache.py
index bdc895474..bdc895474 100644
--- a/nova/tests/test_imagecache.py
+++ b/nova/tests/virt/libvirt/test_imagecache.py
diff --git a/nova/tests/test_libvirt.py b/nova/tests/virt/libvirt/test_libvirt.py
index 338a1559f..f72c37cd1 100644
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/virt/libvirt/test_libvirt.py
@@ -45,10 +45,10 @@ from nova.openstack.common import jsonutils
 from nova.openstack.common import loopingcall
 from nova.openstack.common import uuidutils
 from nova import test
-from nova.tests import fake_libvirt_utils
 from nova.tests import fake_network
 import nova.tests.image.fake
 from nova.tests import matchers
+from nova.tests.virt.libvirt import fake_libvirt_utils
 from nova import utils
 from nova import version
 from nova.virt.disk import api as disk
@@ -68,7 +68,7 @@ from nova.virt import netutils
 try:
     import libvirt
 except ImportError:
-    import nova.tests.fakelibvirt as libvirt
+    import nova.tests.virt.libvirt.fakelibvirt as libvirt
 libvirt_driver.libvirt = libvirt
 
 
@@ -351,7 +351,8 @@ class LibvirtConnTestCase(test.TestCase):
                 return FakeVirtDomain()
 
         # Creating mocks
-        volume_driver = 'iscsi=nova.tests.test_libvirt.FakeVolumeDriver'
+        volume_driver = ('iscsi=nova.tests.virt.libvirt.test_libvirt'
+                         '.FakeVolumeDriver')
         self.flags(libvirt_volume_drivers=[volume_driver])
         fake = FakeLibvirtDriver()
         # Customizing above fake if necessary
diff --git a/nova/tests/test_libvirt_blockinfo.py b/nova/tests/virt/libvirt/test_libvirt_blockinfo.py
index aae5bec58..aae5bec58 100644
--- a/nova/tests/test_libvirt_blockinfo.py
+++ b/nova/tests/virt/libvirt/test_libvirt_blockinfo.py
diff --git a/nova/tests/test_libvirt_config.py b/nova/tests/virt/libvirt/test_libvirt_config.py
index 8eed7136e..8eed7136e 100644
--- a/nova/tests/test_libvirt_config.py
+++ b/nova/tests/virt/libvirt/test_libvirt_config.py
diff --git a/nova/tests/test_libvirt_utils.py b/nova/tests/virt/libvirt/test_libvirt_utils.py
index 60f0682a8..60f0682a8 100644
--- a/nova/tests/test_libvirt_utils.py
+++ b/nova/tests/virt/libvirt/test_libvirt_utils.py
diff --git a/nova/tests/test_libvirt_vif.py b/nova/tests/virt/libvirt/test_libvirt_vif.py
index 0b661d147..c9c6aef12 100644
--- a/nova/tests/test_libvirt_vif.py
+++ b/nova/tests/virt/libvirt/test_libvirt_vif.py
@@ -20,7 +20,7 @@ from oslo.config import cfg
 from nova import exception
 from nova.network import model as network_model
 from nova import test
-from nova.tests import fakelibvirt
+from nova.tests.virt.libvirt import fakelibvirt
 from nova import utils
 from nova.virt.libvirt import config as vconfig
 from nova.virt.libvirt import vif
diff --git a/nova/tests/test_libvirt_volume.py b/nova/tests/virt/libvirt/test_libvirt_volume.py
index 6d2dc9dce..86773dd10 100644
--- a/nova/tests/test_libvirt_volume.py
+++ b/nova/tests/virt/libvirt/test_libvirt_volume.py
@@ -23,7 +23,7 @@ from oslo.config import cfg
 from nova import exception
 from nova.storage import linuxscsi
 from nova import test
-from nova.tests import fake_libvirt_utils
+from nova.tests.virt.libvirt import fake_libvirt_utils
 from nova import utils
 from nova.virt import fake
 from nova.virt.libvirt import utils as libvirt_utils