Merge lp:~jaypipes/glance/glance-cli-tool into lp:~glance-coresec/glance/cactus-trunk

[Jay Pipes]

Add Glance CLI tool

Adds a CLI tool to Glance (bin/glance) that allows a user to
interact with the Glance API server:

* add images
* update image metadata
* delete images and metadata
* delete all images (clear)
* show an image
* list public images
* show detailed info on public images

Adds documentation for the tool and cleans up a few issues
that came up in initial testing.

[Devin Carlen (devcamcar)]

Looks great, and excellent docs!

review: Approve

[Sandy Walsh (sandy-walsh)]

Looks great. I thought I'd pass along some things I like in novatools:

1. the use of PrettyTable to make the output look nice. It's a small, flexible package and would remove the need for the '-' * 16 stuff. http://code.google.com/p/prettytable/

2. Novatools goes through great pain to enforce Don't Repeat Yourself (DRY). All of the command line options are decorated so that they produce the --help output and we don't have to run around to update 3-4 different files whenever a command signature changes. It would be great to see that in this client shell as well.

These aren't critical for this merge, but something that would be nice to see for subsequent refactorings.

review: Approve

[Jay Pipes (jaypipes)]

> Looks great. I thought I'd pass along some things I like in novatools:
>
> 1. the use of PrettyTable to make the output look nice. It's a small, flexible
> package and would remove the need for the '-' * 16 stuff.
> http://code.google.com/p/prettytable/

Hmm, I'll check that out. Thanks for the heads up!

> 2. Novatools goes through great pain to enforce Don't Repeat Yourself (DRY).
> All of the command line options are decorated so that they produce the --help
> output and we don't have to run around to update 3-4 different files whenever
> a command signature changes. It would be great to see that in this client
> shell as well.

All --help documentation is generated from the relevant function's docstrings. Other than the actual RST docs, there's only a single place to change. Does Novatools have RST docs that are auto-generated from the decorators somehow? Is the --help output for Novatools only the function signature (because there's a lot more to the help output in bin/glance, including example usage...)?

-jay

[Cory Wright (corywright)]

Looks like setup.py needs to be updated to install bin/glance as well.

Hurry up and get this in, I can't wait to use it. :)

[Cory Wright (corywright)]

The 'details' view doesn't appear to be working properly. It finds my 7 images, but only prints details on the first one of them.

  cwright@maverick:~/openstack/glance-cli-tool$ ./bin/glance details
  Found 7 public images...
  ================================================================================
  URI: http://0.0.0.0/images/1
  Id: 1
  Public? Yes
  Name: ramdisk
  Size: 3976716
  Location: file:///home/cwright/openstack/images/glance/1
  'disk_format'
  'disk_format'
  cwright@maverick:~/openstack/glance-cli-tool$

From the code it looks like it should print image properties, but it isn't for one of my images. Also, notice the duplicate 'disk_format' lines in the output.

It would also be nice to be able to specify a particular image to get details for instead of having it print all of them. glance details could accept an optional image id.

review: Needs Fixing

[Jay Pipes (jaypipes)]

back from jury duty... will check out Cory's concerns.

[Jay Pipes (jaypipes)]

> The 'details' view doesn't appear to be working properly. It finds my 7
> images, but only prints details on the first one of them.
>
> cwright@maverick:~/openstack/glance-cli-tool$ ./bin/glance details
> Found 7 public images...
> ============================================================================
> ====
> URI: http://0.0.0.0/images/1
> Id: 1
> Public? Yes
> Name: ramdisk
> Size: 3976716
> Location: file:///home/cwright/openstack/images/glance/1
> 'disk_format'
> 'disk_format'
> cwright@maverick:~/openstack/glance-cli-tool$
>
> From the code it looks like it should print image properties, but it isn't for
> one of my images. Also, notice the duplicate 'disk_format' lines in the
> output.

Hmm, looks like this might be because of the admittedly missing database migration file. Looks like disk_format isn't a column returned from the db because the schema hasn't been migrated. Are you using an existing db?

> It would also be nice to be able to specify a particular image to get details
> for instead of having it print all of them. glance details could accept an
> optional image id.

You mean glance show <ID>? :)

-jay

[Cory Wright (corywright)]

> Hmm, looks like this might be because of the admittedly missing database
> migration file. Looks like disk_format isn't a column returned from the db
> because the schema hasn't been migrated. Are you using an existing db?

Yes, I was using my existing db. Sorry about that, I'll try again after migrating the db.

> > It would also be nice to be able to specify a particular image to get
> details
> > for instead of having it print all of them. glance details could accept an
> > optional image id.
>
> You mean glance show <ID>? :)

So 'details' is equivalent to 'show' for all images? I would expect 'show' to give basic information on an image, 'details' to give more information on an image such as custom image properties, and something else (showall?) to list everything.

One other nitpick, in the 'show' output is there a good reason to use 'Public?' instead of 'Public:' ? Using colons as the delimiter everywhere would make this output easy to parse in shell scripts and such.

[Jay Pipes (jaypipes)]

On Tue, Mar 1, 2011 at 10:57 AM, Cory Wright <email address hidden> wrote:
>> Hmm, looks like this might be because of the admittedly missing database
>> migration file.  Looks like disk_format isn't a column returned from the db
>> because the schema hasn't been migrated. Are you using an existing db?
>
> Yes, I was using my existing db.  Sorry about that, I'll try again after migrating the db.
>
>> > It would also be nice to be able to specify a particular image to get
>> details
>> > for instead of having it print all of them.  glance details could accept an
>> > optional image id.
>>
>> You mean glance show <ID>? :)
>
> So 'details' is equivalent to 'show' for all images?  I would expect 'show' to give basic information on an image, 'details' to give more information on an image such as custom image properties, and something else (showall?) to list everything.

Well, show(), index(), and details() do exactly the same as they do in
the OpenStack API controller. That's where the method names come from.

> One other nitpick, in the 'show' output is there a good reason to use 'Public?' instead of 'Public:' ?   Using colons as the delimiter everywhere would make this output easy to parse in shell scripts and such.

No, I can change that. I was planning on adding a -m/--machine option
to make the output ideal for machine-reading.

-jay

[Jay Pipes (jaypipes)]

Changed Public? => Public: per Cory's comment and added some more robust exception handling in a few of the bin/glance methods... also all merged up with trunk and resolved any conflicts. Please re-review at your earliest.

[Cory Wright (corywright)]

review: Approve

[Rick Harris (rconradharris)]

Looks good, great work Jay!

review: Approve

[OpenStack Infra (hudson-openstack)]

Attempt to merge into lp:glance failed due to conflicts:

text conflict in glance/utils.py

[Jay Pipes (jaypipes)]

Resolved conflict after merging trunk.

review: Approve

[OpenStack Infra (hudson-openstack)]

The attempt to merge lp:~jaypipes/glance/glance-cli-tool into lp:glance failed. Below is the output from the failed tests.

running test
running egg_info
creating glance.egg-info
writing glance.egg-info/PKG-INFO
writing top-level names to glance.egg-info/top_level.txt
writing dependency_links to glance.egg-info/dependency_links.txt
writing manifest file 'glance.egg-info/SOURCES.txt'
reading manifest file 'glance.egg-info/SOURCES.txt'
reading manifest template 'MANIFEST.in'
warning: no files found matching 'LICENSE'
warning: no files found matching 'ChangeLog'
warning: no files found matching 'tests/test_data.py'
writing manifest file 'glance.egg-info/SOURCES.txt'
running build_ext

Tests raises BadRequest for invalid store header ... ok
Tests to add a basic image in the file store ... ok
Tests creates a queued image for no body and no loc header ... ok
test_bad_container_format (tests.unit.test_api.TestGlanceAPI) ... ok
test_bad_disk_format (tests.unit.test_api.TestGlanceAPI) ... ok
test_delete_image (tests.unit.test_api.TestGlanceAPI) ... ok
test_delete_non_exists_image (tests.unit.test_api.TestGlanceAPI) ... ok
Test for HEAD /images/<ID> ... ok
test_show_image_basic (tests.unit.test_api.TestGlanceAPI) ... ok
test_show_non_exists_image (tests.unit.test_api.TestGlanceAPI) ... ok
Tests that the /images POST registry API creates the image ... ok
Tests proper exception is raised if a bad disk_format is set ... ok
Tests proper exception is raised if a bad disk_format is set ... ok
Tests proper exception is raised if a bad status is set ... ok
Tests that exception raised for bad matching disk and container ... ok
Tests that the /images DELETE registry API deletes the image ... ok
Tests proper exception is raised if attempt to delete non-existing ... ok
Tests that the /images/detail registry API returns ... ok
Tests that the /images registry API returns list of ... ok
Tests that the root registry API returns "index", ... ok
Tests that the /images PUT registry API updates the image ... ok
Tests proper exception is raised if attempt to update non-existing ... ok
Tests that exception raised trying to set a bad container_format ... ok
Tests that exception raised trying to set a bad disk_format ... ok
Tests that exception raised trying to set a bad status ... ok
Tests that exception raised for bad matching disk and container ... ok
Test ClientConnectionError raised ... ok
Tests proper exception is raised if image with ID already exists ... ok
Tests that we can add image metadata and returns the new id ... ok
Tests a bad status is set to a proper one by server ... ok
Tests BadRequest raised when supplying bad store name in meta ... ok
Tests can add image by passing image data as file ... ok
Tests can add image by passing image data as string ... ok
Tests add image by passing image data as string w/ no size attr ... ok
Tests that we can add image metadata with properties ... ok
Tests client returns image as queued ... ok
Tests that image metadata is deleted properly ... ok
Tests cannot delete non-existing image ... ok
Test a simple file backend retrieval works as expected ... ok
Tests that the detailed info about public images returned ... ok
Test correct...

[Vish Ishaya (vishvananda)]

looks like you mismerged here:

=== modified file 'glance/utils.py'
1200 --- glance/utils.py 2011-03-08 20:12:41 +0000
1201 +++ glance/utils.py 2011-03-09 00:10:38 +0000
1202 @@ -36,9 +36,10 @@
1203 pv = ''
1204 headers["x-image-meta-property-%s"
1205 % pk.lower()] = unicode(pv)
1206 + else:
1207 + headers["x-image-meta-%s" % k.lower()] = unicode(v)
1208 if v is None:
1209 v = ''
1210 - headers["x-image-meta-%s" % k.lower()] = unicode(v)
1211 return headers

the if v is None block needs to be inside the else and above the headers line.

[Jay Pipes (jaypipes)]

Well, duh :) Fixing now :)

On Tue, Mar 8, 2011 at 9:22 PM, Vish Ishaya <email address hidden> wrote:
> looks like you mismerged here:
>
> === modified file 'glance/utils.py'
> 1200    --- glance/utils.py     2011-03-08 20:12:41 +0000
> 1201    +++ glance/utils.py     2011-03-09 00:10:38 +0000
> 1202    @@ -36,9 +36,10 @@
> 1203                         pv = ''
> 1204                     headers["x-image-meta-property-%s"
> 1205                             % pk.lower()] = unicode(pv)
> 1206    +        else:
> 1207    +            headers["x-image-meta-%s" % k.lower()] = unicode(v)
> 1208             if v is None:
> 1209                 v = ''
> 1210    -        headers["x-image-meta-%s" % k.lower()] = unicode(v)
> 1211         return headers
>
> the if v is None block needs to be inside the else and above the headers line.
>
> --
> https://code.launchpad.net/~jaypipes/glance/glance-cli-tool/+merge/51322
> You are the owner of lp:~jaypipes/glance/glance-cli-tool.
>

[lp:~jaypipes/glance/glance-cli-tool]

54. By Jay Pipes on 2011-03-09

Silly mistake when resolving merge conflict...fixed

[Jay Pipes (jaypipes)]

fixed merge mistake..

review: Approve

=== added file 'bin/glance'
--- bin/glance	1970-01-01 00:00:00 +0000
+++ bin/glance	2011-03-09 13:40:45 +0000
@@ -0,0 +1,572 @@
+#!/usr/bin/env python
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2011 OpenStack, LLC
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+"""
+This is the administration program for Glance. It is simply a command-line
+interface for adding, modifying, and retrieving information about the images
+stored in one or more Glance nodes.
+"""
+
+import optparse
+import os
+import re
+import sys
+import time
+
+# If ../glance/__init__.py exists, add ../ to Python search path, so that
+# it will override what happens to be installed in /usr/(local/)lib/python...
+possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
+                                   os.pardir,
+                                   os.pardir))
+if os.path.exists(os.path.join(possible_topdir, 'glance', '__init__.py')):
+    sys.path.insert(0, possible_topdir)
+
+from glance import client
+from glance import version
+from glance.common import exception
+from glance.common import utils
+
+SUCCESS = 0
+FAILURE = 1
+
+
+def get_image_fields_from_args(args):
+    """
+    Validate the set of arguments passed as field name/value pairs
+    and return them as a mapping.
+    """
+    fields = {}
+    for arg in args:
+        pieces = arg.strip(',').split('=')
+        if len(pieces) != 2:
+            msg = ("Arguments should be in the form of field=value. "
+                   "You specified %s." % arg)
+            raise RuntimeError(msg)
+        fields[pieces[0]] = pieces[1]
+
+    fields = dict([(k.lower().replace('-', '_'), v)
+                   for k, v in fields.items()])
+    return fields
+
+
+def print_image_formatted(client, image):
+    """
+    Formatted print of image metadata.
+
+    :param client: The Glance client object
+    :param image: The image metadata
+    """
+    print "URI: %s://%s/images/%s" % (client.use_ssl and "https" or "http",
+                                      client.host,
+                                      image['id'])
+    print "Id: %s" % image['id']
+    print "Public: " + (image['is_public'] and "Yes" or "No")
+    print "Name: %s" % image['name']
+    print "Size: %d" % int(image['size'])
+    print "Location: %s" % image['location']
+    print "Disk format: %s" % image['disk_format']
+    print "Container format: %s" % image['container_format']
+    if len(image['properties']) > 0:
+        for k, v in image['properties'].items():
+            print "Property '%s': %s" % (k, v)
+
+
+def image_add(options, args):
+    """
+%(prog)s add [options] <field1=value1 field2=value2 ...> [ < /path/to/image ]
+
+Adds a new image to Glance. Specify metadata fields as arguments.
+
+SPECIFYING IMAGE METADATA
+===============================================================================
+
+All field/value pairs are converted into a mapping that is passed
+to Glance that represents the metadata for an image.
+
+Field names of note:
+
+id                  Optional. If not specified, an image identifier will be
+                    automatically assigned.
+name                Required. A name for the image.
+size                Optional. Should be size in bytes of the image if
+                    specified.
+is_public           Optional. If specified, interpreted as a boolean value
+                    and sets or unsets the image's availability to the public.
+                    The default value is False.
+disk_format         Optional. Possible values are 'vhd','vmdk','raw', 'qcow2',
+                    and 'ami'. Default value is 'raw'.
+container_format    Optional. Possible values are 'ovf' and 'ami'.
+                    Default value is 'ovf'.
+location            Optional. When specified, should be a readable location
+                    in the form of a URI: $STORE://LOCATION. For example, if
+                    the image data is stored in a file on the local
+                    filesystem at /usr/share/images/some.image.tar.gz
+                    you would specify:
+                    location=file:///usr/share/images/some.image.tar.gz
+
+Any other field names are considered to be custom properties so be careful
+to spell field names correctly. :)
+
+STREAMING IMAGE DATA
+===============================================================================
+
+If the location field is not specified, you can stream an image file on
+the command line using standard redirection. For example:
+
+%(prog)s add name="Ubuntu 10.04 LTS 5GB" < /tmp/images/myimage.tar.gz
+
+EXAMPLES
+===============================================================================
+
+%(prog)s add name="My Image" disk_format=raw container_format=ovf \\
+    location=http://images.ubuntu.org/images/lucid-10.04-i686.iso \\
+    distro="Ubuntu 10.04 LTS"
+
+%(prog)s add name="My Image" distro="Ubuntu 10.04 LTS" < /tmp/myimage.iso"""
+    c = get_client(options)
+
+    try:
+        fields = get_image_fields_from_args(args)
+    except RuntimeError, e:
+        print e
+        return FAILURE
+
+    if 'name' not in fields.keys():
+        print "Please specify a name for the image using name=VALUE"
+        return FAILURE
+
+    image_meta = {'name': fields.pop('name'),
+                  'is_public': utils.bool_from_string(
+                      fields.pop('is_public', False)),
+                  'disk_format': fields.pop('disk_format', 'raw'),
+                  'container_format': fields.pop('container_format', 'ovf')}
+
+    # Strip any args that are not supported
+    unsupported_fields = ['status']
+    for field in unsupported_fields:
+        if field in fields.keys():
+            print 'Found non-settable field %s. Removing.' % field
+            fields.pop(field)
+
+    if 'location' in fields.keys():
+        image_meta['location'] = fields.pop('location')
+
+    # We need either a location or image data/stream to add...
+    image_location = image_meta.get('location')
+    image_data = None
+    if not image_location:
+        # Grab the image data stream from stdin or redirect,
+        # otherwise error out
+        image_data = sys.stdin
+    else:
+        # Ensure no image data has been given
+        if not sys.stdin.isatty():
+            print "Either supply a location=LOCATION argument or supply image "
+            print "data via a redirect. You have supplied BOTH image data "
+            print "AND a location."
+            return FAILURE
+
+    # Add custom attributes, which are all the arguments remaining
+    image_meta['properties'] = fields
+
+    if not options.dry_run:
+        try:
+            image_meta = c.add_image(image_meta, image_data)
+            image_id = image_meta['id']
+            print "Added new image with ID: %s" % image_id
+            if options.verbose:
+                print "Returned the following metadata for the new image:"
+                for k, v in sorted(image_meta.items()):
+                    print " %(k)30s => %(v)s" % locals()
+        except client.ClientConnectionError, e:
+            host = options.host
+            port = options.port
+            print ("Failed to connect to the Glance API server "
+                   "%(host)s:%(port)d. Is the server running?" % locals())
+            if options.verbose:
+                pieces = str(e).split('\n')
+                for piece in pieces:
+                    print piece
+            return FAILURE
+        except Exception, e:
+            print "Failed to add image. Got error:"
+            pieces = str(e).split('\n')
+            for piece in pieces:
+                print piece
+            return FAILURE
+    else:
+        print "Dry run. We would have done the following:"
+        print "Add new image with metadata:"
+        for k, v in sorted(image_meta.items()):
+            print " %(k)30s => %(v)s" % locals()
+
+    return SUCCESS
+
+
+def image_update(options, args):
+    """
+%(prog)s update [options] <ID> <field1=value1 field2=value2 ...>
+
+Updates an image's metadata in Glance. Specify metadata fields as arguments.
+
+All field/value pairs are converted into a mapping that is passed
+to Glance that represents the metadata for an image.
+
+Field names that can be specified:
+
+name                A name for the image.
+is_public           If specified, interpreted as a boolean value
+                    and sets or unsets the image's availability to the public.
+disk_format         Format of the disk image
+container_format    Format of the container
+
+All other field names are considered to be custom properties so be careful
+to spell field names correctly. :)"""
+    c = get_client(options)
+    try:
+        image_id = args.pop(0)
+    except IndexError:
+        print "Please specify the ID of the image you wish to update "
+        print "as the first argument"
+        return FAILURE
+
+    try:
+        fields = get_image_fields_from_args(args)
+    except RuntimeError, e:
+        print e
+        return FAILURE
+
+    image_meta = {}
+
+    # Strip any args that are not supported
+    nonmodifiable_fields = ['created_on', 'deleted_on', 'deleted',
+                          'updated_on', 'size', 'status']
+    for field in nonmodifiable_fields:
+        if field in fields.keys():
+            print 'Found non-modifiable field %s. Removing.' % field
+            fields.pop(field)
+
+    base_image_fields = ['disk_format', 'container_format',
+                         'location']
+    for field in base_image_fields:
+        fvalue = fields.pop(field, None)
+        if fvalue:
+            image_meta[field] = fvalue
+
+    # Have to handle "boolean" values specially...
+    if 'is_public' in fields:
+        image_meta['is_public'] = utils.int_from_bool_as_string(
+            fields.pop('is_public'))
+
+    # Add custom attributes, which are all the arguments remaining
+    image_meta['properties'] = fields
+
+    if not options.dry_run:
+        try:
+            image_meta = c.update_image(image_id, image_meta=image_meta)
+            print "Updated image %s" % image_id
+
+            if options.verbose:
+                print "Updated image metadata for image %s:" % image_id
+                print_image_formatted(c, image_meta)
+        except exception.NotFound:
+            print "No image with ID %s was found" % image_id
+            return FAILURE
+        except Exception, e:
+            print "Failed to update image. Got error:"
+            pieces = str(e).split('\n')
+            for piece in pieces:
+                print piece
+            return FAILURE
+    else:
+        print "Dry run. We would have done the following:"
+        print "Update existing image with metadata:"
+        for k, v in sorted(image_meta.items()):
+            print " %(k)30s => %(v)s" % locals()
+    return SUCCESS
+
+
+def image_delete(options, args):
+    """
+%(prog)s delete [options] <ID>
+
+Deletes an image from Glance"""
+    c = get_client(options)
+    try:
+        image_id = args.pop()
+    except IndexError:
+        print "Please specify the ID of the image you wish to delete "
+        print "as the first argument"
+        return FAILURE
+
+    try:
+        c.delete_image(image_id)
+        print "Deleted image %s" % image_id
+        return SUCCESS
+    except exception.NotFound:
+        print "No image with ID %s was found" % image_id
+        return FAILURE
+
+
+def image_show(options, args):
+    """
+%(prog)s show [options] <ID>
+
+Shows image metadata for an image in Glance"""
+    c = get_client(options)
+    try:
+        if len(args) > 0:
+            image_id = args[0]
+        else:
+            print "Please specify the image identifier as the "
+            print "first argument. Example: "
+            print "$> glance-admin show 12345"
+            return FAILURE
+
+        image = c.get_image_meta(image_id)
+        print_image_formatted(c, image)
+        return SUCCESS
+    except exception.NotFound:
+        print "No image with ID %s was found" % image_id
+        return FAILURE
+    except Exception, e:
+        print "Failed to show image. Got error:"
+        pieces = str(e).split('\n')
+        for piece in pieces:
+            print piece
+        return FAILURE
+
+
+def images_index(options, args):
+    """
+%(prog)s index [options]
+
+Returns basic information for all public images
+a Glance server knows about"""
+    c = get_client(options)
+    try:
+        images = c.get_images()
+        if len(images) == 0:
+            print "No public images found."
+            return SUCCESS
+
+        print "Found %d public images..." % len(images)
+        print "%-16s %-30s %-20s %-20s %-14s" % (("ID"),
+                                           ("Name"),
+                                           ("Disk Format"),
+                                           ("Container Format"),
+                                           ("Size"))
+        print ('-' * 16) + " " + ('-' * 30) + " "\
+              + ('-' * 20) + " " + ('-' * 20) + " " + ('-' * 14)
+        for image in images:
+            print "%-16s %-30s %-20s %-20s %14d" % (image['id'],
+                                              image['name'],
+                                              image['disk_format'],
+                                              image['container_format'],
+                                              int(image['size']))
+        return SUCCESS
+    except Exception, e:
+        print "Failed to show index. Got error:"
+        pieces = str(e).split('\n')
+        for piece in pieces:
+            print piece
+        return FAILURE
+
+
+def images_detailed(options, args):
+    """
+%(prog)s details [options]
+
+Returns detailed information for all public images
+a Glance server knows about"""
+    c = get_client(options)
+    try:
+        images = c.get_images_detailed()
+        if len(images) == 0:
+            print "No public images found."
+            return SUCCESS
+
+        num_images = len(images)
+        print "Found %d public images..." % num_images
+        cur_image = 1
+        for image in images:
+            print "=" * 80
+            print_image_formatted(c, image)
+            if cur_image == num_images:
+                print "=" * 80
+            cur_image += 1
+
+        return SUCCESS
+    except Exception, e:
+        print "Failed to show details. Got error:"
+        pieces = str(e).split('\n')
+        for piece in pieces:
+            print piece
+        return FAILURE
+
+
+def images_clear(options, args):
+    """
+%(prog)s clear [options]
+
+Deletes all images from a Glance server"""
+    c = get_client(options)
+    images = c.get_images()
+    for image in images:
+        if options.verbose:
+            print 'Deleting image %s "%s" ...' % (image['id'], image['name']),
+        try:
+            c.delete_image(image['id'])
+            if options.verbose:
+                print 'done'
+        except Exception, e:
+            print 'Failed to delete image %s' % image['id']
+            print e
+            return FAILURE
+    return SUCCESS
+
+
+def get_client(options):
+    """
+    Returns a new client object to a Glance server
+    specified by the --host and --port options
+    supplied to the CLI
+    """
+    return client.Client(host=options.host,
+                         port=options.port)
+
+
+def create_options(parser):
+    """
+    Sets up the CLI and config-file options that may be
+    parsed and program commands.
+
+    :param parser: The option parser
+    """
+    parser.add_option('-v', '--verbose', default=False, action="store_true",
+                      help="Print more verbose output")
+    parser.add_option('-H', '--host', metavar="ADDRESS", default="0.0.0.0",
+                      help="Address of Glance API host. "
+                           "Default: %default")
+    parser.add_option('-p', '--port', dest="port", metavar="PORT",
+                      type=int, default=9292,
+                      help="Port the Glance API host listens on. "
+                           "Default: %default")
+    parser.add_option('--dry-run', default=False, action="store_true",
+                      help="Don't actually execute the command, just print "
+                           "output showing what WOULD happen.")
+
+
+def parse_options(parser, cli_args):
+    """
+    Returns the parsed CLI options, command to run and its arguments, merged
+    with any same-named options found in a configuration file
+
+    :param parser: The option parser
+    """
+    COMMANDS = {'help': print_help,
+                'add': image_add,
+                'update': image_update,
+                'delete': image_delete,
+                'index': images_index,
+                'details': images_detailed,
+                'show': image_show,
+                'clear': images_clear}
+
+    if not cli_args:
+        cli_args.append('-h')  # Show options in usage output...
+
+    (options, args) = parser.parse_args(cli_args)
+
+    if not args:
+        parser.print_usage()
+        sys.exit(0)
+    else:
+        command_name = args.pop(0)
+        if command_name not in COMMANDS.keys():
+            sys.exit("Unknown command: %s" % command_name)
+    command = COMMANDS[command_name]
+
+    return (options, command, args)
+
+
+def print_help(options, args):
+    """
+    Print help specific to a command
+    """
+    COMMANDS = {'add': image_add,
+                'update': image_update,
+                'delete': image_delete,
+                'index': images_index,
+                'details': images_detailed,
+                'show': image_show,
+                'clear': images_clear}
+
+    if len(args) != 1:
+        sys.exit("Please specify a command")
+
+    command = args.pop()
+    if command not in COMMANDS.keys():
+        parser.print_usage()
+        if args:
+            sys.exit("Unknown command: %s" % command)
+
+    print COMMANDS[command].__doc__ % {'prog': os.path.basename(sys.argv[0])}
+
+
+if __name__ == '__main__':
+    usage = """
+%prog <command> [options] [args]
+
+Commands:
+
+    help <command>  Output help for one of the commands below
+
+    add             Adds a new image to Glance
+
+    update          Updates an image's metadata in Glance
+
+    delete          Deletes an image from Glance
+
+    index           Return brief information about images in Glance
+
+    details         Return detailed information about images in
+                    Glance
+
+    show            Show detailed information about an image in
+                    Glance
+
+    clear           Removes all images and metadata from Glance
+
+"""
+
+    oparser = optparse.OptionParser(version='%%prog %s'
+                                    % version.version_string(),
+                                    usage=usage.strip())
+    create_options(oparser)
+    (options, command, args) = parse_options(oparser, sys.argv[1:])
+
+    try:
+        start_time = time.time()
+        result = command(options, args)
+        end_time = time.time()
+        if options.verbose:
+            print "Completed in %-0.4f sec." % (end_time - start_time)
+        sys.exit(result)
+    except (RuntimeError, NotImplementedError), e:
+        print "ERROR: ", e

=== added file 'doc/source/glance.rst'
--- doc/source/glance.rst	1970-01-01 00:00:00 +0000
+++ doc/source/glance.rst	2011-03-09 13:40:45 +0000
@@ -0,0 +1,374 @@
+..
+      Copyright 2011 OpenStack, LLC
+      All Rights Reserved.
+
+      Licensed under the Apache License, Version 2.0 (the "License"); you may
+      not use this file except in compliance with the License. You may obtain
+      a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+      License for the specific language governing permissions and limitations
+      under the License.
+
+Using the Glance CLI Tool
+=========================
+
+Glance ships with a command-line tool for quering and managing Glance
+It has a fairly simple but powerful interface of the form::
+
+  Usage: glance <command> [options] [args]
+
+Where ``<command>`` is one of the following:
+
+* help
+
+  Show detailed help information about a specific command
+
+* add
+
+  Adds an image to Glance
+
+* update
+
+  Updates an image's stored metadata in Glance
+
+* delete
+
+  Deletes an image and its metadata from Glance
+
+* index
+
+  Lists brief information about *public* images that Glance knows about
+
+* details
+
+  Lists detailed information about *public* images that Glance knows about
+
+* show
+
+  Lists detailed information about a specific image
+
+* clear
+
+  Destroys *all* images and their associated metadata
+
+This document describes how to use the ``glance`` tool for each of
+the above commands.
+
+The ``help`` command
+--------------------
+
+Issuing the ``help`` command with a ``<COMMAND>`` argument shows detailed help
+about a specific command. Running ``glance`` without any arguments shows
+a brief help message, like so::
+
+  $> glance
+  Usage: glance <command> [options] [args]
+
+  Commands:
+
+      help <command>  Output help for one of the commands below
+
+      add             Adds a new image to Glance
+
+      update          Updates an image's metadata in Glance
+
+      delete          Deletes an image from Glance
+
+      index           Return brief information about images in Glance
+
+      details         Return detailed information about images in
+                      Glance
+
+      show            Show detailed information about an image in
+                      Glance
+
+      clear           Removes all images and metadata from Glance
+
+  Options:
+    --version             show program's version number and exit
+    -h, --help            show this help message and exit
+    -v, --verbose         Print more verbose output
+    -H ADDRESS, --host=ADDRESS
+                          Address of Glance API host. Default: example.com
+    -p PORT, --port=PORT  Port the Glance API host listens on. Default: 9292
+    --dry-run             Don't actually execute the command, just print output
+                          showing what WOULD happen.
+
+With a ``<COMMAND>`` argument, more information on the command is shown,
+like so::
+
+  $> glance help update
+
+  glance update [options] <ID> <field1=value1 field2=value2 ...>
+
+  Updates an image's metadata in Glance. Specify metadata fields as arguments.
+
+  All field/value pairs are converted into a mapping that is passed
+  to Glance that represents the metadata for an image.
+
+  Field names that can be specified:
+
+  name                A name for the image.
+  is_public           If specified, interpreted as a boolean value
+                      and sets or unsets the image's availability to the public.
+  disk_format         Format of the disk image
+  container_format    Format of the container
+
+  All other field names are considered to be custom properties so be careful
+  to spell field names correctly. :)
+
+The ``add`` command
+-------------------
+
+The ``add`` command is used to do both of the following:
+
+* Store virtual machine image data and metadata about that image in Glance
+
+* Let Glance know about an existing virtual machine image that may be stored
+  somewhere else
+
+We cover both use cases below.
+
+Store virtual machine image data and metadata
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+When adding an actual virtual machine image to Glance, you use the ``add``
+command. You will pass metadata about the VM image on the command line, and
+you will use a standard shell redirect to stream the image data file to
+``glance``.
+
+Let's walk through a simple example. Suppose we have an image stored on our
+local filesystem that we wish to "upload" to Glance. This image is stored
+on our local filesystem in ``/tmp/images/myimage.tar.gz``.
+
+We'd also like to tell Glance that this image should be called "My Image", and
+that the image should be public -- anyone should be able to fetch it.
+
+Here is how we'd upload this image to Glance::
+
+  $> glance add name="My Image" is_public=true < /tmp/images/myimage.tar.gz
+
+If Glance was able to successfully upload and store your VM image data and
+metadata attributes, you would see something like this::
+
+  $> glance add name="My Image" is_public=true < /tmp/images/myimage.tar.gz
+  Added new image with ID: 2
+
+You can use the ``--verbose`` (or ``-v``) command-line option to print some more
+information about the metadata that was saved with the image::
+
+  $> glance --verbose add name="My Image" is_public=true < /tmp/images/myimage.tar.gz
+  Added new image with ID: 4
+  Returned the following metadata for the new image:
+                 container_format => ovf
+                       created_at => 2011-02-22T19:20:53.298556
+                          deleted => False
+                       deleted_at => None
+                      disk_format => raw
+                               id => 4
+                        is_public => True
+                         location => file:///tmp/images/4
+                             name => My Image
+                       properties => {}
+                             size => 58520278
+                           status => active
+                       updated_at => None
+  Completed in 0.6141 sec.
+
+If you are unsure about what will be added, you can use the ``--dry-run``
+command-line option, which will simply show you what *would* have happened::
+
+  $> glance --dry-run add name="Foo" distro="Ubuntu" is_publi=True < /tmp/images/myimage.tar.gz
+  Dry run. We would have done the following:
+  Add new image with metadata:
+                 container_format => ovf
+                      disk_format => raw
+                        is_public => False
+                             name => Foo
+                       properties => {'is_publi': 'True', 'distro': 'Ubuntu'}
+
+This is useful for detecting problems and for seeing what the default field
+values supplied by ``glance`` are.  For instance, there was a typo in
+the command above (the ``is_public`` field was incorrectly spelled ``is_publi``
+which resulted in the image having an ``is_publi`` custom property added to
+the image and the *real* ``is_public`` field value being `False` (the default)
+and not `True`...
+
+Register a virtual machine image in another location
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Sometimes, you already have stored the virtual machine image in some non-Glance
+location -- perhaps even a location you have no write access to -- and you want
+to tell Glance where this virtual machine image is located and some metadata
+about it. The ``add`` command can do this for you.
+
+When registering an image in this way, the only difference is that you do not
+use a shell redirect to stream a virtual machine image file into Glance, but
+instead, you tell Glance where to find the existing virtual machine image by
+setting the ``location`` field. Below is an example of doing this.
+
+Let's assume that there is a virtual machine image located at the URL
+``http://example.com/images/myimage.tar.gz``. We can register this image with
+Glance using the following::
+
+  $> glance --verbose add name="Some web image" location="http://example.com/images/myimage.tar.gz"
+  Added new image with ID: 1
+  Returned the following metadata for the new image:
+                 container_format => ovf
+                       created_at => 2011-02-23T00:42:04.688890
+                          deleted => False
+                       deleted_at => None
+                      disk_format => vhd
+                               id => 1
+                        is_public => True
+                         location => http://example.com/images/myimage.tar.gz
+                             name => Some web image
+                       properties => {}
+                             size => 0
+                           status => active
+                       updated_at => None
+  Completed in 0.0356 sec.
+
+The ``update`` command
+----------------------
+
+After uploading/adding a virtual machine image to Glance, it is not possible to
+modify the actual virtual machine image -- images are read-only after all --
+however, it *is* possible to update any metadata about the image after you add
+it to Glance.
+
+The ``update`` command allows you to update the metadata fields of a stored
+image. You use this command like so::
+
+  glance update <ID> [field1=value1 field2=value2 ...]
+
+Let's say we have an image with identifier 5 that we wish to change the is_public
+attribute of the image from False to True. The following would accomplish this::
+
+  $> glance update 5 is_public=true
+  Updated image 5
+
+Using the ``--verbose`` flag will show you all the updated data about the image::
+
+  $> glance --verbose update 5 is_public=true
+  Updated image 5
+  Updated image metadata for image 5:
+  URI: http://example.com/images/5
+  Id: 5
+  Public? Yes
+  Name: My Image
+  Size: 58520278
+  Location: file:///tmp/images/5
+  Disk format: raw
+  Container format: ovf
+  Completed in 0.0596 sec.
+
+The ``delete`` command
+----------------------
+
+You can delete an image by using the ``delete`` command, shown below::
+
+  $> glance --verbose delete 5
+  Deleted image 5
+
+The ``index`` command
+---------------------
+
+The ``index`` command displays brief information about the *public* images
+available in Glance, as shown below::
+
+  $> glance index
+  Found 4 public images...
+  ID               Name                           Disk Format          Container Format     Size          
+  ---------------- ------------------------------ -------------------- -------------------- --------------
+  1                Ubuntu 10.10                   vhd                  ovf                        58520278
+  2                Ubuntu 10.04                   ami                  ami                        58520278
+  3                Fedora 9                       vdi                  bare                           3040
+  4                Vanilla Linux 2.6.22           qcow2                bare                              0
+
+The ``details`` command
+-----------------------
+
+The ``details`` command displays detailed information about the *public* images
+available in Glance, as shown below::
+
+  $> glance details
+  Found 4 public images...
+  ================================================================================
+  URI: http://example.com/images/1
+  Id: 1
+  Public? Yes
+  Name: Ubuntu 10.10
+  Size: 58520278
+  Location: file:///tmp/images/1
+  Disk format: vhd
+  Container format: ovf
+  Property 'distro_version': 10.10
+  Property 'distro': Ubuntu
+  ================================================================================
+  URI: http://example.com/images/2
+  Id: 2
+  Public? Yes
+  Name: Ubuntu 10.04
+  Size: 58520278
+  Location: file:///tmp/images/2
+  Disk format: ami
+  Container format: ami
+  Property 'distro_version': 10.04
+  Property 'distro': Ubuntu
+  ================================================================================
+  URI: http://example.com/images/3
+  Id: 3
+  Public? Yes
+  Name: Fedora 9
+  Size: 3040
+  Location: file:///tmp/images/3
+  Disk format: vdi
+  Container format: bare
+  Property 'distro_version': 9
+  Property 'distro': Fedora
+  ================================================================================
+  URI: http://example.com/images/4
+  Id: 4
+  Public? Yes
+  Name: Vanilla Linux 2.6.22
+  Size: 0
+  Location: http://example.com/images/vanilla.tar.gz
+  Disk format: qcow2
+  Container format: bare
+  ================================================================================
+
+The ``show`` command
+--------------------
+
+The ``show`` command displays detailed information about a specific image, specified
+with ``<ID>``, as shown below::
+
+  $> glance show 3
+  URI: http://example.com/images/3
+  Id: 3
+  Public? Yes
+  Name: Fedora 9
+  Size: 3040
+  Location: file:///tmp/images/3
+  Disk format: vdi
+  Container format: bare
+  Property 'distro_version': 9
+  Property 'distro': Fedora
+
+The ``clear`` command
+---------------------
+
+The ``clear`` command is an administrative command that deletes **ALL** images
+and all image metadata. Passing the ``--verbose`` command will print brief
+information about all the images that were deleted, as shown below::
+
+  $> glance --verbose clear
+  Deleting image 1 "Some web image" ... done
+  Deleting image 2 "Some other web image" ... done
+  Completed in 0.0328 sec.

=== modified file 'doc/source/index.rst'
--- doc/source/index.rst	2011-02-25 14:55:26 +0000
+++ doc/source/index.rst	2011-03-09 13:40:45 +0000
@@ -62,6 +62,7 @@
    installing
    controllingservers
    configuring
+   glance
    glanceapi
    client
 

=== modified file 'glance/client.py'
--- glance/client.py	2011-03-06 15:37:28 +0000
+++ glance/client.py	2011-03-09 13:40:45 +0000
@@ -247,10 +247,8 @@
 
         :retval The newly-stored image's metadata.
         """
-        if image_meta is None:
-            image_meta = {}
 
-        headers = utils.image_meta_to_http_headers(image_meta)
+        headers = utils.image_meta_to_http_headers(image_meta or {})
 
         if image_data:
             body = image_data

=== modified file 'glance/common/utils.py'
--- glance/common/utils.py	2011-01-28 21:54:34 +0000
+++ glance/common/utils.py	2011-03-09 13:40:45 +0000
@@ -36,6 +36,37 @@
 TIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ"
 
 
+def int_from_bool_as_string(subject):
+    """
+    Interpret a string as a boolean and return either 1 or 0.
+
+    Any string value in:
+        ('True', 'true', 'On', 'on', '1')
+    is interpreted as a boolean True.
+
+    Useful for JSON-decoded stuff and config file parsing
+    """
+    return bool_from_string(subject) and 1 or 0
+
+
+def bool_from_string(subject):
+    """
+    Interpret a string as a boolean.
+
+    Any string value in:
+        ('True', 'true', 'On', 'on', '1')
+    is interpreted as a boolean True.
+
+    Useful for JSON-decoded stuff and config file parsing
+    """
+    if type(subject) == type(bool):
+        return subject
+    if hasattr(subject, 'startswith'):  # str or unicode...
+        if subject.strip().lower() in ('true', 'on', '1'):
+            return True
+    return False
+
+
 def import_class(import_str):
     """Returns a class from a string including module and class"""
     mod_str, _sep, class_str = import_str.rpartition('.')

=== modified file 'glance/registry/__init__.py'
--- glance/registry/__init__.py	2011-01-28 21:54:34 +0000
+++ glance/registry/__init__.py	2011-03-09 13:40:45 +0000
@@ -1,7 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Copyright 2010-2011 OpenStack, LLC
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -20,12 +19,17 @@
 Registry API
 """
 
+import logging
+
 from glance.registry import client
 
+logger = logging.getLogger('glance.registry')
+
 
 def get_registry_client(options):
-    return client.RegistryClient(options['registry_host'],
-                                 int(options['registry_port']))
+    host = options['registry_host']
+    port = int(options['registry_port'])
+    return client.RegistryClient(host, port)
 
 
 def get_images_list(options):
@@ -43,16 +47,51 @@
     return c.get_image(image_id)
 
 
-def add_image_metadata(options, image_data):
-    c = get_registry_client(options)
-    return c.add_image(image_data)
-
-
-def update_image_metadata(options, image_id, image_data):
-    c = get_registry_client(options)
-    return c.update_image(image_id, image_data)
+def add_image_metadata(options, image_meta):
+    if options['debug']:
+        logger.debug("Adding image metadata...")
+        _debug_print_metadata(image_meta)
+
+    c = get_registry_client(options)
+    new_image_meta = c.add_image(image_meta)
+
+    if options['debug']:
+        logger.debug("Returned image metadata from call to "
+                     "RegistryClient.add_image():")
+        _debug_print_metadata(new_image_meta)
+
+    return new_image_meta
+
+
+def update_image_metadata(options, image_id, image_meta):
+    if options['debug']:
+        logger.debug("Updating image metadata for image %s...", image_id)
+        _debug_print_metadata(image_meta)
+
+    c = get_registry_client(options)
+    new_image_meta = c.update_image(image_id, image_meta)
+
+    if options['debug']:
+        logger.debug("Returned image metadata from call to "
+                     "RegistryClient.update_image():")
+        _debug_print_metadata(new_image_meta)
+
+    return new_image_meta
 
 
 def delete_image_metadata(options, image_id):
+    logger.debug("Deleting image metadata for image %s...", image_id)
     c = get_registry_client(options)
     return c.delete_image(image_id)
+
+
+def _debug_print_metadata(image_meta):
+    data = image_meta.copy()
+    properties = data.pop('properties', None)
+    for key, value in sorted(data.items()):
+        logger.debug(" %(key)20s: %(value)s" % locals())
+    if properties:
+        logger.debug(" %d custom properties...",
+                     len(properties))
+        for key, value in properties.items():
+            logger.debug(" %(key)20s: %(value)s" % locals())

=== modified file 'glance/registry/db/api.py'
--- glance/registry/db/api.py	2011-03-05 17:04:43 +0000
+++ glance/registry/db/api.py	2011-03-09 13:40:45 +0000
@@ -24,6 +24,7 @@
 
 from sqlalchemy import create_engine
 from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import exc
 from sqlalchemy.orm import joinedload
 from sqlalchemy.orm import sessionmaker
 
@@ -126,8 +127,7 @@
                        filter_by(id=image_id).\
                        one()
     except exc.NoResultFound:
-        new_exc = exception.NotFound("No model for id %s" % image_id)
-        raise new_exc.__class__, new_exc, sys.exc_info()[2]
+        raise exception.NotFound("No image found with ID %s" % image_id)
 
 
 def image_get_all_public(context):

=== modified file 'glance/registry/server.py'
--- glance/registry/server.py	2011-02-25 14:55:26 +0000
+++ glance/registry/server.py	2011-03-09 13:40:45 +0000
@@ -55,6 +55,8 @@
         images = db_api.image_get_all_public(None)
         image_dicts = [dict(id=i['id'],
                             name=i['name'],
+                            disk_format=i['disk_format'],
+                            container_format=i['container_format'],
                             size=i['size']) for i in images]
         return dict(images=image_dicts)
 
@@ -144,6 +146,8 @@
 
         context = None
         try:
+            logger.debug("Updating image %(id)s with metadata: %(image_data)r"
+                         % locals())
             updated_image = db_api.image_update(context, id, image_data)
             return dict(image=make_image_dict(updated_image))
         except exception.Invalid, e:

=== modified file 'glance/server.py'
--- glance/server.py	2011-03-06 15:41:29 +0000
+++ glance/server.py	2011-03-09 13:40:45 +0000
@@ -90,6 +90,8 @@
             {'images': [
                 {'id': <ID>,
                  'name': <NAME>,
+                 'disk_format': <DISK_FORMAT>,
+                 'container_format': <DISK_FORMAT>,
                  'size': <SIZE>}, ...
             ]}
         """
@@ -390,7 +392,6 @@
             image_meta = registry.update_image_metadata(self.options,
                                                         id,
                                                         new_image_meta)
-
             if has_body:
                 self._upload_and_activate(req, image_meta)
 

=== modified file 'glance/store/__init__.py'
--- glance/store/__init__.py	2011-02-02 16:40:57 +0000
+++ glance/store/__init__.py	2011-03-09 13:40:45 +0000
@@ -90,7 +90,8 @@
 
     backend_class = get_backend_class(scheme)
 
-    return backend_class.delete(parsed_uri, **kwargs)
+    if hasattr(backend_class, 'delete'):
+        return backend_class.delete(parsed_uri, **kwargs)
 
 
 def get_store_from_location(location):

=== modified file 'glance/utils.py'
--- glance/utils.py	2011-03-08 20:12:41 +0000
+++ glance/utils.py	2011-03-09 13:40:45 +0000
@@ -30,15 +30,16 @@
     """
     headers = {}
     for k, v in image_meta.items():
+        if v is None:
+            v = ''
         if k == 'properties':
             for pk, pv in v.items():
                 if pv is None:
                     pv = ''
                 headers["x-image-meta-property-%s"
                         % pk.lower()] = unicode(pv)
-        if v is None:
-            v = ''
-        headers["x-image-meta-%s" % k.lower()] = unicode(v)
+        else:
+            headers["x-image-meta-%s" % k.lower()] = unicode(v)
     return headers
 
 

=== modified file 'setup.py'
--- setup.py	2011-02-09 21:56:48 +0000
+++ setup.py	2011-03-09 13:40:45 +0000
@@ -85,7 +85,8 @@
         'Programming Language :: Python :: 2.6',
         'Environment :: No Input/Output (Daemon)',
     ],
-    scripts=['bin/glance-api',
+    scripts=['bin/glance',
+             'bin/glance-api',
              'bin/glance-combined',
              'bin/glance-control',
              'bin/glance-manage',

=== modified file 'tests/stubs.py'
--- tests/stubs.py	2011-03-06 15:41:29 +0000
+++ tests/stubs.py	2011-03-09 13:40:45 +0000
@@ -38,6 +38,7 @@
 
 FAKE_FILESYSTEM_ROOTDIR = os.path.join('/tmp', 'glance-tests')
 VERBOSE = False
+DEBUG = False
 
 
 def stub_out_http_backend(stubs):
@@ -170,7 +171,8 @@
                 self.req.body = body
 
         def getresponse(self):
-            options = {'sql_connection': 'sqlite://', 'verbose': VERBOSE}
+            options = {'sql_connection': 'sqlite://', 'verbose': VERBOSE,
+                       'debug': DEBUG}
             res = self.req.get_response(rserver.API(options))
 
             # httplib.Response has a read() method...fake it out
@@ -217,6 +219,7 @@
 
         def getresponse(self):
             options = {'verbose': VERBOSE,
+                       'debug': DEBUG,
                        'registry_host': '0.0.0.0',
                        'registry_port': '9191',
                        'default_store': 'file',

=== modified file 'tests/unit/test_api.py'
--- tests/unit/test_api.py	2011-03-06 15:37:28 +0000
+++ tests/unit/test_api.py	2011-03-09 13:40:45 +0000
@@ -26,6 +26,9 @@
 from glance.registry import server as rserver
 from tests import stubs
 
+VERBOSE = False
+DEBUG = False
+
 
 class TestRegistryAPI(unittest.TestCase):
     def setUp(self):
@@ -34,7 +37,8 @@
         stubs.stub_out_registry_and_store_server(self.stubs)
         stubs.stub_out_registry_db_image_api(self.stubs)
         stubs.stub_out_filesystem_backend()
-        self.api = rserver.API({})
+        self.api = rserver.API({'verbose': VERBOSE,
+                                'debug': DEBUG})
 
     def tearDown(self):
         """Clear the test environment"""
@@ -332,7 +336,9 @@
         stubs.stub_out_registry_and_store_server(self.stubs)
         stubs.stub_out_registry_db_image_api(self.stubs)
         stubs.stub_out_filesystem_backend()
-        options = {'registry_host': '0.0.0.0',
+        options = {'verbose': VERBOSE,
+                   'debug': DEBUG,
+                   'registry_host': '0.0.0.0',
                    'registry_port': '9191',
                    'sql_connection': 'sqlite://',
                    'default_store': 'file',