summaryrefslogtreecommitdiff
path: root/ironic/tests
diff options
context:
space:
mode:
Diffstat (limited to 'ironic/tests')
-rw-r--r--ironic/tests/base.py15
-rw-r--r--ironic/tests/unit/conductor/test_cleaning.py30
-rw-r--r--ironic/tests/unit/conductor/test_manager.py32
-rw-r--r--ironic/tests/unit/conductor/test_utils.py11
-rw-r--r--ironic/tests/unit/db/utils.py2
-rw-r--r--ironic/tests/unit/drivers/modules/drac/test_inspect.py22
-rw-r--r--ironic/tests/unit/drivers/modules/ilo/test_inspect.py47
-rw-r--r--ironic/tests/unit/drivers/modules/irmc/test_inspect.py6
-rw-r--r--ironic/tests/unit/drivers/modules/redfish/test_inspect.py18
-rw-r--r--ironic/tests/unit/objects/test_node.py7
10 files changed, 89 insertions, 101 deletions
diff --git a/ironic/tests/base.py b/ironic/tests/base.py
index 348f15c20..69e449d3b 100644
--- a/ironic/tests/base.py
+++ b/ironic/tests/base.py
@@ -102,6 +102,11 @@ class WarningsFixture(fixtures.Fixture):
category=UserWarning,
)
+ # NOTE(gibi): The UUIDFields emits a warning if the value is not a
+ # valid UUID. Let's escalate that to an exception in the test to
+ # prevent adding violations.
+ warnings.filterwarnings('error', message='.* is an invalid UUID.')
+
# Enable deprecation warnings to capture upcoming SQLAlchemy changes
warnings.filterwarnings(
@@ -125,16 +130,6 @@ class WarningsFixture(fixtures.Fixture):
category=sqla_exc.SAWarning,
)
- # ...but filter everything out until we get around to fixing them
- # TODO(stephenfin): Fix all of these
-
- warnings.filterwarnings(
- 'ignore',
- module='ironic',
- message='SELECT statement has a cartesian product ',
- category=sqla_exc.SAWarning,
- )
-
# FIXME(stephenfin): We can remove this once oslo.db is fixed
# https://review.opendev.org/c/openstack/oslo.db/+/856453
warnings.filterwarnings(
diff --git a/ironic/tests/unit/conductor/test_cleaning.py b/ironic/tests/unit/conductor/test_cleaning.py
index 34e805deb..cdfbf14ee 100644
--- a/ironic/tests/unit/conductor/test_cleaning.py
+++ b/ironic/tests/unit/conductor/test_cleaning.py
@@ -436,6 +436,36 @@ class DoNodeCleanTestCase(db_base.DbTestCase):
self.assertFalse(node.maintenance)
self.assertIsNone(node.fault)
+ @mock.patch('ironic.drivers.modules.fake.FakePower.set_power_state',
+ autospec=True)
+ @mock.patch.object(n_flat.FlatNetwork, 'validate', autospec=True)
+ @mock.patch.object(conductor_steps, 'set_node_cleaning_steps',
+ autospec=True)
+ def test_do_node_clean_steps_fail_poweroff(self, mock_steps, mock_validate,
+ mock_power, clean_steps=None,
+ invalid_exc=True):
+ if invalid_exc:
+ mock_steps.side_effect = exception.InvalidParameterValue('invalid')
+ else:
+ mock_steps.side_effect = exception.NodeCleaningFailure('failure')
+ tgt_prov_state = states.MANAGEABLE if clean_steps else states.AVAILABLE
+ self.config(poweroff_in_cleanfail=True, group='conductor')
+ node = obj_utils.create_test_node(
+ self.context, driver='fake-hardware',
+ uuid=uuidutils.generate_uuid(),
+ provision_state=states.CLEANING,
+ power_state=states.POWER_ON,
+ target_provision_state=tgt_prov_state)
+ with task_manager.acquire(
+ self.context, node.uuid, shared=False) as task:
+ cleaning.do_node_clean(task, clean_steps=clean_steps)
+ mock_validate.assert_called_once_with(mock.ANY, task)
+ node.refresh()
+ self.assertEqual(states.CLEANFAIL, node.provision_state)
+ self.assertEqual(tgt_prov_state, node.target_provision_state)
+ mock_steps.assert_called_once_with(mock.ANY, disable_ramdisk=False)
+ self.assertTrue(mock_power.called)
+
def test__do_node_clean_automated_steps_fail(self):
for invalid in (True, False):
self.__do_node_clean_steps_fail(invalid_exc=invalid)
diff --git a/ironic/tests/unit/conductor/test_manager.py b/ironic/tests/unit/conductor/test_manager.py
index 7278486a5..f0fb075b7 100644
--- a/ironic/tests/unit/conductor/test_manager.py
+++ b/ironic/tests/unit/conductor/test_manager.py
@@ -3568,6 +3568,23 @@ class MiscTestCase(mgr_utils.ServiceSetUpMixin, mgr_utils.CommonMixIn,
filters=mock.sentinel.filters))
self.assertEqual([], result)
+ def test_get_node_with_token(self):
+ node = obj_utils.create_test_node(
+ self.context, driver='fake-hardware',
+ network_interface='noop')
+ self.assertNotIn('agent_secret_token', node.driver_internal_info)
+ res = self.service.get_node_with_token(self.context, node.id)
+ self.assertIn('agent_secret_token', res.driver_internal_info)
+
+ def test_node_with_token_already_set(self):
+ node = obj_utils.create_test_node(
+ self.context, driver='fake-hardware',
+ network_interface='noop',
+ driver_internal_info={'agent_secret_token': 'secret'})
+ res = self.service.get_node_with_token(self.context, node.id)
+ self.assertEqual('******',
+ res.driver_internal_info['agent_secret_token'])
+
@mgr_utils.mock_record_keepalive
class ConsoleTestCase(mgr_utils.ServiceSetUpMixin, db_base.DbTestCase):
@@ -3953,18 +3970,6 @@ class CreatePortTestCase(mgr_utils.ServiceSetUpMixin, db_base.DbTestCase):
self.assertEqual({'foo': 'bar'}, res.extra)
mock_validate.assert_called_once_with(mock.ANY, port)
- def test_create_port_node_locked(self):
- node = obj_utils.create_test_node(self.context, driver='fake-hardware',
- reservation='fake-reserv')
- port = obj_utils.get_test_port(self.context, node_id=node.id)
- exc = self.assertRaises(messaging.rpc.ExpectedException,
- self.service.create_port,
- self.context, port)
- # Compare true exception hidden by @messaging.expected_exceptions
- self.assertEqual(exception.NodeLocked, exc.exc_info[0])
- self.assertRaises(exception.PortNotFound, port.get_by_uuid,
- self.context, port.uuid)
-
@mock.patch.object(conductor_utils, 'validate_port_physnet', autospec=True)
def test_create_port_mac_exists(self, mock_validate):
node = obj_utils.create_test_node(self.context, driver='fake-hardware')
@@ -5089,7 +5094,8 @@ class ManagerDoSyncPowerStateTestCase(db_base.DbTestCase):
self.power = self.driver.power
self.node = obj_utils.create_test_node(
self.context, driver='fake-hardware', maintenance=False,
- provision_state=states.AVAILABLE, instance_uuid=uuidutils.uuid)
+ provision_state=states.AVAILABLE,
+ instance_uuid=uuidutils.generate_uuid())
self.task = mock.Mock(spec_set=['context', 'driver', 'node',
'upgrade_lock', 'shared'])
self.task.context = self.context
diff --git a/ironic/tests/unit/conductor/test_utils.py b/ironic/tests/unit/conductor/test_utils.py
index 52fc72436..27c4bfa86 100644
--- a/ironic/tests/unit/conductor/test_utils.py
+++ b/ironic/tests/unit/conductor/test_utils.py
@@ -243,11 +243,12 @@ class NodePowerActionTestCase(db_base.DbTestCase):
self.config(host='my-host')
# Required for exception handling
mock_notif.__name__ = 'NodeSetPowerStateNotification'
- node = obj_utils.create_test_node(self.context,
- uuid=uuidutils.generate_uuid(),
- driver='fake-hardware',
- instance_uuid=uuidutils.uuid,
- power_state=states.POWER_OFF)
+ node = obj_utils.create_test_node(
+ self.context,
+ uuid=uuidutils.generate_uuid(),
+ driver='fake-hardware',
+ instance_uuid=uuidutils.generate_uuid(),
+ power_state=states.POWER_OFF)
task = task_manager.TaskManager(self.context, node.uuid)
get_power_mock.return_value = states.POWER_OFF
diff --git a/ironic/tests/unit/db/utils.py b/ironic/tests/unit/db/utils.py
index 10055d829..fc5bee226 100644
--- a/ironic/tests/unit/db/utils.py
+++ b/ironic/tests/unit/db/utils.py
@@ -165,7 +165,6 @@ def get_test_snmp_info(**kw):
def get_test_node(**kw):
properties = {
"cpu_arch": "x86_64",
- "cpus": "8",
"local_gb": "10",
"memory_mb": "4096",
}
@@ -509,7 +508,6 @@ def create_test_node_tag(**kw):
def get_test_xclarity_properties():
return {
"cpu_arch": "x86_64",
- "cpus": "8",
"local_gb": "10",
"memory_mb": "4096",
}
diff --git a/ironic/tests/unit/drivers/modules/drac/test_inspect.py b/ironic/tests/unit/drivers/modules/drac/test_inspect.py
index d12adba34..0c04ad887 100644
--- a/ironic/tests/unit/drivers/modules/drac/test_inspect.py
+++ b/ironic/tests/unit/drivers/modules/drac/test_inspect.py
@@ -185,7 +185,6 @@ class DracInspectionTestCase(test_utils.BaseDracTest):
expected_node_properties = {
'memory_mb': 32768,
'local_gb': 1116,
- 'cpus': 18,
'cpu_arch': 'x86_64',
'capabilities': 'boot_mode:uefi,pci_gpu_devices:1'}
mock_client = mock.Mock()
@@ -235,7 +234,6 @@ class DracInspectionTestCase(test_utils.BaseDracTest):
expected_node_properties = {
'memory_mb': 32768,
'local_gb': 279,
- 'cpus': 18,
'cpu_arch': 'x86_64',
'capabilities': 'boot_mode:uefi,pci_gpu_devices:1'}
mock_client = mock.Mock()
@@ -305,7 +303,6 @@ class DracInspectionTestCase(test_utils.BaseDracTest):
expected_node_properties = {
'memory_mb': 32768,
'local_gb': 279,
- 'cpus': 18,
'cpu_arch': 'x86_64',
'capabilities': 'boot_mode:uefi,pci_gpu_devices:0'}
mock_client = mock.Mock()
@@ -355,7 +352,6 @@ class DracInspectionTestCase(test_utils.BaseDracTest):
expected_node_properties = {
'memory_mb': 32768,
'local_gb': 279,
- 'cpus': 18,
'cpu_arch': 'x86_64',
'capabilities': 'boot_mode:uefi,pci_gpu_devices:2'}
mock_client = mock.Mock()
@@ -387,7 +383,6 @@ class DracInspectionTestCase(test_utils.BaseDracTest):
expected_node_properties = {
'memory_mb': 32768,
'local_gb': 279,
- 'cpus': 18,
'cpu_arch': 'x86_64',
'capabilities': 'boot_mode:uefi,pci_gpu_devices:0'}
mock_client = mock.Mock()
@@ -417,7 +412,6 @@ class DracInspectionTestCase(test_utils.BaseDracTest):
expected_node_properties = {
'memory_mb': 32768,
'local_gb': 1116,
- 'cpus': 18,
'cpu_arch': 'x86_64',
'capabilities': 'boot_mode:uefi,pci_gpu_devices:1'}
mock_client = mock.Mock()
@@ -449,22 +443,6 @@ class DracInspectionTestCase(test_utils.BaseDracTest):
self.assertEqual(285888, root_disk.size_mb)
- def test__calculate_cpus(self):
- with task_manager.acquire(self.context, self.node.uuid,
- shared=True) as task:
- cpu = task.driver.inspect._calculate_cpus(
- self.cpus[0])
-
- self.assertEqual(12, cpu)
-
- def test__calculate_cpus_without_ht_enabled(self):
- with task_manager.acquire(self.context, self.node.uuid,
- shared=True) as task:
- cpu = task.driver.inspect._calculate_cpus(
- self.cpus[1])
-
- self.assertEqual(6, cpu)
-
@mock.patch.object(drac_common, 'get_drac_client', spec_set=True,
autospec=True)
def test__get_pxe_dev_nics_with_UEFI_boot_mode(self, mock_get_drac_client):
diff --git a/ironic/tests/unit/drivers/modules/ilo/test_inspect.py b/ironic/tests/unit/drivers/modules/ilo/test_inspect.py
index 1a85d5b28..af262c0d0 100644
--- a/ironic/tests/unit/drivers/modules/ilo/test_inspect.py
+++ b/ironic/tests/unit/drivers/modules/ilo/test_inspect.py
@@ -65,7 +65,7 @@ class IloInspectTestCase(test_common.BaseIloTest):
get_capabilities_mock):
ilo_object_mock = get_ilo_object_mock.return_value
properties = {'memory_mb': '512', 'local_gb': '10',
- 'cpus': '1', 'cpu_arch': 'x86_64'}
+ 'cpu_arch': 'x86_64'}
macs = {'Port 1': 'aa:aa:aa:aa:aa:aa', 'Port 2': 'bb:bb:bb:bb:bb:bb'}
capabilities = {}
result = {'properties': properties, 'macs': macs}
@@ -103,8 +103,7 @@ class IloInspectTestCase(test_common.BaseIloTest):
get_capabilities_mock,
log_mock):
ilo_object_mock = get_ilo_object_mock.return_value
- properties = {'memory_mb': '512', 'local_gb': 0,
- 'cpus': '1', 'cpu_arch': 'x86_64'}
+ properties = {'memory_mb': '512', 'local_gb': 0, 'cpu_arch': 'x86_64'}
macs = {'Port 1': 'aa:aa:aa:aa:aa:aa', 'Port 2': 'bb:bb:bb:bb:bb:bb'}
capabilities = {}
result = {'properties': properties, 'macs': macs}
@@ -118,7 +117,7 @@ class IloInspectTestCase(test_common.BaseIloTest):
task.node.properties = properties
task.node.save()
expected_properties = {'memory_mb': '512', 'local_gb': 10,
- 'cpus': '1', 'cpu_arch': 'x86_64'}
+ 'cpu_arch': 'x86_64'}
task.driver.inspect.inspect_hardware(task)
self.assertEqual(expected_properties, task.node.properties)
power_mock.assert_called_once_with(mock.ANY, task)
@@ -149,8 +148,7 @@ class IloInspectTestCase(test_common.BaseIloTest):
get_capabilities_mock,
log_mock):
ilo_object_mock = get_ilo_object_mock.return_value
- properties = {'memory_mb': '512', 'local_gb': 10,
- 'cpus': '1', 'cpu_arch': 'x86_64'}
+ properties = {'memory_mb': '512', 'local_gb': 10, 'cpu_arch': 'x86_64'}
macs = {'Port 1': 'aa:aa:aa:aa:aa:aa', 'Port 2': 'bb:bb:bb:bb:bb:bb'}
capabilities = {'server_model': 'Gen8'}
result = {'properties': properties, 'macs': macs}
@@ -160,7 +158,7 @@ class IloInspectTestCase(test_common.BaseIloTest):
with task_manager.acquire(self.context, self.node.uuid,
shared=False) as task:
expected_properties = {'memory_mb': '512', 'local_gb': 10,
- 'cpus': '1', 'cpu_arch': 'x86_64',
+ 'cpu_arch': 'x86_64',
'capabilities': 'server_model:Gen8'}
task.driver.inspect.inspect_hardware(task)
self.assertEqual(expected_properties, task.node.properties)
@@ -195,8 +193,7 @@ class IloInspectTestCase(test_common.BaseIloTest):
get_security_params_mock,
log_mock):
ilo_object_mock = get_ilo_object_mock.return_value
- properties = {'memory_mb': '512', 'local_gb': 10,
- 'cpus': '1', 'cpu_arch': 'x86_64'}
+ properties = {'memory_mb': '512', 'local_gb': 10, 'cpu_arch': 'x86_64'}
macs = {'NIC.LOM.1.1': 'aa:aa:aa:aa:aa:aa'}
capabilities = {'server_model': 'Gen10'}
security_params = (
@@ -209,7 +206,7 @@ class IloInspectTestCase(test_common.BaseIloTest):
with task_manager.acquire(self.context, self.node.uuid,
shared=False) as task:
expected_properties = {
- 'memory_mb': '512', 'local_gb': 10, 'cpus': '1',
+ 'memory_mb': '512', 'local_gb': 10,
'cpu_arch': 'x86_64', 'capabilities': 'server_model:Gen10',
'security_parameters': {'Password Complexity': 'ok'}}
task.driver.inspect.inspect_hardware(task)
@@ -243,7 +240,7 @@ class IloInspectTestCase(test_common.BaseIloTest):
get_capabilities_mock):
ilo_object_mock = get_ilo_object_mock.return_value
properties = {'memory_mb': '512', 'local_gb': '10',
- 'cpus': '1', 'cpu_arch': 'x86_64'}
+ 'cpu_arch': 'x86_64'}
macs = {'Port 1': 'aa:aa:aa:aa:aa:aa', 'Port 2': 'bb:bb:bb:bb:bb:bb'}
capabilities = {}
result = {'properties': properties, 'macs': macs}
@@ -280,7 +277,7 @@ class IloInspectTestCase(test_common.BaseIloTest):
get_capabilities_mock):
ilo_object_mock = get_ilo_object_mock.return_value
properties = {'memory_mb': '512', 'local_gb': '10',
- 'cpus': '1', 'cpu_arch': 'x86_64'}
+ 'cpu_arch': 'x86_64'}
macs = {'Port 1': 'aa:aa:aa:aa:aa:aa', 'Port 2': 'bb:bb:bb:bb:bb:bb'}
capability_str = 'sriov_enabled:true'
capabilities = {'sriov_enabled': 'true'}
@@ -292,7 +289,7 @@ class IloInspectTestCase(test_common.BaseIloTest):
shared=False) as task:
task.driver.inspect.inspect_hardware(task)
expected_properties = {'memory_mb': '512', 'local_gb': '10',
- 'cpus': '1', 'cpu_arch': 'x86_64',
+ 'cpu_arch': 'x86_64',
'capabilities': capability_str}
self.assertEqual(expected_properties, task.node.properties)
power_mock.assert_called_once_with(mock.ANY, task)
@@ -320,8 +317,7 @@ class IloInspectTestCase(test_common.BaseIloTest):
get_capabilities_mock):
ilo_object_mock = get_ilo_object_mock.return_value
properties = {'memory_mb': '512', 'local_gb': '10',
- 'cpus': '1', 'cpu_arch': 'x86_64',
- 'somekey': 'somevalue'}
+ 'cpu_arch': 'x86_64', 'somekey': 'somevalue'}
macs = {'Port 1': 'aa:aa:aa:aa:aa:aa', 'Port 2': 'bb:bb:bb:bb:bb:bb'}
result = {'properties': properties, 'macs': macs}
capabilities = {'sriov_enabled': 'true'}
@@ -339,7 +335,7 @@ class IloInspectTestCase(test_common.BaseIloTest):
set2 = set(end_capabilities.split(','))
self.assertEqual(set1, set2)
expected_properties = {'memory_mb': '512', 'local_gb': '10',
- 'cpus': '1', 'cpu_arch': 'x86_64',
+ 'cpu_arch': 'x86_64',
'capabilities': end_capabilities}
power_mock.assert_called_once_with(mock.ANY, task)
self.assertEqual(task.node.properties, expected_properties)
@@ -356,7 +352,7 @@ class TestInspectPrivateMethods(test_common.BaseIloTest):
def test__get_essential_properties_ok(self):
ilo_mock = mock.MagicMock(spec=['get_essential_properties'])
properties = {'memory_mb': '512', 'local_gb': '10',
- 'cpus': '1', 'cpu_arch': 'x86_64'}
+ 'cpu_arch': 'x86_64'}
macs = {'Port 1': 'aa:aa:aa:aa:aa:aa', 'Port 2': 'bb:bb:bb:bb:bb:bb'}
result = {'properties': properties, 'macs': macs}
ilo_mock.get_essential_properties.return_value = result
@@ -368,8 +364,7 @@ class TestInspectPrivateMethods(test_common.BaseIloTest):
ilo_mock = mock.MagicMock(
spec=['get_additional_capabilities', 'get_essential_properties'])
# Missing key: cpu_arch
- properties = {'memory_mb': '512', 'local_gb': '10',
- 'cpus': '1'}
+ properties = {'memory_mb': '512', 'local_gb': '10'}
macs = {'Port 1': 'aa:aa:aa:aa:aa:aa', 'Port 2': 'bb:bb:bb:bb:bb:bb'}
result = {'properties': properties, 'macs': macs}
ilo_mock.get_essential_properties.return_value = result
@@ -386,8 +381,7 @@ class TestInspectPrivateMethods(test_common.BaseIloTest):
ilo_mock = mock.MagicMock(
spec=['get_additional_capabilities', 'get_essential_properties'])
# Not a dict
- properties = ['memory_mb', '512', 'local_gb', '10',
- 'cpus', '1']
+ properties = ['memory_mb', '512', 'local_gb', '10']
macs = ['aa:aa:aa:aa:aa:aa', 'bb:bb:bb:bb:bb:bb']
capabilities = ''
result = {'properties': properties, 'macs': macs}
@@ -400,7 +394,7 @@ class TestInspectPrivateMethods(test_common.BaseIloTest):
def test__get_essential_properties_fail_mac_invalid_format(self):
ilo_mock = mock.MagicMock(spec=['get_essential_properties'])
properties = {'memory_mb': '512', 'local_gb': '10',
- 'cpus': '1', 'cpu_arch': 'x86_64'}
+ 'cpu_arch': 'x86_64'}
# Not a dict
macs = 'aa:aa:aa:aa:aa:aa'
result = {'properties': properties, 'macs': macs}
@@ -413,7 +407,7 @@ class TestInspectPrivateMethods(test_common.BaseIloTest):
ilo_mock = mock.MagicMock(
spec=['get_additional_capabilities', 'get_essential_properties'])
properties = {'memory_mb': '512', 'local_gb': '10',
- 'cpus': '1', 'cpu_arch': 'x86_64'}
+ 'cpu_arch': 'x86_64'}
# Not a dictionary
macs = None
result = {'properties': properties, 'macs': macs}
@@ -427,7 +421,7 @@ class TestInspectPrivateMethods(test_common.BaseIloTest):
def test__get_essential_properties_hardware_port_not_dict(self):
ilo_mock = mock.MagicMock(spec=['get_essential_properties'])
properties = {'memory_mb': '512', 'local_gb': '10',
- 'cpus': '1', 'cpu_arch': 'x86_64'}
+ 'cpu_arch': 'x86_64'}
# Not a dict
macs = 'aa:bb:cc:dd:ee:ff'
result = {'properties': properties, 'macs': macs}
@@ -447,7 +441,7 @@ class TestInspectPrivateMethods(test_common.BaseIloTest):
def test__validate_ok(self):
properties = {'memory_mb': '512', 'local_gb': '10',
- 'cpus': '2', 'cpu_arch': 'x86_arch'}
+ 'cpu_arch': 'x86_arch'}
macs = {'Port 1': 'aa:aa:aa:aa:aa:aa'}
data = {'properties': properties, 'macs': macs}
valid_keys = ilo_inspect.IloInspect.ESSENTIAL_PROPERTIES
@@ -455,8 +449,7 @@ class TestInspectPrivateMethods(test_common.BaseIloTest):
self.assertEqual(sorted(set(properties)), sorted(valid_keys))
def test__validate_essential_keys_fail_missing_key(self):
- properties = {'memory_mb': '512', 'local_gb': '10',
- 'cpus': '1'}
+ properties = {'memory_mb': '512', 'local_gb': '10'}
macs = {'Port 1': 'aa:aa:aa:aa:aa:aa'}
data = {'properties': properties, 'macs': macs}
self.assertRaises(exception.HardwareInspectionFailure,
diff --git a/ironic/tests/unit/drivers/modules/irmc/test_inspect.py b/ironic/tests/unit/drivers/modules/irmc/test_inspect.py
index 2cec2429f..e8762391f 100644
--- a/ironic/tests/unit/drivers/modules/irmc/test_inspect.py
+++ b/ironic/tests/unit/drivers/modules/irmc/test_inspect.py
@@ -83,7 +83,6 @@ class IRMCInspectInternalMethodsTestCase(test_common.BaseIRMCTest):
inspected_props = {
'memory_mb': '1024',
'local_gb': 10,
- 'cpus': 2,
'cpu_arch': 'x86_64'}
inspected_capabilities = {
'irmc_firmware_version': 'iRMC S4-7.82F',
@@ -142,7 +141,6 @@ class IRMCInspectInternalMethodsTestCase(test_common.BaseIRMCTest):
inspected_props = {
'memory_mb': '1024',
'local_gb': 10,
- 'cpus': 2,
'cpu_arch': 'x86_64'}
inspected_capabilities = {
'irmc_firmware_version': 'iRMC S6-2.00S',
@@ -260,7 +258,6 @@ class IRMCInspectTestCase(test_common.BaseIRMCTest):
inspected_props = {
'memory_mb': '1024',
'local_gb': 10,
- 'cpus': 2,
'cpu_arch': 'x86_64'}
inspected_macs = ['aa:aa:aa:aa:aa:aa', 'bb:bb:bb:bb:bb:bb']
new_traits = ['CUSTOM_CPU_FPGA']
@@ -318,7 +315,6 @@ class IRMCInspectTestCase(test_common.BaseIRMCTest):
inspected_props = {
'memory_mb': '1024',
'local_gb': 10,
- 'cpus': 2,
'cpu_arch': 'x86_64'}
inspected_macs = ['aa:aa:aa:aa:aa:aa', 'bb:bb:bb:bb:bb:bb']
new_traits = ['CUSTOM_CPU_FPGA']
@@ -398,7 +394,6 @@ class IRMCInspectTestCase(test_common.BaseIRMCTest):
inspected_props = {
'memory_mb': '1024',
'local_gb': 10,
- 'cpus': 2,
'cpu_arch': 'x86_64'}
inspected_macs = ['aa:aa:aa:aa:aa:aa', 'bb:bb:bb:bb:bb:bb']
existing_traits = ['CUSTOM_CPU_FPGA']
@@ -459,7 +454,6 @@ class IRMCInspectTestCase(test_common.BaseIRMCTest):
inspected_props = {
'memory_mb': '1024',
'local_gb': 10,
- 'cpus': 2,
'cpu_arch': 'x86_64'}
inspected_macs = ['aa:aa:aa:aa:aa:aa', 'bb:bb:bb:bb:bb:bb']
diff --git a/ironic/tests/unit/drivers/modules/redfish/test_inspect.py b/ironic/tests/unit/drivers/modules/redfish/test_inspect.py
index dc1ffff4d..995dbb6d9 100644
--- a/ironic/tests/unit/drivers/modules/redfish/test_inspect.py
+++ b/ironic/tests/unit/drivers/modules/redfish/test_inspect.py
@@ -93,8 +93,7 @@ class RedfishInspectTestCase(db_base.DbTestCase):
mock_get_system):
expected_properties = {
'capabilities': 'boot_mode:uefi',
- 'cpu_arch': 'mips', 'cpus': '8',
- 'local_gb': '3', 'memory_mb': '2048'
+ 'cpu_arch': 'mips', 'local_gb': '3', 'memory_mb': '2048'
}
self.init_system_mock(mock_get_system.return_value)
@@ -140,8 +139,7 @@ class RedfishInspectTestCase(db_base.DbTestCase):
shared=True) as task:
expected_properties = {
'capabilities': 'boot_mode:uefi',
- 'cpu_arch': 'x86_64', 'cpus': '8',
- 'local_gb': '3', 'memory_mb': '2048'
+ 'cpu_arch': 'x86_64', 'local_gb': '3', 'memory_mb': '2048'
}
task.driver.inspect.inspect_hardware(task)
self.assertEqual(expected_properties, task.node.properties)
@@ -156,8 +154,7 @@ class RedfishInspectTestCase(db_base.DbTestCase):
shared=True) as task:
expected_properties = {
'capabilities': 'boot_mode:uefi',
- 'cpu_arch': 'mips', 'cpus': '8',
- 'local_gb': '0', 'memory_mb': '2048'
+ 'cpu_arch': 'mips', 'local_gb': '0', 'memory_mb': '2048'
}
task.driver.inspect.inspect_hardware(task)
self.assertEqual(expected_properties, task.node.properties)
@@ -182,8 +179,7 @@ class RedfishInspectTestCase(db_base.DbTestCase):
shared=True) as task:
expected_properties = {
'capabilities': 'boot_mode:uefi',
- 'cpu_arch': 'mips', 'cpus': '8',
- 'local_gb': '3', 'memory_mb': '4096'
+ 'cpu_arch': 'mips', 'local_gb': '3', 'memory_mb': '4096'
}
task.driver.inspect.inspect_hardware(task)
self.assertEqual(expected_properties, task.node.properties)
@@ -212,8 +208,7 @@ class RedfishInspectTestCase(db_base.DbTestCase):
}
expected_properties = {
'capabilities': 'boot_mode:bios',
- 'cpu_arch': 'mips', 'cpus': '8',
- 'local_gb': '3', 'memory_mb': '2048'
+ 'cpu_arch': 'mips', 'local_gb': '3', 'memory_mb': '2048'
}
task.driver.inspect.inspect_hardware(task)
self.assertEqual(expected_properties, task.node.properties)
@@ -226,8 +221,7 @@ class RedfishInspectTestCase(db_base.DbTestCase):
with task_manager.acquire(self.context, self.node.uuid,
shared=True) as task:
expected_properties = {
- 'cpu_arch': 'mips', 'cpus': '8',
- 'local_gb': '3', 'memory_mb': '2048'
+ 'cpu_arch': 'mips', 'local_gb': '3', 'memory_mb': '2048'
}
task.driver.inspect.inspect_hardware(task)
self.assertEqual(expected_properties, task.node.properties)
diff --git a/ironic/tests/unit/objects/test_node.py b/ironic/tests/unit/objects/test_node.py
index 146120644..5ba823a89 100644
--- a/ironic/tests/unit/objects/test_node.py
+++ b/ironic/tests/unit/objects/test_node.py
@@ -534,10 +534,10 @@ class TestNodeObject(db_base.DbTestCase, obj_utils.SchemasTestMixIn):
autospec=True) as mock_get_node:
mock_get_node.return_value = self.fake_node
node = objects.Node.get(self.context, uuid)
- node.properties = {"local_gb": "5G", "memory_mb": "5",
- 'cpus': '-1', 'cpu_arch': 'x86_64'}
+ node.properties = {"local_gb": "5G", "memory_mb": "-5",
+ 'cpu_arch': 'x86_64'}
self.assertRaisesRegex(exception.InvalidParameterValue,
- ".*local_gb=5G, cpus=-1$", node.save)
+ ".*local_gb=5G, memory_mb=-5$", node.save)
mock_get_node.assert_called_once_with(uuid)
def test__validate_property_values_success(self):
@@ -549,7 +549,6 @@ class TestNodeObject(db_base.DbTestCase, obj_utils.SchemasTestMixIn):
values = self.fake_node
expect = {
'cpu_arch': 'x86_64',
- "cpus": '8',
"local_gb": '10',
"memory_mb": '4096',
}
View Lorry Controller Status