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
more_events
Alvaro Neira Ayuso 2020-01-02 20:44:17 +01:00 committed by Alvaro Neira Ayuso
parent 6d1e79b8eb
commit 261a5edf7c
2 changed files with 16 additions and 0 deletions

View File

@ -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')

View File

@ -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))