summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJose M. Guisado <jguisado@soleta.eu>2021-02-10 11:46:06 +0000
committerJose M. Guisado <jguisado@soleta.eu>2021-02-10 11:46:06 +0000
commit3eda3fa68487a81e67f844e01ad7a6edf646d627 (patch)
tree83473ffed393be7ea096271d692eb157442a0483
parent95b28c9403dc33d64b5aa5ee3f41b98da184c1a1 (diff)
Add UNICAST-DIRECT method to image restore
Previously the only method (in the form select) was "UNICAST". This patch enables specifying a correct parameter for the underlying script to fetch the image to be restored. UNICAST-DIRECT makes the administrator transfer the image through the network. UNICAST-CACHE indicates the taget pc to search for the image in its cache partition. Also redirects to the /scopes when ogserver responds with 200 OK.
-rw-r--r--ogcp/forms/action_forms.py3
-rw-r--r--ogcp/views.py2
2 files changed, 3 insertions, 2 deletions
diff --git a/ogcp/forms/action_forms.py b/ogcp/forms/action_forms.py
index bc0915a..d85b15d 100644
--- a/ogcp/forms/action_forms.py
+++ b/ogcp/forms/action_forms.py
@@ -49,7 +49,8 @@ class ImageRestoreForm(FlaskForm):
partition = SelectField(label=_('Partition'), choices=[])
image = SelectField(label=_('Image'), choices=[])
method = SelectField(label=_('Method'),
- choices=[('UNICAST', 'Unicast')])
+ choices=[('UNICAST-CACHE', 'Unicast Cache'),
+ ('UNICAST-DIRECT', 'Unicast Direct')])
restore = SubmitField(label=_('Restore'))
class ClientDetailsForm(FlaskForm):
diff --git a/ogcp/views.py b/ogcp/views.py
index 191d496..e2ecaf4 100644
--- a/ogcp/views.py
+++ b/ogcp/views.py
@@ -252,7 +252,7 @@ def action_image_restore():
'id': str(image['id'])}
g.server.post('/image/restore', payload)
if r.status_code == requests.codes.ok:
- return make_response("200 OK", 200)
+ return redirect(url_for("scopes"))
return make_response("400 Bad Request", 400)
else:
ips = parse_ips(request.args.to_dict())