From 38b57c4ae43e062049d8a2a1a33f9a790a18b327 Mon Sep 17 00:00:00 2001 From: Alvaro Neira Ayuso Date: Tue, 14 Jan 2020 13:02:45 +0100 Subject: Improve setup command response This patch adds a new response support. This way allows us to send a new response message with more information about the partitions already set up. The format of the response is: { "disk" : "1", "cache" : "1", "cache_size" : "0", "partition_setup": [{"partition": "1", "code": "LINUX", "filesystem": "EMPTY", "size": "498688", "format": "0"}...] --- src/ogRest.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'src/ogRest.py') diff --git a/src/ogRest.py b/src/ogRest.py index 5119eea..cf7a4ee 100644 --- a/src/ogRest.py +++ b/src/ogRest.py @@ -102,8 +102,14 @@ class ogThread(): client.send(restResponse.getResponse(ogResponses.OK, jsonResp)) # Process setup - def procsetup(msgqueue, httpparser): - ogOperations.procsetup(httpparser) + def procsetup(client, httpparser): + jsonResp = jsonResponse() + jsonResp.addElement('disk', httpparser.getDisk()) + jsonResp.addElement('cache', httpparser.getCache()) + jsonResp.addElement('cache_size', httpparser.getCacheSize()) + listconfig = ogOperations.procsetup(httpparser) + jsonResp.addElement('partition_setup', listconfig) + client.send(restResponse.getResponse(ogResponses.OK, jsonResp)) # Process image restore def procirestore(httpparser): @@ -212,8 +218,7 @@ class ogRest(): client.send(restResponse.getResponse(ogResponses.OK)) def process_setup(self, client, httpparser): - threading.Thread(target=ogThread.procsetup, args=(self.msgqueue, httpparser,)).start() - client.send(restResponse.getResponse(ogResponses.OK)) + threading.Thread(target=ogThread.procsetup, args=(client, httpparser,)).start() def process_irestore(self, client, httpparser): threading.Thread(target=ogThread.procirestore, args=(client, httpparser,)).start() -- cgit v1.2.3-18-g5258