x/solar
Code Issues Proposed changes

Snapshotter: fixes to vboxmanage (machineoutput), stop & resume vm for restore

Browse Source
This commit is contained in:
Przemyslaw Kaminski 2015-09-03 13:00:20 +02:00
parent 4f148062e7
commit f1e8b63d7a
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
snapshotter.py
View File

@ -3,7 +3,7 @@
import click import click
import time import time
from itertools import takewhile from itertools import takewhile
from subprocess import check_output from subprocess import check_output, CalledProcessError
def get_vagrant_vms(): def get_vagrant_vms():
@ -14,11 +14,14 @@ def get_vagrant_vms():
return vms return vms
def vboxmanage(*args): def vboxmanage(args, output_dict=False):
args = ('VBoxManage', ) + args args = ['VBoxManage'] + args
if args[1] in ('list', 'showvminfo'): if output_dict:
args = args + ('--machinereadable',) args = args + ['--machinereadable']
p = check_output(args, shell=False) p = check_output(args, shell=False)
if not output_dict:
return p
elements = [line.split('=') for line in p.split('\n') if line] elements = [line.split('=') for line in p.split('\n') if line]
return { return {
@ -47,7 +50,7 @@ def take(n):
vms = get_vagrant_vms() vms = get_vagrant_vms()
for vm in vms: for vm in vms:
click.echo("Taking %s" % vm) click.echo("Taking %s" % vm)
snap = vboxmanage('snapshot', vm, 'take', n, '--live', '--description', 'solar: %d' % now) snap = vboxmanage(['snapshot', vm, 'take', n, '--live', '--description', 'solar: %d' % now])
click.echo(snap) click.echo(snap)
@ -56,8 +59,16 @@ def take(n):
def restore(n): def restore(n):
vms = get_vagrant_vms() vms = get_vagrant_vms()
for vm in vms: for vm in vms:
vminfo = vboxmanage(['showvminfo', vm], output_dict=True)
was_running = False
if vminfo['VMState'] == 'running':
click.echo('[{vm}] Running, stopping'.format(vm=vm))
vagrant('suspend', vm)
was_running = True
click.echo("Restoring %s" % vm) click.echo("Restoring %s" % vm)
snap = vboxmanage('snapshot', vm, 'restore', n) snap = vboxmanage(['snapshot', vm, 'restore', n])
if was_running:
vagrant('up', vm)
click.echo(snap) click.echo(snap)
@ -72,9 +83,9 @@ def show():
'snap': '', 'snap': '',
} }
try: try:
snap = vboxmanage('snapshot', vm, 'list') snap = vboxmanage(['snapshot', vm, 'list'], output_dict=True)
kwargs['snap'] = '{SnapshotName} (UUID: {SnapshotUUID})'.format(**snap) kwargs['snap'] = '{SnapshotName} (UUID: {SnapshotUUID})'.format(**snap)
except Exception: except CalledProcessError:
kwargs['snap'] = click.style( kwargs['snap'] = click.style(
'This machine does not have any snapshots', 'This machine does not have any snapshots',
fg='red' fg='red'
@ -89,7 +100,7 @@ def delete(n):
vms = get_vagrant_vms() vms = get_vagrant_vms()
for vm in vms: for vm in vms:
click.echo('Removing %s from %s' % (n, vm)) click.echo('Removing %s from %s' % (n, vm))
snap = vboxmanage('snapshot', vm, 'delete', n) snap = vboxmanage(['snapshot', vm, 'delete', n])
click.echo(snap) click.echo(snap)