From 269c7b505501ef24a4839b92afeb4fe15f3ced38 Mon Sep 17 00:00:00 2001 From: Roberto Hueso Gómez Date: Wed, 13 May 2020 17:30:12 +0200 Subject: Rename operation 'execCMD' to 'shellrun' This patch also ignores calls to shellrun when virtual mode is activated. --- src/linux/ogOperations.py | 2 +- src/ogRest.py | 2 +- src/virtual/ogOperations.py | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/linux/ogOperations.py b/src/linux/ogOperations.py index ab58cd7..e194468 100644 --- a/src/linux/ogOperations.py +++ b/src/linux/ogOperations.py @@ -68,7 +68,7 @@ class OgLinuxOperations: else: subprocess.call(['/sbin/reboot']) - def execCMD(self, request, ogRest): + def shellrun(self, request, ogRest) cmd = request.getrun() cmds = cmd.split(";|\n\r") diff --git a/src/ogRest.py b/src/ogRest.py index 14b9d33..3f76053 100644 --- a/src/ogRest.py +++ b/src/ogRest.py @@ -79,7 +79,7 @@ class ogThread(): return try: - shellout = ogRest.operations.execCMD(request, ogRest) + shellout = ogRest.operations.shellrun(request, ogRest) except ValueError as err: response = restResponse(ogResponses.INTERNAL_ERR) client.send(response.get()) diff --git a/src/virtual/ogOperations.py b/src/virtual/ogOperations.py index 02f50da..6ff9e0b 100644 --- a/src/virtual/ogOperations.py +++ b/src/virtual/ogOperations.py @@ -217,9 +217,8 @@ class OgVirtualOperations: pass return installed_os - def execCMD(self, request, ogRest): - # TODO Implement. - raise NotImplementedError + def shellrun(self, request, ogRest): + return def session(self, request, ogRest): disk = request.getDisk() -- cgit v1.2.3-18-g5258