48k.eu-mirror
/
ogcp
mirror of https://git.48k.eu/ogcp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use assigned repository on images transfers 

Otherwise, update/restore fails on images not saved in the same machine
which runs ogServer.
multi-ogserver
Javier Sánchez Parra 2022-05-23 10:35:09 +02:00
parent d9d3d2ad5f
commit 85be1258e1
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ogcp/views.py
View File

@ -122,6 +122,13 @@ def get_clients(state_filter=None):
return clients
def get_repository(repository_id):
repositories = get_repositories()
[repository] = [repository for repository in repositories
if repository['id'] == repository_id]
return repository
def get_repositories():
r = g.server.get('/repositories')
repositories = r.json()['repositories']
@ -509,11 +516,12 @@ def action_image_restore():
if not image:
flash(_(f'Image to restore was not found'), category='error')
return redirect(url_for('commands'))
repository = get_repository(image['repo_id'])
payload = {'disk': disk,
'partition': partition,
'name': image['name'],
'repository': g.server.ip,
'repository': repository['ip'],
'clients': ips,
'type': form.method.data,
'profile': str(image['software_id']),
@ -1018,12 +1026,13 @@ def action_image_update():
if not image:
flash(_('Image to restore was not found'), category='error')
return redirect(url_for('commands'))
repository = get_repository(image['repo_id'])
payload = {'clients': [ip],
'disk': disk,
'partition': partition,
'code': code,
'name': image['name'],
'repository': g.server.ip,
'repository': repository['ip'],
'id': str(image['id']),
# Dummy parameters, not used by ogServer on image update.
'group_id': 0,