Revision dd339992 snf-cyclades-app/synnefo/volume/util.py

b/snf-cyclades-app/synnefo/volume/util.py
12 12 
    if for_update:
13 13 
        volumes = volumes.select_for_update()
14 14 
    try:
15 
        volume_id = int(volume_id)
16 
    except (TypeError, ValueError):
17 
        raise faults.BadRequest("Invalid volume id: %s" % volume_id)
18 
    try:
15 19 
        return volumes.get(id=volume_id, userid=user_id)
16 20 
    except models.Volume.DoesNotExist:
17 21 
        raise exception("Volume %s not found" % volume_id)
......
35 39 
def get_server(user_id, server_id, for_update=False,
36 40 
               exception=faults.ItemNotFound):
37 41 
    try:
42 
        server_id = int(server_id)
43 
    except (TypeError, ValueError):
44 
        raise faults.BadRequest("Invalid server id: %s" % server_id)
45 
    try:
38 46 
        return get_vm(server_id, user_id, for_update=for_update,
39 47 
                      non_deleted=True, non_suspended=True)
40 48 
    except faults.ItemNotFound:

Also available in: Unified diff