From 1ab981a539f3553021b3cf1642619338f2782af1 Mon Sep 17 00:00:00 2001 From: "Jose M. Guisado" Date: Wed, 18 May 2022 11:14:02 +0200 Subject: live: replace getConfiguration with refresh Old refresh was a wrapper around getConfiguration bash script. New refresh operation does what getConfiguration used to do externally. See commit 097769b971f64f93004a87393721a289fe3db13f. --- src/live/ogOperations.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/live/ogOperations.py b/src/live/ogOperations.py index d9c3740..efdc813 100644 --- a/src/live/ogOperations.py +++ b/src/live/ogOperations.py @@ -145,9 +145,7 @@ class OgLiveOperations: except: raise ValueError('Error: Incorrect command value') - cmd_get_conf = f'{ogClient.OG_PATH}interfaceAdm/getConfiguration' - result = subprocess.check_output([cmd_get_conf], shell=True) - self._restartBrowser(self._url) + self.refresh(ogRest) return output.decode('utf-8') @@ -235,11 +233,9 @@ class OgLiveOperations: except: raise ValueError('Error: Incorrect command value') - cmd_get_conf = f'{ogClient.OG_PATH}interfaceAdm/getConfiguration' - result = subprocess.check_output([cmd_get_conf], shell=True) - self._restartBrowser(self._url) + result = self.refresh(ogRest) - return self.parseGetConf(result.decode('utf-8')) + return result def image_restore(self, request, ogRest): disk = request.getDisk() @@ -265,9 +261,7 @@ class OgLiveOperations: except: raise ValueError('Error: Incorrect command value') - cmd_get_conf = f'{ogClient.OG_PATH}interfaceAdm/getConfiguration' - result = subprocess.check_output([cmd_get_conf], shell=True) - self._restartBrowser(self._url) + self.refresh(ogRest) return output.decode('utf-8') -- cgit v1.2.3-18-g5258