summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJose M. Guisado <jguisado@soleta.eu>2022-05-18 11:14:02 +0200
committerJose M. Guisado <jguisado@soleta.eu>2022-06-01 11:48:30 +0200
commit1ab981a539f3553021b3cf1642619338f2782af1 (patch)
tree215780ea0b66bfdcef5f6004dd00c7c4c9f7283c
parent6c441e94e25ed544daf0e010288e0444c9000188 (diff)
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.
-rw-r--r--src/live/ogOperations.py14
1 files changed, 4 insertions, 10 deletions
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')