diff options
| author | Alvaro Neira Ayuso <aneira@soleta.eu> | 2020-01-02 20:44:17 +0100 |
|---|---|---|
| committer | Alvaro Neira Ayuso <alvaroneay@gmail.com> | 2020-01-19 19:50:44 +0100 |
| commit | 261a5edf7c26fcfada6ba1560febe316caf35e9f (patch) | |
| tree | 1ada6a09144ec7f7853aa3c38301c464e990db54 | |
| parent | 6d1e79b8eb898d12fd5e2fa83489fc26f956bb8e (diff) | |
Add hardware command to inventory the machine hardware
ogAdmClient has a support to inventory the hardware in a machine. This new
command allows the new ogClient to execute the same script to inventory the hw.
No arguments needed for executing the command
| -rw-r--r-- | src/linux/ogOperations.py | 4 | ||||
| -rw-r--r-- | src/ogRest.py | 12 |
2 files changed, 16 insertions, 0 deletions
diff --git a/src/linux/ogOperations.py b/src/linux/ogOperations.py index c11ee30..85c8c0a 100644 --- a/src/linux/ogOperations.py +++ b/src/linux/ogOperations.py @@ -31,3 +31,7 @@ def procsession(disk, partition): def procsoftware(disk, partition, path): result = subprocess.check_output([OG_PATH + 'interfaceAdm/InventarioSoftware', disk, partition, path], shell=True) return result.decode('utf-8') + +def prochardware(path): + result = subprocess.check_output([OG_PATH + 'interfaceAdm/InventarioHardware', path], shell=True) + return result.decode('utf-8') diff --git a/src/ogRest.py b/src/ogRest.py index 680bfd3..0e05ad8 100644 --- a/src/ogRest.py +++ b/src/ogRest.py @@ -45,6 +45,11 @@ class ogThread(): msgqueue.queue.clear() msgqueue.put(ogOperations.procsoftware(disk, partition, path)) + # Process hardware + def prochardware(msgqueue, path): + msgqueue.queue.clear() + msgqueue.put(ogOperations.prochardware(path)) + class ogResponses(Enum): BAD_REQUEST=0 IN_PROGRESS=1 @@ -81,6 +86,8 @@ class ogRest(): self.process_probe(client) elif ("shell/output" in URI): self.process_shellout(client) + elif ("hardware" in URI): + self.process_hardware(client) else: client.send(self.getResponse(ogResponses.BAD_REQUEST)) elif ("POST" in op): @@ -145,3 +152,8 @@ class ogRest(): path = '/tmp/CSft-' + client.ip + '-' + partition threading.Thread(target=ogThread.procsoftware, args=(self.msgqueue, disk, partition, path,)).start() client.send(self.getResponse(ogResponses.OK)) + + def process_hardware(self, client): + path = '/tmp/Chrd-' + client.ip + threading.Thread(target=ogThread.prochardware, args=(self.msgqueue, path,)).start() + client.send(self.getResponse(ogResponses.OK)) |