summaryrefslogtreecommitdiffstats
path: root/src/ogRest.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/ogRest.py')
-rw-r--r--src/ogRest.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/ogRest.py b/src/ogRest.py
index 24c8a70..4fb2bba 100644
--- a/src/ogRest.py
+++ b/src/ogRest.py
@@ -119,7 +119,7 @@ class ogThread():
def software(client, request, path, ogRest):
try:
- ogRest.operations.software(request, path, ogRest)
+ software = ogRest.operations.software(request, path, ogRest)
except ValueError as err:
response = restResponse(ogResponses.INTERNAL_ERR)
client.send(response.get())
@@ -128,8 +128,7 @@ class ogThread():
json_body = jsonBody()
json_body.add_element('partition', request.getPartition())
- with open(path, 'r') as f:
- json_body.add_element('software', f.read())
+ json_body.add_element('software', software)
response = restResponse(ogResponses.OK, json_body)
client.send(response.get())
@@ -188,6 +187,7 @@ class ogThread():
def image_create(client, path, request, ogRest):
try:
ogRest.operations.image_create(path, request, ogRest)
+ software = ogRest.operations.software(request, path, ogRest)
except ValueError as err:
response = restResponse(ogResponses.INTERNAL_ERR)
client.send(response.get())
@@ -201,8 +201,7 @@ class ogThread():
json_body.add_element('id', request.getId())
json_body.add_element('name', request.getName())
json_body.add_element('repository', request.getRepo())
- with open(path, 'r') as f:
- json_body.add_element('software', f.read())
+ json_body.add_element('software', software)
response = restResponse(ogResponses.OK, json_body)
client.send(response.get())