summaryrefslogtreecommitdiffstats
path: root/src/live/ogOperations.py
diff options
context:
space:
mode:
authorJose M. Guisado <jguisado@soleta.eu>2023-05-17 11:31:27 +0200
committerJose M. Guisado <jguisado@soleta.eu>2023-05-17 12:44:50 +0200
commitfa51f2be8f6db224d82c8e50e2ad43b0f4abd722 (patch)
tree77ee8bbc8848bc8e1e35a29a56ab8ca2a69fbb2f /src/live/ogOperations.py
parent0c6dd12f4c743c998071fb31c80064b8c6ee40df (diff)
src: remove unused legacy software inventory code
Remove unnecessary InventarioSoftware invocation inside image_create operation. Software inventory is executed after image creation (see ogRest.py). Remove legacy 'path' parameter. This parameter was used to specify the path of a text file in which legacy bash scripts wrote the software inventory of the client (something like "Csft-{ip}..."). Fixes: 04bb35bd86b58c ("live: rewrite software inventory") Fixes: 2e3d47b7b8db69 ("Avoid writting /software output to a file")
Diffstat (limited to 'src/live/ogOperations.py')
-rw-r--r--src/live/ogOperations.py17
1 files changed, 2 insertions, 15 deletions
diff --git a/src/live/ogOperations.py b/src/live/ogOperations.py
index 6f759d7..8e5da48 100644
--- a/src/live/ogOperations.py
+++ b/src/live/ogOperations.py
@@ -266,7 +266,7 @@ class OgLiveOperations:
logging.info('Starting OS at disk %s partition %s', disk, partition)
return output.decode('utf-8')
- def software(self, request, path, ogRest):
+ def software(self, request, ogRest):
disk = request.getDisk()
partition = request.getPartition()
partdev = get_partition_device(int(disk), int(partition))
@@ -399,13 +399,11 @@ class OgLiveOperations:
logging.info('Image restore command OK')
return output
- def image_create(self, path, request, ogRest):
+ def image_create(self, request, ogRest):
disk = int(request.getDisk())
partition = int(request.getPartition())
name = request.getName()
repo = request.getRepo()
- cmd_software = f'{ogClient.OG_PATH}interfaceAdm/InventarioSoftware {disk} ' \
- f'{partition} {path}'
image_path = f'/opt/opengnsys/images/{name}.img'
self._ogbrowser_clear_logs()
@@ -416,17 +414,6 @@ class OgLiveOperations:
logging.error('ogChangeRepo could not change repository to %s', repo)
raise ValueError(f'Error: Cannot change repository to {repo}')
- try:
- ogRest.proc = subprocess.Popen([cmd_software],
- stdout=subprocess.PIPE,
- shell=True,
- executable=OG_SHELL)
- (output, error) = ogRest.proc.communicate()
- except:
- self._restartBrowser(self._url)
- logging.error('Exception when running software inventory subprocess')
- raise ValueError('Error: Incorrect command value')
-
if ogRest.terminated:
return