openstack
/
ironic-tempest-plugin
Code Issues Proposed changes

discovery: optional support for testing changing driver 

Now that we have reset_interfaces in the API, we can try changing the driver after
discovery. This is optional, since reset_interfaces was only introduced in Rocky.

Change-Id: I8718941bb194c8fc0646a1f0bc11ef3468291ccb
This commit is contained in:
Dmitry Tantsur 2019-03-14 10:56:45 +01:00
parent df2244ea40
commit 0812cc7594
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ironic_tempest_plugin/config.py
View File

@ -195,4 +195,7 @@ BaremetalIntrospectionGroup = [
default='fake',
help="The driver expected to be set on newly discovered nodes. "
"Only has effect with auto_discovery_feature is True."),
cfg.StrOpt('auto_discovery_target_driver',
help="The driver to set on the newly discovered nodes. "
"Only has effect with auto_discovery_feature is True."),
]

27
ironic_tempest_plugin/tests/scenario/test_introspection_discovery.py
View File

@ -37,6 +37,13 @@ class InspectorDiscoveryTest(introspection_manager.InspectorScenarioTest):
discovered_node = self._get_discovery_node()
self.node_info = self._get_node_info(discovered_node)
self.default_driver = (
CONF.baremetal_introspection.auto_discovery_default_driver
)
self.expected_driver = (
CONF.baremetal_introspection.auto_discovery_target_driver
or CONF.baremetal_introspection.auto_discovery_default_driver
)
rule = {
"description": "Auto-discovery rule",
@ -51,14 +58,26 @@ class InspectorDiscoveryTest(introspection_manager.InspectorScenarioTest):
"path": "/name",
"value": self.node_info['name']},
],
# This flag must be automatically set by the auto-discovery process
"conditions": [
# This flag must be automatically set by the auto-discovery
# process.
{"op": "eq",
"field": "data://auto_discovered",
"value": True}
"value": True},
# Making sure the initial driver matches the expected.
{"op": "eq",
"field": "node://driver",
"value": self.default_driver},
]
}
if self.expected_driver != self.default_driver:
rule['actions'].append({
'action': 'set-attribute',
'path': '/driver',
'value': self.expected_driver
})
self.rule_import_from_dict(rule)
self.addCleanup(self.rule_purge)
@ -141,7 +160,5 @@ class InspectorDiscoveryTest(introspection_manager.InspectorScenarioTest):
self.verify_node_introspection_data(inspected_node)
self.assertEqual(ProvisionStates.ENROLL,
inspected_node['provision_state'])
self.assertEqual(
CONF.baremetal_introspection.auto_discovery_default_driver,
inspected_node['driver'])
self.assertEqual(self.expected_driver, inspected_node['driver'])
self.assertEqual('yes', inspected_node['extra']['discovered'])