Skip to content

fix: find storage #367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: find storage #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8e2be5
fix: find storage
CllaudiaB Feb 12, 2025
dd9d087
Merge branch 'Solvik:master' into disk
CllaudiaB Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions netbox_agent/lshw.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,20 +94,7 @@ def find_network(self, obj):
)

def find_storage(self, obj):
if "children" in obj:
for device in obj["children"]:
self.disks.append(
{
"logicalname": device.get("logicalname"),
"product": device.get("product"),
"serial": device.get("serial"),
"version": device.get("version"),
"size": device.get("size"),
"description": device.get("description"),
"type": device.get("description"),
}
)
elif "driver" in obj["configuration"] and "nvme" in obj["configuration"]["driver"]:
if obj.get("configuration") and "driver" in obj["configuration"] and "nvme" in obj["configuration"]["driver"]:
if not is_tool("nvme"):
logging.error("nvme-cli >= 1.0 does not seem to be installed")
return
Expand All @@ -131,6 +118,20 @@ def find_storage(self, obj):
self.disks.append(d)
except Exception:
pass
elif "children" in obj:
for device in obj["children"]:
if device.get("class") == "disk":
self.disks.append(
{
"logicalname": device.get("logicalname"),
"product": device.get("product"),
"serial": device.get("serial"),
"version": device.get("version"),
"size": device.get("size"),
"description": device.get("description"),
"type": device.get("description"),
}
)
Comment on lines +121 to +134
Copy link
Collaborator

@ribetm ribetm Feb 19, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems some controllers are nested one level deeper, it could help for some edge cases to do a deep search inside all storage objects, when it's neither a NVME or disk object

Suggested change
elif "children" in obj:
for device in obj["children"]:
if device.get("class") == "disk":
self.disks.append(
{
"logicalname": device.get("logicalname"),
"product": device.get("product"),
"serial": device.get("serial"),
"version": device.get("version"),
"size": device.get("size"),
"description": device.get("description"),
"type": device.get("description"),
}
)
elif obj.get("class") == "disk":
self.disks.append(
{
"logicalname": obj.get("logicalname"),
"product": obj.get("product"),
"serial": obj.get("serial"),
"version": obj.get("version"),
"size": obj.get("size"),
"description": obj.get("description"),
"type": obj.get("description"),
}
)
else:
for child in obj.get("children") or []:
self.find_storage(child)


def find_cpus(self, obj):
if "product" in obj:
Expand Down
2 changes: 1 addition & 1 deletion netbox_agent/virtualmachine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ def netbox_create_or_update(self, config):
vm.memory = memory
updated += 1
if vm.disk != disk:
vm.disk = disk
vm.disk = round(disk)
updated += 1

vm_tags = sorted(set([x.name for x in vm.tags]))
Expand Down
Loading