Skip to content

Feat(Format): handle PDU #164

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

Draft
stonebuzz wants to merge 9 commits into
base: main
Choose a base branch
from
Draft

Feat(Format): handle PDU #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fa05f66
Feat(Format): handle PDU
stonebuzz Jan 28, 2026
a0a400c
fix
stonebuzz Jan 29, 2026
6e78bef
fix
stonebuzz Jan 29, 2026
66393ed
fix schema
stonebuzz Jan 29, 2026
16fb1e5
revert useless change
stonebuzz Jan 29, 2026
8ad7a34
implement orther fields
stonebuzz Feb 10, 2026
bbf648d
set as number
stonebuzz Feb 10, 2026
6257281
fix schema and converter
stonebuzz Feb 12, 2026
521e05a
fix CS
stonebuzz Feb 12, 2026
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
40 changes: 38 additions & 2 deletions inventory.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2838,7 +2838,7 @@
},
"type": {
"type": "string",
"pattern": "^(Unmanaged|Computer|Networking|Printer|Storage|Power|Phone|Video|KVM)$"
"pattern": "^(Unmanaged|Computer|Networking|Printer|Storage|Power|Phone|Video|KVM|Pdu)$"
},
"uptime": {
"type": "string",
Expand All @@ -2855,6 +2855,42 @@
},
"credentials": {
"type": "integer"
},
"pdu": {
"type": "object",
"title": "Power Distribution Unit inventory",
"properties": {
"type": {
"type": "string",
"title": "PDU type"
},
"plugs": {
"title": "List of plugs of pdu",
"type": "array",
"items": {
"type": "object",
"required": [
"name"
],
"properties": {
"name": {
"type": "string",
"title": "Plug name"
},
"number": {
"type": "integer",
"title": "Plug number"
},
"type": {
"type": "string",
"title": "Plug type"
}
}
},
"additionalProperties": false
}
},
"additionalProperties": false
}
}
},
Expand Down Expand Up @@ -2967,7 +3003,7 @@
"type": "string",
"title": "Item type",
"default": "Unmanaged",
"pattern": "^(Unmanaged|Computer|Phone|NetworkEquipment|Printer)$"
"pattern": "^(Unmanaged|Computer|Phone|NetworkEquipment|Printer|Pdu)$"
},
"partial": {
"type": "boolean",
Expand Down
5 changes: 5 additions & 0 deletions lib/php/Converter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1303,6 +1303,7 @@ public function convertNetworkInventory(array $data): array
case 'Phone':
case 'Printer':
case 'Unmanaged':
case 'Pdu':
$itemtype = $device_info['type'];
break;
case 'Networking':
Expand Down Expand Up @@ -1437,6 +1438,10 @@ public function convertNetworkInventory(array $data): array
case "error":
$data['content'][$key] = $device_data;
break;
case "pdu":
// put pdu into network_device
$data['content']['network_device'][$key] = $device_data;
break;
default:
throw new RuntimeException('Key ' . $key . ' is not handled in network devices conversion');
}
Expand Down
2 changes: 1 addition & 1 deletion tests/Glpi/Inventory/tests/units/Schema.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public function testValidateUnknownItemtype(): void
$json = json_decode(json_encode(['deviceid' => 'myid', 'itemtype' => $itemtype, 'content' => ['versionclient' => 'GLPI-Agent_v1.0', 'hardware' => ['name' => 'my inventory']]]));
$instance = new \Glpi\Inventory\Schema();
$this->expectException(\RuntimeException::class);
$this->expectExceptionMessage('\\\\Glpi\\\\Custom\\\\Asset\\\\Mine" does not match to ^(Unmanaged|Computer|Phone|NetworkEquipment|Printer)$');
$this->expectExceptionMessage('\\\\Glpi\\\\Custom\\\\Asset\\\\Mine" does not match to ^(Unmanaged|Computer|Phone|NetworkEquipment|Printer|Pdu)$');
$this->assertFalse($instance->validate($json));
}

Expand Down