Revision fc517e59

b/snf-cyclades-app/synnefo/plankton/management/commands/image-show.py
28 28
# policies, either expressed or implied, of GRNET S.A.
29 29
#
30 30

  
31
from optparse import make_option
31 32
from django.core.management.base import BaseCommand, CommandError
32 33

  
34
from synnefo.management import common
33 35
from synnefo.plankton.utils import image_backend
34 36
from snf_django.management import utils
35 37

  
......
37 39
class Command(BaseCommand):
38 40
    args = "<image_id>"
39 41
    help = "Display available information about an image"
42
    option_list = BaseCommand.option_list + (
43
        make_option(
44
            '--user-id',
45
            dest='userid',
46
            default=None,
47
            help="The UUID of the owner of the image. Required"
48
                 " if image is not public"),
49
    )
40 50

  
51
    @common.convert_api_faults
41 52
    def handle(self, *args, **options):
42 53

  
43 54
        if len(args) != 1:
44 55
            raise CommandError("Please provide an image ID")
45 56
        image_id = args[0]
57
        user_id = options["userid"]
46 58

  
47
        with image_backend(None) as backend:
48
            images = backend._list_images(None)
49
            try:
50
                image = filter(lambda x: x["id"] == image_id, images)[0]
51
            except IndexError:
52
                raise CommandError("Image not found. Use snf-manage image-list"
53
                                   " to get the list of all images.")
59
        with image_backend(userid) as backend:
60
            image = backend.get_image(image_id)
54 61
        utils.pprint_table(out=self.stdout, table=[image.values()],
55 62
                           headers=image.keys(), vertical=True)
b/snf-cyclades-app/synnefo/plankton/utils.py
50 50
    try:
51 51
        yield image_backend
52 52
    except backend.Forbidden as e:
53
        raise faults.Forbidden
54
    except backend.ImageNotFound:
55
        raise faults.ItemNotFound
53
        raise faults.Forbidden("Access forbidden")
54
    except backend.ImageNotFound as e:
55
        raise faults.ItemNotFound("Not found")
56 56
    except backend.InvalidMetadata as e:
57 57
        raise faults.BadRequest(str(e))
58 58
    except QuotaError as e:
b/snf-cyclades-app/synnefo/volume/management/commands/snapshot-show.py
1
# Copyright 2012 GRNET S.A. All rights reserved.
2
#
3
# Redistribution and use in source and binary forms, with or without
4
# modification, are permitted provided that the following conditions
5
# are met:
6
#
7
#   1. Redistributions of source code must retain the above copyright
8
#      notice, this list of conditions and the following disclaimer.
9
#
10
#  2. Redistributions in binary form must reproduce the above copyright
11
#     notice, this list of conditions and the following disclaimer in the
12
#     documentation and/or other materials provided with the distribution.
13
#
14
# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
15
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
16
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
17
# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
18
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20
# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24
# SUCH DAMAGE.
25
#
26
# The views and conclusions contained in the software and documentation are
27
# those of the authors and should not be interpreted as representing official
28
# policies, either expressed or implied, of GRNET S.A.
29
#
30

  
31
from django.core.management.base import BaseCommand, CommandError
32
from optparse import make_option
33

  
34
from synnefo.management import common
35
from synnefo.plankton.utils import image_backend
36
from snf_django.management import utils
37

  
38

  
39
class Command(BaseCommand):
40
    args = "<snapshot_id>"
41
    help = "Display available information about a snapshot"
42
    option_list = BaseCommand.option_list + (
43
        make_option(
44
            '--user-id',
45
            dest='userid',
46
            default=None,
47
            help="The UUID of the owner of the snapshot. Required"
48
                 "if snapshot is not public"),
49
    )
50

  
51
    @common.convert_api_faults
52
    def handle(self, *args, **options):
53

  
54
        if len(args) != 1:
55
            raise CommandError("Please provide a snapshot ID")
56

  
57
        snapshot_id = args[0]
58
        user_id = options["userid"]
59

  
60
        with image_backend(userid) as backend:
61
            snapshot = backend.get_snapshot(userid, snapshot_id)
62
        utils.pprint_table(out=self.stdout, table=[snapshot.values()],
63
                           headers=snapshot.keys(), vertical=True)

Also available in: Unified diff