Stop using mgr_utils.mock_the_extension_manager
It is not needed in most cases, but was blindly cargo-culted everywhere. It will be removed with the switch to hardware types. Change-Id: I1de6be6ab8b0c210f457fa0c1cd685c42406b888
This commit is contained in:
parent
0e1be8bb81
commit
91601c9704
|
@ -17,7 +17,6 @@ from ironic.common import boot_devices
|
||||||
from ironic.common import states
|
from ironic.common import states
|
||||||
from ironic.conductor import task_manager
|
from ironic.conductor import task_manager
|
||||||
from ironic.drivers.modules import iscsi_deploy
|
from ironic.drivers.modules import iscsi_deploy
|
||||||
from ironic.tests.unit.conductor import mgr_utils
|
|
||||||
from ironic.tests.unit.db import base as db_base
|
from ironic.tests.unit.db import base as db_base
|
||||||
from ironic.tests.unit.objects import utils as obj_utils
|
from ironic.tests.unit.objects import utils as obj_utils
|
||||||
import mock
|
import mock
|
||||||
|
@ -32,7 +31,7 @@ class AMTISCSIDeployTestCase(db_base.DbTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(AMTISCSIDeployTestCase, self).setUp()
|
super(AMTISCSIDeployTestCase, self).setUp()
|
||||||
mgr_utils.mock_the_extension_manager(driver="pxe_amt_iscsi")
|
self.config(enabled_drivers=["pxe_amt_iscsi"])
|
||||||
self.node = obj_utils.create_test_node(
|
self.node = obj_utils.create_test_node(
|
||||||
self.context, driver='pxe_amt_iscsi', driver_info=INFO_DICT)
|
self.context, driver='pxe_amt_iscsi', driver_info=INFO_DICT)
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,6 @@ Test class for AMT ManagementInterface
|
||||||
from ironic.common import boot_devices
|
from ironic.common import boot_devices
|
||||||
from ironic.common import exception as ironic_exception
|
from ironic.common import exception as ironic_exception
|
||||||
from ironic.conductor import task_manager
|
from ironic.conductor import task_manager
|
||||||
from ironic.tests.unit.conductor import mgr_utils
|
|
||||||
from ironic.tests.unit.db import base as db_base
|
from ironic.tests.unit.db import base as db_base
|
||||||
from ironic.tests.unit.objects import utils as obj_utils
|
from ironic.tests.unit.objects import utils as obj_utils
|
||||||
import mock
|
import mock
|
||||||
|
@ -41,7 +40,7 @@ class AMTManagementInteralMethodsTestCase(db_base.DbTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(AMTManagementInteralMethodsTestCase, self).setUp()
|
super(AMTManagementInteralMethodsTestCase, self).setUp()
|
||||||
mgr_utils.mock_the_extension_manager(driver='fake_amt_fake')
|
self.config(enabled_drivers=['fake_amt_fake'])
|
||||||
self.node = obj_utils.create_test_node(self.context,
|
self.node = obj_utils.create_test_node(self.context,
|
||||||
driver='fake_amt_fake',
|
driver='fake_amt_fake',
|
||||||
driver_info=INFO_DICT)
|
driver_info=INFO_DICT)
|
||||||
|
@ -129,7 +128,7 @@ class AMTManagementTestCase(db_base.DbTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(AMTManagementTestCase, self).setUp()
|
super(AMTManagementTestCase, self).setUp()
|
||||||
mgr_utils.mock_the_extension_manager(driver='fake_amt_fake')
|
self.config(enabled_drivers=['fake_amt_fake'])
|
||||||
self.info = INFO_DICT
|
self.info = INFO_DICT
|
||||||
self.node = obj_utils.create_test_node(self.context,
|
self.node = obj_utils.create_test_node(self.context,
|
||||||
driver='fake_amt_fake',
|
driver='fake_amt_fake',
|
||||||
|
|
|
@ -19,7 +19,6 @@ from ironic.common import boot_devices
|
||||||
from ironic.common import exception as ironic_exception
|
from ironic.common import exception as ironic_exception
|
||||||
from ironic.common import states
|
from ironic.common import states
|
||||||
from ironic.conductor import task_manager
|
from ironic.conductor import task_manager
|
||||||
from ironic.tests.unit.conductor import mgr_utils
|
|
||||||
from ironic.tests.unit.db import base as db_base
|
from ironic.tests.unit.db import base as db_base
|
||||||
from ironic.tests.unit.objects import utils as obj_utils
|
from ironic.tests.unit.objects import utils as obj_utils
|
||||||
import mock
|
import mock
|
||||||
|
@ -41,7 +40,7 @@ class AMTPowerInteralMethodsTestCase(db_base.DbTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(AMTPowerInteralMethodsTestCase, self).setUp()
|
super(AMTPowerInteralMethodsTestCase, self).setUp()
|
||||||
mgr_utils.mock_the_extension_manager(driver='fake_amt_fake')
|
self.config(enabled_drivers=['fake_amt_fake'])
|
||||||
self.info = INFO_DICT
|
self.info = INFO_DICT
|
||||||
self.node = obj_utils.create_test_node(self.context,
|
self.node = obj_utils.create_test_node(self.context,
|
||||||
driver='fake_amt_fake',
|
driver='fake_amt_fake',
|
||||||
|
@ -221,7 +220,7 @@ class AMTPowerTestCase(db_base.DbTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(AMTPowerTestCase, self).setUp()
|
super(AMTPowerTestCase, self).setUp()
|
||||||
mgr_utils.mock_the_extension_manager(driver='fake_amt_fake')
|
self.config(enabled_drivers=['fake_amt_fake'])
|
||||||
self.info = INFO_DICT
|
self.info = INFO_DICT
|
||||||
self.node = obj_utils.create_test_node(self.context,
|
self.node = obj_utils.create_test_node(self.context,
|
||||||
driver='fake_amt_fake',
|
driver='fake_amt_fake',
|
||||||
|
|
|
@ -23,7 +23,6 @@ from ironic.common import driver_factory
|
||||||
from ironic.common import exception as ironic_exception
|
from ironic.common import exception as ironic_exception
|
||||||
from ironic.common import states
|
from ironic.common import states
|
||||||
from ironic.conductor import task_manager
|
from ironic.conductor import task_manager
|
||||||
from ironic.tests.unit.conductor import mgr_utils
|
|
||||||
from ironic.tests.unit.db import base as db_base
|
from ironic.tests.unit.db import base as db_base
|
||||||
from ironic.tests.unit.objects import utils as obj_utils
|
from ironic.tests.unit.objects import utils as obj_utils
|
||||||
|
|
||||||
|
@ -262,7 +261,7 @@ class IBootDriverTestCase(db_base.DbTestCase):
|
||||||
self.config(max_retry=0, group='iboot')
|
self.config(max_retry=0, group='iboot')
|
||||||
self.config(retry_interval=0, group='iboot')
|
self.config(retry_interval=0, group='iboot')
|
||||||
self.config(reboot_delay=0, group='iboot')
|
self.config(reboot_delay=0, group='iboot')
|
||||||
mgr_utils.mock_the_extension_manager(driver='fake_iboot_fake')
|
self.config(enabled_drivers=['fake_iboot_fake'])
|
||||||
self.driver = driver_factory.get_driver('fake_iboot_fake')
|
self.driver = driver_factory.get_driver('fake_iboot_fake')
|
||||||
self.node = obj_utils.create_test_node(
|
self.node = obj_utils.create_test_node(
|
||||||
self.context,
|
self.context,
|
||||||
|
|
|
@ -19,7 +19,6 @@ import os
|
||||||
from ironic.common import exception
|
from ironic.common import exception
|
||||||
from ironic.conductor import task_manager
|
from ironic.conductor import task_manager
|
||||||
from ironic.drivers.modules import ipmitool
|
from ironic.drivers.modules import ipmitool
|
||||||
from ironic.tests.unit.conductor import mgr_utils
|
|
||||||
from ironic.tests.unit.db import base as db_base
|
from ironic.tests.unit.db import base as db_base
|
||||||
from ironic.tests.unit.objects import utils as obj_utils
|
from ironic.tests.unit.objects import utils as obj_utils
|
||||||
from ironic_lib import utils as ironic_utils
|
from ironic_lib import utils as ironic_utils
|
||||||
|
@ -66,7 +65,7 @@ class IntelNMPassthruTestCase(db_base.DbTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(IntelNMPassthruTestCase, self).setUp()
|
super(IntelNMPassthruTestCase, self).setUp()
|
||||||
mgr_utils.mock_the_extension_manager(driver='fake_nm')
|
self.config(enabled_drivers=['fake_nm'])
|
||||||
self.node = obj_utils.create_test_node(self.context, driver='fake_nm')
|
self.node = obj_utils.create_test_node(self.context, driver='fake_nm')
|
||||||
self.temp_filename = os.path.join(CONF.tempdir, self.node.uuid +
|
self.temp_filename = os.path.join(CONF.tempdir, self.node.uuid +
|
||||||
'.sdr')
|
'.sdr')
|
||||||
|
|
|
@ -26,7 +26,6 @@ from ironic.common import exception
|
||||||
from ironic.common import states
|
from ironic.common import states
|
||||||
from ironic.conductor import task_manager
|
from ironic.conductor import task_manager
|
||||||
from ironic.drivers import utils as driver_utils
|
from ironic.drivers import utils as driver_utils
|
||||||
from ironic.tests.unit.conductor import mgr_utils
|
|
||||||
from ironic.tests.unit.db import base as db_base
|
from ironic.tests.unit.db import base as db_base
|
||||||
from ironic.tests.unit.objects import utils as obj_utils
|
from ironic.tests.unit.objects import utils as obj_utils
|
||||||
|
|
||||||
|
@ -225,7 +224,7 @@ class LibvirtPrivateMethodsTestCase(db_base.DbTestCase):
|
||||||
@mock.patch.object(power, '_get_libvirt_connection',
|
@mock.patch.object(power, '_get_libvirt_connection',
|
||||||
return_value=FakeConnection())
|
return_value=FakeConnection())
|
||||||
def test__get_domain_by_macs(self, libvirt_conn_mock):
|
def test__get_domain_by_macs(self, libvirt_conn_mock):
|
||||||
mgr_utils.mock_the_extension_manager(driver="fake_libvirt_fake")
|
self.config(enabled_drivers=["fake_libvirt_fake"])
|
||||||
driver_factory.get_driver("fake_libvirt_fake")
|
driver_factory.get_driver("fake_libvirt_fake")
|
||||||
node = obj_utils.create_test_node(
|
node = obj_utils.create_test_node(
|
||||||
self.context,
|
self.context,
|
||||||
|
@ -244,7 +243,7 @@ class LibvirtPrivateMethodsTestCase(db_base.DbTestCase):
|
||||||
@mock.patch.object(power, '_get_libvirt_connection',
|
@mock.patch.object(power, '_get_libvirt_connection',
|
||||||
return_value=FakeConnection())
|
return_value=FakeConnection())
|
||||||
def test__get_domain_by_macs_not_found(self, libvirt_conn_mock):
|
def test__get_domain_by_macs_not_found(self, libvirt_conn_mock):
|
||||||
mgr_utils.mock_the_extension_manager(driver="fake_libvirt_fake")
|
self.config(enabled_drivers=["fake_libvirt_fake"])
|
||||||
driver_factory.get_driver("fake_libvirt_fake")
|
driver_factory.get_driver("fake_libvirt_fake")
|
||||||
node = obj_utils.create_test_node(
|
node = obj_utils.create_test_node(
|
||||||
self.context,
|
self.context,
|
||||||
|
@ -432,7 +431,7 @@ class LibvirtPowerTestCase(db_base.DbTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(LibvirtPowerTestCase, self).setUp()
|
super(LibvirtPowerTestCase, self).setUp()
|
||||||
mgr_utils.mock_the_extension_manager(driver="fake_libvirt_fake")
|
self.config(enabled_drivers=["fake_libvirt_fake"])
|
||||||
driver_factory.get_driver("fake_libvirt_fake")
|
driver_factory.get_driver("fake_libvirt_fake")
|
||||||
self.node = obj_utils.create_test_node(
|
self.node = obj_utils.create_test_node(
|
||||||
self.context,
|
self.context,
|
||||||
|
@ -566,7 +565,7 @@ class LibvirtManagementTestCase(db_base.DbTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(LibvirtManagementTestCase, self).setUp()
|
super(LibvirtManagementTestCase, self).setUp()
|
||||||
mgr_utils.mock_the_extension_manager(driver="fake_libvirt_fake")
|
self.config(enabled_drivers=["fake_libvirt_fake"])
|
||||||
driver_factory.get_driver("fake_libvirt_fake")
|
driver_factory.get_driver("fake_libvirt_fake")
|
||||||
self.node = obj_utils.create_test_node(
|
self.node = obj_utils.create_test_node(
|
||||||
self.context,
|
self.context,
|
||||||
|
|
|
@ -17,7 +17,6 @@ import time
|
||||||
from ironic.common import boot_devices
|
from ironic.common import boot_devices
|
||||||
from ironic.common import states
|
from ironic.common import states
|
||||||
from ironic.conductor import task_manager
|
from ironic.conductor import task_manager
|
||||||
from ironic.tests.unit.conductor import mgr_utils
|
|
||||||
from ironic.tests.unit.db import base as db_base
|
from ironic.tests.unit.db import base as db_base
|
||||||
from ironic.tests.unit.objects import utils as obj_utils
|
from ironic.tests.unit.objects import utils as obj_utils
|
||||||
import mock
|
import mock
|
||||||
|
@ -41,10 +40,8 @@ class oVirtDriverTestCase(db_base.DbTestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(oVirtDriverTestCase, self).setUp()
|
super(oVirtDriverTestCase, self).setUp()
|
||||||
self.config(enabled_power_interfaces='staging-ovirt',
|
self.config(enabled_power_interfaces='staging-ovirt',
|
||||||
enabled_management_interfaces='staging-ovirt')
|
enabled_management_interfaces='staging-ovirt',
|
||||||
namespace = 'ironic.hardware.types'
|
enabled_hardware_types=['staging-ovirt'])
|
||||||
mgr_utils.mock_the_extension_manager(driver='staging-ovirt',
|
|
||||||
namespace=namespace)
|
|
||||||
self.node = obj_utils.create_test_node(self.context,
|
self.node = obj_utils.create_test_node(self.context,
|
||||||
driver='staging-ovirt',
|
driver='staging-ovirt',
|
||||||
driver_info=_ovirt_info())
|
driver_info=_ovirt_info())
|
||||||
|
|
|
@ -22,7 +22,6 @@ from ironic.common import driver_factory
|
||||||
from ironic.common import exception as ironic_exception
|
from ironic.common import exception as ironic_exception
|
||||||
from ironic.common import states
|
from ironic.common import states
|
||||||
from ironic.conductor import task_manager
|
from ironic.conductor import task_manager
|
||||||
from ironic.tests.unit.conductor import mgr_utils
|
|
||||||
from ironic.tests.unit.db import base as db_base
|
from ironic.tests.unit.db import base as db_base
|
||||||
from ironic.tests.unit.objects import utils as obj_utils
|
from ironic.tests.unit.objects import utils as obj_utils
|
||||||
import mock
|
import mock
|
||||||
|
@ -37,7 +36,7 @@ class WakeOnLanPrivateMethodTestCase(db_base.DbTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(WakeOnLanPrivateMethodTestCase, self).setUp()
|
super(WakeOnLanPrivateMethodTestCase, self).setUp()
|
||||||
mgr_utils.mock_the_extension_manager(driver='fake_wol_fake')
|
self.config(enabled_drivers=['fake_wol_fake'])
|
||||||
self.driver = driver_factory.get_driver('fake_wol_fake')
|
self.driver = driver_factory.get_driver('fake_wol_fake')
|
||||||
self.node = obj_utils.create_test_node(self.context,
|
self.node = obj_utils.create_test_node(self.context,
|
||||||
driver='fake_wol_fake')
|
driver='fake_wol_fake')
|
||||||
|
@ -131,7 +130,7 @@ class WakeOnLanDriverTestCase(db_base.DbTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(WakeOnLanDriverTestCase, self).setUp()
|
super(WakeOnLanDriverTestCase, self).setUp()
|
||||||
mgr_utils.mock_the_extension_manager(driver='fake_wol_fake')
|
self.config(enabled_drivers=['fake_wol_fake'])
|
||||||
self.driver = driver_factory.get_driver('fake_wol_fake')
|
self.driver = driver_factory.get_driver('fake_wol_fake')
|
||||||
self.node = obj_utils.create_test_node(self.context,
|
self.node = obj_utils.create_test_node(self.context,
|
||||||
driver='fake_wol_fake')
|
driver='fake_wol_fake')
|
||||||
|
|
Loading…
Reference in New Issue