From ee80dc89ad8227e277bf39d12bcbe7ef0176b8a3 Mon Sep 17 00:00:00 2001 From: "Jose M. Guisado" Date: Mon, 17 Apr 2023 13:02:54 +0200 Subject: live: rewrite hardware inventory command Replace legacy shell script InventarioHardware for helper functions from hw_inventory.py Use get_hardware_inventory to obtain a HardwareInventory object with the hardware information. Map the HardwareInventory object to a legacy response string with the legacy_list_hardware_inventory function. Remove "Chrd-*" file reading logic, it's no longer needed. Legacy shell script InventarioHardware uses that file. Expect a change in the structure of hardware inventory response payload in the future. This patch does not address the HTTP response containing the hardware inventory as a '\n' separated string of hardware elements. --- src/ogRest.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/ogRest.py') diff --git a/src/ogRest.py b/src/ogRest.py index fe6c0da..ac312f2 100644 --- a/src/ogRest.py +++ b/src/ogRest.py @@ -135,16 +135,15 @@ class ogThread(): client.send(response.get()) ogRest.state = ThreadState.IDLE - def hardware(client, path, ogRest): + def hardware(client, ogRest): try: - ogRest.operations.hardware(path, ogRest) + result = ogRest.operations.hardware(ogRest) except Exception as e: ogRest.send_internal_server_error(client, exc=e) return json_body = jsonBody() - with open(path, 'r') as f: - json_body.add_element('hardware', f.read()) + json_body.add_element('hardware', result) response = restResponse(ogResponses.OK, json_body) client.send(response.get()) @@ -399,8 +398,7 @@ class ogRest(): threading.Thread(target=ogThread.software, args=(client, request, path, self,)).start() def process_hardware(self, client): - path = '/tmp/Chrd-' + client.ip - threading.Thread(target=ogThread.hardware, args=(client, path, self,)).start() + threading.Thread(target=ogThread.hardware, args=(client, self,)).start() def process_schedule(self, client): response = restResponse(ogResponses.OK) -- cgit v1.2.3-18-g5258