1
=== added file 'bin/glance'
2
--- bin/glance	1970-01-01 00:00:00 +0000
3
+++ bin/glance	2011-03-09 13:40:45 +0000
4
@@ -0,0 +1,572 @@
5
1
#!/usr/bin/env python
6
2
# vim: tabstop=4 shiftwidth=4 softtabstop=4
7
3
8
4
# Copyright 2011 OpenStack, LLC
9
5
# All Rights Reserved.
10
6
#
11
7
#    Licensed under the Apache License, Version 2.0 (the "License"); you may
12
8
#    not use this file except in compliance with the License. You may obtain
13
9
#    a copy of the License at
14
10
#
15
11
#         http://www.apache.org/licenses/LICENSE-2.0
16
12
#
17
13
#    Unless required by applicable law or agreed to in writing, software
18
14
#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
19
15
#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
20
16
#    License for the specific language governing permissions and limitations
21
17
#    under the License.
22
18
23
19
"""
24
20
This is the administration program for Glance. It is simply a command-line
25
21
interface for adding, modifying, and retrieving information about the images
26
22
stored in one or more Glance nodes.
27
23
"""
28
24
29
25
import optparse
30
26
import os
31
27
import re
32
28
import sys
33
29
import time
34
30
35
31
# If ../glance/__init__.py exists, add ../ to Python search path, so that
36
32
# it will override what happens to be installed in /usr/(local/)lib/python...
37
33
possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
38
34
                                   os.pardir,
39
35
                                   os.pardir))
40
36
if os.path.exists(os.path.join(possible_topdir, 'glance', '__init__.py')):
41
37
    sys.path.insert(0, possible_topdir)
42
38
43
39
from glance import client
44
40
from glance import version
45
41
from glance.common import exception
46
42
from glance.common import utils
47
43
48
44
SUCCESS = 0
49
45
FAILURE = 1
50
46
51
47
52
48
def get_image_fields_from_args(args):
53
49
    """
54
50
    Validate the set of arguments passed as field name/value pairs
55
51
    and return them as a mapping.
56
52
    """
57
53
    fields = {}
58
54
    for arg in args:
59
55
        pieces = arg.strip(',').split('=')
60
56
        if len(pieces) != 2:
61
57
            msg = ("Arguments should be in the form of field=value. "
62
58
                   "You specified %s." % arg)
63
59
            raise RuntimeError(msg)
64
60
        fields[pieces[0]] = pieces[1]
65
61
66
62
    fields = dict([(k.lower().replace('-', '_'), v)
67
63
                   for k, v in fields.items()])
68
64
    return fields
69
65
70
66
71
67
def print_image_formatted(client, image):
72
68
    """
73
69
    Formatted print of image metadata.
74
70
75
71
    :param client: The Glance client object
76
72
    :param image: The image metadata
77
73
    """
78
74
    print "URI: %s://%s/images/%s" % (client.use_ssl and "https" or "http",
79
75
                                      client.host,
80
76
                                      image['id'])
81
77
    print "Id: %s" % image['id']
82
78
    print "Public: " + (image['is_public'] and "Yes" or "No")
83
79
    print "Name: %s" % image['name']
84
80
    print "Size: %d" % int(image['size'])
85
81
    print "Location: %s" % image['location']
86
82
    print "Disk format: %s" % image['disk_format']
87
83
    print "Container format: %s" % image['container_format']
88
84
    if len(image['properties']) > 0:
89
85
        for k, v in image['properties'].items():
90
86
            print "Property '%s': %s" % (k, v)
91
87
92
88
93
89
def image_add(options, args):
94
90
    """
95
91
%(prog)s add [options] <field1=value1 field2=value2 ...> [ < /path/to/image ]
96
92
97
93
Adds a new image to Glance. Specify metadata fields as arguments.
98
94
99
95
SPECIFYING IMAGE METADATA
100
96
===============================================================================
101
97
102
98
All field/value pairs are converted into a mapping that is passed
103
99
to Glance that represents the metadata for an image.
104
100
105
101
Field names of note:
106
102
107
103
id                  Optional. If not specified, an image identifier will be
108
104
                    automatically assigned.
109
105
name                Required. A name for the image.
110
106
size                Optional. Should be size in bytes of the image if
111
107
                    specified.
112
108
is_public           Optional. If specified, interpreted as a boolean value
113
109
                    and sets or unsets the image's availability to the public.
114
110
                    The default value is False.
115
111
disk_format         Optional. Possible values are 'vhd','vmdk','raw', 'qcow2',
116
112
                    and 'ami'. Default value is 'raw'.
117
113
container_format    Optional. Possible values are 'ovf' and 'ami'.
118
114
                    Default value is 'ovf'.
119
115
location            Optional. When specified, should be a readable location
120
116
                    in the form of a URI: $STORE://LOCATION. For example, if
121
117
                    the image data is stored in a file on the local
122
118
                    filesystem at /usr/share/images/some.image.tar.gz
123
119
                    you would specify:
124
120
                    location=file:///usr/share/images/some.image.tar.gz
125
121
126
122
Any other field names are considered to be custom properties so be careful
127
123
to spell field names correctly. :)
128
124
129
125
STREAMING IMAGE DATA
130
126
===============================================================================
131
127
132
128
If the location field is not specified, you can stream an image file on
133
129
the command line using standard redirection. For example:
134
130
135
131
%(prog)s add name="Ubuntu 10.04 LTS 5GB" < /tmp/images/myimage.tar.gz
136
132
137
133
EXAMPLES
138
134
===============================================================================
139
135
140
136
%(prog)s add name="My Image" disk_format=raw container_format=ovf \\
141
137
    location=http://images.ubuntu.org/images/lucid-10.04-i686.iso \\
142
138
    distro="Ubuntu 10.04 LTS"
143
139
144
140
%(prog)s add name="My Image" distro="Ubuntu 10.04 LTS" < /tmp/myimage.iso"""
145
141
    c = get_client(options)
146
142
147
143
    try:
148
144
        fields = get_image_fields_from_args(args)
149
145
    except RuntimeError, e:
150
146
        print e
151
147
        return FAILURE
152
148
153
149
    if 'name' not in fields.keys():
154
150
        print "Please specify a name for the image using name=VALUE"
155
151
        return FAILURE
156
152
157
153
    image_meta = {'name': fields.pop('name'),
158
154
                  'is_public': utils.bool_from_string(
159
155
                      fields.pop('is_public', False)),
160
156
                  'disk_format': fields.pop('disk_format', 'raw'),
161
157
                  'container_format': fields.pop('container_format', 'ovf')}
162
158
163
159
    # Strip any args that are not supported
164
160
    unsupported_fields = ['status']
165
161
    for field in unsupported_fields:
166
162
        if field in fields.keys():
167
163
            print 'Found non-settable field %s. Removing.' % field
168
164
            fields.pop(field)
169
165
170
166
    if 'location' in fields.keys():
171
167
        image_meta['location'] = fields.pop('location')
172
168
173
169
    # We need either a location or image data/stream to add...
174
170
    image_location = image_meta.get('location')
175
171
    image_data = None
176
172
    if not image_location:
177
173
        # Grab the image data stream from stdin or redirect,
178
174
        # otherwise error out
179
175
        image_data = sys.stdin
180
176
    else:
181
177
        # Ensure no image data has been given
182
178
        if not sys.stdin.isatty():
183
179
            print "Either supply a location=LOCATION argument or supply image "
184
180
            print "data via a redirect. You have supplied BOTH image data "
185
181
            print "AND a location."
186
182
            return FAILURE
187
183
188
184
    # Add custom attributes, which are all the arguments remaining
189
185
    image_meta['properties'] = fields
190
186
191
187
    if not options.dry_run:
192
188
        try:
193
189
            image_meta = c.add_image(image_meta, image_data)
194
190
            image_id = image_meta['id']
195
191
            print "Added new image with ID: %s" % image_id
196
192
            if options.verbose:
197
193
                print "Returned the following metadata for the new image:"
198
194
                for k, v in sorted(image_meta.items()):
199
195
                    print " %(k)30s => %(v)s" % locals()
200
196
        except client.ClientConnectionError, e:
201
197
            host = options.host
202
198
            port = options.port
203
199
            print ("Failed to connect to the Glance API server "
204
200
                   "%(host)s:%(port)d. Is the server running?" % locals())
205
201
            if options.verbose:
206
202
                pieces = str(e).split('\n')
207
203
                for piece in pieces:
208
204
                    print piece
209
205
            return FAILURE
210
206
        except Exception, e:
211
207
            print "Failed to add image. Got error:"
212
208
            pieces = str(e).split('\n')
213
209
            for piece in pieces:
214
210
                print piece
215
211
            return FAILURE
216
212
    else:
217
213
        print "Dry run. We would have done the following:"
218
214
        print "Add new image with metadata:"
219
215
        for k, v in sorted(image_meta.items()):
220
216
            print " %(k)30s => %(v)s" % locals()
221
217
222
218
    return SUCCESS
223
219
224
220
225
221
def image_update(options, args):
226
222
    """
227
223
%(prog)s update [options] <ID> <field1=value1 field2=value2 ...>
228
224
229
225
Updates an image's metadata in Glance. Specify metadata fields as arguments.
230
226
231
227
All field/value pairs are converted into a mapping that is passed
232
228
to Glance that represents the metadata for an image.
233
229
234
230
Field names that can be specified:
235
231
236
232
name                A name for the image.
237
233
is_public           If specified, interpreted as a boolean value
238
234
                    and sets or unsets the image's availability to the public.
239
235
disk_format         Format of the disk image
240
236
container_format    Format of the container
241
237
242
238
All other field names are considered to be custom properties so be careful
243
239
to spell field names correctly. :)"""
244
240
    c = get_client(options)
245
241
    try:
246
242
        image_id = args.pop(0)
247
243
    except IndexError:
248
244
        print "Please specify the ID of the image you wish to update "
249
245
        print "as the first argument"
250
246
        return FAILURE
251
247
252
248
    try:
253
249
        fields = get_image_fields_from_args(args)
254
250
    except RuntimeError, e:
255
251
        print e
256
252
        return FAILURE
257
253
258
254
    image_meta = {}
259
255
260
256
    # Strip any args that are not supported
261
257
    nonmodifiable_fields = ['created_on', 'deleted_on', 'deleted',
262
258
                          'updated_on', 'size', 'status']
263
259
    for field in nonmodifiable_fields:
264
260
        if field in fields.keys():
265
261
            print 'Found non-modifiable field %s. Removing.' % field
266
262
            fields.pop(field)
267
263
268
264
    base_image_fields = ['disk_format', 'container_format',
269
265
                         'location']
270
266
    for field in base_image_fields:
271
267
        fvalue = fields.pop(field, None)
272
268
        if fvalue:
273
269
            image_meta[field] = fvalue
274
270
275
271
    # Have to handle "boolean" values specially...
276
272
    if 'is_public' in fields:
277
273
        image_meta['is_public'] = utils.int_from_bool_as_string(
278
274
            fields.pop('is_public'))
279
275
280
276
    # Add custom attributes, which are all the arguments remaining
281
277
    image_meta['properties'] = fields
282
278
283
279
    if not options.dry_run:
284
280
        try:
285
281
            image_meta = c.update_image(image_id, image_meta=image_meta)
286
282
            print "Updated image %s" % image_id
287
283
288
284
            if options.verbose:
289
285
                print "Updated image metadata for image %s:" % image_id
290
286
                print_image_formatted(c, image_meta)
291
287
        except exception.NotFound:
292
288
            print "No image with ID %s was found" % image_id
293
289
            return FAILURE
294
290
        except Exception, e:
295
291
            print "Failed to update image. Got error:"
296
292
            pieces = str(e).split('\n')
297
293
            for piece in pieces:
298
294
                print piece
299
295
            return FAILURE
300
296
    else:
301
297
        print "Dry run. We would have done the following:"
302
298
        print "Update existing image with metadata:"
303
299
        for k, v in sorted(image_meta.items()):
304
300
            print " %(k)30s => %(v)s" % locals()
305
301
    return SUCCESS
306
302
307
303
308
304
def image_delete(options, args):
309
305
    """
310
306
%(prog)s delete [options] <ID>
311
307
312
308
Deletes an image from Glance"""
313
309
    c = get_client(options)
314
310
    try:
315
311
        image_id = args.pop()
316
312
    except IndexError:
317
313
        print "Please specify the ID of the image you wish to delete "
318
314
        print "as the first argument"
319
315
        return FAILURE
320
316
321
317
    try:
322
318
        c.delete_image(image_id)
323
319
        print "Deleted image %s" % image_id
324
320
        return SUCCESS
325
321
    except exception.NotFound:
326
322
        print "No image with ID %s was found" % image_id
327
323
        return FAILURE
328
324
329
325
330
326
def image_show(options, args):
331
327
    """
332
328
%(prog)s show [options] <ID>
333
329
334
330
Shows image metadata for an image in Glance"""
335
331
    c = get_client(options)
336
332
    try:
337
333
        if len(args) > 0:
338
334
            image_id = args[0]
339
335
        else:
340
336
            print "Please specify the image identifier as the "
341
337
            print "first argument. Example: "
342
338
            print "$> glance-admin show 12345"
343
339
            return FAILURE
344
340
345
341
        image = c.get_image_meta(image_id)
346
342
        print_image_formatted(c, image)
347
343
        return SUCCESS
348
344
    except exception.NotFound:
349
345
        print "No image with ID %s was found" % image_id
350
346
        return FAILURE
351
347
    except Exception, e:
352
348
        print "Failed to show image. Got error:"
353
349
        pieces = str(e).split('\n')
354
350
        for piece in pieces:
355
351
            print piece
356
352
        return FAILURE
357
353
358
354
359
355
def images_index(options, args):
360
356
    """
361
357
%(prog)s index [options]
362
358
363
359
Returns basic information for all public images
364
360
a Glance server knows about"""
365
361
    c = get_client(options)
366
362
    try:
367
363
        images = c.get_images()
368
364
        if len(images) == 0:
369
365
            print "No public images found."
370
366
            return SUCCESS
371
367
372
368
        print "Found %d public images..." % len(images)
373
369
        print "%-16s %-30s %-20s %-20s %-14s" % (("ID"),
374
370
                                           ("Name"),
375
371
                                           ("Disk Format"),
376
372
                                           ("Container Format"),
377
373
                                           ("Size"))
378
374
        print ('-' * 16) + " " + ('-' * 30) + " "\
379
375
              + ('-' * 20) + " " + ('-' * 20) + " " + ('-' * 14)
380
376
        for image in images:
381
377
            print "%-16s %-30s %-20s %-20s %14d" % (image['id'],
382
378
                                              image['name'],
383
379
                                              image['disk_format'],
384
380
                                              image['container_format'],
385
381
                                              int(image['size']))
386
382
        return SUCCESS
387
383
    except Exception, e:
388
384
        print "Failed to show index. Got error:"
389
385
        pieces = str(e).split('\n')
390
386
        for piece in pieces:
391
387
            print piece
392
388
        return FAILURE
393
389
394
390
395
391
def images_detailed(options, args):
396
392
    """
397
393
%(prog)s details [options]
398
394
399
395
Returns detailed information for all public images
400
396
a Glance server knows about"""
401
397
    c = get_client(options)
402
398
    try:
403
399
        images = c.get_images_detailed()
404
400
        if len(images) == 0:
405
401
            print "No public images found."
406
402
            return SUCCESS
407
403
408
404
        num_images = len(images)
409
405
        print "Found %d public images..." % num_images
410
406
        cur_image = 1
411
407
        for image in images:
412
408
            print "=" * 80
413
409
            print_image_formatted(c, image)
414
410
            if cur_image == num_images:
415
411
                print "=" * 80
416
412
            cur_image += 1
417
413
418
414
        return SUCCESS
419
415
    except Exception, e:
420
416
        print "Failed to show details. Got error:"
421
417
        pieces = str(e).split('\n')
422
418
        for piece in pieces:
423
419
            print piece
424
420
        return FAILURE
425
421
426
422
427
423
def images_clear(options, args):
428
424
    """
429
425
%(prog)s clear [options]
430
426
431
427
Deletes all images from a Glance server"""
432
428
    c = get_client(options)
433
429
    images = c.get_images()
434
430
    for image in images:
435
431
        if options.verbose:
436
432
            print 'Deleting image %s "%s" ...' % (image['id'], image['name']),
437
433
        try:
438
434
            c.delete_image(image['id'])
439
435
            if options.verbose:
440
436
                print 'done'
441
437
        except Exception, e:
442
438
            print 'Failed to delete image %s' % image['id']
443
439
            print e
444
440
            return FAILURE
445
441
    return SUCCESS
446
442
447
443
448
444
def get_client(options):
449
445
    """
450
446
    Returns a new client object to a Glance server
451
447
    specified by the --host and --port options
452
448
    supplied to the CLI
453
449
    """
454
450
    return client.Client(host=options.host,
455
451
                         port=options.port)
456
452
457
453
458
454
def create_options(parser):
459
455
    """
460
456
    Sets up the CLI and config-file options that may be
461
457
    parsed and program commands.
462
458
463
459
    :param parser: The option parser
464
460
    """
465
461
    parser.add_option('-v', '--verbose', default=False, action="store_true",
466
462
                      help="Print more verbose output")
467
463
    parser.add_option('-H', '--host', metavar="ADDRESS", default="0.0.0.0",
468
464
                      help="Address of Glance API host. "
469
465
                           "Default: %default")
470
466
    parser.add_option('-p', '--port', dest="port", metavar="PORT",
471
467
                      type=int, default=9292,
472
468
                      help="Port the Glance API host listens on. "
473
469
                           "Default: %default")
474
470
    parser.add_option('--dry-run', default=False, action="store_true",
475
471
                      help="Don't actually execute the command, just print "
476
472
                           "output showing what WOULD happen.")
477
473
478
474
479
475
def parse_options(parser, cli_args):
480
476
    """
481
477
    Returns the parsed CLI options, command to run and its arguments, merged
482
478
    with any same-named options found in a configuration file
483
479
484
480
    :param parser: The option parser
485
481
    """
486
482
    COMMANDS = {'help': print_help,
487
483
                'add': image_add,
488
484
                'update': image_update,
489
485
                'delete': image_delete,
490
486
                'index': images_index,
491
487
                'details': images_detailed,
492
488
                'show': image_show,
493
489
                'clear': images_clear}
494
490
495
491
    if not cli_args:
496
492
        cli_args.append('-h')  # Show options in usage output...
497
493
498
494
    (options, args) = parser.parse_args(cli_args)
499
495
500
496
    if not args:
501
497
        parser.print_usage()
502
498
        sys.exit(0)
503
499
    else:
504
500
        command_name = args.pop(0)
505
501
        if command_name not in COMMANDS.keys():
506
502
            sys.exit("Unknown command: %s" % command_name)
507
503
    command = COMMANDS[command_name]
508
504
509
505
    return (options, command, args)
510
506
511
507
512
508
def print_help(options, args):
513
509
    """
514
510
    Print help specific to a command
515
511
    """
516
512
    COMMANDS = {'add': image_add,
517
513
                'update': image_update,
518
514
                'delete': image_delete,
519
515
                'index': images_index,
520
516
                'details': images_detailed,
521
517
                'show': image_show,
522
518
                'clear': images_clear}
523
519
524
520
    if len(args) != 1:
525
521
        sys.exit("Please specify a command")
526
522
527
523
    command = args.pop()
528
524
    if command not in COMMANDS.keys():
529
525
        parser.print_usage()
530
526
        if args:
531
527
            sys.exit("Unknown command: %s" % command)
532
528
533
529
    print COMMANDS[command].__doc__ % {'prog': os.path.basename(sys.argv[0])}
534
530
535
531
536
532
if __name__ == '__main__':
537
533
    usage = """
538
534
%prog <command> [options] [args]
539
535
540
536
Commands:
541
537
542
538
    help <command>  Output help for one of the commands below
543
539
544
540
    add             Adds a new image to Glance
545
541
546
542
    update          Updates an image's metadata in Glance
547
543
548
544
    delete          Deletes an image from Glance
549
545
550
546
    index           Return brief information about images in Glance
551
547
552
548
    details         Return detailed information about images in
553
549
                    Glance
554
550
555
551
    show            Show detailed information about an image in
556
552
                    Glance
557
553
558
554
    clear           Removes all images and metadata from Glance
559
555
560
556
"""
561
557
562
558
    oparser = optparse.OptionParser(version='%%prog %s'
563
559
                                    % version.version_string(),
564
560
                                    usage=usage.strip())
565
561
    create_options(oparser)
566
562
    (options, command, args) = parse_options(oparser, sys.argv[1:])
567
563
568
564
    try:
569
565
        start_time = time.time()
570
566
        result = command(options, args)
571
567
        end_time = time.time()
572
568
        if options.verbose:
573
569
            print "Completed in %-0.4f sec." % (end_time - start_time)
574
570
        sys.exit(result)
575
571
    except (RuntimeError, NotImplementedError), e:
576
572
        print "ERROR: ", e
577
0
573
578
=== added file 'doc/source/glance.rst'
579
--- doc/source/glance.rst	1970-01-01 00:00:00 +0000
580
+++ doc/source/glance.rst	2011-03-09 13:40:45 +0000
581
@@ -0,0 +1,374 @@
582
1
..
583
2
      Copyright 2011 OpenStack, LLC
584
3
      All Rights Reserved.
585
4
586
5
      Licensed under the Apache License, Version 2.0 (the "License"); you may
587
6
      not use this file except in compliance with the License. You may obtain
588
7
      a copy of the License at
589
8
590
9
          http://www.apache.org/licenses/LICENSE-2.0
591
10
592
11
      Unless required by applicable law or agreed to in writing, software
593
12
      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
594
13
      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
595
14
      License for the specific language governing permissions and limitations
596
15
      under the License.
597
16
598
17
Using the Glance CLI Tool
599
18
=========================
600
19
601
20
Glance ships with a command-line tool for quering and managing Glance
602
21
It has a fairly simple but powerful interface of the form::
603
22
604
23
  Usage: glance <command> [options] [args]
605
24
606
25
Where ``<command>`` is one of the following:
607
26
608
27
* help
609
28
610
29
  Show detailed help information about a specific command
611
30
612
31
* add
613
32
614
33
  Adds an image to Glance
615
34
616
35
* update
617
36
618
37
  Updates an image's stored metadata in Glance
619
38
620
39
* delete
621
40
622
41
  Deletes an image and its metadata from Glance
623
42
624
43
* index
625
44
626
45
  Lists brief information about *public* images that Glance knows about
627
46
628
47
* details
629
48
630
49
  Lists detailed information about *public* images that Glance knows about
631
50
632
51
* show
633
52
634
53
  Lists detailed information about a specific image
635
54
636
55
* clear
637
56
638
57
  Destroys *all* images and their associated metadata
639
58
640
59
This document describes how to use the ``glance`` tool for each of
641
60
the above commands.
642
61
643
62
The ``help`` command
644
63
--------------------
645
64
646
65
Issuing the ``help`` command with a ``<COMMAND>`` argument shows detailed help
647
66
about a specific command. Running ``glance`` without any arguments shows
648
67
a brief help message, like so::
649
68
650
69
  $> glance
651
70
  Usage: glance <command> [options] [args]
652
71
653
72
  Commands:
654
73
655
74
      help <command>  Output help for one of the commands below
656
75
657
76
      add             Adds a new image to Glance
658
77
659
78
      update          Updates an image's metadata in Glance
660
79
661
80
      delete          Deletes an image from Glance
662
81
663
82
      index           Return brief information about images in Glance
664
83
665
84
      details         Return detailed information about images in
666
85
                      Glance
667
86
668
87
      show            Show detailed information about an image in
669
88
                      Glance
670
89
671
90
      clear           Removes all images and metadata from Glance
672
91
673
92
  Options:
674
93
    --version             show program's version number and exit
675
94
    -h, --help            show this help message and exit
676
95
    -v, --verbose         Print more verbose output
677
96
    -H ADDRESS, --host=ADDRESS
678
97
                          Address of Glance API host. Default: example.com
679
98
    -p PORT, --port=PORT  Port the Glance API host listens on. Default: 9292
680
99
    --dry-run             Don't actually execute the command, just print output
681
100
                          showing what WOULD happen.
682
101
683
102
With a ``<COMMAND>`` argument, more information on the command is shown,
684
103
like so::
685
104
686
105
  $> glance help update
687
106
688
107
  glance update [options] <ID> <field1=value1 field2=value2 ...>
689
108
690
109
  Updates an image's metadata in Glance. Specify metadata fields as arguments.
691
110
692
111
  All field/value pairs are converted into a mapping that is passed
693
112
  to Glance that represents the metadata for an image.
694
113
695
114
  Field names that can be specified:
696
115
697
116
  name                A name for the image.
698
117
  is_public           If specified, interpreted as a boolean value
699
118
                      and sets or unsets the image's availability to the public.
700
119
  disk_format         Format of the disk image
701
120
  container_format    Format of the container
702
121
703
122
  All other field names are considered to be custom properties so be careful
704
123
  to spell field names correctly. :)
705
124
706
125
The ``add`` command
707
126
-------------------
708
127
709
128
The ``add`` command is used to do both of the following:
710
129
711
130
* Store virtual machine image data and metadata about that image in Glance
712
131
713
132
* Let Glance know about an existing virtual machine image that may be stored
714
133
  somewhere else
715
134
716
135
We cover both use cases below.
717
136
718
137
Store virtual machine image data and metadata
719
138
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
720
139
721
140
When adding an actual virtual machine image to Glance, you use the ``add``
722
141
command. You will pass metadata about the VM image on the command line, and
723
142
you will use a standard shell redirect to stream the image data file to
724
143
``glance``.
725
144
726
145
Let's walk through a simple example. Suppose we have an image stored on our
727
146
local filesystem that we wish to "upload" to Glance. This image is stored
728
147
on our local filesystem in ``/tmp/images/myimage.tar.gz``.
729
148
730
149
We'd also like to tell Glance that this image should be called "My Image", and
731
150
that the image should be public -- anyone should be able to fetch it.
732
151
733
152
Here is how we'd upload this image to Glance::
734
153
735
154
  $> glance add name="My Image" is_public=true < /tmp/images/myimage.tar.gz
736
155
737
156
If Glance was able to successfully upload and store your VM image data and
738
157
metadata attributes, you would see something like this::
739
158
740
159
  $> glance add name="My Image" is_public=true < /tmp/images/myimage.tar.gz
741
160
  Added new image with ID: 2
742
161
743
162
You can use the ``--verbose`` (or ``-v``) command-line option to print some more
744
163
information about the metadata that was saved with the image::
745
164
746
165
  $> glance --verbose add name="My Image" is_public=true < /tmp/images/myimage.tar.gz
747
166
  Added new image with ID: 4
748
167
  Returned the following metadata for the new image:
749
168
                 container_format => ovf
750
169
                       created_at => 2011-02-22T19:20:53.298556
751
170
                          deleted => False
752
171
                       deleted_at => None
753
172
                      disk_format => raw
754
173
                               id => 4
755
174
                        is_public => True
756
175
                         location => file:///tmp/images/4
757
176
                             name => My Image
758
177
                       properties => {}
759
178
                             size => 58520278
760
179
                           status => active
761
180
                       updated_at => None
762
181
  Completed in 0.6141 sec.
763
182
764
183
If you are unsure about what will be added, you can use the ``--dry-run``
765
184
command-line option, which will simply show you what *would* have happened::
766
185
767
186
  $> glance --dry-run add name="Foo" distro="Ubuntu" is_publi=True < /tmp/images/myimage.tar.gz
768
187
  Dry run. We would have done the following:
769
188
  Add new image with metadata:
770
189
                 container_format => ovf
771
190
                      disk_format => raw
772
191
                        is_public => False
773
192
                             name => Foo
774
193
                       properties => {'is_publi': 'True', 'distro': 'Ubuntu'}
775
194
776
195
This is useful for detecting problems and for seeing what the default field
777
196
values supplied by ``glance`` are.  For instance, there was a typo in
778
197
the command above (the ``is_public`` field was incorrectly spelled ``is_publi``
779
198
which resulted in the image having an ``is_publi`` custom property added to
780
199
the image and the *real* ``is_public`` field value being `False` (the default)
781
200
and not `True`...
782
201
783
202
Register a virtual machine image in another location
784
203
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
785
204
786
205
Sometimes, you already have stored the virtual machine image in some non-Glance
787
206
location -- perhaps even a location you have no write access to -- and you want
788
207
to tell Glance where this virtual machine image is located and some metadata
789
208
about it. The ``add`` command can do this for you.
790
209
791
210
When registering an image in this way, the only difference is that you do not
792
211
use a shell redirect to stream a virtual machine image file into Glance, but
793
212
instead, you tell Glance where to find the existing virtual machine image by
794
213
setting the ``location`` field. Below is an example of doing this.
795
214
796
215
Let's assume that there is a virtual machine image located at the URL
797
216
``http://example.com/images/myimage.tar.gz``. We can register this image with
798
217
Glance using the following::
799
218
800
219
  $> glance --verbose add name="Some web image" location="http://example.com/images/myimage.tar.gz"
801
220
  Added new image with ID: 1
802
221
  Returned the following metadata for the new image:
803
222
                 container_format => ovf
804
223
                       created_at => 2011-02-23T00:42:04.688890
805
224
                          deleted => False
806
225
                       deleted_at => None
807
226
                      disk_format => vhd
808
227
                               id => 1
809
228
                        is_public => True
810
229
                         location => http://example.com/images/myimage.tar.gz
811
230
                             name => Some web image
812
231
                       properties => {}
813
232
                             size => 0
814
233
                           status => active
815
234
                       updated_at => None
816
235
  Completed in 0.0356 sec.
817
236
818
237
The ``update`` command
819
238
----------------------
820
239
821
240
After uploading/adding a virtual machine image to Glance, it is not possible to
822
241
modify the actual virtual machine image -- images are read-only after all --
823
242
however, it *is* possible to update any metadata about the image after you add
824
243
it to Glance.
825
244
826
245
The ``update`` command allows you to update the metadata fields of a stored
827
246
image. You use this command like so::
828
247
829
248
  glance update <ID> [field1=value1 field2=value2 ...]
830
249
831
250
Let's say we have an image with identifier 5 that we wish to change the is_public
832
251
attribute of the image from False to True. The following would accomplish this::
833
252
834
253
  $> glance update 5 is_public=true
835
254
  Updated image 5
836
255
837
256
Using the ``--verbose`` flag will show you all the updated data about the image::
838
257
839
258
  $> glance --verbose update 5 is_public=true
840
259
  Updated image 5
841
260
  Updated image metadata for image 5:
842
261
  URI: http://example.com/images/5
843
262
  Id: 5
844
263
  Public? Yes
845
264
  Name: My Image
846
265
  Size: 58520278
847
266
  Location: file:///tmp/images/5
848
267
  Disk format: raw
849
268
  Container format: ovf
850
269
  Completed in 0.0596 sec.
851
270
852
271
The ``delete`` command
853
272
----------------------
854
273
855
274
You can delete an image by using the ``delete`` command, shown below::
856
275
857
276
  $> glance --verbose delete 5
858
277
  Deleted image 5
859
278
860
279
The ``index`` command
861
280
---------------------
862
281
863
282
The ``index`` command displays brief information about the *public* images
864
283
available in Glance, as shown below::
865
284
866
285
  $> glance index
867
286
  Found 4 public images...
868
287
  ID               Name                           Disk Format          Container Format     Size          
869
288
  ---------------- ------------------------------ -------------------- -------------------- --------------
870
289
  1                Ubuntu 10.10                   vhd                  ovf                        58520278
871
290
  2                Ubuntu 10.04                   ami                  ami                        58520278
872
291
  3                Fedora 9                       vdi                  bare                           3040
873
292
  4                Vanilla Linux 2.6.22           qcow2                bare                              0
874
293
875
294
The ``details`` command
876
295
-----------------------
877
296
878
297
The ``details`` command displays detailed information about the *public* images
879
298
available in Glance, as shown below::
880
299
881
300
  $> glance details
882
301
  Found 4 public images...
883
302
  ================================================================================
884
303
  URI: http://example.com/images/1
885
304
  Id: 1
886
305
  Public? Yes
887
306
  Name: Ubuntu 10.10
888
307
  Size: 58520278
889
308
  Location: file:///tmp/images/1
890
309
  Disk format: vhd
891
310
  Container format: ovf
892
311
  Property 'distro_version': 10.10
893
312
  Property 'distro': Ubuntu
894
313
  ================================================================================
895
314
  URI: http://example.com/images/2
896
315
  Id: 2
897
316
  Public? Yes
898
317
  Name: Ubuntu 10.04
899
318
  Size: 58520278
900
319
  Location: file:///tmp/images/2
901
320
  Disk format: ami
902
321
  Container format: ami
903
322
  Property 'distro_version': 10.04
904
323
  Property 'distro': Ubuntu
905
324
  ================================================================================
906
325
  URI: http://example.com/images/3
907
326
  Id: 3
908
327
  Public? Yes
909
328
  Name: Fedora 9
910
329
  Size: 3040
911
330
  Location: file:///tmp/images/3
912
331
  Disk format: vdi
913
332
  Container format: bare
914
333
  Property 'distro_version': 9
915
334
  Property 'distro': Fedora
916
335
  ================================================================================
917
336
  URI: http://example.com/images/4
918
337
  Id: 4
919
338
  Public? Yes
920
339
  Name: Vanilla Linux 2.6.22
921
340
  Size: 0
922
341
  Location: http://example.com/images/vanilla.tar.gz
923
342
  Disk format: qcow2
924
343
  Container format: bare
925
344
  ================================================================================
926
345
927
346
The ``show`` command
928
347
--------------------
929
348
930
349
The ``show`` command displays detailed information about a specific image, specified
931
350
with ``<ID>``, as shown below::
932
351
933
352
  $> glance show 3
934
353
  URI: http://example.com/images/3
935
354
  Id: 3
936
355
  Public? Yes
937
356
  Name: Fedora 9
938
357
  Size: 3040
939
358
  Location: file:///tmp/images/3
940
359
  Disk format: vdi
941
360
  Container format: bare
942
361
  Property 'distro_version': 9
943
362
  Property 'distro': Fedora
944
363
945
364
The ``clear`` command
946
365
---------------------
947
366
948
367
The ``clear`` command is an administrative command that deletes **ALL** images
949
368
and all image metadata. Passing the ``--verbose`` command will print brief
950
369
information about all the images that were deleted, as shown below::
951
370
952
371
  $> glance --verbose clear
953
372
  Deleting image 1 "Some web image" ... done
954
373
  Deleting image 2 "Some other web image" ... done
955
374
  Completed in 0.0328 sec.
956
0
375
957
=== modified file 'doc/source/index.rst'
958
--- doc/source/index.rst	2011-02-25 14:55:26 +0000
959
+++ doc/source/index.rst	2011-03-09 13:40:45 +0000
960
@@ -62,6 +62,7 @@
961
62
   installing
62
   installing
962
63
   controllingservers
63
   controllingservers
963
64
   configuring
64
   configuring
964
65
   glance
965
65
   glanceapi
66
   glanceapi
966
66
   client
67
   client
967
67
68
968
68
69
969
=== modified file 'glance/client.py'
970
--- glance/client.py	2011-03-06 15:37:28 +0000
971
+++ glance/client.py	2011-03-09 13:40:45 +0000
972
@@ -247,10 +247,8 @@
973
247
247
974
248
        :retval The newly-stored image's metadata.
248
        :retval The newly-stored image's metadata.
975
249
        """
249
        """
976
250
        if image_meta is None:
977
251
            image_meta = {}
978
252
250
980
253
        headers = utils.image_meta_to_http_headers(image_meta)
251
        headers = utils.image_meta_to_http_headers(image_meta or {})
981
254
252
982
255
        if image_data:
253
        if image_data:
983
256
            body = image_data
254
            body = image_data
984
257
255
985
=== modified file 'glance/common/utils.py'
986
--- glance/common/utils.py	2011-01-28 21:54:34 +0000
987
+++ glance/common/utils.py	2011-03-09 13:40:45 +0000
988
@@ -36,6 +36,37 @@
989
36
TIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ"
36
TIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ"
990
37
37
991
38
38
992
39
def int_from_bool_as_string(subject):
993
40
    """
994
41
    Interpret a string as a boolean and return either 1 or 0.
995
42
996
43
    Any string value in:
997
44
        ('True', 'true', 'On', 'on', '1')
998
45
    is interpreted as a boolean True.
999
46
1000
47
    Useful for JSON-decoded stuff and config file parsing
1001
48
    """
1002
49
    return bool_from_string(subject) and 1 or 0
1003
50
1004
51
1005
52
def bool_from_string(subject):
1006
53
    """
1007
54
    Interpret a string as a boolean.
1008
55
1009
56
    Any string value in:
1010
57
        ('True', 'true', 'On', 'on', '1')
1011
58
    is interpreted as a boolean True.
1012
59
1013
60
    Useful for JSON-decoded stuff and config file parsing
1014
61
    """
1015
62
    if type(subject) == type(bool):
1016
63
        return subject
1017
64
    if hasattr(subject, 'startswith'):  # str or unicode...
1018
65
        if subject.strip().lower() in ('true', 'on', '1'):
1019
66
            return True
1020
67
    return False
1021
68
1022
69
1023
39
def import_class(import_str):
70
def import_class(import_str):
1024
40
    """Returns a class from a string including module and class"""
71
    """Returns a class from a string including module and class"""
1025
41
    mod_str, _sep, class_str = import_str.rpartition('.')
72
    mod_str, _sep, class_str = import_str.rpartition('.')
1026
42
73
1027
=== modified file 'glance/registry/__init__.py'
1028
--- glance/registry/__init__.py	2011-01-28 21:54:34 +0000
1029
+++ glance/registry/__init__.py	2011-03-09 13:40:45 +0000
1030
@@ -1,7 +1,6 @@
1031
1
# vim: tabstop=4 shiftwidth=4 softtabstop=4
1
# vim: tabstop=4 shiftwidth=4 softtabstop=4
1032
2
2
1035
3
# Copyright 2010 United States Government as represented by the
3
# Copyright 2010-2011 OpenStack, LLC
1034
4
# Administrator of the National Aeronautics and Space Administration.
1036
5
# All Rights Reserved.
4
# All Rights Reserved.
1037
6
#
5
#
1038
7
#    Licensed under the Apache License, Version 2.0 (the "License"); you may
6
#    Licensed under the Apache License, Version 2.0 (the "License"); you may
1039
@@ -20,12 +19,17 @@
1040
20
Registry API
19
Registry API
1041
21
"""
20
"""
1042
22
21
1043
22
import logging
1044
23
1045
23
from glance.registry import client
24
from glance.registry import client
1046
24
25
1047
26
logger = logging.getLogger('glance.registry')
1048
27
1049
25
28
1050
26
def get_registry_client(options):
29
def get_registry_client(options):
1053
27
    return client.RegistryClient(options['registry_host'],
30
    host = options['registry_host']
1054
28
                                 int(options['registry_port']))
31
    port = int(options['registry_port'])
1055
32
    return client.RegistryClient(host, port)
1056
29
33
1057
30
34
1058
31
def get_images_list(options):
35
def get_images_list(options):
1059
@@ -43,16 +47,51 @@
1060
43
    return c.get_image(image_id)
47
    return c.get_image(image_id)
1061
44
48
1062
45
49
1071
46
def add_image_metadata(options, image_data):
50
def add_image_metadata(options, image_meta):
1072
47
    c = get_registry_client(options)
51
    if options['debug']:
1073
48
    return c.add_image(image_data)
52
        logger.debug("Adding image metadata...")
1074
49
53
        _debug_print_metadata(image_meta)
1075
50
54
1076
51
def update_image_metadata(options, image_id, image_data):
55
    c = get_registry_client(options)
1077
52
    c = get_registry_client(options)
56
    new_image_meta = c.add_image(image_meta)
1078
53
    return c.update_image(image_id, image_data)
57
1079
58
    if options['debug']:
1080
59
        logger.debug("Returned image metadata from call to "
1081
60
                     "RegistryClient.add_image():")
1082
61
        _debug_print_metadata(new_image_meta)
1083
62
1084
63
    return new_image_meta
1085
64
1086
65
1087
66
def update_image_metadata(options, image_id, image_meta):
1088
67
    if options['debug']:
1089
68
        logger.debug("Updating image metadata for image %s...", image_id)
1090
69
        _debug_print_metadata(image_meta)
1091
70
1092
71
    c = get_registry_client(options)
1093
72
    new_image_meta = c.update_image(image_id, image_meta)
1094
73
1095
74
    if options['debug']:
1096
75
        logger.debug("Returned image metadata from call to "
1097
76
                     "RegistryClient.update_image():")
1098
77
        _debug_print_metadata(new_image_meta)
1099
78
1100
79
    return new_image_meta
1101
54
80
1102
55
81
1103
56
def delete_image_metadata(options, image_id):
82
def delete_image_metadata(options, image_id):
1104
83
    logger.debug("Deleting image metadata for image %s...", image_id)
1105
57
    c = get_registry_client(options)
84
    c = get_registry_client(options)
1106
58
    return c.delete_image(image_id)
85
    return c.delete_image(image_id)
1107
86
1108
87
1109
88
def _debug_print_metadata(image_meta):
1110
89
    data = image_meta.copy()
1111
90
    properties = data.pop('properties', None)
1112
91
    for key, value in sorted(data.items()):
1113
92
        logger.debug(" %(key)20s: %(value)s" % locals())
1114
93
    if properties:
1115
94
        logger.debug(" %d custom properties...",
1116
95
                     len(properties))
1117
96
        for key, value in properties.items():
1118
97
            logger.debug(" %(key)20s: %(value)s" % locals())
1119
59
98
1120
=== modified file 'glance/registry/db/api.py'
1121
--- glance/registry/db/api.py	2011-03-05 17:04:43 +0000
1122
+++ glance/registry/db/api.py	2011-03-09 13:40:45 +0000
1123
@@ -24,6 +24,7 @@
1124
24
24
1125
25
from sqlalchemy import create_engine
25
from sqlalchemy import create_engine
1126
26
from sqlalchemy.ext.declarative import declarative_base
26
from sqlalchemy.ext.declarative import declarative_base
1127
27
from sqlalchemy.orm import exc
1128
27
from sqlalchemy.orm import joinedload
28
from sqlalchemy.orm import joinedload
1129
28
from sqlalchemy.orm import sessionmaker
29
from sqlalchemy.orm import sessionmaker
1130
29
30
1131
@@ -126,8 +127,7 @@
1132
126
                       filter_by(id=image_id).\
127
                       filter_by(id=image_id).\
1133
127
                       one()
128
                       one()
1134
128
    except exc.NoResultFound:
129
    except exc.NoResultFound:
1137
129
        new_exc = exception.NotFound("No model for id %s" % image_id)
130
        raise exception.NotFound("No image found with ID %s" % image_id)
1136
130
        raise new_exc.__class__, new_exc, sys.exc_info()[2]
1138
131
131
1139
132
132
1140
133
def image_get_all_public(context):
133
def image_get_all_public(context):
1141
134
134
1142
=== modified file 'glance/registry/server.py'
1143
--- glance/registry/server.py	2011-02-25 14:55:26 +0000
1144
+++ glance/registry/server.py	2011-03-09 13:40:45 +0000
1145
@@ -55,6 +55,8 @@
1146
55
        images = db_api.image_get_all_public(None)
55
        images = db_api.image_get_all_public(None)
1147
56
        image_dicts = [dict(id=i['id'],
56
        image_dicts = [dict(id=i['id'],
1148
57
                            name=i['name'],
57
                            name=i['name'],
1149
58
                            disk_format=i['disk_format'],
1150
59
                            container_format=i['container_format'],
1151
58
                            size=i['size']) for i in images]
60
                            size=i['size']) for i in images]
1152
59
        return dict(images=image_dicts)
61
        return dict(images=image_dicts)
1153
60
62
1154
@@ -144,6 +146,8 @@
1155
144
146
1156
145
        context = None
147
        context = None
1157
146
        try:
148
        try:
1158
149
            logger.debug("Updating image %(id)s with metadata: %(image_data)r"
1159
150
                         % locals())
1160
147
            updated_image = db_api.image_update(context, id, image_data)
151
            updated_image = db_api.image_update(context, id, image_data)
1161
148
            return dict(image=make_image_dict(updated_image))
152
            return dict(image=make_image_dict(updated_image))
1162
149
        except exception.Invalid, e:
153
        except exception.Invalid, e:
1163
150
154
1164
=== modified file 'glance/server.py'
1165
--- glance/server.py	2011-03-06 15:41:29 +0000
1166
+++ glance/server.py	2011-03-09 13:40:45 +0000
1167
@@ -90,6 +90,8 @@
1168
90
            {'images': [
90
            {'images': [
1169
91
                {'id': <ID>,
91
                {'id': <ID>,
1170
92
                 'name': <NAME>,
92
                 'name': <NAME>,
1171
93
                 'disk_format': <DISK_FORMAT>,
1172
94
                 'container_format': <DISK_FORMAT>,
1173
93
                 'size': <SIZE>}, ...
95
                 'size': <SIZE>}, ...
1174
94
            ]}
96
            ]}
1175
95
        """
97
        """
1176
@@ -390,7 +392,6 @@
1177
390
            image_meta = registry.update_image_metadata(self.options,
392
            image_meta = registry.update_image_metadata(self.options,
1178
391
                                                        id,
393
                                                        id,
1179
392
                                                        new_image_meta)
394
                                                        new_image_meta)
1180
393
1181
394
            if has_body:
395
            if has_body:
1182
395
                self._upload_and_activate(req, image_meta)
396
                self._upload_and_activate(req, image_meta)
1183
396
397
1184
397
398
1185
=== modified file 'glance/store/__init__.py'
1186
--- glance/store/__init__.py	2011-02-02 16:40:57 +0000
1187
+++ glance/store/__init__.py	2011-03-09 13:40:45 +0000
1188
@@ -90,7 +90,8 @@
1189
90
90
1190
91
    backend_class = get_backend_class(scheme)
91
    backend_class = get_backend_class(scheme)
1191
92
92
1193
93
    return backend_class.delete(parsed_uri, **kwargs)
93
    if hasattr(backend_class, 'delete'):
1194
94
        return backend_class.delete(parsed_uri, **kwargs)
1195
94
95
1196
95
96
1197
96
def get_store_from_location(location):
97
def get_store_from_location(location):
1198
97
98
1199
=== modified file 'glance/utils.py'
1200
--- glance/utils.py	2011-03-08 20:12:41 +0000
1201
+++ glance/utils.py	2011-03-09 13:40:45 +0000
1202
@@ -30,15 +30,16 @@
1203
30
    """
30
    """
1204
31
    headers = {}
31
    headers = {}
1205
32
    for k, v in image_meta.items():
32
    for k, v in image_meta.items():
1206
33
        if v is None:
1207
34
            v = ''
1208
33
        if k == 'properties':
35
        if k == 'properties':
1209
34
            for pk, pv in v.items():
36
            for pk, pv in v.items():
1210
35
                if pv is None:
37
                if pv is None:
1211
36
                    pv = ''
38
                    pv = ''
1212
37
                headers["x-image-meta-property-%s"
39
                headers["x-image-meta-property-%s"
1213
38
                        % pk.lower()] = unicode(pv)
40
                        % pk.lower()] = unicode(pv)
1217
39
        if v is None:
41
        else:
1218
40
            v = ''
42
            headers["x-image-meta-%s" % k.lower()] = unicode(v)
1216
41
        headers["x-image-meta-%s" % k.lower()] = unicode(v)
1219
42
    return headers
43
    return headers
1220
43
44
1221
44
45
1222
45
46
1223
=== modified file 'setup.py'
1224
--- setup.py	2011-02-09 21:56:48 +0000
1225
+++ setup.py	2011-03-09 13:40:45 +0000
1226
@@ -85,7 +85,8 @@
1227
85
        'Programming Language :: Python :: 2.6',
85
        'Programming Language :: Python :: 2.6',
1228
86
        'Environment :: No Input/Output (Daemon)',
86
        'Environment :: No Input/Output (Daemon)',
1229
87
    ],
87
    ],
1231
88
    scripts=['bin/glance-api',
88
    scripts=['bin/glance',
1232
89
             'bin/glance-api',
1233
89
             'bin/glance-combined',
90
             'bin/glance-combined',
1234
90
             'bin/glance-control',
91
             'bin/glance-control',
1235
91
             'bin/glance-manage',
92
             'bin/glance-manage',
1236
92
93
1237
=== modified file 'tests/stubs.py'
1238
--- tests/stubs.py	2011-03-06 15:41:29 +0000
1239
+++ tests/stubs.py	2011-03-09 13:40:45 +0000
1240
@@ -38,6 +38,7 @@
1241
38
38
1242
39
FAKE_FILESYSTEM_ROOTDIR = os.path.join('/tmp', 'glance-tests')
39
FAKE_FILESYSTEM_ROOTDIR = os.path.join('/tmp', 'glance-tests')
1243
40
VERBOSE = False
40
VERBOSE = False
1244
41
DEBUG = False
1245
41
42
1246
42
43
1247
43
def stub_out_http_backend(stubs):
44
def stub_out_http_backend(stubs):
1248
@@ -170,7 +171,8 @@
1249
170
                self.req.body = body
171
                self.req.body = body
1250
171
172
1251
172
        def getresponse(self):
173
        def getresponse(self):
1253
173
            options = {'sql_connection': 'sqlite://', 'verbose': VERBOSE}
174
            options = {'sql_connection': 'sqlite://', 'verbose': VERBOSE,
1254
175
                       'debug': DEBUG}
1255
174
            res = self.req.get_response(rserver.API(options))
176
            res = self.req.get_response(rserver.API(options))
1256
175
177
1257
176
            # httplib.Response has a read() method...fake it out
178
            # httplib.Response has a read() method...fake it out
1258
@@ -217,6 +219,7 @@
1259
217
219
1260
218
        def getresponse(self):
220
        def getresponse(self):
1261
219
            options = {'verbose': VERBOSE,
221
            options = {'verbose': VERBOSE,
1262
222
                       'debug': DEBUG,
1263
220
                       'registry_host': '0.0.0.0',
223
                       'registry_host': '0.0.0.0',
1264
221
                       'registry_port': '9191',
224
                       'registry_port': '9191',
1265
222
                       'default_store': 'file',
225
                       'default_store': 'file',
1266
223
226
1267
=== modified file 'tests/unit/test_api.py'
1268
--- tests/unit/test_api.py	2011-03-06 15:37:28 +0000
1269
+++ tests/unit/test_api.py	2011-03-09 13:40:45 +0000
1270
@@ -26,6 +26,9 @@
1271
26
from glance.registry import server as rserver
26
from glance.registry import server as rserver
1272
27
from tests import stubs
27
from tests import stubs
1273
28
28
1274
29
VERBOSE = False
1275
30
DEBUG = False
1276
31
1277
29
32
1278
30
class TestRegistryAPI(unittest.TestCase):
33
class TestRegistryAPI(unittest.TestCase):
1279
31
    def setUp(self):
34
    def setUp(self):
1280
@@ -34,7 +37,8 @@
1281
34
        stubs.stub_out_registry_and_store_server(self.stubs)
37
        stubs.stub_out_registry_and_store_server(self.stubs)
1282
35
        stubs.stub_out_registry_db_image_api(self.stubs)
38
        stubs.stub_out_registry_db_image_api(self.stubs)
1283
36
        stubs.stub_out_filesystem_backend()
39
        stubs.stub_out_filesystem_backend()
1285
37
        self.api = rserver.API({})
40
        self.api = rserver.API({'verbose': VERBOSE,
1286
41
                                'debug': DEBUG})
1287
38
42
1288
39
    def tearDown(self):
43
    def tearDown(self):
1289
40
        """Clear the test environment"""
44
        """Clear the test environment"""
1290
@@ -332,7 +336,9 @@
1291
332
        stubs.stub_out_registry_and_store_server(self.stubs)
336
        stubs.stub_out_registry_and_store_server(self.stubs)
1292
333
        stubs.stub_out_registry_db_image_api(self.stubs)
337
        stubs.stub_out_registry_db_image_api(self.stubs)
1293
334
        stubs.stub_out_filesystem_backend()
338
        stubs.stub_out_filesystem_backend()
1295
335
        options = {'registry_host': '0.0.0.0',
339
        options = {'verbose': VERBOSE,
1296
340
                   'debug': DEBUG,
1297
341
                   'registry_host': '0.0.0.0',
1298
336
                   'registry_port': '9191',
342
                   'registry_port': '9191',
1299
337
                   'sql_connection': 'sqlite://',
343
                   'sql_connection': 'sqlite://',
1300
338
                   'default_store': 'file',
344
                   'default_store': 'file',
Status:	Merged
Approved by:	Jay Pipes on 2011-03-09
Approved revision:	54
Merged at revision:	85
Proposed branch:	lp:~jaypipes/glance/glance-cli-tool
Merge into:	lp:~glance-coresec/glance/cactus-trunk
Prerequisite:	lp:~jaypipes/glance/api-image-format
Diff against target:	1300 lines (+1058/-26) 14 files modified bin/glance (+572/-0) doc/source/glance.rst (+374/-0) doc/source/index.rst (+1/-0) glance/client.py (+1/-3) glance/common/utils.py (+31/-0) glance/registry/__init__.py (+51/-12) glance/registry/db/api.py (+2/-2) glance/registry/server.py (+4/-0) glance/server.py (+2/-1) glance/store/__init__.py (+2/-1) glance/utils.py (+4/-3) setup.py (+2/-1) tests/stubs.py (+4/-1) tests/unit/test_api.py (+8/-2)
To merge this branch:	bzr merge lp:~jaypipes/glance/glance-cli-tool
Related bugs:	Link a bug report
Related blueprints:	Create bin/glance (High)
Reviewer	Date Requested	Status
Jay Pipes (community)		Approve on 2011-03-09
Rick Harris (community)	2011-02-27	Approve on 2011-03-08
Cory Wright (community)		Approve on 2011-03-08
Sandy Walsh (community)		Approve on 2011-02-28
Devin Carlen (community)	2011-02-25	Approve on 2011-02-27
Sandy Walsh	2011-02-27	Pending
Review via email: mp+51322@code.launchpad.net