Revision b84ed662 snf-cyclades-app/synnefo/api/management/commands/server-show.py

b/snf-cyclades-app/synnefo/api/management/commands/server-show.py
32 32
# or implied, of GRNET S.A.
33 33

  
34 34
from django.core.management.base import BaseCommand, CommandError
35

  
36
from synnefo.api.util import get_image
37
from synnefo.db.models import VirtualMachine
38

  
39
from ._common import format_bool, format_date, format_vm_state
35
from synnefo.management.common import (format_bool, format_date,
36
                                       format_vm_state, get_vm,
37
                                       get_image)
40 38

  
41 39

  
42 40
class Command(BaseCommand):
......
47 45
        if len(args) != 1:
48 46
            raise CommandError("Please provide a server ID")
49 47

  
50
        try:
51
            server_id = int(args[0])
52
            server = VirtualMachine.objects.get(id=server_id)
53
        except (ValueError, VirtualMachine.DoesNotExist):
54
            raise CommandError("Invalid server ID")
48
        server = get_vm(args[0])
55 49

  
56 50
        flavor = '%s (%s)' % (server.flavor.id, server.flavor.name)
57 51
        userid = server.userid
......
64 58
        image = '%s (%s)' % (imageid, image_name)
65 59

  
66 60
        kv = {
67
            'id': server_id,
61
            'id': server.id,
68 62
            'name': server.name,
69 63
            'owner': userid,
70 64
            'created': format_date(server.created),

Also available in: Unified diff