Merge "Nova Hyper-V driver refactoring"

264 files changed, 729 insertions, 1047 deletions

diff --git a/nova/tests/hyperv/README.rst b/nova/tests/hyperv/README.rst
deleted file mode 100644
index c7ba16046..000000000
--- a/nova/tests/hyperv/README.rst
+++ /dev/null
@@ -1,83 +0,0 @@
-=====================================
-OpenStack Hyper-V Nova Testing Architecture
-=====================================
-
-The Hyper-V Nova Compute plugin uses Windows Management Instrumentation (WMI)
-as the main API for hypervisor related operations.
-WMI has a database / procedural oriented nature that can become difficult to
-test with a traditional static mock / stub based unit testing approach.
-
-The included Hyper-V testing framework has been developed with the
-following goals:
-
-1) Dynamic mock generation.
-2) Decoupling. No dependencies on WMI or any other module.
-    The tests are designed to work with mocked objects in all cases, including
-    OS-dependent (e.g. wmi, os, subprocess) and non-deterministic
-    (e.g. time, uuid) modules
-3) Transparency. Mocks and real objects can be swapped via DI
-    or monkey patching.
-4) Platform independence.
-5) Tests need to be executed against the real object or against the mocks
-    with a simple configuration switch. Development efforts can highly
-    benefit from this feature.
-6) It must be possible to change a mock's behavior without running the tests
-    against the hypervisor (e.g. by manually adding a value / return value).
-
-The tests included in this package include dynamically generated mock objects,
-based on the recording of the attribute values and invocations on the
-real WMI objects and other OS dependent features.
-The generated mock objects are serialized in the nova/tests/hyperv/stubs
-directory as gzipped pickled objects.
-
-An environment variable controls the execution mode of the tests.
-
-Recording mode:
-
-NOVA_GENERATE_TEST_MOCKS=True
-Tests are executed on the hypervisor (without mocks), and mock objects are
-generated.
-
-Replay mode:
-
-NOVA_GENERATE_TEST_MOCKS=
-Tests are executed with the existing mock objects (default).
-
-Mock generation is performed by nova.tests.hyperv.mockproxy.MockProxy.
-Instances of this class wrap objects that need to be mocked and act as a
-delegate on the wrapped object by leveraging Python's __getattr__ feature.
-Attribute values and method call return values are recorded at each access.
-Objects returned by attributes and method invocations are wrapped in a
-MockProxy consistently.
-From a caller perspective, the MockProxy is completely transparent,
-with the exception of calls to the type(...) builtin function.
-
-At the end of the test, a mock is generated by each MockProxy by calling
-the get_mock() method. A mock is represented by an instance of the
-nova.tests.hyperv.mockproxy.Mock class.
-
-The Mock class task consists of replicating the behaviour of the mocked
-objects / modules by returning the same values in the same order, for example:
-
-def check_path(path):
-    if not os.path.exists(path):
-        os.makedirs(path)
-
-check_path(path)
-# The second time os.path.exists returns True
-check_path(path)
-
-The injection of MockProxy / Mock instances is performed by the
-nova.tests.hyperv.basetestcase.BaseTestCase class in the setUp()
-method via selective monkey patching.
-Mocks are serialized in tearDown() during recording.
-
-The actual Hyper-V test case inherits from BaseTestCase:
-nova.tests.hyperv.test_hypervapi.HyperVAPITestCase
-
-
-Future directions:
-
-1) Replace the pickled files with a more generic serialization option (e.g. json)
-2) Add methods to statically extend the mocks (e.g. method call return values)
-3) Extend an existing framework, e.g. mox
diff --git a/nova/tests/hyperv/__init__.py b/nova/tests/hyperv/__init__.py
index e69de29bb..090fc0639 100644
--- a/nova/tests/hyperv/__init__.py
+++ b/nova/tests/hyperv/__init__.py
@@ -0,0 +1,16 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2013 Cloudbase Solutions Srl
+# All Rights Reserved.
+#
+#    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/hyperv/basetestcase.py b/nova/tests/hyperv/basetestcase.py
deleted file mode 100644
index c4f6cf95f..000000000
--- a/nova/tests/hyperv/basetestcase.py
+++ /dev/null
@@ -1,105 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-#  Copyright 2012 Cloudbase Solutions Srl
-#
-#    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.
-
-"""
-TestCase for MockProxy based tests and related classes.
-"""
-
-import gzip
-import os
-import pickle
-import sys
-
-from nova import test
-from nova.tests.hyperv import mockproxy
-
-gen_test_mocks_key = 'NOVA_GENERATE_TEST_MOCKS'
-
-
-class BaseTestCase(test.TestCase):
-    """TestCase for MockProxy based tests."""
-
-    def run(self, result=None):
-        self._currentResult = result
-        super(BaseTestCase, self).run(result)
-
-    def setUp(self):
-        super(BaseTestCase, self).setUp()
-        self._mps = {}
-
-    def tearDown(self):
-        super(BaseTestCase, self).tearDown()
-
-        # python-subunit will wrap test results with a decorator.
-        # Need to access the decorated member of results to get the
-        # actual test result when using python-subunit.
-        if hasattr(self._currentResult, 'decorated'):
-            result = self._currentResult.decorated
-        else:
-            result = self._currentResult
-        has_errors = len([test for (test, msgs) in result.errors
-            if test.id() == self.id()]) > 0
-        failed = len([test for (test, msgs) in result.failures
-            if test.id() == self.id()]) > 0
-
-        if not has_errors and not failed:
-            self._save_mock_proxies()
-
-    def _save_mock(self, name, mock):
-        path = self._get_stub_file_path(self.id(), name)
-        pickle.dump(mock, gzip.open(path, 'wb'))
-
-    def _get_stub_file_path(self, test_name, mock_name):
-        # test naming differs between platforms
-        prefix = 'nova.tests.'
-        if test_name.startswith(prefix):
-            test_name = test_name[len(prefix):]
-        file_name = '{0}_{1}.p.gz'.format(test_name, mock_name)
-        return os.path.join(os.path.dirname(mockproxy.__file__),
-                "stubs", file_name)
-
-    def _load_mock(self, name):
-        path = self._get_stub_file_path(self.id(), name)
-        if os.path.exists(path):
-            return pickle.load(gzip.open(path, 'rb'))
-        else:
-            return None
-
-    def _load_mock_or_create_proxy(self, module_name):
-        m = None
-        if not gen_test_mocks_key in os.environ or \
-                os.environ[gen_test_mocks_key].lower() \
-                    not in ['true', 'yes', '1']:
-            m = self._load_mock(module_name)
-        else:
-            __import__(module_name)
-            module = sys.modules[module_name]
-            m = mockproxy.MockProxy(module)
-            self._mps[module_name] = m
-        return m
-
-    def _inject_mocks_in_modules(self, objects_to_mock, modules_to_test):
-        for module_name in objects_to_mock:
-            mp = self._load_mock_or_create_proxy(module_name)
-            for mt in modules_to_test:
-                module_local_name = module_name.split('.')[-1]
-                setattr(mt, module_local_name, mp)
-
-    def _save_mock_proxies(self):
-        for name, mp in self._mps.items():
-            m = mp.get_mock()
-            if m.has_values():
-                self._save_mock(name, m)
diff --git a/nova/tests/hyperv/db_fakes.py b/nova/tests/hyperv/db_fakes.py
index 16d894df8..e384e909a 100644
--- a/nova/tests/hyperv/db_fakes.py
+++ b/nova/tests/hyperv/db_fakes.py
@@ -29,35 +29,35 @@ from nova import utils
 
 def get_fake_instance_data(name, project_id, user_id):
     return {'name': name,
-              'id': 1,
-              'uuid': str(uuid.uuid4()),
-              'project_id': project_id,
-              'user_id': user_id,
-              'image_ref': "1",
-              'kernel_id': "1",
-              'ramdisk_id': "1",
-              'mac_address': "de:ad:be:ef:be:ef",
-              'instance_type':
-                {'name': 'm1.tiny',
-                'memory_mb': 512,
-                'vcpus': 1,
-                'root_gb': 0,
-                'flavorid': 1,
-                'rxtx_factor': 1}
-              }
+            'id': 1,
+            'uuid': str(uuid.uuid4()),
+            'project_id': project_id,
+            'user_id': user_id,
+            'image_ref': "1",
+            'kernel_id': "1",
+            'ramdisk_id': "1",
+            'mac_address': "de:ad:be:ef:be:ef",
+            'instance_type':
+            {'name': 'm1.tiny',
+             'memory_mb': 512,
+             'vcpus': 1,
+             'root_gb': 0,
+             'flavorid': 1,
+             'rxtx_factor': 1}
+            }
 
 
 def get_fake_image_data(project_id, user_id):
     return {'name': 'image1',
-              'id': 1,
-              'project_id': project_id,
-              'user_id': user_id,
-              'image_ref': "1",
-              'kernel_id': "1",
-              'ramdisk_id': "1",
-              'mac_address': "de:ad:be:ef:be:ef",
-              'instance_type': 'm1.tiny',
-              }
+            'id': 1,
+            'project_id': project_id,
+            'user_id': user_id,
+            'image_ref': "1",
+            'kernel_id': "1",
+            'ramdisk_id': "1",
+            'mac_address': "de:ad:be:ef:be:ef",
+            'instance_type': 'm1.tiny',
+            }
 
 
 def get_fake_volume_info_data(target_portal, volume_id):
@@ -72,25 +72,25 @@ def get_fake_volume_info_data(target_portal, volume_id):
             'auth_method': 'fake',
             'auth_method': 'fake',
         }
-}
+    }
 
 
 def get_fake_block_device_info(target_portal, volume_id):
-    return {
-            'block_device_mapping': [{'connection_info': {
-                'driver_volume_type': 'iscsi',
-                'data': {'target_lun': 1,
-                         'volume_id': volume_id,
-                         'target_iqn': 'iqn.2010-10.org.openstack:volume-' +
-                            volume_id,
-                         'target_portal': target_portal,
-                         'target_discovered': False}},
-                'mount_device': 'vda',
-                'delete_on_termination': False}],
+    return {'block_device_mapping': [{'connection_info': {
+                                      'driver_volume_type': 'iscsi',
+                                      'data': {'target_lun': 1,
+                                      'volume_id': volume_id,
+                                      'target_iqn':
+                                      'iqn.2010-10.org.openstack:volume-' +
+                                      volume_id,
+                                      'target_portal': target_portal,
+                                      'target_discovered': False}},
+                                     'mount_device': 'vda',
+                                     'delete_on_termination': False}],
             'root_device_name': None,
             'ephemerals': [],
             'swap': None
-    }
+            }
 
 
 def stub_out_db_instance_api(stubs):
@@ -99,11 +99,9 @@ def stub_out_db_instance_api(stubs):
     INSTANCE_TYPES = {
         'm1.tiny': dict(memory_mb=512, vcpus=1, root_gb=0, flavorid=1),
         'm1.small': dict(memory_mb=2048, vcpus=1, root_gb=20, flavorid=2),
-        'm1.medium':
-            dict(memory_mb=4096, vcpus=2, root_gb=40, flavorid=3),
+        'm1.medium': dict(memory_mb=4096, vcpus=2, root_gb=40, flavorid=3),
         'm1.large': dict(memory_mb=8192, vcpus=4, root_gb=80, flavorid=4),
-        'm1.xlarge':
-            dict(memory_mb=16384, vcpus=8, root_gb=160, flavorid=5)}
+        'm1.xlarge': dict(memory_mb=16384, vcpus=8, root_gb=160, flavorid=5)}
 
     class FakeModel(object):
         """Stubs out for model."""
@@ -152,7 +150,7 @@ def stub_out_db_instance_api(stubs):
             'vcpus': instance_type['vcpus'],
             'mac_addresses': [{'address': values['mac_address']}],
             'root_gb': instance_type['root_gb'],
-            }
+        }
         return FakeModel(base_options)
 
     def fake_network_get_by_instance(context, instance_id):
@@ -181,4 +179,4 @@ def stub_out_db_instance_api(stubs):
     stubs.Set(db, 'instance_type_get_all', fake_instance_type_get_all)
     stubs.Set(db, 'instance_type_get_by_name', fake_instance_type_get_by_name)
     stubs.Set(db, 'block_device_mapping_get_all_by_instance',
-        fake_block_device_mapping_get_all_by_instance)
+              fake_block_device_mapping_get_all_by_instance)
diff --git a/nova/tests/hyperv/fake.py b/nova/tests/hyperv/fake.py
new file mode 100644
index 000000000..9890a5462
--- /dev/null
+++ b/nova/tests/hyperv/fake.py
@@ -0,0 +1,46 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2013 Cloudbase Solutions Srl
+# All Rights Reserved.
+#
+#    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.
+
+import io
+import os
+
+
+class PathUtils(object):
+    def open(self, path, mode):
+        return io.BytesIO(b'fake content')
+
+    def get_instances_path(self):
+        return 'C:\\FakePath\\'
+
+    def get_instance_path(self, instance_name):
+        return os.path.join(self.get_instances_path(), instance_name)
+
+    def get_vhd_path(self, instance_name):
+        instance_path = self.get_instance_path(instance_name)
+        return os.path.join(instance_path, instance_name + ".vhd")
+
+    def get_base_vhd_path(self, image_name):
+        base_dir = os.path.join(self.get_instances_path(), '_base')
+        return os.path.join(base_dir, image_name + ".vhd")
+
+    def make_export_path(self, instance_name):
+        export_folder = os.path.join(self.get_instances_path(), "export",
+                                     instance_name)
+        return export_folder
+
+    def vhd_exists(self, path):
+        return False
diff --git a/nova/tests/hyperv/hypervutils.py b/nova/tests/hyperv/hypervutils.py
deleted file mode 100644
index b71e60229..000000000
--- a/nova/tests/hyperv/hypervutils.py
+++ /dev/null
@@ -1,262 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-#  Copyright 2012 Cloudbase Solutions Srl
-#
-#    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.
-
-"""
-Hyper-V classes to be used in testing.
-"""
-
-import sys
-import time
-
-from nova import exception
-from nova.virt.hyperv import constants
-from nova.virt.hyperv import volumeutilsV2
-from xml.etree import ElementTree
-
-# Check needed for unit testing on Unix
-if sys.platform == 'win32':
-    import wmi
-
-
-class HyperVUtils(object):
-    def __init__(self):
-        self.__conn = None
-        self.__conn_v2 = None
-        self.__conn_cimv2 = None
-        self.__conn_wmi = None
-        self.__conn_storage = None
-        self._volumeutils = volumeutilsV2.VolumeUtilsV2(
-                                        self._conn_storage, self._conn_wmi)
-
-    @property
-    def _conn(self):
-        if self.__conn is None:
-            self.__conn = wmi.WMI(moniker='//./root/virtualization')
-        return self.__conn
-
-    @property
-    def _conn_v2(self):
-        if self.__conn_v2 is None:
-            self.__conn_v2 = wmi.WMI(moniker='//./root/virtualization/v2')
-        return self.__conn_v2
-
-    @property
-    def _conn_cimv2(self):
-        if self.__conn_cimv2 is None:
-            self.__conn_cimv2 = wmi.WMI(moniker='//./root/cimv2')
-        return self.__conn_cimv2
-
-    @property
-    def _conn_wmi(self):
-        if self.__conn_wmi is None:
-            self.__conn_wmi = wmi.WMI(moniker='//./root/wmi')
-        return self.__conn_wmi
-
-    @property
-    def _conn_storage(self):
-        if self.__conn_storage is None:
-            storage_namespace = '//./Root/Microsoft/Windows/Storage'
-            self.__conn_storage = wmi.WMI(moniker=storage_namespace)
-        return self.__conn_storage
-
-    def create_vhd(self, path):
-        image_service = self._conn.query(
-            "Select * from Msvm_ImageManagementService")[0]
-        (job, ret_val) = image_service.CreateDynamicVirtualHardDisk(
-                Path=path, MaxInternalSize=3 * 1024 * 1024)
-
-        if ret_val == constants.WMI_JOB_STATUS_STARTED:
-            success = self._check_job_status(job)
-        else:
-            success = (ret_val == 0)
-        if not success:
-            raise Exception('Failed to create Dynamic disk %s with error %d'
-                    % (path, ret_val))
-
-    def _check_job_status(self, jobpath):
-        """Poll WMI job state for completion."""
-        job_wmi_path = jobpath.replace('\\', '/')
-        job = wmi.WMI(moniker=job_wmi_path)
-
-        while job.JobState == constants.WMI_JOB_STATE_RUNNING:
-            time.sleep(0.1)
-            job = wmi.WMI(moniker=job_wmi_path)
-        return job.JobState == constants.WMI_JOB_STATE_COMPLETED
-
-    def _get_vm(self, vm_name, conn=None):
-        if conn is None:
-            conn = self._conn
-        vml = conn.Msvm_ComputerSystem(ElementName=vm_name)
-        if not len(vml):
-            raise exception.InstanceNotFound(instance=vm_name)
-        return vml[0]
-
-    def remote_vm_exists(self, server, vm_name):
-        conn = wmi.WMI(moniker='//' + server + '/root/virtualization')
-        return self._vm_exists(conn, vm_name)
-
-    def vm_exists(self, vm_name):
-        return self._vm_exists(self._conn, vm_name)
-
-    def _vm_exists(self, conn, vm_name):
-        return len(conn.Msvm_ComputerSystem(ElementName=vm_name)) > 0
-
-    def _get_vm_summary(self, vm_name):
-        vm = self._get_vm(vm_name)
-        vs_man_svc = self._conn.Msvm_VirtualSystemManagementService()[0]
-        vmsettings = vm.associators(
-                       wmi_association_class='Msvm_SettingsDefineState',
-                       wmi_result_class='Msvm_VirtualSystemSettingData')
-        settings_paths = [v.path_() for v in vmsettings]
-        return vs_man_svc.GetSummaryInformation([100, 105],
-            settings_paths)[1][0]
-
-    def get_vm_uptime(self, vm_name):
-        return self._get_vm_summary(vm_name).UpTime
-
-    def get_vm_state(self, vm_name):
-        return self._get_vm_summary(vm_name).EnabledState
-
-    def set_vm_state(self, vm_name, req_state):
-        self._set_vm_state(self._conn, vm_name, req_state)
-
-    def _set_vm_state(self, conn, vm_name, req_state):
-        vm = self._get_vm(vm_name, conn)
-        (job, ret_val) = vm.RequestStateChange(req_state)
-
-        success = False
-        if ret_val == constants.WMI_JOB_STATUS_STARTED:
-            success = self._check_job_status(job)
-        elif ret_val == 0:
-            success = True
-        elif ret_val == 32775:
-            #Invalid state for current operation. Typically means it is
-            #already in the state requested
-            success = True
-        if not success:
-            raise Exception(_("Failed to change vm state of %(vm_name)s"
-                    " to %(req_state)s") % locals())
-
-    def get_vm_disks(self, vm_name):
-        return self._get_vm_disks(self._conn, vm_name)
-
-    def _get_vm_disks(self, conn, vm_name):
-        vm = self._get_vm(vm_name, conn)
-        vmsettings = vm.associators(
-            wmi_result_class='Msvm_VirtualSystemSettingData')
-        rasds = vmsettings[0].associators(
-            wmi_result_class='MSVM_ResourceAllocationSettingData')
-
-        disks = [r for r in rasds
-            if r.ResourceSubType == 'Microsoft Virtual Hard Disk']
-        disk_files = []
-        for disk in disks:
-            disk_files.extend([c for c in disk.Connection])
-
-        volumes = [r for r in rasds
-            if r.ResourceSubType == 'Microsoft Physical Disk Drive']
-        volume_drives = []
-        for volume in volumes:
-            hostResources = volume.HostResource
-            drive_path = hostResources[0]
-            volume_drives.append(drive_path)
-
-        dvds = [r for r in rasds
-            if r.ResourceSubType == 'Microsoft Virtual CD/DVD Disk']
-        dvd_files = []
-        for dvd in dvds:
-            dvd_files.extend([c for c in dvd.Connection])
-
-        return (disk_files, volume_drives, dvd_files)
-
-    def remove_remote_vm(self, server, vm_name):
-        conn = wmi.WMI(moniker='//' + server + '/root/virtualization')
-        conn_cimv2 = wmi.WMI(moniker='//' + server + '/root/cimv2')
-        self._remove_vm(vm_name, conn, conn_cimv2)
-
-    def remove_vm(self, vm_name):
-        self._remove_vm(vm_name, self._conn, self._conn_cimv2)
-
-    def _remove_vm(self, vm_name, conn, conn_cimv2):
-        vm = self._get_vm(vm_name, conn)
-        vs_man_svc = conn.Msvm_VirtualSystemManagementService()[0]
-        #Stop the VM first.
-        self._set_vm_state(conn, vm_name, 3)
-
-        (disk_files, volume_drives, dvd_files) = self._get_vm_disks(conn,
-            vm_name)
-
-        (job, ret_val) = vs_man_svc.DestroyVirtualSystem(vm.path_())
-        if ret_val == constants.WMI_JOB_STATUS_STARTED:
-            success = self._check_job_status(job)
-        elif ret_val == 0:
-            success = True
-        if not success:
-            raise Exception(_('Failed to destroy vm %s') % vm_name)
-
-        #Delete associated vhd disk files.
-        for disk in disk_files + dvd_files:
-            vhd_file = conn_cimv2.query(
-            "Select * from CIM_DataFile where Name = '" +
-                disk.replace("'", "''") + "'")[0]
-            vhd_file.Delete()
-
-    def _get_target_iqn(self, volume_id):
-        return 'iqn.2010-10.org.openstack:volume-' + volume_id
-
-    def logout_iscsi_volume_sessions(self, volume_id):
-        target_iqn = self._get_target_iqn(volume_id)
-        if (self.iscsi_volume_sessions_exist(volume_id)):
-            self._volumeutils.logout_storage_target(target_iqn)
-
-    def iscsi_volume_sessions_exist(self, volume_id):
-        target_iqn = self._get_target_iqn(volume_id)
-        return len(self._conn_wmi.query(
-                    "SELECT * FROM MSiSCSIInitiator_SessionClass \
-                    WHERE TargetName='" + target_iqn + "'")) > 0
-
-    def get_vm_count(self):
-        return len(self._conn.query(
-            "Select * from Msvm_ComputerSystem where Description "
-            "<> 'Microsoft Hosting Computer System'"))
-
-    def get_vm_snapshots_count(self, vm_name):
-        return len(self._conn.query(
-                "Select * from Msvm_VirtualSystemSettingData where \
-                SettingType = 5 and SystemName = '" + vm_name + "'"))
-
-    def get_vhd_parent_path(self, vhd_path):
-
-        image_man_svc = self._conn.Msvm_ImageManagementService()[0]
-
-        (vhd_info, job_path, ret_val) = \
-            image_man_svc.GetVirtualHardDiskInfo(vhd_path)
-        if ret_val == constants.WMI_JOB_STATUS_STARTED:
-            success = self._check_job_status(job_path)
-        else:
-            success = (ret_val == 0)
-        if not success:
-                raise Exception(_("Failed to get info for disk %s") %
-                    (vhd_path))
-
-        base_disk_path = None
-        et = ElementTree.fromstring(vhd_info)
-        for item in et.findall("PROPERTY"):
-            if item.attrib["NAME"] == "ParentPath":
-                base_disk_path = item.find("VALUE").text
-                break
-
-        return base_disk_path
diff --git a/nova/tests/hyperv/mockproxy.py b/nova/tests/hyperv/mockproxy.py
deleted file mode 100644
index 513422c13..000000000
--- a/nova/tests/hyperv/mockproxy.py
+++ /dev/null
@@ -1,272 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-#  Copyright 2012 Cloudbase Solutions Srl
-#
-#    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
-
-"""
-Classes for dynamic generation of mock objects.
-"""
-
-import inspect
-
-
-def serialize_obj(obj):
-    if isinstance(obj, float):
-        val = str(round(obj, 10))
-    elif isinstance(obj, dict):
-        d = {}
-        for k1, v1 in obj.items():
-            d[k1] = serialize_obj(v1)
-        val = str(d)
-    elif isinstance(obj, list):
-        l1 = []
-        for i1 in obj:
-            l1.append(serialize_obj(i1))
-        val = str(l1)
-    elif isinstance(obj, tuple):
-        l1 = ()
-        for i1 in obj:
-            l1 = l1 + (serialize_obj(i1),)
-        val = str(l1)
-    else:
-        if isinstance(obj, str) or isinstance(obj, unicode):
-            val = obj
-        elif hasattr(obj, '__str__') and inspect.ismethod(obj.__str__):
-            val = str(obj)
-        else:
-            val = str(type(obj))
-    return val
-
-
-def serialize_args(*args, **kwargs):
-    """Workaround for float string conversion issues in Python 2.6."""
-    return serialize_obj((args, kwargs))
-
-
-class MockException(Exception):
-    def __init__(self, message):
-        super(MockException, self).__init__(message)
-
-
-class Mock(object):
-    def _get_next_value(self, name):
-        c = self._access_count.get(name)
-        if c is None:
-            c = 0
-        else:
-            c = c + 1
-        self._access_count[name] = c
-
-        try:
-            value = self._values[name][c]
-        except IndexError as ex:
-            raise MockException(_('Couldn\'t find invocation num. %(c)d '
-                'of attribute "%(name)s"') % locals())
-        return value
-
-    def _get_next_ret_value(self, name, params):
-        d = self._access_count.get(name)
-        if d is None:
-            d = {}
-            self._access_count[name] = d
-        c = d.get(params)
-        if c is None:
-            c = 0
-        else:
-            c = c + 1
-        d[params] = c
-
-        try:
-            m = self._values[name]
-        except KeyError as ex:
-            raise MockException(_('Couldn\'t find attribute "%s"') % (name))
-
-        try:
-            value = m[params][c]
-        except KeyError as ex:
-            raise MockException(_('Couldn\'t find attribute "%(name)s" '
-                'with arguments "%(params)s"') % locals())
-        except IndexError as ex:
-            raise MockException(_('Couldn\'t find invocation num. %(c)d '
-                'of attribute "%(name)s" with arguments "%(params)s"')
-                    % locals())
-
-        return value
-
-    def __init__(self, values):
-        self._values = values
-        self._access_count = {}
-
-    def has_values(self):
-        return len(self._values) > 0
-
-    def __getattr__(self, name):
-        if name.startswith('__') and name.endswith('__'):
-            return object.__getattribute__(self, name)
-        else:
-            try:
-                isdict = isinstance(self._values[name], dict)
-            except KeyError as ex:
-                raise MockException(_('Couldn\'t find attribute "%s"')
-                    % (name))
-
-            if isdict:
-                def newfunc(*args, **kwargs):
-                    params = serialize_args(args, kwargs)
-                    return self._get_next_ret_value(name, params)
-                return newfunc
-            else:
-                return self._get_next_value(name)
-
-    def __str__(self):
-        return self._get_next_value('__str__')
-
-    def __iter__(self):
-        return getattr(self._get_next_value('__iter__'), '__iter__')()
-
-    def __len__(self):
-        return self._get_next_value('__len__')
-
-    def __getitem__(self, key):
-        return self._get_next_ret_value('__getitem__', str(key))
-
-    def __call__(self, *args, **kwargs):
-        params = serialize_args(args, kwargs)
-        return self._get_next_ret_value('__call__', params)
-
-
-class MockProxy(object):
-    def __init__(self, wrapped):
-        self._wrapped = wrapped
-        self._recorded_values = {}
-
-    def _get_proxy_object(self, obj):
-        if hasattr(obj, '__dict__') or isinstance(obj, tuple) or \
-            isinstance(obj, list) or isinstance(obj, dict):
-            p = MockProxy(obj)
-        else:
-            p = obj
-        return p
-
-    def __getattr__(self, name):
-        if name in ['_wrapped']:
-            return object.__getattribute__(self, name)
-        else:
-            attr = getattr(self._wrapped, name)
-            if inspect.isfunction(attr) or inspect.ismethod(attr) or \
-                inspect.isbuiltin(attr):
-                def newfunc(*args, **kwargs):
-                    result = attr(*args, **kwargs)
-                    p = self._get_proxy_object(result)
-                    params = serialize_args(args, kwargs)
-                    self._add_recorded_ret_value(name, params, p)
-                    return p
-                return newfunc
-            elif hasattr(attr, '__dict__') or (hasattr(attr, '__getitem__')
-                and not (isinstance(attr, str) or isinstance(attr, unicode))):
-                p = MockProxy(attr)
-            else:
-                p = attr
-            self._add_recorded_value(name, p)
-            return p
-
-    def __setattr__(self, name, value):
-        if name in ['_wrapped', '_recorded_values']:
-            object.__setattr__(self, name, value)
-        else:
-            setattr(self._wrapped, name, value)
-
-    def _add_recorded_ret_value(self, name, params, val):
-        d = self._recorded_values.get(name)
-        if d is None:
-            d = {}
-            self._recorded_values[name] = d
-        l = d.get(params)
-        if l is None:
-            l = []
-            d[params] = l
-        l.append(val)
-
-    def _add_recorded_value(self, name, val):
-        if not name in self._recorded_values:
-            self._recorded_values[name] = []
-        self._recorded_values[name].append(val)
-
-    def get_mock(self):
-        values = {}
-        for k, v in self._recorded_values.items():
-            if isinstance(v, dict):
-                d = {}
-                values[k] = d
-                for k1, v1 in v.items():
-                    l = []
-                    d[k1] = l
-                    for i1 in v1:
-                        if isinstance(i1, MockProxy):
-                            l.append(i1.get_mock())
-                        else:
-                            l.append(i1)
-            else:
-                l = []
-                values[k] = l
-                for i in v:
-                    if isinstance(i, MockProxy):
-                        l.append(i.get_mock())
-                    elif isinstance(i, dict):
-                        d = {}
-                        for k1, v1 in v.items():
-                            if isinstance(v1, MockProxy):
-                                d[k1] = v1.get_mock()
-                            else:
-                                d[k1] = v1
-                        l.append(d)
-                    elif isinstance(i, list):
-                        l1 = []
-                        for i1 in i:
-                            if isinstance(i1, MockProxy):
-                                l1.append(i1.get_mock())
-                            else:
-                                l1.append(i1)
-                        l.append(l1)
-                    else:
-                        l.append(i)
-        return Mock(values)
-
-    def __str__(self):
-        s = str(self._wrapped)
-        self._add_recorded_value('__str__', s)
-        return s
-
-    def __len__(self):
-        l = len(self._wrapped)
-        self._add_recorded_value('__len__', l)
-        return l
-
-    def __iter__(self):
-        it = []
-        for i in self._wrapped:
-            it.append(self._get_proxy_object(i))
-        self._add_recorded_value('__iter__', it)
-        return iter(it)
-
-    def __getitem__(self, key):
-        p = self._get_proxy_object(self._wrapped[key])
-        self._add_recorded_ret_value('__getitem__', str(key), p)
-        return p
-
-    def __call__(self, *args, **kwargs):
-        c = self._wrapped(*args, **kwargs)
-        p = self._get_proxy_object(c)
-        params = serialize_args(args, kwargs)
-        self._add_recorded_ret_value('__call__', params, p)
-        return p
diff --git a/nova/tests/hyperv/stubs/README.rst b/nova/tests/hyperv/stubs/README.rst
deleted file mode 100644
index 150fd3ad1..000000000
--- a/nova/tests/hyperv/stubs/README.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Files with extension p.gz are compressed pickle files containing serialized
-mocks used during unit testing
diff --git a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_attach_volume_os.p.gz b/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_attach_volume_os.p.gz
deleted file mode 100644
index c65832c57..000000000
--- a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_attach_volume_os.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_attach_volume_subprocess.p.gz b/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_attach_volume_subprocess.p.gz
deleted file mode 100644
index 7076c4868..000000000
--- a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_attach_volume_subprocess.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_attach_volume_time.p.gz b/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_attach_volume_time.p.gz
deleted file mode 100644
index c251f9d6c..000000000
--- a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_attach_volume_time.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_attach_volume_uuid.p.gz b/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_attach_volume_uuid.p.gz
deleted file mode 100644
index cac08e3d0..000000000
--- a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_attach_volume_uuid.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_attach_volume_with_target_connection_failure_os.p.gz b/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_attach_volume_with_target_connection_failure_os.p.gz
deleted file mode 100644
index d6e624bb0..000000000
--- a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_attach_volume_with_target_connection_failure_os.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_attach_volume_with_target_connection_failure_subprocess.p.gz b/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_attach_volume_with_target_connection_failure_subprocess.p.gz
deleted file mode 100644
index bb18f7453..000000000
--- a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_attach_volume_with_target_connection_failure_subprocess.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_attach_volume_with_target_connection_failure_time.p.gz b/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_attach_volume_with_target_connection_failure_time.p.gz
deleted file mode 100644
index a5f592a74..000000000
--- a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_attach_volume_with_target_connection_failure_time.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_attach_volume_with_target_connection_failure_uuid.p.gz b/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_attach_volume_with_target_connection_failure_uuid.p.gz
deleted file mode 100644
index 4bebe0e72..000000000
--- a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_attach_volume_with_target_connection_failure_uuid.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_attach_volume_with_target_connection_failure_wmi.p.gz b/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_attach_volume_with_target_connection_failure_wmi.p.gz
deleted file mode 100644
index 29a610f36..000000000
--- a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_attach_volume_with_target_connection_failure_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_attach_volume_wmi.p.gz b/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_attach_volume_wmi.p.gz
deleted file mode 100644
index ca92ece00..000000000
--- a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_attach_volume_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_boot_from_volume_subprocess.p.gz b/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_boot_from_volume_subprocess.p.gz
deleted file mode 100644
index 58269455d..000000000
--- a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_boot_from_volume_subprocess.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_boot_from_volume_time.p.gz b/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_boot_from_volume_time.p.gz
deleted file mode 100644
index 97cd7e62b..000000000
--- a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_boot_from_volume_time.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_boot_from_volume_uuid.p.gz b/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_boot_from_volume_uuid.p.gz
deleted file mode 100644
index 708197430..000000000
--- a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_boot_from_volume_uuid.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_boot_from_volume_wmi.p.gz b/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_boot_from_volume_wmi.p.gz
deleted file mode 100644
index d5eb4d746..000000000
--- a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_boot_from_volume_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_detach_volume_os.p.gz b/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_detach_volume_os.p.gz
deleted file mode 100644
index d8c63d8ad..000000000
--- a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_detach_volume_os.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_detach_volume_subprocess.p.gz b/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_detach_volume_subprocess.p.gz
deleted file mode 100644
index d0b27d201..000000000
--- a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_detach_volume_subprocess.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_detach_volume_time.p.gz b/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_detach_volume_time.p.gz
deleted file mode 100644
index 657379cec..000000000
--- a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_detach_volume_time.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_detach_volume_uuid.p.gz b/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_detach_volume_uuid.p.gz
deleted file mode 100644
index 8bf58ef5c..000000000
--- a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_detach_volume_uuid.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_detach_volume_wmi.p.gz b/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_detach_volume_wmi.p.gz
deleted file mode 100644
index c20281811..000000000
--- a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_detach_volume_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_live_migration_os.p.gz b/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_live_migration_os.p.gz
deleted file mode 100644
index a198af844..000000000
--- a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_live_migration_os.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_live_migration_time.p.gz b/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_live_migration_time.p.gz
deleted file mode 100644
index 749eabe40..000000000
--- a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_live_migration_time.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_live_migration_uuid.p.gz b/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_live_migration_uuid.p.gz
deleted file mode 100644
index c40e6f995..000000000
--- a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_live_migration_uuid.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_live_migration_with_target_failure_os.p.gz b/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_live_migration_with_target_failure_os.p.gz
deleted file mode 100644
index c67dc9271..000000000
--- a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_live_migration_with_target_failure_os.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_live_migration_with_target_failure_time.p.gz b/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_live_migration_with_target_failure_time.p.gz
deleted file mode 100644
index 0d671fc18..000000000
--- a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_live_migration_with_target_failure_time.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_live_migration_with_target_failure_uuid.p.gz b/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_live_migration_with_target_failure_uuid.p.gz
deleted file mode 100644
index 66583beb1..000000000
--- a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_live_migration_with_target_failure_uuid.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_live_migration_with_target_failure_wmi.p.gz b/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_live_migration_with_target_failure_wmi.p.gz
deleted file mode 100644
index efdef819f..000000000
--- a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_live_migration_with_target_failure_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_live_migration_wmi.p.gz b/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_live_migration_wmi.p.gz
deleted file mode 100644
index 5edd6f147..000000000
--- a/nova/tests/hyperv/stubs/nova.tests.test_hypervapi.HyperVAPITestCase.test_live_migration_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_nova.utils.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_nova.utils.p.gz
deleted file mode 100644
index f968e2af5..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_nova.utils.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_nova.virt.configdrive.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_nova.virt.configdrive.p.gz
deleted file mode 100644
index bd5ced9f8..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_nova.virt.configdrive.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_os.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_os.p.gz
deleted file mode 100644
index a48a21ca9..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_os.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_shutil.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_shutil.p.gz
deleted file mode 100644
index c662b602a..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_shutil.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_subprocess.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_subprocess.p.gz
deleted file mode 100644
index 6a692b3d8..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_subprocess.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_time.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_time.p.gz
deleted file mode 100644
index f2ae56be1..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_time.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_uuid.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_uuid.p.gz
deleted file mode 100644
index 2d24523aa..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_uuid.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_with_target_connection_failure_nova.utils.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_with_target_connection_failure_nova.utils.p.gz
deleted file mode 100644
index aca0d6f0c..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_with_target_connection_failure_nova.utils.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_with_target_connection_failure_nova.virt.configdrive.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_with_target_connection_failure_nova.virt.configdrive.p.gz
deleted file mode 100644
index bbeec53df..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_with_target_connection_failure_nova.virt.configdrive.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_with_target_connection_failure_os.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_with_target_connection_failure_os.p.gz
deleted file mode 100644
index 3bf9bd13a..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_with_target_connection_failure_os.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_with_target_connection_failure_shutil.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_with_target_connection_failure_shutil.p.gz
deleted file mode 100644
index 62e3fa329..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_with_target_connection_failure_shutil.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_with_target_connection_failure_subprocess.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_with_target_connection_failure_subprocess.p.gz
deleted file mode 100644
index 36970348a..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_with_target_connection_failure_subprocess.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_with_target_connection_failure_time.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_with_target_connection_failure_time.p.gz
deleted file mode 100644
index 8db997abf..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_with_target_connection_failure_time.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_with_target_connection_failure_uuid.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_with_target_connection_failure_uuid.p.gz
deleted file mode 100644
index 73f90ac2b..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_with_target_connection_failure_uuid.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_with_target_connection_failure_wmi.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_with_target_connection_failure_wmi.p.gz
deleted file mode 100644
index 3ae9a6f46..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_with_target_connection_failure_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_wmi.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_wmi.p.gz
deleted file mode 100644
index 5b851f9b7..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_attach_volume_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_boot_from_volume_nova.utils.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_boot_from_volume_nova.utils.p.gz
deleted file mode 100644
index 7a1c47449..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_boot_from_volume_nova.utils.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_boot_from_volume_nova.virt.configdrive.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_boot_from_volume_nova.virt.configdrive.p.gz
deleted file mode 100644
index 48583265e..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_boot_from_volume_nova.virt.configdrive.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_boot_from_volume_shutil.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_boot_from_volume_shutil.p.gz
deleted file mode 100644
index 90d6a2ca6..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_boot_from_volume_shutil.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_boot_from_volume_subprocess.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_boot_from_volume_subprocess.p.gz
deleted file mode 100644
index 3b17cc74f..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_boot_from_volume_subprocess.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_boot_from_volume_time.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_boot_from_volume_time.p.gz
deleted file mode 100644
index 162f52457..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_boot_from_volume_time.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_boot_from_volume_uuid.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_boot_from_volume_uuid.p.gz
deleted file mode 100644
index f88f8bc86..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_boot_from_volume_uuid.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_boot_from_volume_wmi.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_boot_from_volume_wmi.p.gz
deleted file mode 100644
index f671dc247..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_boot_from_volume_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_destroy_nova.utils.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_destroy_nova.utils.p.gz
deleted file mode 100644
index 37892d051..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_destroy_nova.utils.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_destroy_nova.virt.configdrive.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_destroy_nova.virt.configdrive.p.gz
deleted file mode 100644
index 9aec45796..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_destroy_nova.virt.configdrive.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_destroy_os.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_destroy_os.p.gz
deleted file mode 100644
index ffc21536e..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_destroy_os.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_destroy_shutil.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_destroy_shutil.p.gz
deleted file mode 100644
index b47c49202..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_destroy_shutil.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_destroy_time.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_destroy_time.p.gz
deleted file mode 100644
index 78e4292b6..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_destroy_time.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_destroy_uuid.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_destroy_uuid.p.gz
deleted file mode 100644
index 5bc7602a8..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_destroy_uuid.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_destroy_wmi.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_destroy_wmi.p.gz
deleted file mode 100644
index 9ba025e55..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_destroy_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_detach_volume_nova.utils.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_detach_volume_nova.utils.p.gz
deleted file mode 100644
index 3341bca28..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_detach_volume_nova.utils.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_detach_volume_nova.virt.configdrive.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_detach_volume_nova.virt.configdrive.p.gz
deleted file mode 100644
index 56cb9d103..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_detach_volume_nova.virt.configdrive.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_detach_volume_os.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_detach_volume_os.p.gz
deleted file mode 100644
index 81205e04d..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_detach_volume_os.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_detach_volume_shutil.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_detach_volume_shutil.p.gz
deleted file mode 100644
index 9d1311341..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_detach_volume_shutil.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_detach_volume_subprocess.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_detach_volume_subprocess.p.gz
deleted file mode 100644
index a151a99b4..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_detach_volume_subprocess.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_detach_volume_time.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_detach_volume_time.p.gz
deleted file mode 100644
index b1d0b0f3a..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_detach_volume_time.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_detach_volume_uuid.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_detach_volume_uuid.p.gz
deleted file mode 100644
index c2985c424..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_detach_volume_uuid.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_detach_volume_wmi.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_detach_volume_wmi.p.gz
deleted file mode 100644
index 2c4901c9f..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_detach_volume_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_available_resource_ctypes.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_available_resource_ctypes.p.gz
deleted file mode 100644
index 2481a7b3e..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_available_resource_ctypes.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_available_resource_multiprocessing.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_available_resource_multiprocessing.p.gz
deleted file mode 100644
index 61cbc1854..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_available_resource_multiprocessing.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_available_resource_os.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_available_resource_os.p.gz
deleted file mode 100644
index 09b86b24e..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_available_resource_os.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_available_resource_shutil.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_available_resource_shutil.p.gz
deleted file mode 100644
index ba89bfd7e..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_available_resource_shutil.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_available_resource_wmi.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_available_resource_wmi.p.gz
deleted file mode 100644
index cfce8c10a..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_available_resource_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_host_stats_os.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_host_stats_os.p.gz
deleted file mode 100644
index 6092f36ab..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_host_stats_os.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_host_stats_shutil.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_host_stats_shutil.p.gz
deleted file mode 100644
index 010c07e56..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_host_stats_shutil.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_host_stats_wmi.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_host_stats_wmi.p.gz
deleted file mode 100644
index 9d3adec48..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_host_stats_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_info_nova.utils.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_info_nova.utils.p.gz
deleted file mode 100644
index 995dde1b5..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_info_nova.utils.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_info_nova.virt.configdrive.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_info_nova.virt.configdrive.p.gz
deleted file mode 100644
index 12d18d12e..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_info_nova.virt.configdrive.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_info_os.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_info_os.p.gz
deleted file mode 100644
index 64c756ffa..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_info_os.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_info_shutil.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_info_shutil.p.gz
deleted file mode 100644
index d2cefdc37..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_info_shutil.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_info_time.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_info_time.p.gz
deleted file mode 100644
index 9fdef3b90..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_info_time.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_info_uuid.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_info_uuid.p.gz
deleted file mode 100644
index c34d2308b..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_info_uuid.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_info_wmi.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_info_wmi.p.gz
deleted file mode 100644
index 36a342e7c..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_info_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_list_instances_detail_shutil.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_list_instances_detail_shutil.p.gz
deleted file mode 100644
index 3ab35a29f..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_list_instances_detail_shutil.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_list_instances_detail_wmi.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_list_instances_detail_wmi.p.gz
deleted file mode 100644
index 411c0ed07..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_list_instances_detail_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_list_instances_shutil.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_list_instances_shutil.p.gz
deleted file mode 100644
index 1af20acde..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_list_instances_shutil.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_list_instances_wmi.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_list_instances_wmi.p.gz
deleted file mode 100644
index d84122d77..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_list_instances_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_nova.utils.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_nova.utils.p.gz
deleted file mode 100644
index d650f40a5..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_nova.utils.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_nova.virt.configdrive.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_nova.virt.configdrive.p.gz
deleted file mode 100644
index a03d442a4..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_nova.virt.configdrive.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_os.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_os.p.gz
deleted file mode 100644
index 993d9bb2d..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_os.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_shutil.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_shutil.p.gz
deleted file mode 100644
index 6693c2ce9..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_shutil.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_time.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_time.p.gz
deleted file mode 100644
index 07898dd55..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_time.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_uuid.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_uuid.p.gz
deleted file mode 100644
index 56e583449..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_uuid.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_with_target_failure_nova.utils.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_with_target_failure_nova.utils.p.gz
deleted file mode 100644
index 5d4c0e111..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_with_target_failure_nova.utils.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_with_target_failure_nova.virt.configdrive.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_with_target_failure_nova.virt.configdrive.p.gz
deleted file mode 100644
index cb52cb974..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_with_target_failure_nova.virt.configdrive.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_with_target_failure_os.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_with_target_failure_os.p.gz
deleted file mode 100644
index 8b2ff15f3..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_with_target_failure_os.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_with_target_failure_shutil.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_with_target_failure_shutil.p.gz
deleted file mode 100644
index aee1fb14d..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_with_target_failure_shutil.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_with_target_failure_time.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_with_target_failure_time.p.gz
deleted file mode 100644
index f926d206f..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_with_target_failure_time.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_with_target_failure_uuid.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_with_target_failure_uuid.p.gz
deleted file mode 100644
index 483b23d53..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_with_target_failure_uuid.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_with_target_failure_wmi.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_with_target_failure_wmi.p.gz
deleted file mode 100644
index 14d61039f..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_with_target_failure_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_wmi.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_wmi.p.gz
deleted file mode 100644
index daecf0156..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_live_migration_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_already_paused_nova.utils.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_already_paused_nova.utils.p.gz
deleted file mode 100644
index 548b88148..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_already_paused_nova.utils.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_already_paused_nova.virt.configdrive.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_already_paused_nova.virt.configdrive.p.gz
deleted file mode 100644
index 8545a1833..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_already_paused_nova.virt.configdrive.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_already_paused_os.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_already_paused_os.p.gz
deleted file mode 100644
index c1daf3db9..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_already_paused_os.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_already_paused_shutil.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_already_paused_shutil.p.gz
deleted file mode 100644
index 750d68d29..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_already_paused_shutil.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_already_paused_time.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_already_paused_time.p.gz
deleted file mode 100644
index 6e91b72a2..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_already_paused_time.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_already_paused_uuid.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_already_paused_uuid.p.gz
deleted file mode 100644
index 2d0349d96..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_already_paused_uuid.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_already_paused_wmi.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_already_paused_wmi.p.gz
deleted file mode 100644
index 6b9ef360a..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_already_paused_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_nova.utils.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_nova.utils.p.gz
deleted file mode 100644
index 3e582226f..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_nova.utils.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_nova.virt.configdrive.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_nova.virt.configdrive.p.gz
deleted file mode 100644
index 723966011..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_nova.virt.configdrive.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_os.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_os.p.gz
deleted file mode 100644
index 29b73888b..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_os.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_shutil.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_shutil.p.gz
deleted file mode 100644
index 595124af2..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_shutil.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_time.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_time.p.gz
deleted file mode 100644
index 03d53be74..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_time.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_uuid.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_uuid.p.gz
deleted file mode 100644
index 2a0663e6f..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_uuid.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_wmi.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_wmi.p.gz
deleted file mode 100644
index e651c02fc..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pause_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_already_powered_off_nova.utils.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_already_powered_off_nova.utils.p.gz
deleted file mode 100644
index a50935649..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_already_powered_off_nova.utils.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_already_powered_off_nova.virt.configdrive.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_already_powered_off_nova.virt.configdrive.p.gz
deleted file mode 100644
index 4b07271c1..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_already_powered_off_nova.virt.configdrive.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_already_powered_off_os.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_already_powered_off_os.p.gz
deleted file mode 100644
index f62298ed7..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_already_powered_off_os.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_already_powered_off_shutil.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_already_powered_off_shutil.p.gz
deleted file mode 100644
index 12a164f23..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_already_powered_off_shutil.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_already_powered_off_time.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_already_powered_off_time.p.gz
deleted file mode 100644
index 33f1862e6..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_already_powered_off_time.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_already_powered_off_uuid.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_already_powered_off_uuid.p.gz
deleted file mode 100644
index 80853eea4..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_already_powered_off_uuid.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_already_powered_off_wmi.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_already_powered_off_wmi.p.gz
deleted file mode 100644
index 5cebe527d..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_already_powered_off_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_nova.utils.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_nova.utils.p.gz
deleted file mode 100644
index d0c431b9d..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_nova.utils.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_nova.virt.configdrive.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_nova.virt.configdrive.p.gz
deleted file mode 100644
index d231f803d..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_nova.virt.configdrive.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_os.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_os.p.gz
deleted file mode 100644
index 25fe5f3ff..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_os.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_shutil.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_shutil.p.gz
deleted file mode 100644
index 8be80ba56..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_shutil.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_time.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_time.p.gz
deleted file mode 100644
index 51b6f2df8..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_time.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_uuid.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_uuid.p.gz
deleted file mode 100644
index 97812405e..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_uuid.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_wmi.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_wmi.p.gz
deleted file mode 100644
index 20b2e021e..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_off_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_already_running_nova.utils.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_already_running_nova.utils.p.gz
deleted file mode 100644
index c32f9ecd2..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_already_running_nova.utils.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_already_running_nova.virt.configdrive.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_already_running_nova.virt.configdrive.p.gz
deleted file mode 100644
index 672376a0e..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_already_running_nova.virt.configdrive.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_already_running_os.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_already_running_os.p.gz
deleted file mode 100644
index aa6f4ca8a..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_already_running_os.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_already_running_shutil.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_already_running_shutil.p.gz
deleted file mode 100644
index 00f5770a7..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_already_running_shutil.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_already_running_time.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_already_running_time.p.gz
deleted file mode 100644
index 1631f35df..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_already_running_time.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_already_running_uuid.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_already_running_uuid.p.gz
deleted file mode 100644
index ec28756ad..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_already_running_uuid.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_already_running_wmi.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_already_running_wmi.p.gz
deleted file mode 100644
index 699ccde76..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_already_running_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_nova.utils.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_nova.utils.p.gz
deleted file mode 100644
index 2b99fb9cd..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_nova.utils.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_nova.virt.configdrive.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_nova.virt.configdrive.p.gz
deleted file mode 100644
index a43bfeb7e..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_nova.virt.configdrive.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_os.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_os.p.gz
deleted file mode 100644
index 57e74e618..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_os.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_shutil.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_shutil.p.gz
deleted file mode 100644
index 273364d95..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_shutil.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_time.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_time.p.gz
deleted file mode 100644
index 732a0f2e6..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_time.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_uuid.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_uuid.p.gz
deleted file mode 100644
index d6cb32559..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_uuid.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_wmi.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_wmi.p.gz
deleted file mode 100644
index e44197039..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_power_on_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pre_live_migration_cow_image_nova.utils.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pre_live_migration_cow_image_nova.utils.p.gz
deleted file mode 100644
index 456af2816..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pre_live_migration_cow_image_nova.utils.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pre_live_migration_cow_image_os.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pre_live_migration_cow_image_os.p.gz
deleted file mode 100644
index 93568dcef..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pre_live_migration_cow_image_os.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pre_live_migration_cow_image_shutil.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pre_live_migration_cow_image_shutil.p.gz
deleted file mode 100644
index 6a4b90850..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pre_live_migration_cow_image_shutil.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pre_live_migration_cow_image_time.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pre_live_migration_cow_image_time.p.gz
deleted file mode 100644
index fc816320f..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pre_live_migration_cow_image_time.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pre_live_migration_cow_image_uuid.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pre_live_migration_cow_image_uuid.p.gz
deleted file mode 100644
index 83cf9c071..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pre_live_migration_cow_image_uuid.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pre_live_migration_cow_image_wmi.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pre_live_migration_cow_image_wmi.p.gz
deleted file mode 100644
index 93977743f..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pre_live_migration_cow_image_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pre_live_migration_no_cow_image_nova.utils.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pre_live_migration_no_cow_image_nova.utils.p.gz
deleted file mode 100644
index f58f80a79..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pre_live_migration_no_cow_image_nova.utils.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pre_live_migration_no_cow_image_shutil.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pre_live_migration_no_cow_image_shutil.p.gz
deleted file mode 100644
index 18a8aed13..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pre_live_migration_no_cow_image_shutil.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pre_live_migration_no_cow_image_uuid.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pre_live_migration_no_cow_image_uuid.p.gz
deleted file mode 100644
index 4225a72b0..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pre_live_migration_no_cow_image_uuid.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pre_live_migration_no_cow_image_wmi.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pre_live_migration_no_cow_image_wmi.p.gz
deleted file mode 100644
index 363c431d4..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_pre_live_migration_no_cow_image_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_reboot_nova.utils.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_reboot_nova.utils.p.gz
deleted file mode 100644
index 8761703dc..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_reboot_nova.utils.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_reboot_nova.virt.configdrive.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_reboot_nova.virt.configdrive.p.gz
deleted file mode 100644
index fc907ed31..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_reboot_nova.virt.configdrive.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_reboot_os.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_reboot_os.p.gz
deleted file mode 100644
index 0eca8e6ce..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_reboot_os.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_reboot_shutil.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_reboot_shutil.p.gz
deleted file mode 100644
index 0886c942d..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_reboot_shutil.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_reboot_time.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_reboot_time.p.gz
deleted file mode 100644
index d0fb77bd1..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_reboot_time.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_reboot_uuid.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_reboot_uuid.p.gz
deleted file mode 100644
index df3961276..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_reboot_uuid.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_reboot_wmi.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_reboot_wmi.p.gz
deleted file mode 100644
index 4df451154..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_reboot_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_already_running_nova.utils.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_already_running_nova.utils.p.gz
deleted file mode 100644
index 59724b43d..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_already_running_nova.utils.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_already_running_nova.virt.configdrive.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_already_running_nova.virt.configdrive.p.gz
deleted file mode 100644
index 4b3711ec0..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_already_running_nova.virt.configdrive.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_already_running_os.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_already_running_os.p.gz
deleted file mode 100644
index 2f9a5de9c..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_already_running_os.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_already_running_shutil.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_already_running_shutil.p.gz
deleted file mode 100644
index 8ffa516c0..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_already_running_shutil.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_already_running_time.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_already_running_time.p.gz
deleted file mode 100644
index 6aade88c6..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_already_running_time.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_already_running_uuid.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_already_running_uuid.p.gz
deleted file mode 100644
index 276c06397..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_already_running_uuid.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_already_running_wmi.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_already_running_wmi.p.gz
deleted file mode 100644
index 77a1650d4..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_already_running_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_nova.utils.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_nova.utils.p.gz
deleted file mode 100644
index ce19ed290..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_nova.utils.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_nova.virt.configdrive.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_nova.virt.configdrive.p.gz
deleted file mode 100644
index b2dadcd4d..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_nova.virt.configdrive.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_os.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_os.p.gz
deleted file mode 100644
index aa378fedd..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_os.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_shutil.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_shutil.p.gz
deleted file mode 100644
index 333a27b89..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_shutil.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_time.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_time.p.gz
deleted file mode 100644
index 16ca553f6..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_time.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_uuid.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_uuid.p.gz
deleted file mode 100644
index 8cf3b564e..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_uuid.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_wmi.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_wmi.p.gz
deleted file mode 100644
index 0a2c8513b..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_resume_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_nova.utils.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_nova.utils.p.gz
deleted file mode 100644
index ae42d7734..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_nova.utils.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_nova.virt.configdrive.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_nova.virt.configdrive.p.gz
deleted file mode 100644
index 4fec34d08..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_nova.virt.configdrive.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_os.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_os.p.gz
deleted file mode 100644
index 74e8e95a6..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_os.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_shutil.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_shutil.p.gz
deleted file mode 100644
index da0528797..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_shutil.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_time.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_time.p.gz
deleted file mode 100644
index 63f02bc75..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_time.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_uuid.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_uuid.p.gz
deleted file mode 100644
index c014d5003..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_uuid.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_with_update_failure_nova.utils.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_with_update_failure_nova.utils.p.gz
deleted file mode 100644
index 592658541..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_with_update_failure_nova.utils.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_with_update_failure_nova.virt.configdrive.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_with_update_failure_nova.virt.configdrive.p.gz
deleted file mode 100644
index 892f3c346..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_with_update_failure_nova.virt.configdrive.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_with_update_failure_os.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_with_update_failure_os.p.gz
deleted file mode 100644
index 9996339f5..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_with_update_failure_os.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_with_update_failure_shutil.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_with_update_failure_shutil.p.gz
deleted file mode 100644
index 409ee5ef7..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_with_update_failure_shutil.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_with_update_failure_time.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_with_update_failure_time.p.gz
deleted file mode 100644
index 9e799c196..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_with_update_failure_time.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_with_update_failure_uuid.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_with_update_failure_uuid.p.gz
deleted file mode 100644
index 848024366..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_with_update_failure_uuid.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_with_update_failure_wmi.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_with_update_failure_wmi.p.gz
deleted file mode 100644
index 687952c4c..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_with_update_failure_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_wmi.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_wmi.p.gz
deleted file mode 100644
index 57988a6b6..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_snapshot_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_cdrom_nova.utils.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_cdrom_nova.utils.p.gz
deleted file mode 100644
index 303a47019..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_cdrom_nova.utils.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_cdrom_nova.virt.configdrive.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_cdrom_nova.virt.configdrive.p.gz
deleted file mode 100644
index c211622e1..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_cdrom_nova.virt.configdrive.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_cdrom_os.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_cdrom_os.p.gz
deleted file mode 100644
index 5e5303cbc..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_cdrom_os.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_cdrom_shutil.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_cdrom_shutil.p.gz
deleted file mode 100644
index 1bcbd48f3..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_cdrom_shutil.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_cdrom_time.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_cdrom_time.p.gz
deleted file mode 100644
index ae557d73d..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_cdrom_time.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_cdrom_uuid.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_cdrom_uuid.p.gz
deleted file mode 100644
index 90ebff4e7..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_cdrom_uuid.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_cdrom_wmi.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_cdrom_wmi.p.gz
deleted file mode 100644
index beccc2737..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_cdrom_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_nova.utils.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_nova.utils.p.gz
deleted file mode 100644
index af5082ab6..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_nova.utils.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_nova.virt.configdrive.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_nova.virt.configdrive.p.gz
deleted file mode 100644
index 837d81b70..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_nova.virt.configdrive.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_os.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_os.p.gz
deleted file mode 100644
index ecea62a01..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_os.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_shutil.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_shutil.p.gz
deleted file mode 100644
index 283cd7fdd..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_shutil.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_time.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_time.p.gz
deleted file mode 100644
index 44dcc89ae..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_time.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_uuid.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_uuid.p.gz
deleted file mode 100644
index 5c520c768..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_uuid.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_wmi.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_wmi.p.gz
deleted file mode 100644
index aec53305d..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_config_drive_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_cow_image_nova.utils.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_cow_image_nova.utils.p.gz
deleted file mode 100644
index a16c88e54..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_cow_image_nova.utils.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_cow_image_nova.virt.configdrive.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_cow_image_nova.virt.configdrive.p.gz
deleted file mode 100644
index d9c4e9c82..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_cow_image_nova.virt.configdrive.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_cow_image_os.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_cow_image_os.p.gz
deleted file mode 100644
index 94aafb39a..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_cow_image_os.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_cow_image_shutil.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_cow_image_shutil.p.gz
deleted file mode 100644
index e0ad00bf6..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_cow_image_shutil.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_cow_image_time.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_cow_image_time.p.gz
deleted file mode 100644
index 00f7839ba..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_cow_image_time.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_cow_image_uuid.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_cow_image_uuid.p.gz
deleted file mode 100644
index 77422d3f5..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_cow_image_uuid.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_cow_image_wmi.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_cow_image_wmi.p.gz
deleted file mode 100644
index 414194a9d..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_cow_image_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_config_drive_nova.utils.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_config_drive_nova.utils.p.gz
deleted file mode 100644
index b1e825822..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_config_drive_nova.utils.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_config_drive_nova.virt.configdrive.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_config_drive_nova.virt.configdrive.p.gz
deleted file mode 100644
index 1e3d89fea..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_config_drive_nova.virt.configdrive.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_config_drive_os.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_config_drive_os.p.gz
deleted file mode 100644
index 627c78d7e..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_config_drive_os.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_config_drive_shutil.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_config_drive_shutil.p.gz
deleted file mode 100644
index e577cdb5e..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_config_drive_shutil.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_config_drive_time.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_config_drive_time.p.gz
deleted file mode 100644
index 72962fc52..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_config_drive_time.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_config_drive_uuid.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_config_drive_uuid.p.gz
deleted file mode 100644
index 5d1351a14..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_config_drive_uuid.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_config_drive_wmi.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_config_drive_wmi.p.gz
deleted file mode 100644
index eb0ed7241..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_config_drive_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_cow_image_nova.utils.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_cow_image_nova.utils.p.gz
deleted file mode 100644
index c65264688..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_cow_image_nova.utils.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_cow_image_nova.virt.configdrive.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_cow_image_nova.virt.configdrive.p.gz
deleted file mode 100644
index ca40d6413..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_cow_image_nova.virt.configdrive.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_cow_image_os.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_cow_image_os.p.gz
deleted file mode 100644
index 1d8081a3e..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_cow_image_os.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_cow_image_shutil.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_cow_image_shutil.p.gz
deleted file mode 100644
index e03633b90..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_cow_image_shutil.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_cow_image_time.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_cow_image_time.p.gz
deleted file mode 100644
index 00c56dacc..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_cow_image_time.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_cow_image_uuid.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_cow_image_uuid.p.gz
deleted file mode 100644
index 7381c3cc6..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_cow_image_uuid.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_cow_image_wmi.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_cow_image_wmi.p.gz
deleted file mode 100644
index 115ed1dd5..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_cow_image_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_vswitch_exception_nova.utils.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_vswitch_exception_nova.utils.p.gz
deleted file mode 100644
index df40b08c0..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_vswitch_exception_nova.utils.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_vswitch_exception_nova.virt.configdrive.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_vswitch_exception_nova.virt.configdrive.p.gz
deleted file mode 100644
index b51766f75..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_vswitch_exception_nova.virt.configdrive.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_vswitch_exception_os.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_vswitch_exception_os.p.gz
deleted file mode 100644
index 092a1f933..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_vswitch_exception_os.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_vswitch_exception_shutil.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_vswitch_exception_shutil.p.gz
deleted file mode 100644
index 77f333c00..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_vswitch_exception_shutil.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_vswitch_exception_time.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_vswitch_exception_time.p.gz
deleted file mode 100644
index 8ab166a60..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_vswitch_exception_time.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_vswitch_exception_uuid.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_vswitch_exception_uuid.p.gz
deleted file mode 100644
index 97e96be17..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_vswitch_exception_uuid.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_vswitch_exception_wmi.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_vswitch_exception_wmi.p.gz
deleted file mode 100644
index 728464ca9..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_spawn_no_vswitch_exception_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_already_suspended_nova.utils.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_already_suspended_nova.utils.p.gz
deleted file mode 100644
index 4aa6d171a..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_already_suspended_nova.utils.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_already_suspended_nova.virt.configdrive.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_already_suspended_nova.virt.configdrive.p.gz
deleted file mode 100644
index df063a22e..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_already_suspended_nova.virt.configdrive.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_already_suspended_os.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_already_suspended_os.p.gz
deleted file mode 100644
index b30363fcc..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_already_suspended_os.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_already_suspended_shutil.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_already_suspended_shutil.p.gz
deleted file mode 100644
index 1681d9947..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_already_suspended_shutil.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_already_suspended_time.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_already_suspended_time.p.gz
deleted file mode 100644
index 4469fd90e..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_already_suspended_time.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_already_suspended_uuid.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_already_suspended_uuid.p.gz
deleted file mode 100644
index f94f2ebb9..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_already_suspended_uuid.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_already_suspended_wmi.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_already_suspended_wmi.p.gz
deleted file mode 100644
index 03afe2235..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_already_suspended_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_nova.utils.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_nova.utils.p.gz
deleted file mode 100644
index 2f95f62bf..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_nova.utils.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_nova.virt.configdrive.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_nova.virt.configdrive.p.gz
deleted file mode 100644
index 2e7ab44ad..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_nova.virt.configdrive.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_os.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_os.p.gz
deleted file mode 100644
index eb514d086..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_os.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_shutil.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_shutil.p.gz
deleted file mode 100644
index 810c9e14d..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_shutil.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_time.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_time.p.gz
deleted file mode 100644
index 2eb2a8372..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_time.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_uuid.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_uuid.p.gz
deleted file mode 100644
index 67311757a..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_uuid.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_wmi.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_wmi.p.gz
deleted file mode 100644
index 0779125b3..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_suspend_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_already_running_nova.utils.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_already_running_nova.utils.p.gz
deleted file mode 100644
index 7e6cc708e..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_already_running_nova.utils.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_already_running_nova.virt.configdrive.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_already_running_nova.virt.configdrive.p.gz
deleted file mode 100644
index 0ce4bbf63..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_already_running_nova.virt.configdrive.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_already_running_os.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_already_running_os.p.gz
deleted file mode 100644
index 9068792c7..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_already_running_os.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_already_running_shutil.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_already_running_shutil.p.gz
deleted file mode 100644
index 9b06cb884..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_already_running_shutil.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_already_running_time.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_already_running_time.p.gz
deleted file mode 100644
index e91e6c965..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_already_running_time.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_already_running_uuid.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_already_running_uuid.p.gz
deleted file mode 100644
index 271ded270..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_already_running_uuid.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_already_running_wmi.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_already_running_wmi.p.gz
deleted file mode 100644
index 253bdfc82..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_already_running_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_nova.utils.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_nova.utils.p.gz
deleted file mode 100644
index 20486b189..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_nova.utils.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_nova.virt.configdrive.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_nova.virt.configdrive.p.gz
deleted file mode 100644
index be92217ed..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_nova.virt.configdrive.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_os.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_os.p.gz
deleted file mode 100644
index 36059e753..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_os.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_shutil.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_shutil.p.gz
deleted file mode 100644
index aea394e9f..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_shutil.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_time.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_time.p.gz
deleted file mode 100644
index 4850d3cda..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_time.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_uuid.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_uuid.p.gz
deleted file mode 100644
index 99bf1806c..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_uuid.p.gz
+++ /dev/null
diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_wmi.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_wmi.p.gz
deleted file mode 100644
index 87b571e4a..000000000
--- a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_unpause_wmi.p.gz
+++ /dev/null
diff --git a/nova/tests/test_hypervapi.py b/nova/tests/test_hypervapi.py
index 9fec9d151..3b624e6d1 100644
--- a/nova/tests/test_hypervapi.py
+++ b/nova/tests/test_hypervapi.py
@@ -18,37 +18,53 @@
 Test suite for the Hyper-V driver and related APIs.
 """
 
-import json
+import io
+import mox
 import os
 import platform
 import shutil
-import sys
+import time
 import uuid
 
+from nova.api.metadata import base as instance_metadata
 from nova.compute import power_state
 from nova.compute import task_states
 from nova import context
 from nova import db
 from nova.image import glance
 from nova.openstack.common import cfg
+from nova import test
 from nova.tests import fake_network
-from nova.tests.hyperv import basetestcase
 from nova.tests.hyperv import db_fakes
-from nova.tests.hyperv import hypervutils
-from nova.tests.hyperv import mockproxy
-import nova.tests.image.fake as fake_image
+from nova.tests.hyperv import fake
+from nova.tests.image import fake as fake_image
 from nova.tests import matchers
+from nova import utils
+from nova.virt import configdrive
+from nova.virt.hyperv import basevolumeutils
 from nova.virt.hyperv import constants
 from nova.virt.hyperv import driver as driver_hyperv
+from nova.virt.hyperv import hostutils
+from nova.virt.hyperv import livemigrationutils
+from nova.virt.hyperv import networkutils
+from nova.virt.hyperv import pathutils
+from nova.virt.hyperv import vhdutils
 from nova.virt.hyperv import vmutils
+from nova.virt.hyperv import volumeutils
+from nova.virt.hyperv import volumeutilsv2
 from nova.virt import images
 
 CONF = cfg.CONF
+CONF.import_opt('vswitch_name', 'nova.virt.hyperv.vif')
 
 
-class HyperVAPITestCase(basetestcase.BaseTestCase):
+class HyperVAPITestCase(test.TestCase):
     """Unit tests for Hyper-V driver calls."""
 
+    def __init__(self, test_case_name):
+        self._mox = mox.Mox()
+        super(HyperVAPITestCase, self).__init__(test_case_name)
+
     def setUp(self):
         super(HyperVAPITestCase, self).setUp()
 
@@ -56,22 +72,22 @@ class HyperVAPITestCase(basetestcase.BaseTestCase):
         self._project_id = 'fake'
         self._instance_data = None
         self._image_metadata = None
-        self._dest_server = None
         self._fetched_image = None
         self._update_image_raise_exception = False
-        self._post_method_called = False
-        self._recover_method_called = False
         self._volume_target_portal = 'testtargetportal:3260'
-        self._volume_id = '8957e088-dbee-4216-8056-978353a3e737'
+        self._volume_id = '0ef5d708-45ab-4129-8c59-d774d2837eb7'
         self._context = context.RequestContext(self._user_id, self._project_id)
+        self._instance_ide_disks = []
+        self._instance_ide_dvds = []
+        self._instance_volume_disks = []
 
         self._setup_stubs()
 
         self.flags(instances_path=r'C:\Hyper-V\test\instances',
                    vswitch_name='external',
-                   network_api_class='nova.network.quantumv2.api.API')
+                   network_api_class='nova.network.quantumv2.api.API',
+                   force_volumeutils_v1=True)
 
-        self._hypervutils = hypervutils.HyperVUtils()
         self._conn = driver_hyperv.HyperVDriver(None)
 
     def _setup_stubs(self):
@@ -79,14 +95,8 @@ class HyperVAPITestCase(basetestcase.BaseTestCase):
         fake_image.stub_out_image_service(self.stubs)
         fake_network.stub_out_nw_api_get_instance_nw_info(self.stubs)
 
-        def fake_dumps(msg, default=None, **kwargs):
-            return '""'
-        self.stubs.Set(json, 'dumps', fake_dumps)
-
         def fake_fetch(context, image_id, target, user, project):
             self._fetched_image = target
-            if not os.path.exists(target):
-                self._hypervutils.create_vhd(target)
         self.stubs.Set(images, 'fetch', fake_fetch)
 
         def fake_get_remote_image_service(context, name):
@@ -98,104 +108,198 @@ class HyperVAPITestCase(basetestcase.BaseTestCase):
                     self._image_metadata = image_metadata
             return (FakeGlanceImageService(), 1)
         self.stubs.Set(glance, 'get_remote_image_service',
-            fake_get_remote_image_service)
-
-        # Modules to mock
-        modules_to_mock = [
-            'wmi',
-            'os',
-            'shutil',
-            'uuid',
-            'time',
-            'multiprocessing',
-            '_winreg',
-            'nova.virt.configdrive',
-            'nova.utils',
-            'ctypes'
-        ]
+                       fake_get_remote_image_service)
+
+        def fake_sleep(ms):
+            pass
+        self.stubs.Set(time, 'sleep', fake_sleep)
+
+        self.stubs.Set(pathutils, 'PathUtils', fake.PathUtils)
+        self._mox.StubOutWithMock(fake.PathUtils, 'open')
+
+        self._mox.StubOutWithMock(vmutils.VMUtils, 'vm_exists')
+        self._mox.StubOutWithMock(vmutils.VMUtils, 'create_vm')
+        self._mox.StubOutWithMock(vmutils.VMUtils, 'destroy_vm')
+        self._mox.StubOutWithMock(vmutils.VMUtils, 'attach_ide_drive')
+        self._mox.StubOutWithMock(vmutils.VMUtils, 'create_scsi_controller')
+        self._mox.StubOutWithMock(vmutils.VMUtils, 'create_nic')
+        self._mox.StubOutWithMock(vmutils.VMUtils, 'set_vm_state')
+        self._mox.StubOutWithMock(vmutils.VMUtils, 'list_instances')
+        self._mox.StubOutWithMock(vmutils.VMUtils, 'get_vm_summary_info')
+        self._mox.StubOutWithMock(vmutils.VMUtils, 'take_vm_snapshot')
+        self._mox.StubOutWithMock(vmutils.VMUtils, 'remove_vm_snapshot')
+        self._mox.StubOutWithMock(vmutils.VMUtils, 'set_nic_connection')
+        self._mox.StubOutWithMock(vmutils.VMUtils, 'get_vm_iscsi_controller')
+        self._mox.StubOutWithMock(vmutils.VMUtils, 'get_vm_ide_controller')
+        self._mox.StubOutWithMock(vmutils.VMUtils, 'get_attached_disks_count')
+        self._mox.StubOutWithMock(vmutils.VMUtils,
+                                  'attach_volume_to_controller')
+        self._mox.StubOutWithMock(vmutils.VMUtils,
+                                  'get_mounted_disk_by_drive_number')
+        self._mox.StubOutWithMock(vmutils.VMUtils, 'detach_vm_disk')
+
+        self._mox.StubOutWithMock(vhdutils.VHDUtils, 'create_differencing_vhd')
+        self._mox.StubOutWithMock(vhdutils.VHDUtils, 'reconnect_parent_vhd')
+        self._mox.StubOutWithMock(vhdutils.VHDUtils, 'merge_vhd')
+        self._mox.StubOutWithMock(vhdutils.VHDUtils, 'get_vhd_parent_path')
+
+        self._mox.StubOutWithMock(hostutils.HostUtils, 'get_cpus_info')
+        self._mox.StubOutWithMock(hostutils.HostUtils,
+                                  'is_cpu_feature_present')
+        self._mox.StubOutWithMock(hostutils.HostUtils, 'get_memory_info')
+        self._mox.StubOutWithMock(hostutils.HostUtils, 'get_volume_info')
+        self._mox.StubOutWithMock(hostutils.HostUtils, 'get_windows_version')
+
+        self._mox.StubOutWithMock(networkutils.NetworkUtils,
+                                  'get_external_vswitch')
+        self._mox.StubOutWithMock(networkutils.NetworkUtils,
+                                  'create_vswitch_port')
+
+        self._mox.StubOutWithMock(livemigrationutils.LiveMigrationUtils,
+                                  'live_migrate_vm')
+        self._mox.StubOutWithMock(livemigrationutils.LiveMigrationUtils,
+                                  'check_live_migration_config')
+
+        self._mox.StubOutWithMock(basevolumeutils.BaseVolumeUtils,
+                                  'volume_in_mapping')
+        self._mox.StubOutWithMock(basevolumeutils.BaseVolumeUtils,
+                                  'get_session_id_from_mounted_disk')
+        self._mox.StubOutWithMock(basevolumeutils.BaseVolumeUtils,
+                                  'get_device_number_for_target')
+
+        self._mox.StubOutWithMock(volumeutils.VolumeUtils,
+                                  'login_storage_target')
+        self._mox.StubOutWithMock(volumeutils.VolumeUtils,
+                                  'logout_storage_target')
+        self._mox.StubOutWithMock(volumeutils.VolumeUtils,
+                                  'execute_log_out')
+
+        self._mox.StubOutWithMock(volumeutilsv2.VolumeUtilsV2,
+                                  'login_storage_target')
+        self._mox.StubOutWithMock(volumeutilsv2.VolumeUtilsV2,
+                                  'logout_storage_target')
+        self._mox.StubOutWithMock(volumeutilsv2.VolumeUtilsV2,
+                                  'execute_log_out')
+
+        self._mox.StubOutWithMock(shutil, 'copyfile')
+        self._mox.StubOutWithMock(shutil, 'rmtree')
+
+        self._mox.StubOutWithMock(os, 'remove')
+
+        self._mox.StubOutClassWithMocks(instance_metadata, 'InstanceMetadata')
+        self._mox.StubOutWithMock(instance_metadata.InstanceMetadata,
+                                  'metadata_for_config_drive')
+
+        # Can't use StubOutClassWithMocks due to __exit__ and __enter__
+        self._mox.StubOutWithMock(configdrive, 'ConfigDriveBuilder')
+        self._mox.StubOutWithMock(configdrive.ConfigDriveBuilder, 'make_drive')
+
+        self._mox.StubOutWithMock(utils, 'execute')
 
-        # Modules in which the mocks are going to be injected
-        from nova.virt.hyperv import baseops
-        from nova.virt.hyperv import basevolumeutils
-        from nova.virt.hyperv import hostops
-        from nova.virt.hyperv import livemigrationops
-        from nova.virt.hyperv import snapshotops
-        from nova.virt.hyperv import vif
-        from nova.virt.hyperv import vmops
-        from nova.virt.hyperv import volumeops
-        from nova.virt.hyperv import volumeutils
-        from nova.virt.hyperv import volumeutilsV2
-
-        modules_to_test = [
-            driver_hyperv,
-            basevolumeutils,
-            baseops,
-            hostops,
-            vif,
-            vmops,
-            vmutils,
-            volumeops,
-            volumeutils,
-            volumeutilsV2,
-            snapshotops,
-            livemigrationops,
-            hypervutils,
-            db_fakes,
-            sys.modules[__name__]
-        ]
+    def tearDown(self):
+        self._mox.UnsetStubs()
+        super(HyperVAPITestCase, self).tearDown()
 
-        self._inject_mocks_in_modules(modules_to_mock, modules_to_test)
+    def test_get_available_resource(self):
+        cpu_info = {'Architecture': 'fake',
+                    'Name': 'fake',
+                    'Manufacturer': 'ACME, Inc.',
+                    'NumberOfCores': 2,
+                    'NumberOfLogicalProcessors': 4}
 
-        if isinstance(snapshotops.wmi, mockproxy.Mock):
-            from nova.virt.hyperv import ioutils
-            import StringIO
+        tot_mem_kb = 2000000L
+        free_mem_kb = 1000000L
 
-            def fake_open(name, mode):
-                return StringIO.StringIO("fake file content")
-            self.stubs.Set(ioutils, 'open', fake_open)
+        tot_hdd_b = 4L * 1024 ** 3
+        free_hdd_b = 3L * 1024 ** 3
 
-    def tearDown(self):
-        try:
-            if self._instance_data and self._hypervutils.vm_exists(
-                    self._instance_data["name"]):
-                self._hypervutils.remove_vm(self._instance_data["name"])
+        windows_version = '6.2.9200'
 
-            if self._dest_server and \
-                    self._hypervutils.remote_vm_exists(self._dest_server,
-                        self._instance_data["name"]):
-                self._hypervutils.remove_remote_vm(self._dest_server,
-                    self._instance_data["name"])
+        hostutils.HostUtils.get_memory_info().AndReturn((tot_mem_kb,
+                                                        free_mem_kb))
 
-            self._hypervutils.logout_iscsi_volume_sessions(self._volume_id)
+        m = hostutils.HostUtils.get_volume_info(mox.IsA(str))
+        m.AndReturn((tot_hdd_b, free_hdd_b))
 
-            shutil.rmtree(CONF.instances_path, True)
+        hostutils.HostUtils.get_cpus_info().AndReturn([cpu_info])
+        m = hostutils.HostUtils.is_cpu_feature_present(mox.IsA(int))
+        m.MultipleTimes()
 
-            fake_image.FakeImageService_reset()
-        finally:
-            super(HyperVAPITestCase, self).tearDown()
+        m = hostutils.HostUtils.get_windows_version()
+        m.AndReturn(windows_version)
 
-    def test_get_available_resource(self):
+        self._mox.ReplayAll()
         dic = self._conn.get_available_resource(None)
+        self._mox.VerifyAll()
 
+        self.assertEquals(dic['vcpus'], cpu_info['NumberOfLogicalProcessors'])
         self.assertEquals(dic['hypervisor_hostname'], platform.node())
+        self.assertEquals(dic['memory_mb'], tot_mem_kb / 1024)
+        self.assertEquals(dic['memory_mb_used'],
+                          tot_mem_kb / 1024 - free_mem_kb / 1024)
+        self.assertEquals(dic['local_gb'], tot_hdd_b / 1024 ** 3)
+        self.assertEquals(dic['local_gb_used'],
+                          tot_hdd_b / 1024 ** 3 - free_hdd_b / 1024 ** 3)
+        self.assertEquals(dic['hypervisor_version'],
+                          windows_version.replace('.', ''))
 
     def test_get_host_stats(self):
+        tot_mem_kb = 2000000L
+        free_mem_kb = 1000000L
+
+        tot_hdd_b = 4L * 1024 ** 3
+        free_hdd_b = 3L * 1024 ** 3
+
+        hostutils.HostUtils.get_memory_info().AndReturn((tot_mem_kb,
+                                                        free_mem_kb))
+
+        m = hostutils.HostUtils.get_volume_info(mox.IsA(str))
+        m.AndReturn((tot_hdd_b, free_hdd_b))
+
+        self._mox.ReplayAll()
         dic = self._conn.get_host_stats(True)
+        self._mox.VerifyAll()
+
+        self.assertEquals(dic['disk_total'], tot_hdd_b / 1024 ** 3)
+        self.assertEquals(dic['disk_available'], free_hdd_b / 1024 ** 3)
+
+        self.assertEquals(dic['host_memory_total'], tot_mem_kb / 1024)
+        self.assertEquals(dic['host_memory_free'], free_mem_kb / 1024)
 
         self.assertEquals(dic['disk_total'],
-            dic['disk_used'] + dic['disk_available'])
+                          dic['disk_used'] + dic['disk_available'])
         self.assertEquals(dic['host_memory_total'],
-            dic['host_memory_overhead'] + dic['host_memory_free'])
+                          dic['host_memory_overhead'] +
+                          dic['host_memory_free'])
 
     def test_list_instances(self):
-        num_vms = self._hypervutils.get_vm_count()
+        fake_instances = ['fake1', 'fake2']
+        vmutils.VMUtils.list_instances().AndReturn(fake_instances)
+
+        self._mox.ReplayAll()
         instances = self._conn.list_instances()
+        self._mox.VerifyAll()
 
-        self.assertEquals(len(instances), num_vms)
+        self.assertEquals(instances, fake_instances)
 
     def test_get_info(self):
-        self._spawn_instance(True)
+        self._instance_data = self._get_instance_data()
+
+        summary_info = {'NumberOfProcessors': 2,
+                        'EnabledState': constants.HYPERV_VM_STATE_ENABLED,
+                        'MemoryUsage': 1000,
+                        'UpTime': 1}
+
+        m = vmutils.VMUtils.vm_exists(mox.Func(self._check_instance_name))
+        m.AndReturn(True)
+
+        func = mox.Func(self._check_instance_name)
+        m = vmutils.VMUtils.get_vm_summary_info(func)
+        m.AndReturn(summary_info)
+
+        self._mox.ReplayAll()
         info = self._conn.get_info(self._instance_data)
+        self._mox.VerifyAll()
 
         self.assertEquals(info["state"], power_state.RUNNING)
 
@@ -205,189 +309,237 @@ class HyperVAPITestCase(basetestcase.BaseTestCase):
     def test_spawn_no_cow_image(self):
         self._test_spawn_instance(False)
 
-    def test_spawn_config_drive(self):
-        self.skip('broken by move to contextlib for configdrive')
-
+    def _setup_spawn_config_drive_mocks(self, use_cdrom):
+        im = instance_metadata.InstanceMetadata(mox.IgnoreArg(),
+                                                content=mox.IsA(list),
+                                                extra_md=mox.IsA(dict))
+
+        cdb = self._mox.CreateMockAnything()
+        m = configdrive.ConfigDriveBuilder(instance_md=mox.IgnoreArg())
+        m.AndReturn(cdb)
+        # __enter__ and __exit__ are required by "with"
+        cdb.__enter__().AndReturn(cdb)
+        cdb.make_drive(mox.IsA(str))
+        cdb.__exit__(None, None, None).AndReturn(None)
+
+        if not use_cdrom:
+            utils.execute(CONF.qemu_img_cmd,
+                          'convert',
+                          '-f',
+                          'raw',
+                          '-O',
+                          'vpc',
+                          mox.IsA(str),
+                          mox.IsA(str),
+                          attempts=1)
+            os.remove(mox.IsA(str))
+
+        m = vmutils.VMUtils.attach_ide_drive(mox.IsA(str),
+                                             mox.IsA(str),
+                                             mox.IsA(int),
+                                             mox.IsA(int),
+                                             mox.IsA(str))
+        m.WithSideEffects(self._add_ide_disk)
+
+    def _test_spawn_config_drive(self, use_cdrom):
         self.flags(force_config_drive=True)
+        self.flags(config_drive_cdrom=use_cdrom)
         self.flags(mkisofs_cmd='mkisofs.exe')
 
-        self._spawn_instance(True)
+        self._setup_spawn_config_drive_mocks(use_cdrom)
 
-        (vhd_paths, _, dvd_paths) = self._hypervutils.get_vm_disks(
-            self._instance_data["name"])
-        self.assertEquals(len(dvd_paths), 0)
-        self.assertEquals(len(vhd_paths), 2)
+        if use_cdrom:
+            expected_ide_disks = 1
+            expected_ide_dvds = 1
+        else:
+            expected_ide_disks = 2
+            expected_ide_dvds = 0
 
-    def test_spawn_config_drive_cdrom(self):
-        self.skip('broken by move to contextlib for configdrive')
+        self._test_spawn_instance(expected_ide_disks=expected_ide_disks,
+                                  expected_ide_dvds=expected_ide_dvds)
 
-        self.flags(force_config_drive=True)
-        self.flags(config_drive_cdrom=True)
-        self.flags(mkisofs_cmd='mkisofs.exe')
-
-        self._spawn_instance(True)
+    def test_spawn_config_drive(self):
+        self._test_spawn_config_drive(False)
 
-        (vhd_paths, _, dvd_paths) = self._hypervutils.get_vm_disks(
-            self._instance_data["name"])
-        self.assertEquals(len(dvd_paths), 1)
-        self.assertEquals(len(vhd_paths), 1)
-        self.assertTrue(os.path.exists(dvd_paths[0]))
+    def test_spawn_config_drive_cdrom(self):
+        self._test_spawn_config_drive(True)
 
     def test_spawn_no_config_drive(self):
         self.flags(force_config_drive=False)
 
-        self._spawn_instance(True)
+        expected_ide_disks = 1
+        expected_ide_dvds = 0
+
+        self._test_spawn_instance(expected_ide_disks=expected_ide_disks,
+                                  expected_ide_dvds=expected_ide_dvds)
+
+    def test_spawn_nova_net_vif(self):
+        self.flags(network_api_class='nova.network.api.API')
+        # Reinstantiate driver, as the VIF plugin is loaded during __init__
+        self._conn = driver_hyperv.HyperVDriver(None)
+
+        def setup_vif_mocks():
+            fake_vswitch_path = 'fake vswitch path'
+            fake_vswitch_port = 'fake port'
+
+            m = networkutils.NetworkUtils.get_external_vswitch(
+                CONF.vswitch_name)
+            m.AndReturn(fake_vswitch_path)
+
+            m = networkutils.NetworkUtils.create_vswitch_port(
+                fake_vswitch_path, mox.IsA(str))
+            m.AndReturn(fake_vswitch_port)
 
-        (_, _, dvd_paths) = self._hypervutils.get_vm_disks(
-            self._instance_data["name"])
-        self.assertEquals(len(dvd_paths), 0)
+            vmutils.VMUtils.set_nic_connection(mox.IsA(str), mox.IsA(str),
+                                               fake_vswitch_port)
 
-    def test_spawn_no_vswitch_exception(self):
+        self._test_spawn_instance(setup_vif_mocks_func=setup_vif_mocks)
+
+    def test_spawn_nova_net_vif_no_vswitch_exception(self):
         self.flags(network_api_class='nova.network.api.API')
         # Reinstantiate driver, as the VIF plugin is loaded during __init__
         self._conn = driver_hyperv.HyperVDriver(None)
-        # Set flag to a non existing vswitch
-        self.flags(vswitch_name=str(uuid.uuid4()))
-        self.assertRaises(vmutils.HyperVException, self._spawn_instance, True)
 
-        self.assertFalse(self._hypervutils.vm_exists(
-            self._instance_data["name"]))
+        def setup_vif_mocks():
+            m = networkutils.NetworkUtils.get_external_vswitch(
+                CONF.vswitch_name)
+            m.AndRaise(vmutils.HyperVException(_('fake vswitch not found')))
+
+        self.assertRaises(vmutils.HyperVException, self._test_spawn_instance,
+                          setup_vif_mocks_func=setup_vif_mocks,
+                          with_exception=True)
+
+    def _check_instance_name(self, vm_name):
+        return vm_name == self._instance_data['name']
 
     def _test_vm_state_change(self, action, from_state, to_state):
-        self._spawn_instance(True)
-        if from_state:
-            self._hypervutils.set_vm_state(self._instance_data["name"],
-                from_state)
-        action(self._instance_data)
+        self._instance_data = self._get_instance_data()
 
-        vmstate = self._hypervutils.get_vm_state(self._instance_data["name"])
-        self.assertEquals(vmstate, to_state)
+        vmutils.VMUtils.set_vm_state(mox.Func(self._check_instance_name),
+                                     to_state)
+
+        self._mox.ReplayAll()
+        action(self._instance_data)
+        self._mox.VerifyAll()
 
     def test_pause(self):
         self._test_vm_state_change(self._conn.pause, None,
-            constants.HYPERV_VM_STATE_PAUSED)
+                                   constants.HYPERV_VM_STATE_PAUSED)
 
     def test_pause_already_paused(self):
         self._test_vm_state_change(self._conn.pause,
-            constants.HYPERV_VM_STATE_PAUSED,
-            constants.HYPERV_VM_STATE_PAUSED)
+                                   constants.HYPERV_VM_STATE_PAUSED,
+                                   constants.HYPERV_VM_STATE_PAUSED)
 
     def test_unpause(self):
         self._test_vm_state_change(self._conn.unpause,
-            constants.HYPERV_VM_STATE_PAUSED,
-            constants.HYPERV_VM_STATE_ENABLED)
+                                   constants.HYPERV_VM_STATE_PAUSED,
+                                   constants.HYPERV_VM_STATE_ENABLED)
 
     def test_unpause_already_running(self):
         self._test_vm_state_change(self._conn.unpause, None,
-            constants.HYPERV_VM_STATE_ENABLED)
+                                   constants.HYPERV_VM_STATE_ENABLED)
 
     def test_suspend(self):
         self._test_vm_state_change(self._conn.suspend, None,
-                constants.HYPERV_VM_STATE_SUSPENDED)
+                                   constants.HYPERV_VM_STATE_SUSPENDED)
 
     def test_suspend_already_suspended(self):
         self._test_vm_state_change(self._conn.suspend,
-                constants.HYPERV_VM_STATE_SUSPENDED,
-                constants.HYPERV_VM_STATE_SUSPENDED)
+                                   constants.HYPERV_VM_STATE_SUSPENDED,
+                                   constants.HYPERV_VM_STATE_SUSPENDED)
 
     def test_resume(self):
         self._test_vm_state_change(lambda i: self._conn.resume(i, None),
-            constants.HYPERV_VM_STATE_SUSPENDED,
-            constants.HYPERV_VM_STATE_ENABLED)
+                                   constants.HYPERV_VM_STATE_SUSPENDED,
+                                   constants.HYPERV_VM_STATE_ENABLED)
 
     def test_resume_already_running(self):
         self._test_vm_state_change(lambda i: self._conn.resume(i, None), None,
-            constants.HYPERV_VM_STATE_ENABLED)
+                                   constants.HYPERV_VM_STATE_ENABLED)
 
     def test_power_off(self):
         self._test_vm_state_change(self._conn.power_off, None,
-            constants.HYPERV_VM_STATE_DISABLED)
+                                   constants.HYPERV_VM_STATE_DISABLED)
 
     def test_power_off_already_powered_off(self):
-        self._test_vm_state_change(self._conn.suspend,
-            constants.HYPERV_VM_STATE_DISABLED,
-            constants.HYPERV_VM_STATE_DISABLED)
+        self._test_vm_state_change(self._conn.power_off,
+                                   constants.HYPERV_VM_STATE_DISABLED,
+                                   constants.HYPERV_VM_STATE_DISABLED)
 
     def test_power_on(self):
         self._test_vm_state_change(self._conn.power_on,
-            constants.HYPERV_VM_STATE_DISABLED,
-            constants.HYPERV_VM_STATE_ENABLED)
+                                   constants.HYPERV_VM_STATE_DISABLED,
+                                   constants.HYPERV_VM_STATE_ENABLED)
 
     def test_power_on_already_running(self):
         self._test_vm_state_change(self._conn.power_on, None,
-            constants.HYPERV_VM_STATE_ENABLED)
+                                   constants.HYPERV_VM_STATE_ENABLED)
 
     def test_reboot(self):
-        self._spawn_instance(True)
 
         network_info = fake_network.fake_get_instance_nw_info(self.stubs,
                                                               spectacular=True)
-        self._conn.reboot(self._instance_data, network_info, None)
+        self._instance_data = self._get_instance_data()
 
-        vmstate = self._hypervutils.get_vm_state(self._instance_data["name"])
-        self.assertEquals(vmstate, constants.HYPERV_VM_STATE_ENABLED)
+        vmutils.VMUtils.set_vm_state(mox.Func(self._check_instance_name),
+                                     constants.HYPERV_VM_STATE_REBOOT)
+
+        self._mox.ReplayAll()
+        self._conn.reboot(self._instance_data, network_info, None)
+        self._mox.VerifyAll()
 
     def test_destroy(self):
-        self._spawn_instance(True)
-        (vhd_paths, _, _) = self._hypervutils.get_vm_disks(
-            self._instance_data["name"])
+        self._instance_data = self._get_instance_data()
 
-        self._conn.destroy(self._instance_data)
+        m = vmutils.VMUtils.vm_exists(mox.Func(self._check_instance_name))
+        m.AndReturn(True)
 
-        self.assertFalse(self._hypervutils.vm_exists(
-            self._instance_data["name"]))
-        self._instance_data = None
+        m = vmutils.VMUtils.destroy_vm(mox.Func(self._check_instance_name),
+                                       True)
+        m.AndReturn([])
 
-        for vhd_path in vhd_paths:
-            self.assertFalse(os.path.exists(vhd_path))
+        self._mox.ReplayAll()
+        self._conn.destroy(self._instance_data)
+        self._mox.VerifyAll()
 
     def test_live_migration(self):
-        self.flags(limit_cpu_features=True)
-        self._spawn_instance(False)
+        self._test_live_migration(False)
 
-        # Existing server
-        self._dest_server = "HV12OSDEMO2"
+    def test_live_migration_with_target_failure(self):
+        self._test_live_migration(True)
 
-        self._live_migration(self._dest_server)
+    def _test_live_migration(self, test_failure):
+        dest_server = 'fake_server'
 
-        instance_name = self._instance_data["name"]
-        self.assertFalse(self._hypervutils.vm_exists(instance_name))
-        self.assertTrue(self._hypervutils.remote_vm_exists(self._dest_server,
-            instance_name))
+        instance_data = self._get_instance_data()
 
-        self.assertTrue(self._post_method_called)
-        self.assertFalse(self._recover_method_called)
+        fake_post_method = self._mox.CreateMockAnything()
+        if not test_failure:
+            fake_post_method(self._context, instance_data, dest_server,
+                             False)
 
-    def test_live_migration_with_target_failure(self):
-        self.flags(limit_cpu_features=True)
-        self._spawn_instance(False)
+        fake_recover_method = self._mox.CreateMockAnything()
+        if test_failure:
+            fake_recover_method(self._context, instance_data, dest_server,
+                                False)
 
-        dest_server = "nonexistingserver"
+        m = livemigrationutils.LiveMigrationUtils.live_migrate_vm(
+            instance_data['name'], dest_server)
+        if test_failure:
+            m.AndRaise(Exception('Simulated failure'))
 
-        exception_raised = False
+        self._mox.ReplayAll()
         try:
-            self._live_migration(dest_server)
+            self._conn.live_migration(self._context, instance_data,
+                                      dest_server, fake_post_method,
+                                      fake_recover_method)
+            exception_raised = False
         except Exception:
             exception_raised = True
 
-        # Cannot use assertRaises with pythoncom.com_error on Linux
-        self.assertTrue(exception_raised)
-
-        instance_name = self._instance_data["name"]
-        self.assertTrue(self._hypervutils.vm_exists(instance_name))
-
-        self.assertFalse(self._post_method_called)
-        self.assertTrue(self._recover_method_called)
-
-    def _live_migration(self, dest_server):
-        def fake_post_method(context, instance_ref, dest, block_migration):
-                self._post_method_called = True
-
-        def fake_recover_method(context, instance_ref, dest, block_migration):
-            self._recover_method_called = True
-
-        self._conn.live_migration(self._context, self._instance_data,
-            dest_server, fake_post_method, fake_recover_method)
+        self.assertTrue(not test_failure ^ exception_raised)
+        self._mox.VerifyAll()
 
     def test_pre_live_migration_cow_image(self):
         self._test_pre_live_migration(True)
@@ -398,83 +550,134 @@ class HyperVAPITestCase(basetestcase.BaseTestCase):
     def _test_pre_live_migration(self, cow):
         self.flags(use_cow_images=cow)
 
-        instance_name = 'openstack_unit_test_vm_' + str(uuid.uuid4())
+        instance_data = self._get_instance_data()
 
         network_info = fake_network.fake_get_instance_nw_info(self.stubs,
                                                               spectacular=True)
-        instance_data = db_fakes.get_fake_instance_data(instance_name,
-            self._project_id, self._user_id)
-        block_device_info = None
 
+        m = livemigrationutils.LiveMigrationUtils.check_live_migration_config()
+        m.AndReturn(True)
+
+        if cow:
+            m = basevolumeutils.BaseVolumeUtils.volume_in_mapping(mox.IsA(str),
+                                                                  None)
+            m.AndReturn([])
+
+        self._mox.ReplayAll()
         self._conn.pre_live_migration(self._context, instance_data,
-            block_device_info, network_info)
+                                      None, network_info)
+        self._mox.VerifyAll()
 
         if cow:
-            self.assertTrue(not self._fetched_image is None)
+            self.assertTrue(self._fetched_image is not None)
         else:
             self.assertTrue(self._fetched_image is None)
 
     def test_snapshot_with_update_failure(self):
-        expected_calls = [
-            {'args': (),
-             'kwargs':
-                 {'task_state': task_states.IMAGE_PENDING_UPLOAD}},
-            {'args': (),
-             'kwargs':
-                 {'task_state': task_states.IMAGE_UPLOADING,
-                  'expected_state': task_states.IMAGE_PENDING_UPLOAD}}]
-        func_call_matcher = matchers.FunctionCallMatcher(expected_calls)
-
-        self._spawn_instance(True)
+        (snapshot_name, func_call_matcher) = self._setup_snapshot_mocks()
 
         self._update_image_raise_exception = True
-        snapshot_name = 'test_snapshot_' + str(uuid.uuid4())
+
+        self._mox.ReplayAll()
         self.assertRaises(vmutils.HyperVException, self._conn.snapshot,
                           self._context, self._instance_data, snapshot_name,
                           func_call_matcher.call)
+        self._mox.VerifyAll()
 
-        # assert states changed in correct order
+        # Assert states changed in correct order
         self.assertIsNone(func_call_matcher.match())
 
-        # assert VM snapshots have been removed
-        self.assertEquals(self._hypervutils.get_vm_snapshots_count(
-            self._instance_data["name"]), 0)
-
-    def test_snapshot(self):
+    def _setup_snapshot_mocks(self):
         expected_calls = [
             {'args': (),
-               'kwargs':
-                   {'task_state': task_states.IMAGE_PENDING_UPLOAD}},
-              {'args': (),
-               'kwargs':
-                   {'task_state': task_states.IMAGE_UPLOADING,
-                    'expected_state': task_states.IMAGE_PENDING_UPLOAD}}]
+             'kwargs': {'task_state': task_states.IMAGE_PENDING_UPLOAD}},
+            {'args': (),
+             'kwargs': {'task_state': task_states.IMAGE_UPLOADING,
+                        'expected_state': task_states.IMAGE_PENDING_UPLOAD}}
+        ]
         func_call_matcher = matchers.FunctionCallMatcher(expected_calls)
 
-        self._spawn_instance(True)
-
         snapshot_name = 'test_snapshot_' + str(uuid.uuid4())
+
+        fake_hv_snapshot_path = 'fake_snapshot_path'
+        fake_parent_vhd_path = 'C:\\fake_vhd_path\\parent.vhd'
+
+        self._instance_data = self._get_instance_data()
+
+        func = mox.Func(self._check_instance_name)
+        m = vmutils.VMUtils.take_vm_snapshot(func)
+        m.AndReturn(fake_hv_snapshot_path)
+
+        m = vhdutils.VHDUtils.get_vhd_parent_path(mox.IsA(str))
+        m.AndReturn(fake_parent_vhd_path)
+
+        self._fake_dest_disk_path = None
+
+        def copy_dest_disk_path(src, dest):
+            self._fake_dest_disk_path = dest
+
+        m = shutil.copyfile(mox.IsA(str), mox.IsA(str))
+        m.WithSideEffects(copy_dest_disk_path)
+
+        self._fake_dest_base_disk_path = None
+
+        def copy_dest_base_disk_path(src, dest):
+            self._fake_dest_base_disk_path = dest
+
+        m = shutil.copyfile(fake_parent_vhd_path, mox.IsA(str))
+        m.WithSideEffects(copy_dest_base_disk_path)
+
+        def check_dest_disk_path(path):
+            return path == self._fake_dest_disk_path
+
+        def check_dest_base_disk_path(path):
+            return path == self._fake_dest_base_disk_path
+
+        func1 = mox.Func(check_dest_disk_path)
+        func2 = mox.Func(check_dest_base_disk_path)
+        # Make sure that the hyper-v base and differential VHDs are merged
+        vhdutils.VHDUtils.reconnect_parent_vhd(func1, func2)
+        vhdutils.VHDUtils.merge_vhd(func1, func2)
+
+        def check_snapshot_path(snapshot_path):
+            return snapshot_path == fake_hv_snapshot_path
+
+        # Make sure that the Hyper-V snapshot is removed
+        func = mox.Func(check_snapshot_path)
+        vmutils.VMUtils.remove_vm_snapshot(func)
+
+        shutil.rmtree(mox.IsA(str))
+
+        m = fake.PathUtils.open(func2, 'rb')
+        m.AndReturn(io.BytesIO(b'fake content'))
+
+        return (snapshot_name, func_call_matcher)
+
+    def test_snapshot(self):
+        (snapshot_name, func_call_matcher) = self._setup_snapshot_mocks()
+
+        self._mox.ReplayAll()
         self._conn.snapshot(self._context, self._instance_data, snapshot_name,
                             func_call_matcher.call)
+        self._mox.VerifyAll()
 
         self.assertTrue(self._image_metadata and
-                "disk_format" in self._image_metadata and
-                self._image_metadata["disk_format"] == "vhd")
+                        "disk_format" in self._image_metadata and
+                        self._image_metadata["disk_format"] == "vhd")
 
-        # assert states changed in correct order
+        # Assert states changed in correct order
         self.assertIsNone(func_call_matcher.match())
 
-        # assert VM snapshots have been removed
-        self.assertEquals(self._hypervutils.get_vm_snapshots_count(
-            self._instance_data["name"]), 0)
+    def _get_instance_data(self):
+        instance_name = 'openstack_unit_test_vm_' + str(uuid.uuid4())
+        return db_fakes.get_fake_instance_data(instance_name,
+                                               self._project_id,
+                                               self._user_id)
 
     def _spawn_instance(self, cow, block_device_info=None):
         self.flags(use_cow_images=cow)
 
-        instance_name = 'openstack_unit_test_vm_' + str(uuid.uuid4())
-
-        self._instance_data = db_fakes.get_fake_instance_data(instance_name,
-                self._project_id, self._user_id)
+        self._instance_data = self._get_instance_data()
         instance = db.instance_create(self._context, self._instance_data)
 
         image = db_fakes.get_fake_image_data(self._project_id, self._user_id)
@@ -487,73 +690,216 @@ class HyperVAPITestCase(basetestcase.BaseTestCase):
                          network_info=network_info,
                          block_device_info=block_device_info)
 
-    def _test_spawn_instance(self, cow):
-        self._spawn_instance(cow)
+    def _add_ide_disk(self, vm_name, path, ctrller_addr,
+                      drive_addr, drive_type):
+        if drive_type == constants.IDE_DISK:
+            self._instance_ide_disks.append(path)
+        elif drive_type == constants.IDE_DVD:
+            self._instance_ide_dvds.append(path)
+
+    def _add_volume_disk(self, vm_name, controller_path, address,
+                         mounted_disk_path):
+        self._instance_volume_disks.append(mounted_disk_path)
 
-        self.assertTrue(self._hypervutils.vm_exists(
-            self._instance_data["name"]))
+    def _setup_spawn_instance_mocks(self, cow, setup_vif_mocks_func=None,
+                                    with_exception=False,
+                                    block_device_info=None):
+        self._test_vm_name = None
 
-        vmstate = self._hypervutils.get_vm_state(self._instance_data["name"])
-        self.assertEquals(vmstate, constants.HYPERV_VM_STATE_ENABLED)
+        def set_vm_name(vm_name):
+            self._test_vm_name = vm_name
 
-        (vhd_paths, _, _) = self._hypervutils.get_vm_disks(
-            self._instance_data["name"])
-        self.assertEquals(len(vhd_paths), 1)
+        def check_vm_name(vm_name):
+            return vm_name == self._test_vm_name
+
+        m = vmutils.VMUtils.vm_exists(mox.IsA(str))
+        m.WithSideEffects(set_vm_name).AndReturn(False)
+
+        if not block_device_info:
+            m = basevolumeutils.BaseVolumeUtils.volume_in_mapping(mox.IsA(str),
+                                                                  None)
+            m.AndReturn([])
+        else:
+            m = basevolumeutils.BaseVolumeUtils.volume_in_mapping(
+                mox.IsA(str), block_device_info)
+            m.AndReturn(True)
 
-        parent_path = self._hypervutils.get_vhd_parent_path(vhd_paths[0])
         if cow:
-            self.assertTrue(not parent_path is None)
-            self.assertEquals(self._fetched_image, parent_path)
+            def check_path(parent_path):
+                return parent_path == self._fetched_image
+
+            vhdutils.VHDUtils.create_differencing_vhd(mox.IsA(str),
+                                                      mox.Func(check_path))
+
+        vmutils.VMUtils.create_vm(mox.Func(check_vm_name), mox.IsA(int),
+                                  mox.IsA(int), mox.IsA(bool))
+
+        if not block_device_info:
+            m = vmutils.VMUtils.attach_ide_drive(mox.Func(check_vm_name),
+                                                 mox.IsA(str),
+                                                 mox.IsA(int),
+                                                 mox.IsA(int),
+                                                 mox.IsA(str))
+            m.WithSideEffects(self._add_ide_disk).InAnyOrder()
+
+        m = vmutils.VMUtils.create_scsi_controller(mox.Func(check_vm_name))
+        m.InAnyOrder()
+
+        vmutils.VMUtils.create_nic(mox.Func(check_vm_name), mox.IsA(str),
+                                   mox.IsA(str)).InAnyOrder()
+
+        if setup_vif_mocks_func:
+            setup_vif_mocks_func()
+
+        # TODO(alexpilotti) Based on where the exception is thrown
+        # some of the above mock calls need to be skipped
+        if with_exception:
+            m = vmutils.VMUtils.vm_exists(mox.Func(check_vm_name))
+            m.AndReturn(True)
+
+            vmutils.VMUtils.destroy_vm(mox.Func(check_vm_name), True)
         else:
-            self.assertTrue(parent_path is None)
-            self.assertEquals(self._fetched_image, vhd_paths[0])
+            vmutils.VMUtils.set_vm_state(mox.Func(check_vm_name),
+                                         constants.HYPERV_VM_STATE_ENABLED)
+
+    def _test_spawn_instance(self, cow=True,
+                             expected_ide_disks=1,
+                             expected_ide_dvds=0,
+                             setup_vif_mocks_func=None,
+                             with_exception=False):
+        self._setup_spawn_instance_mocks(cow, setup_vif_mocks_func,
+                                         with_exception)
+
+        self._mox.ReplayAll()
+        self._spawn_instance(cow, )
+        self._mox.VerifyAll()
+
+        self.assertEquals(len(self._instance_ide_disks), expected_ide_disks)
+        self.assertEquals(len(self._instance_ide_dvds), expected_ide_dvds)
+
+        if not cow:
+            self.assertEquals(self._fetched_image, self._instance_ide_disks[0])
+
+    def test_attach_volume(self):
+        instance_data = self._get_instance_data()
+        instance_name = instance_data['name']
 
-    def _attach_volume(self):
-        self._spawn_instance(True)
         connection_info = db_fakes.get_fake_volume_info_data(
             self._volume_target_portal, self._volume_id)
+        data = connection_info['data']
+        target_lun = data['target_lun']
+        target_iqn = data['target_iqn']
+        target_portal = data['target_portal']
 
-        self._conn.attach_volume(connection_info,
-            self._instance_data, '/dev/sdc')
+        mount_point = '/dev/sdc'
 
-    def test_attach_volume(self):
-        self._attach_volume()
+        volumeutils.VolumeUtils.login_storage_target(target_lun,
+                                                     target_iqn,
+                                                     target_portal)
+
+        fake_mounted_disk = "fake_mounted_disk"
+        fake_device_number = 0
+        fake_controller_path = 'fake_scsi_controller_path'
+        fake_free_slot = 1
+
+        m = volumeutils.VolumeUtils.get_device_number_for_target(target_iqn,
+                                                                 target_lun)
+        m.AndReturn(fake_device_number)
+
+        m = vmutils.VMUtils.get_mounted_disk_by_drive_number(
+            fake_device_number)
+        m.AndReturn(fake_mounted_disk)
 
-        (_, volumes_paths, _) = self._hypervutils.get_vm_disks(
-            self._instance_data["name"])
-        self.assertEquals(len(volumes_paths), 1)
+        m = vmutils.VMUtils.get_vm_iscsi_controller(instance_name)
+        m.AndReturn(fake_controller_path)
 
-        sessions_exist = self._hypervutils.iscsi_volume_sessions_exist(
-            self._volume_id)
-        self.assertTrue(sessions_exist)
+        m = vmutils.VMUtils.get_attached_disks_count(fake_controller_path)
+        m.AndReturn(fake_free_slot)
+
+        m = vmutils.VMUtils.attach_volume_to_controller(instance_name,
+                                                        fake_controller_path,
+                                                        fake_free_slot,
+                                                        fake_mounted_disk)
+        m.WithSideEffects(self._add_volume_disk)
+
+        self._mox.ReplayAll()
+        self._conn.attach_volume(connection_info, instance_data, mount_point)
+        self._mox.VerifyAll()
+
+        self.assertEquals(len(self._instance_volume_disks), 1)
 
     def test_detach_volume(self):
-        self._attach_volume()
+        instance_data = self._get_instance_data()
+        instance_name = instance_data['name']
+
         connection_info = db_fakes.get_fake_volume_info_data(
             self._volume_target_portal, self._volume_id)
+        data = connection_info['data']
+        target_lun = data['target_lun']
+        target_iqn = data['target_iqn']
+        target_portal = data['target_portal']
+        mount_point = '/dev/sdc'
 
-        self._conn.detach_volume(connection_info,
-            self._instance_data, '/dev/sdc')
+        fake_mounted_disk = "fake_mounted_disk"
+        fake_device_number = 0
+        fake_free_slot = 1
+        m = volumeutils.VolumeUtils.get_device_number_for_target(target_iqn,
+                                                                 target_lun)
+        m.AndReturn(fake_device_number)
 
-        (_, volumes_paths, _) = self._hypervutils.get_vm_disks(
-            self._instance_data["name"])
-        self.assertEquals(len(volumes_paths), 0)
+        m = vmutils.VMUtils.get_mounted_disk_by_drive_number(
+            fake_device_number)
+        m.AndReturn(fake_mounted_disk)
 
-        sessions_exist = self._hypervutils.iscsi_volume_sessions_exist(
-            self._volume_id)
-        self.assertFalse(sessions_exist)
+        vmutils.VMUtils.detach_vm_disk(mox.IsA(str), fake_mounted_disk)
+
+        volumeutils.VolumeUtils.logout_storage_target(mox.IsA(str))
+
+        self._mox.ReplayAll()
+        self._conn.detach_volume(connection_info, instance_data, mount_point)
+        self._mox.VerifyAll()
 
     def test_boot_from_volume(self):
+        connection_info = db_fakes.get_fake_volume_info_data(
+            self._volume_target_portal, self._volume_id)
+        data = connection_info['data']
+        target_lun = data['target_lun']
+        target_iqn = data['target_iqn']
+        target_portal = data['target_portal']
+
         block_device_info = db_fakes.get_fake_block_device_info(
             self._volume_target_portal, self._volume_id)
 
-        self._spawn_instance(False, block_device_info)
+        fake_mounted_disk = "fake_mounted_disk"
+        fake_device_number = 0
+        fake_controller_path = 'fake_scsi_controller_path'
+
+        volumeutils.VolumeUtils.login_storage_target(target_lun,
+                                                     target_iqn,
+                                                     target_portal)
+
+        m = volumeutils.VolumeUtils.get_device_number_for_target(target_iqn,
+                                                                 target_lun)
+        m.AndReturn(fake_device_number)
 
-        (_, volumes_paths, _) = self._hypervutils.get_vm_disks(
-            self._instance_data["name"])
+        m = vmutils.VMUtils.get_mounted_disk_by_drive_number(
+            fake_device_number)
+        m.AndReturn(fake_mounted_disk)
 
-        self.assertEquals(len(volumes_paths), 1)
+        m = vmutils.VMUtils.get_vm_ide_controller(mox.IsA(str), mox.IsA(int))
+        m.AndReturn(fake_controller_path)
+
+        m = vmutils.VMUtils.attach_volume_to_controller(mox.IsA(str),
+                                                        fake_controller_path,
+                                                        0,
+                                                        fake_mounted_disk)
+        m.WithSideEffects(self._add_volume_disk)
+
+        self._setup_spawn_instance_mocks(cow=False,
+                                         block_device_info=block_device_info)
+
+        self._mox.ReplayAll()
+        self._spawn_instance(False, block_device_info)
+        self._mox.VerifyAll()
 
-        sessions_exist = self._hypervutils.iscsi_volume_sessions_exist(
-            self._volume_id)
-        self.assertTrue(sessions_exist)
+        self.assertEquals(len(self._instance_volume_disks), 1)