openstack/ironic
Code Issues Proposed changes

Merge "inspection: fix None case for inventory data"

Browse Source
This commit is contained in:
Zuul
2025-08-25 20:27:20 +00:00
committed by Gerrit Code Review
parent a65ea27aa4 64ed78c810
commit 37d97b0790
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ironic/drivers/modules/inspect_utils.py
View File

@@ -164,8 +164,6 @@ def get_inspection_data(node, context):
:raises: NodeInventoryNotFound if no inventory has been saved :raises: NodeInventoryNotFound if no inventory has been saved
""" """
store_data = CONF.inventory.data_backend store_data = CONF.inventory.data_backend
if store_data == 'none':
raise exception.NodeInventoryNotFound(node=node.uuid)
if store_data == 'database': if store_data == 'database':
node_inventory = objects.NodeInventory.get_by_node_id( node_inventory = objects.NodeInventory.get_by_node_id(
context, node.id) context, node.id)
@@ -176,6 +174,8 @@ def get_inspection_data(node, context):
return _get_inspection_data_from_swift(node.uuid) return _get_inspection_data_from_swift(node.uuid)
except exception.SwiftObjectNotFoundError: except exception.SwiftObjectNotFoundError:
raise exception.NodeInventoryNotFound(node=node.uuid) raise exception.NodeInventoryNotFound(node=node.uuid)
# all other cases should not return any data
raise exception.NodeInventoryNotFound(node=node.uuid)
def _store_inspection_data_in_swift(node_uuid, inventory_data, plugin_data): def _store_inspection_data_in_swift(node_uuid, inventory_data, plugin_data):