Merge lp:~jaypipes/glance/use-optparse into lp:~glance-coresec/glance/cactus-trunk

[Jay Pipes]

Replaces gflags with optparse

Replaces gflags with optparse

[Devin Carlen (devcamcar)]

I recommend you removing optparse and use argparse. optparse is marked deprecated as of python 2.7.

review: Needs Fixing

[Jay Pipes (jaypipes)]

And how does that go towards our goal of supporting Python 2.6? :)

[Devin Carlen (devcamcar)]

It doesn't, of course. :)

It's just one of those things - if it is easy to use argparse over optparse, then we get some future proofing which is always good.

http://argparse.googlecode.com/svn/trunk/doc/argparse-vs-optparse.html

It looks like it would be pretty trivial to make the change, but I'll leave it up to you at the end of the day.

Either way I'll approve this for now, if you decide to go with argparse it can be a separate merge.

review: Approve

[Rick Harris (rconradharris)]

I'll throw in my 2c here.

I personally agree with Devin, argparse is a great library, does some things that optparse can't, and is easy enough to include as a dependency. So I'd be a +1 on moving to argparse.

That said, I'm totally cool with going with optparse for now and then moving to argparse when 2.7 becomes more standard.

No biggie.

review: Approve

[Jay Pipes (jaypipes)]

I like argparse too :)

We'll move to argparse fully eventually, prolly sooner than later. I'll bring it up at the next design summit and let's see if we can get consensus on the ML and at the summit on it.

[Jay Pipes (jaypipes)]

Discovered a bug this morning while working on a separate issue but having branched from my local use-optparse tree:

(.glance-venv)jpipes@serialcoder:~/repos/glance/use-optparse$ ./bin/glance-api --daemonize start
(.glance-venv)jpipes@serialcoder:~/repos/glance/use-optparse$ ./bin/glance-api stop
Traceback (most recent call last):
  File "./bin/glance-api", line 116, in <module>
    server.serve('glance-api', main, options, args)
  File "/home/jpipes/repos/glance/use-optparse/glance/common/server.py", line 82, in serve
    daemonize(args, name, main, options)
  File "/home/jpipes/repos/glance/use-optparse/glance/common/server.py", line 136, in daemonize
    files_preserve=files_to_keep):
  File "/home/jpipes/repos/glance/use-optparse/.glance-venv/lib/python2.6/site-packages/daemon/daemon.py", line 352, in __enter__
    self.open()
  File "/home/jpipes/repos/glance/use-optparse/.glance-venv/lib/python2.6/site-packages/daemon/daemon.py", line 344, in open
    self.pidfile.__enter__()
  File "/home/jpipes/repos/glance/use-optparse/.glance-venv/lib/python2.6/site-packages/lockfile.py", line 223, in __enter__
    self.acquire()
  File "/home/jpipes/repos/glance/use-optparse/.glance-venv/lib/python2.6/site-packages/daemon/pidlockfile.py", line 109, in acquire
    super(TimeoutPIDLockFile, self).acquire(timeout, *args, **kwargs)
  File "/home/jpipes/repos/glance/use-optparse/.glance-venv/lib/python2.6/site-packages/daemon/pidlockfile.py", line 59, in acquire
    super(PIDLockFile, self).acquire(*args, **kwargs)
  File "/home/jpipes/repos/glance/use-optparse/.glance-venv/lib/python2.6/site-packages/lockfile.py", line 261, in acquire
    raise LockTimeout
lockfile.LockTimeout

This doesn't happen on Bexar's trunk, so it's a bug introduced by this patch...

[Rick Harris (rconradharris)]

lgtm

yotta-nit:

70 if len(args):

Could just be `if args`, no need to compute actual number of arguments since it's truthiness suffices.

review: Approve

[Devin Carlen (devcamcar)]

approvage

review: Approve

[Jay Pipes (jaypipes)]

Just noticed this in /glance/common/db/sqlalchemy/session.py:

283 - _ENGINE = create_engine(FLAGS.sql_connection, echo=echo)
284 + _ENGINE = create_engine('sqlite://', echo=echo)

Oops.

[Devin Carlen (devcamcar)]

Oops, I totally missed that too :)

[Jay Pipes (jaypipes)]

Alrighty, fixed the issue with a hard-coded sqlite:// sql_connection setting...

Also removed the glance.common.db.sqlalchemy stuff

[Devin Carlen (devcamcar)]

ok, -really- approving this time ;)

review: Approve

[Rick Harris (rconradharris)]

lgtm

review: Approve

=== modified file 'bin/glance-api'
--- bin/glance-api	2011-01-27 04:04:29 +0000
+++ bin/glance-api	2011-01-31 19:42:44 +0000
@@ -3,6 +3,7 @@
 
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
+# Copyright 2011 OpenStack LLC.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -21,6 +22,7 @@
 Glance API Server
 """
 
+import optparse
 import os
 import sys
 
@@ -28,14 +30,72 @@
 
 sys.path.append(ROOT_DIR)
 
-from glance.common import flags
-from glance.common import utils
+from glance import version
+from glance.common import config
 from glance.common import server
-
-
-FLAGS = flags.FLAGS
-flags.DEFINE_string('api_host', '0.0.0.0', 'API server lives at this address')
-flags.DEFINE_integer('api_port', 9292, 'API server listens on this port')
+import glance.store
+
+
+DEFAULT_STORE_CHOICES = ['file', 'swift', 's3']
+
+
+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, dest="verbose",
+                      action="store_true",
+                      help="Print more verbose output")
+    parser.add_option('-H', '--host',
+                      dest="host", metavar="ADDRESS",
+                      default="0.0.0.0",
+                      help="Address of Glance API server. "
+                           "Default: %default")
+    parser.add_option('-p', '--port',
+                      dest="port", metavar="PORT", type=int,
+                      default=9292,
+                      help="Port the Glance API server listens on. "
+                           "Default: %default")
+    parser.add_option('--daemonize', default=False, action="store_true",
+                      help="Daemonize this process")
+    parser.add_option('--use-syslog', default=True, action="store_true",
+                      help="Output to syslog when daemonizing. "
+                           "Default: %default")
+    parser.add_option('--logfile', default=None,
+                      metavar="PATH",
+                      help="(Optional) Name of log file to output to.")
+    parser.add_option("--logdir", default=None,
+                      help="(Optional) The directory to keep log files in "
+                           "(will be prepended to --logfile)")
+    parser.add_option("--pidfile", default=None,
+                      help="(Optional) Name of pid file for the server")
+    parser.add_option('--working-directory', '--working-dir',
+                      default=os.path.abspath(os.getcwd()),
+                      help="The working directory. Default: %default")
+    parser.add_option("--uid", type=int, default=os.getuid(),
+                      help="uid under which to run. Default: %default")
+    parser.add_option("--gid", type=int, default=os.getgid(),
+                      help="gid under which to run. Default: %default")
+    parser.add_option('--registry-host',
+                      dest="registry_host", metavar="ADDRESS",
+                      default="0.0.0.0",
+                      help="Address of a Glance Registry server. "
+                           "Default: %default")
+    parser.add_option('--registry-port',
+                      dest="registry_port", metavar="PORT", type=int,
+                      default=9191,
+                      help="Port a Glance Registry server listens on. "
+                           "Default: %default")
+    parser.add_option('--default-store', metavar="STORE",
+                      default="file",
+                      choices=DEFAULT_STORE_CHOICES,
+                      help="The backend store that Glance will use to store "
+                      "virtual machine images to. Choices: ('%s') "
+                      "Default: %%default" % "','".join(DEFAULT_STORE_CHOICES))
+    glance.store.add_options(parser)
 
 
 def main(_args):
@@ -44,10 +104,13 @@
     from glance.common import wsgi
     from glance.server import API
     server = wsgi.Server()
-    server.start(API(), FLAGS.api_port, host=FLAGS.api_host)
+    server.start(API(options), options['port'], host=options['host'])
     server.wait()
 
 
 if __name__ == '__main__':
-    utils.default_flagfile()
-    server.serve('glance-api', main)
+    oparser = optparse.OptionParser(version='%%prog %s'
+                                    % version.version_string())
+    create_options(oparser)
+    (options, args) = config.parse_options(oparser)
+    server.serve('glance-api', main, options, args)

=== modified file 'bin/glance-registry'
--- bin/glance-registry	2011-01-27 04:04:29 +0000
+++ bin/glance-registry	2011-01-31 19:42:44 +0000
@@ -22,6 +22,7 @@
 Reference implementation server for Glance Registry
 """
 
+import optparse
 import os
 import sys
 
@@ -29,12 +30,55 @@
 
 sys.path.append(ROOT_DIR)
 
-from glance.common import flags
-from glance.common import utils
+from glance import version
+from glance.common import config
 from glance.common import server
 
 
-FLAGS = flags.FLAGS
+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, dest="verbose",
+                      action="store_true",
+                      help="Print more verbose output")
+    parser.add_option('-H', '--host',
+                      dest="host", metavar="ADDRESS",
+                      default="0.0.0.0",
+                      help="Address of Glance API server. "
+                           "Default: %default")
+    parser.add_option('-p', '--port',
+                      dest="port", metavar="PORT", type=int,
+                      default=9191,
+                      help="Port the Glance Registry server listens on. "
+                           "Default: %default")
+    parser.add_option('--daemonize', default=False, action="store_true",
+                      help="Daemonize this process")
+    parser.add_option('--use-syslog', default=True, action="store_true",
+                      help="Output to syslog when daemonizing. "
+                           "Default: %default")
+    parser.add_option('--logfile', default=None,
+                      metavar="PATH",
+                      help="(Optional) Name of log file to output to.")
+    parser.add_option("--logdir", default=None,
+                      help="(Optional) The directory to keep log files in "
+                           "(will be prepended to --logfile)")
+    parser.add_option("--pidfile", default=None,
+                      help="(Optional) Name of pid file for the server")
+    parser.add_option('--working-directory', '--working-dir',
+                      default=os.path.abspath(os.getcwd()),
+                      help="The working directory. Default: %default")
+    parser.add_option("--uid", type=int, default=os.getuid(),
+                      help="uid under which to run. Default: %default")
+    parser.add_option("--gid", type=int, default=os.getgid(),
+                      help="gid under which to run. Default: %default")
+    parser.add_option('--sql-connection', metavar="CONNECTION",
+                      default='sqlite:///glance.sqlite',
+                      help="A valid SQLAlchemy connection string for the "
+                           "registry database. Default: %default")
 
 
 def main(_args):
@@ -43,10 +87,13 @@
     from glance.common import wsgi
     from glance.registry.server import API
     server = wsgi.Server()
-    server.start(API(), FLAGS.registry_port, host=FLAGS.registry_host)
+    server.start(API(options), int(options['port']), host=options['host'])
     server.wait()
 
 
 if __name__ == '__main__':
-    utils.default_flagfile()
-    server.serve('glance-registry', main)
+    oparser = optparse.OptionParser(version='%%prog %s'
+                                    % version.version_string())
+    create_options(oparser)
+    (options, args) = config.parse_options(oparser)
+    server.serve('glance-registry', main, options, args)

=== added file 'glance/common/config.py'
--- glance/common/config.py	1970-01-01 00:00:00 +0000
+++ glance/common/config.py	2011-01-31 19:42:44 +0000
@@ -0,0 +1,54 @@
+#!/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.
+
+
+def parse_options(parser, cli_args=None):
+    """
+    Returns the parsed CLI options, command to run and its arguments, merged
+    with any same-named options found in a configuration file.
+
+    The function returns a tuple of (options, args), where options is a
+    mapping of option key/str(value) pairs, and args is the set of arguments
+    (not options) supplied on the command-line.
+
+    The reason that the option values are returned as strings only is that
+    ConfigParser and paste.deploy only accept string values...
+
+    :param parser: The option parser
+    :param cli_args: (Optional) Set of arguments to process. If not present,
+                     sys.argv[1:] is used.
+    :retval tuple of (options, args)
+    """
+
+    (options, args) = parser.parse_args(cli_args)
+
+    return (vars(options), args)
+
+
+def options_to_conf(options):
+    """
+    Converts a mapping of options having typed values into
+    a mapping of configuration options having only stringified values.
+
+    This method is used to convert the return of parse_options()[0]
+    into the configuration mapping that is expected by ConfigParser
+    and paste.deploy.
+
+    :params options: Mapping of typed option key/values
+    """
+    return dict([(k, str(v)) for k, v in options.items()])

=== removed directory 'glance/common/db/sqlalchemy'
=== removed file 'glance/common/db/sqlalchemy/__init__.py'
--- glance/common/db/sqlalchemy/__init__.py	2011-01-26 17:26:54 +0000
+++ glance/common/db/sqlalchemy/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2010-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.

=== removed file 'glance/common/db/sqlalchemy/session.py'
--- glance/common/db/sqlalchemy/session.py	2011-01-26 17:26:54 +0000
+++ glance/common/db/sqlalchemy/session.py	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
-# 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.
-
-"""
-Session Handling for SQLAlchemy backend
-"""
-
-from sqlalchemy import create_engine
-from sqlalchemy.orm import sessionmaker
-
-from glance.common import flags
-
-FLAGS = flags.FLAGS
-
-_ENGINE = None
-_MAKER = None
-
-
-def get_engine(echo=False):
-    global _ENGINE
-    if not _ENGINE:
-        _ENGINE = create_engine(FLAGS.sql_connection, echo=echo)
-    return _ENGINE
-
-
-def get_session(autocommit=True, expire_on_commit=False):
-    """Helper method to grab session"""
-    global _MAKER
-    if not _MAKER:
-        engine = get_engine()
-        _MAKER = sessionmaker(bind=engine,
-                              autocommit=autocommit,
-                              expire_on_commit=expire_on_commit)
-    return _MAKER()

=== removed file 'glance/common/flags.py'
--- glance/common/flags.py	2011-01-26 17:26:54 +0000
+++ glance/common/flags.py	1970-01-01 00:00:00 +0000
@@ -1,177 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
-# 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.
-
-"""
-Package-level global flags are defined here, the rest are defined
-where they're used.
-"""
-
-import getopt
-import os
-import socket
-import sys
-
-import gflags
-
-
-class FlagValues(gflags.FlagValues):
-    """Extension of gflags.FlagValues that allows undefined and runtime flags.
-
-    Unknown flags will be ignored when parsing the command line, but the
-    command line will be kept so that it can be replayed if new flags are
-    defined after the initial parsing.
-
-    """
-
-    def __init__(self):
-        gflags.FlagValues.__init__(self)
-        self.__dict__['__dirty'] = []
-        self.__dict__['__was_already_parsed'] = False
-        self.__dict__['__stored_argv'] = []
-
-    def __call__(self, argv):
-        # We're doing some hacky stuff here so that we don't have to copy
-        # out all the code of the original verbatim and then tweak a few lines.
-        # We're hijacking the output of getopt so we can still return the
-        # leftover args at the end
-        sneaky_unparsed_args = {"value": None}
-        original_argv = list(argv)
-
-        if self.IsGnuGetOpt():
-            orig_getopt = getattr(getopt, 'gnu_getopt')
-            orig_name = 'gnu_getopt'
-        else:
-            orig_getopt = getattr(getopt, 'getopt')
-            orig_name = 'getopt'
-
-        def _sneaky(*args, **kw):
-            optlist, unparsed_args = orig_getopt(*args, **kw)
-            sneaky_unparsed_args['value'] = unparsed_args
-            return optlist, unparsed_args
-
-        try:
-            setattr(getopt, orig_name, _sneaky)
-            args = gflags.FlagValues.__call__(self, argv)
-        except gflags.UnrecognizedFlagError:
-            # Undefined args were found, for now we don't care so just
-            # act like everything went well
-            # (these three lines are copied pretty much verbatim from the end
-            # of the __call__ function we are wrapping)
-            unparsed_args = sneaky_unparsed_args['value']
-            if unparsed_args:
-                if self.IsGnuGetOpt():
-                    args = argv[:1] + unparsed_args
-                else:
-                    args = argv[:1] + original_argv[-len(unparsed_args):]
-            else:
-                args = argv[:1]
-        finally:
-            setattr(getopt, orig_name, orig_getopt)
-
-        # Store the arguments for later, we'll need them for new flags
-        # added at runtime
-        self.__dict__['__stored_argv'] = original_argv
-        self.__dict__['__was_already_parsed'] = True
-        self.ClearDirty()
-        return args
-
-    def SetDirty(self, name):
-        """Mark a flag as dirty so that accessing it will case a reparse."""
-        self.__dict__['__dirty'].append(name)
-
-    def IsDirty(self, name):
-        return name in self.__dict__['__dirty']
-
-    def ClearDirty(self):
-        self.__dict__['__is_dirty'] = []
-
-    def WasAlreadyParsed(self):
-        return self.__dict__['__was_already_parsed']
-
-    def ParseNewFlags(self):
-        if '__stored_argv' not in self.__dict__:
-            return
-        new_flags = FlagValues()
-        for k in self.__dict__['__dirty']:
-            new_flags[k] = gflags.FlagValues.__getitem__(self, k)
-
-        new_flags(self.__dict__['__stored_argv'])
-        for k in self.__dict__['__dirty']:
-            setattr(self, k, getattr(new_flags, k))
-        self.ClearDirty()
-
-    def __setitem__(self, name, flag):
-        gflags.FlagValues.__setitem__(self, name, flag)
-        if self.WasAlreadyParsed():
-            self.SetDirty(name)
-
-    def __getitem__(self, name):
-        if self.IsDirty(name):
-            self.ParseNewFlags()
-        return gflags.FlagValues.__getitem__(self, name)
-
-    def __getattr__(self, name):
-        if self.IsDirty(name):
-            self.ParseNewFlags()
-        return gflags.FlagValues.__getattr__(self, name)
-
-
-FLAGS = FlagValues()
-
-
-def _wrapper(func):
-    def _wrapped(*args, **kw):
-        kw.setdefault('flag_values', FLAGS)
-        func(*args, **kw)
-    _wrapped.func_name = func.func_name
-    return _wrapped
-
-
-DEFINE = _wrapper(gflags.DEFINE)
-DEFINE_string = _wrapper(gflags.DEFINE_string)
-DEFINE_integer = _wrapper(gflags.DEFINE_integer)
-DEFINE_bool = _wrapper(gflags.DEFINE_bool)
-DEFINE_boolean = _wrapper(gflags.DEFINE_boolean)
-DEFINE_float = _wrapper(gflags.DEFINE_float)
-DEFINE_enum = _wrapper(gflags.DEFINE_enum)
-DEFINE_list = _wrapper(gflags.DEFINE_list)
-DEFINE_spaceseplist = _wrapper(gflags.DEFINE_spaceseplist)
-DEFINE_multistring = _wrapper(gflags.DEFINE_multistring)
-DEFINE_multi_int = _wrapper(gflags.DEFINE_multi_int)
-
-
-def DECLARE(name, module_string, flag_values=FLAGS):
-    if module_string not in sys.modules:
-        __import__(module_string, globals(), locals())
-    if name not in flag_values:
-        raise gflags.UnrecognizedFlag(
-                "%s not defined by %s" % (name, module_string))
-
-
-# __GLOBAL FLAGS ONLY__
-# Define any app-specific flags in their own files, docs at:
-# http://code.google.com/p/python-gflags/source/browse/trunk/gflags.py#39
-
-# TODO(sirp): move this out to an application specific setting when we create
-# Nova/Glance common library
-DEFINE_string('sql_connection',
-              'sqlite:///%s/glance.sqlite' % os.path.abspath("./"),
-              'connection string for sql database')
-DEFINE_bool('verbose', False, 'show debug output')
-DEFINE_string('default_store', 'file',
-              'Default storage backend. Default: "file"')

=== modified file 'glance/common/server.py'
--- glance/common/server.py	2011-01-26 17:26:54 +0000
+++ glance/common/server.py	2011-01-31 19:42:44 +0000
@@ -25,30 +25,11 @@
 import logging
 import logging.handlers
 import os
+import pprint
 import signal
 import sys
 import time
 
-from glance.common import flags
-
-
-FLAGS = flags.FLAGS
-flags.DEFINE_bool('daemonize', False, 'daemonize this process')
-# NOTE(termie): right now I am defaulting to using syslog when we daemonize
-#               it may be better to do something else -shrug-
-# NOTE(Devin): I think we should let each process have its own log file
-#              and put it in /var/logs/nova/(appname).log
-#              This makes debugging much easier and cuts down on sys log
-#              clutter.
-flags.DEFINE_bool('use_syslog', True, 'output to syslog when daemonizing')
-flags.DEFINE_string('logfile', None, 'log file to output to')
-flags.DEFINE_string('logdir',  None, 'directory to keep log files in '
-                                     '(will be prepended to $logfile)')
-flags.DEFINE_string('pidfile', None, 'pid file to output to')
-flags.DEFINE_string('working_directory', './', 'working directory...')
-flags.DEFINE_integer('uid', os.getuid(), 'uid under which to run')
-flags.DEFINE_integer('gid', os.getgid(), 'gid under which to run')
-
 
 def stop(pidfile):
     """
@@ -64,6 +45,7 @@
 
     # Try killing the daemon process
     try:
+        print "Killing process from pidfile %s" % pidfile
         while 1:
             os.kill(pid, signal.SIGTERM)
             time.sleep(0.1)
@@ -77,53 +59,58 @@
             sys.exit(1)
 
 
-def serve(name, main):
+def serve(name, main, options, args):
     """Controller for server"""
-    argv = FLAGS(sys.argv)
-
-    if not FLAGS.pidfile:
-        FLAGS.pidfile = '%s.pid' % name
-
-    logging.debug("Full set of FLAGS: \n\n\n")
-    for flag in FLAGS:
-        logging.debug("%s : %s", flag, FLAGS.get(flag, None))
+
+    pidfile = options['pidfile']
+    if not pidfile:
+        options['pidfile'] = '%s.pid' % name
 
     action = 'start'
-    if len(argv) > 1:
-        action = argv.pop()
+    if len(args):
+        action = args.pop()
 
     if action == 'stop':
-        stop(FLAGS.pidfile)
+        stop(options['pidfile'])
         sys.exit()
     elif action == 'restart':
-        stop(FLAGS.pidfile)
+        stop(options['pidfile'])
     elif action == 'start':
         pass
     else:
-        print 'usage: %s [options] [start|stop|restart]' % argv[0]
+        print 'usage: %s [options] [start|stop|restart]' % name
         sys.exit(1)
-    daemonize(argv, name, main)
-
-
-def daemonize(args, name, main):
+    daemonize(args, name, main, options)
+
+
+def daemonize(args, name, main, options):
     """Does the work of daemonizing the process"""
     logging.getLogger('amqplib').setLevel(logging.WARN)
+    pidfile = options['pidfile']
+    logfile = options['logfile']
+    if not logfile:
+        logfile = None
+    logdir = options['logdir']
+    if not logdir:
+        logdir = None
+    daemonize = options['daemonize']
+    use_syslog = options['use_syslog']
     files_to_keep = []
-    if FLAGS.daemonize:
+    if daemonize:
         logger = logging.getLogger()
         formatter = logging.Formatter(
                 name + '(%(name)s): %(levelname)s %(message)s')
-        if FLAGS.use_syslog and not FLAGS.logfile:
+        if use_syslog and not logfile:
             syslog = logging.handlers.SysLogHandler(address='/dev/log')
             syslog.setFormatter(formatter)
             logger.addHandler(syslog)
             files_to_keep.append(syslog.socket)
         else:
-            if not FLAGS.logfile:
-                FLAGS.logfile = '%s.log' % name
-            if FLAGS.logdir:
-                FLAGS.logfile = os.path.join(FLAGS.logdir, FLAGS.logfile)
-            logfile = logging.FileHandler(FLAGS.logfile)
+            if not logfile:
+                logfile = '%s.log' % name
+            if logdir:
+                logfile = os.path.join(logdir, logfile)
+            logfile = logging.FileHandler(logfile)
             logfile.setFormatter(formatter)
             logger.addHandler(logfile)
             files_to_keep.append(logfile.stream)
@@ -131,21 +118,21 @@
     else:
         stdin, stdout, stderr = sys.stdin, sys.stdout, sys.stderr
 
-    if FLAGS.verbose:
+    if options['verbose']:
         logging.getLogger().setLevel(logging.DEBUG)
     else:
         logging.getLogger().setLevel(logging.WARNING)
 
     with daemon.DaemonContext(
-            detach_process=FLAGS.daemonize,
-            working_directory=FLAGS.working_directory,
-            pidfile=pidlockfile.TimeoutPIDLockFile(FLAGS.pidfile,
+            detach_process=daemonize,
+            working_directory=options['working_directory'],
+            pidfile=pidlockfile.TimeoutPIDLockFile(pidfile,
                                                    acquire_timeout=1,
                                                    threaded=False),
             stdin=stdin,
             stdout=stdout,
             stderr=stderr,
-            uid=FLAGS.uid,
-            gid=FLAGS.gid,
+            uid=options['uid'],
+            gid=options['gid'],
             files_preserve=files_to_keep):
         main(args)

=== modified file 'glance/common/utils.py'
--- glance/common/utils.py	2011-01-26 17:26:54 +0000
+++ glance/common/utils.py	2011-01-31 19:42:44 +0000
@@ -30,11 +30,9 @@
 import sys
 
 from glance.common import exception
-from glance.common import flags
 from glance.common.exception import ProcessExecutionError
 
 
-FLAGS = flags.FLAGS
 TIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ"
 
 
@@ -147,21 +145,6 @@
     return int(address.split(".")[-1])
 
 
-def get_my_ip():
-    """Returns the actual ip of the local machine."""
-    if getattr(FLAGS, 'fake_tests', None):
-        return '127.0.0.1'
-    try:
-        csock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        csock.connect(('www.google.com', 80))
-        (addr, port) = csock.getsockname()
-        csock.close()
-        return addr
-    except socket.gaierror as ex:
-        logging.warn("Couldn't get IP, using 127.0.0.1 %s", ex)
-        return "127.0.0.1"
-
-
 def isotime(at=None):
     if not at:
         at = datetime.datetime.utcnow()

=== modified file 'glance/registry/__init__.py'
--- glance/registry/__init__.py	2011-01-26 20:44:36 +0000
+++ glance/registry/__init__.py	2011-01-31 19:42:44 +0000
@@ -20,45 +20,39 @@
 Registry API
 """
 
-from glance.common import flags
 from glance.registry import client
 
-FLAGS = flags.FLAGS
-
-# TODO(jaypipes): Separate server flags from client flags
-#                 and allow a list of client host/port
-#                 combinations
-flags.DEFINE_string('registry_host', '0.0.0.0',
-                    'Registry server lives at this address')
-flags.DEFINE_integer('registry_port', 9191,
-                     'Registry server listens on this port')
-
-
-def get_images_list():
-    c = client.RegistryClient(FLAGS.registry_host, FLAGS.registry_port)
+
+def get_registry_client(options):
+    return client.RegistryClient(options['registry_host'],
+                                 int(options['registry_port']))
+
+
+def get_images_list(options):
+    c = get_registry_client(options)
     return c.get_images()
 
 
-def get_images_detail():
-    c = client.RegistryClient(FLAGS.registry_host, FLAGS.registry_port)
+def get_images_detail(options):
+    c = get_registry_client(options)
     return c.get_images_detailed()
 
 
-def get_image_metadata(image_id):
-    c = client.RegistryClient(FLAGS.registry_host, FLAGS.registry_port)
+def get_image_metadata(options, image_id):
+    c = get_registry_client(options)
     return c.get_image(image_id)
 
 
-def add_image_metadata(image_data):
-    c = client.RegistryClient(FLAGS.registry_host, FLAGS.registry_port)
+def add_image_metadata(options, image_data):
+    c = get_registry_client(options)
     return c.add_image(image_data)
 
 
-def update_image_metadata(image_id, image_data):
-    c = client.RegistryClient(FLAGS.registry_host, FLAGS.registry_port)
+def update_image_metadata(options, image_id, image_data):
+    c = get_registry_client(options)
     return c.update_image(image_id, image_data)
 
 
-def delete_image_metadata(image_id):
-    c = client.RegistryClient(FLAGS.registry_host, FLAGS.registry_port)
+def delete_image_metadata(options, image_id):
+    c = get_registry_client(options)
     return c.delete_image(image_id)

=== modified file 'glance/registry/db/__init__.py'
--- glance/registry/db/__init__.py	2011-01-28 19:39:19 +0000
+++ glance/registry/db/__init__.py	2011-01-31 19:42:44 +0000
@@ -16,12 +16,3 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-
-"""
-DB abstraction for Nova and Glance
-"""
-
-from glance.registry.db import models
-
-
-models.register_models()

=== modified file 'glance/registry/db/api.py'
--- glance/registry/db/api.py	2011-01-28 19:54:10 +0000
+++ glance/registry/db/api.py	2011-01-31 19:42:44 +0000
@@ -21,13 +21,19 @@
 Defines interface for DB access
 """
 
+
+from sqlalchemy import create_engine
+from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import joinedload
+from sqlalchemy.orm import sessionmaker
 
 from glance.common import exception
 from glance.common import utils
-from glance.common.db.sqlalchemy.session import get_session
 from glance.registry.db import models
 
+_ENGINE = None
+_MAKER = None
+BASE = declarative_base()
 
 # attributes common to all models
 BASE_MODEL_ATTRS = set(['id', 'created_at', 'updated_at', 'deleted_at',
@@ -36,7 +42,44 @@
 IMAGE_ATTRS = BASE_MODEL_ATTRS | set(['name', 'type', 'status', 'size',
                                       'is_public', 'location'])
 
-###################
+
+def configure_db(options):
+    """
+    Establish the database, create an engine if needed, and
+    register the models.
+
+    :param options: Mapping of configuration options
+    """
+    global _ENGINE
+    if not _ENGINE:
+        _ENGINE = create_engine(options['sql_connection'],
+                                echo=options['verbose'])
+        register_models()
+
+
+def get_session(autocommit=True, expire_on_commit=False):
+    """Helper method to grab session"""
+    global _MAKER, _ENGINE
+    if not _MAKER:
+        assert _ENGINE
+        _MAKER = sessionmaker(bind=_ENGINE,
+                              autocommit=autocommit,
+                              expire_on_commit=expire_on_commit)
+    return _MAKER()
+
+
+def register_models():
+    """Register Models and create properties"""
+    global _ENGINE
+    assert _ENGINE
+    BASE.metadata.create_all(_ENGINE)
+
+
+def unregister_models():
+    """Unregister Models, useful clearing out data before testing"""
+    global _ENGINE
+    assert _ENGINE
+    BASE.metadata.drop_all(engine)
 
 
 def image_create(context, values):

=== modified file 'glance/registry/db/models.py'
--- glance/registry/db/models.py	2011-01-28 19:39:19 +0000
+++ glance/registry/db/models.py	2011-01-31 19:42:44 +0000
@@ -29,10 +29,9 @@
 from sqlalchemy import UniqueConstraint
 from sqlalchemy.ext.declarative import declarative_base
 
-from glance.common.db.sqlalchemy.session import get_session, get_engine
+import glance.registry.db.api
 from glance.common import exception
 
-
 BASE = declarative_base()
 
 
@@ -50,7 +49,7 @@
 
     def save(self, session=None):
         """Save this object"""
-        session = session or get_session()
+        session = session or glance.registry.db.api.get_session()
         session.add(self)
         session.flush()
 
@@ -126,15 +125,3 @@
 
     key = Column(String(255), index=True)
     value = Column(Text)
-
-
-def register_models():
-    """Register Models and create properties"""
-    engine = get_engine()
-    BASE.metadata.create_all(engine)
-
-
-def unregister_models():
-    """Unregister Models, useful clearing out data before testing"""
-    engine = get_engine()
-    BASE.metadata.drop_all(engine)

=== modified file 'glance/registry/server.py'
--- glance/registry/server.py	2011-01-28 19:39:19 +0000
+++ glance/registry/server.py	2011-01-31 19:42:44 +0000
@@ -27,8 +27,12 @@
 from glance.registry.db import api as db_api
 
 
-class ImageController(wsgi.Controller):
-    """Image Controller """
+class Controller(wsgi.Controller):
+    """Controller for the reference implementation registry server"""
+
+    def __init__(self, options):
+        self.options = options
+        db_api.configure_db(options)
 
     def index(self, req):
         """Return basic information for all public, non-deleted images
@@ -141,11 +145,12 @@
 class API(wsgi.Router):
     """WSGI entry point for all Registry requests."""
 
-    def __init__(self):
+    def __init__(self, options):
         mapper = routes.Mapper()
-        mapper.resource("image", "images", controller=ImageController(),
+        controller = Controller(options)
+        mapper.resource("image", "images", controller=controller,
                        collection={'detail': 'GET'})
-        mapper.connect("/", controller=ImageController(), action="index")
+        mapper.connect("/", controller=controller, action="index")
         super(API, self).__init__(mapper)
 
 

=== modified file 'glance/server.py'
--- glance/server.py	2011-01-27 04:19:13 +0000
+++ glance/server.py	2011-01-31 19:42:44 +0000
@@ -39,7 +39,6 @@
                        HTTPBadRequest)
 
 from glance.common import exception
-from glance.common import flags
 from glance.common import wsgi
 from glance.store import (get_from_backend,
                           delete_from_backend,
@@ -50,9 +49,6 @@
 from glance import util
 
 
-FLAGS = flags.FLAGS
-
-
 class Controller(wsgi.Controller):
 
     """
@@ -73,6 +69,9 @@
         DELETE /images/<ID> -- Delete the image with id <ID>
     """
 
+    def __init__(self, options):
+        self.options = options
+
     def index(self, req):
         """
         Returns the following information for all public, available images:
@@ -92,7 +91,7 @@
                  'type': <TYPE>}, ...
             ]}
         """
-        images = registry.get_images_list()
+        images = registry.get_images_list(self.options)
         return dict(images=images)
 
     def detail(self, req):
@@ -115,7 +114,7 @@
                  'properties': {'distro': 'Ubuntu 10.04 LTS', ...}}, ...
             ]}
         """
-        images = registry.get_images_detail()
+        images = registry.get_images_detail(self.options)
         return dict(images=images)
 
     def meta(self, req, id):
@@ -183,7 +182,8 @@
         image_meta['size'] = image_meta.get('size', 0)
 
         try:
-            image_meta = registry.add_image_metadata(image_meta)
+            image_meta = registry.add_image_metadata(self.options,
+                                                     image_meta)
             return image_meta
         except exception.Duplicate:
             msg = "An image with identifier %s already exists"\
@@ -212,21 +212,27 @@
                 "Content-Type must be application/octet-stream")
 
         image_store = req.headers.get(
-            'x-image-meta-store', FLAGS.default_store)
+            'x-image-meta-store', self.options['default_store'])
 
         store = self.get_store_or_400(req, image_store)
 
         image_meta['status'] = 'saving'
-        registry.update_image_metadata(image_meta['id'], image_meta)
+        registry.update_image_metadata(self.options,
+                                       image_meta['id'],
+                                       image_meta)
 
         try:
-            location, size = store.add(image_meta['id'], req.body_file)
+            location, size = store.add(image_meta['id'],
+                                       req.body_file,
+                                       self.options)
             # If size returned from store is different from size
             # already stored in registry, update the registry with
             # the new size of the image
             if image_meta.get('size', 0) != size:
                 image_meta['size'] = size
-                registry.update_image_metadata(image_meta['id'], image_meta)
+                registry.update_image_metadata(self.options,
+                                               image_meta['id'],
+                                               image_meta)
             return location
         except exception.Duplicate, e:
             logging.error("Error adding image to store: %s", str(e))
@@ -243,7 +249,9 @@
         """
         image_meta['location'] = location
         image_meta['status'] = 'active'
-        registry.update_image_metadata(image_meta['id'], image_meta)
+        registry.update_image_metadata(self.options,
+                                       image_meta['id'],
+                                       image_meta)
 
     def _kill(self, req, image_meta):
         """
@@ -253,7 +261,9 @@
         :param image_meta: Mapping of metadata about image
         """
         image_meta['status'] = 'killed'
-        registry.update_image_metadata(image_meta['id'], image_meta)
+        registry.update_image_metadata(self.options,
+                                       image_meta['id'],
+                                       image_meta)
 
     def _safe_kill(self, req, image_meta):
         """
@@ -351,7 +361,9 @@
             raise HTTPConflict("Cannot upload to an unqueued image")
 
         new_image_meta = util.get_image_meta_from_headers(req)
-        image_meta = registry.update_image_metadata(id, new_image_meta)
+        image_meta = registry.update_image_metadata(self.options,
+                                                    id,
+                                                    new_image_meta)
 
         if has_body:
             self._upload_and_activate(req, image_meta)
@@ -374,7 +386,7 @@
 
         delete_from_backend(image['location'])
 
-        registry.delete_image_metadata(id)
+        registry.delete_image_metadata(self.options, id)
 
     def get_image_meta_or_404(self, request, id):
         """
@@ -387,7 +399,7 @@
         :raises HTTPNotFound if image does not exist
         """
         try:
-            return registry.get_image_metadata(id)
+            return registry.get_image_metadata(self.options, id)
         except exception.NotFound:
             raise HTTPNotFound(body='Image not found',
                                request=request,
@@ -417,11 +429,13 @@
 
     """WSGI entry point for all Glance API requests."""
 
-    def __init__(self):
+    def __init__(self, options):
+        self.options = options
         mapper = routes.Mapper()
-        mapper.resource("image", "images", controller=Controller(),
+        controller = Controller(options)
+        mapper.resource("image", "images", controller=controller,
                        collection={'detail': 'GET'})
-        mapper.connect("/", controller=Controller(), action="index")
-        mapper.connect("/images/{id}", controller=Controller(), action="meta",
+        mapper.connect("/", controller=controller, action="index")
+        mapper.connect("/images/{id}", controller=controller, action="meta",
                        conditions=dict(method=["HEAD"]))
         super(API, self).__init__(mapper)

=== modified file 'glance/store/__init__.py'
--- glance/store/__init__.py	2011-01-27 04:19:13 +0000
+++ glance/store/__init__.py	2011-01-31 19:42:44 +0000
@@ -139,3 +139,26 @@
     authurl = "https://%s" % '/'.join(path_parts)
 
     return user, key, authurl, container, obj
+
+
+def add_options(parser):
+    """
+    Adds any configuration options that each store might
+    have.
+
+    :param parser: An optparse.OptionParser object
+    :retval None
+    """
+    # TODO(jaypipes): Remove these imports...
+    from glance.store.http import HTTPBackend
+    from glance.store.s3 import S3Backend
+    from glance.store.swift import SwiftBackend
+    from glance.store.filesystem import FilesystemBackend
+
+    backend_classes = [FilesystemBackend,
+                       HTTPBackend,
+                       SwiftBackend,
+                       S3Backend]
+    for b in backend_classes:
+        if hasattr(b, 'add_options'):
+            b.add_options(parser)

=== modified file 'glance/store/filesystem.py'
--- glance/store/filesystem.py	2011-01-27 04:19:13 +0000
+++ glance/store/filesystem.py	2011-01-31 19:42:44 +0000
@@ -23,17 +23,9 @@
 import urlparse
 
 from glance.common import exception
-from glance.common import flags
 import glance.store
 
 
-flags.DEFINE_string('filesystem_store_datadir', '/var/lib/glance/images/',
-                    'Location to write image data. '
-                    'Default: /var/lib/glance/images/')
-
-FLAGS = flags.FLAGS
-
-
 class ChunkedFile(object):
 
     """
@@ -102,21 +94,22 @@
             raise exception.NotFound("Image file %s does not exist" % fn)
 
     @classmethod
-    def add(cls, id, data):
+    def add(cls, id, data, options):
         """
         Stores image data to disk and returns a location that the image was
         written to. By default, the backend writes the image data to a file
         `/<DATADIR>/<ID>`, where <DATADIR> is the value of
-        FLAGS.filesystem_store_datadir and <ID> is the supplied image ID.
+        options['filesystem_store_datadir'] and <ID> is the supplied image ID.
 
         :param id: The opaque image identifier
         :param data: The image data to write, as a file-like object
+        :param options: Conf mapping
 
         :retval Tuple with (location, size)
                 The location that was written, with file:// scheme prepended
                 and the size in bytes of the data written
         """
-        datadir = FLAGS.filesystem_store_datadir
+        datadir = options['filesystem_store_datadir']
 
         if not os.path.exists(datadir):
             os.makedirs(datadir)
@@ -137,3 +130,18 @@
                 f.write(buf)
 
         return ('file://%s' % filepath, bytes_written)
+
+    @classmethod
+    def add_options(cls, parser):
+        """
+        Adds specific configuration options for this store
+
+        :param parser: An optparse.OptionParser object
+        :retval None
+        """
+
+        parser.add_option('--filesystem-store-datadir', metavar="DIR",
+                          default="/var/lib/glance/images/",
+                          help="Location to write image data. This directory "
+                          "should be writeable by the user that runs the "
+                          "glance-api program. Default: %default")

=== modified file 'tests/stubs.py'
--- tests/stubs.py	2011-01-28 19:39:19 +0000
+++ tests/stubs.py	2011-01-31 19:42:44 +0000
@@ -239,7 +239,8 @@
                 self.req.body = body
 
         def getresponse(self):
-            res = self.req.get_response(rserver.API())
+            res = self.req.get_response(rserver.API({'sql_connection': 'sqlite://',
+                                                     'verbose': True}))
 
             # httplib.Response has a read() method...fake it out
             def fake_reader():
@@ -284,7 +285,11 @@
                 self.req.body = body
 
         def getresponse(self):
-            res = self.req.get_response(server.API())
+            res = self.req.get_response(server.API({'verbose': True,
+                                                    'registry_host': '0.0.0.0',
+                                                    'registry_port': '9191',
+                                                    'default_store': 'file',
+                                                    'filesystem_store_datadir': FAKE_FILESYSTEM_ROOTDIR}))
 
             # httplib.Response has a read() method...fake it out
             def fake_reader():

=== modified file 'tests/unit/test_api.py'
--- tests/unit/test_api.py	2011-01-26 17:26:54 +0000
+++ tests/unit/test_api.py	2011-01-31 19:42:44 +0000
@@ -23,12 +23,9 @@
 import webob
 
 from glance import server
-from glance.common import flags
 from glance.registry import server as rserver
 from tests import stubs
 
-FLAGS = flags.FLAGS
-
 
 class TestRegistryAPI(unittest.TestCase):
     def setUp(self):
@@ -37,6 +34,7 @@
         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({})
 
     def tearDown(self):
         """Clear the test environment"""
@@ -51,7 +49,7 @@
         fixture = {'id': 2,
                    'name': 'fake image #2'}
         req = webob.Request.blank('/')
-        res = req.get_response(rserver.API())
+        res = req.get_response(self.api)
         res_dict = json.loads(res.body)
         self.assertEquals(res.status_int, 200)
 
@@ -69,7 +67,7 @@
         fixture = {'id': 2,
                    'name': 'fake image #2'}
         req = webob.Request.blank('/images')
-        res = req.get_response(rserver.API())
+        res = req.get_response(self.api)
         res_dict = json.loads(res.body)
         self.assertEquals(res.status_int, 200)
 
@@ -91,7 +89,7 @@
                    'status': 'active'}
 
         req = webob.Request.blank('/images/detail')
-        res = req.get_response(rserver.API())
+        res = req.get_response(self.api)
         res_dict = json.loads(res.body)
         self.assertEquals(res.status_int, 200)
 
@@ -112,7 +110,7 @@
         req.method = 'POST'
         req.body = json.dumps(dict(image=fixture))
 
-        res = req.get_response(rserver.API())
+        res = req.get_response(self.api)
 
         self.assertEquals(res.status_int, 200)
 
@@ -140,10 +138,7 @@
         req.method = 'POST'
         req.body = json.dumps(dict(image=fixture))
 
-        # TODO(jaypipes): Port Nova's Fault infrastructure
-        # over to Glance to support exception catching into
-        # standard HTTP errors.
-        res = req.get_response(rserver.API())
+        res = req.get_response(self.api)
         self.assertEquals(res.status_int, webob.exc.HTTPBadRequest.code)
 
     def test_update_image(self):
@@ -156,7 +151,7 @@
         req.method = 'PUT'
         req.body = json.dumps(dict(image=fixture))
 
-        res = req.get_response(rserver.API())
+        res = req.get_response(self.api)
 
         self.assertEquals(res.status_int, 200)
 
@@ -179,10 +174,7 @@
         req.method = 'PUT'
         req.body = json.dumps(dict(image=fixture))
 
-        # TODO(jaypipes): Port Nova's Fault infrastructure
-        # over to Glance to support exception catching into
-        # standard HTTP errors.
-        res = req.get_response(rserver.API())
+        res = req.get_response(self.api)
         self.assertEquals(res.status_int,
                           webob.exc.HTTPNotFound.code)
 
@@ -191,7 +183,7 @@
 
         # Grab the original number of images
         req = webob.Request.blank('/images')
-        res = req.get_response(rserver.API())
+        res = req.get_response(self.api)
         res_dict = json.loads(res.body)
         self.assertEquals(res.status_int, 200)
 
@@ -202,13 +194,13 @@
 
         req.method = 'DELETE'
 
-        res = req.get_response(rserver.API())
+        res = req.get_response(self.api)
 
         self.assertEquals(res.status_int, 200)
 
         # Verify one less image
         req = webob.Request.blank('/images')
-        res = req.get_response(rserver.API())
+        res = req.get_response(self.api)
         res_dict = json.loads(res.body)
         self.assertEquals(res.status_int, 200)
 
@@ -223,10 +215,7 @@
 
         req.method = 'DELETE'
 
-        # TODO(jaypipes): Port Nova's Fault infrastructure
-        # over to Glance to support exception catching into
-        # standard HTTP errors.
-        res = req.get_response(rserver.API())
+        res = req.get_response(self.api)
         self.assertEquals(res.status_int,
                           webob.exc.HTTPNotFound.code)
 
@@ -238,12 +227,14 @@
         stubs.stub_out_registry_and_store_server(self.stubs)
         stubs.stub_out_registry_db_image_api(self.stubs)
         stubs.stub_out_filesystem_backend()
-        self.orig_filesystem_store_datadir = FLAGS.filesystem_store_datadir
-        FLAGS.filesystem_store_datadir = stubs.FAKE_FILESYSTEM_ROOTDIR
+        self.api = server.API({'registry_host': '0.0.0.0',
+                               'registry_port': '9191',
+                               'sql_connection': 'sqlite://',
+                               'default_store': 'file',
+                               'filesystem_store_datadir': stubs.FAKE_FILESYSTEM_ROOTDIR})
 
     def tearDown(self):
         """Clear the test environment"""
-        FLAGS.filesystem_store_datadir = self.orig_filesystem_store_datadir
         stubs.clean_out_fake_filesystem_backend()
         self.stubs.UnsetAll()
 
@@ -256,7 +247,7 @@
         req.method = 'POST'
         for k, v in fixture_headers.iteritems():
             req.headers[k] = v
-        res = req.get_response(server.API())
+        res = req.get_response(self.api)
         self.assertEquals(res.status_int, httplib.OK)
 
         res_body = json.loads(res.body)['image']
@@ -274,7 +265,7 @@
 
         req.headers['Content-Type'] = 'application/octet-stream'
         req.body = "chunk00000remainder"
-        res = req.get_response(server.API())
+        res = req.get_response(self.api)
         self.assertEquals(res.status_int, webob.exc.HTTPBadRequest.code)
 
     def test_add_image_basic_file_store(self):
@@ -289,7 +280,7 @@
 
         req.headers['Content-Type'] = 'application/octet-stream'
         req.body = "chunk00000remainder"
-        res = req.get_response(server.API())
+        res = req.get_response(self.api)
         self.assertEquals(res.status_int, 200)
 
         res_body = json.loads(res.body)['image']
@@ -302,7 +293,7 @@
                             'x-image-meta-name': 'fake image #2'}
         req = webob.Request.blank("/images/2")
         req.method = 'HEAD'
-        res = req.get_response(server.API())
+        res = req.get_response(self.api)
         self.assertEquals(res.status_int, 200)
 
         for key, value in expected_headers.iteritems():
@@ -310,28 +301,28 @@
 
     def test_show_image_basic(self):
         req = webob.Request.blank("/images/2")
-        res = req.get_response(server.API())
+        res = req.get_response(self.api)
         self.assertEqual('chunk00000remainder', res.body)
 
     def test_show_non_exists_image(self):
         req = webob.Request.blank("/images/42")
-        res = req.get_response(server.API())
+        res = req.get_response(self.api)
         self.assertEquals(res.status_int, webob.exc.HTTPNotFound.code)
 
     def test_delete_image(self):
         req = webob.Request.blank("/images/2")
         req.method = 'DELETE'
-        res = req.get_response(server.API())
+        res = req.get_response(self.api)
         self.assertEquals(res.status_int, 200)
 
         req = webob.Request.blank("/images/2")
         req.method = 'GET'
-        res = req.get_response(server.API())
+        res = req.get_response(self.api)
         self.assertEquals(res.status_int, webob.exc.HTTPNotFound.code,
                           res.body)
 
     def test_delete_non_exists_image(self):
         req = webob.Request.blank("/images/42")
         req.method = 'DELETE'
-        res = req.get_response(server.API())
+        res = req.get_response(self.api)
         self.assertEquals(res.status_int, webob.exc.HTTPNotFound.code)

=== modified file 'tests/unit/test_clients.py'
--- tests/unit/test_clients.py	2011-01-26 20:47:01 +0000
+++ tests/unit/test_clients.py	2011-01-31 19:42:44 +0000
@@ -25,12 +25,9 @@
 
 from glance import client
 from glance.registry import client as rclient
-from glance.common import flags
 from glance.common import exception
 from tests import stubs
 
-FLAGS = flags.FLAGS
-
 
 class TestBadClients(unittest.TestCase):
 
@@ -273,13 +270,10 @@
         stubs.stub_out_registry_db_image_api(self.stubs)
         stubs.stub_out_registry_and_store_server(self.stubs)
         stubs.stub_out_filesystem_backend()
-        self.orig_filesystem_store_datadir = FLAGS.filesystem_store_datadir
-        FLAGS.filesystem_store_datadir = stubs.FAKE_FILESYSTEM_ROOTDIR
         self.client = client.Client("0.0.0.0")
 
     def tearDown(self):
         """Clear the test environment"""
-        FLAGS.filesystem_store_datadir = self.orig_filesystem_store_datadir
         stubs.clean_out_fake_filesystem_backend()
         self.stubs.UnsetAll()
 

=== removed file 'tests/unit/test_registry_api.py'
--- tests/unit/test_registry_api.py	2011-01-26 17:26:54 +0000
+++ tests/unit/test_registry_api.py	1970-01-01 00:00:00 +0000
@@ -1,227 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2010-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.
-
-import json
-import stubout
-import unittest
-import webob
-
-from glance.common import exception
-from glance.registry import server
-from tests import stubs
-
-
-class TestImageController(unittest.TestCase):
-    def setUp(self):
-        """Establish a clean test environment"""
-        self.stubs = stubout.StubOutForTesting()
-        stubs.stub_out_registry_db_image_api(self.stubs)
-
-    def tearDown(self):
-        """Clear the test environment"""
-        self.stubs.UnsetAll()
-
-    def test_get_root(self):
-        """Tests that the root registry API returns "index",
-        which is a list of public images
-
-        """
-        fixture = {'id': 2,
-                   'name': 'fake image #2'}
-        req = webob.Request.blank('/')
-        res = req.get_response(server.API())
-        res_dict = json.loads(res.body)
-        self.assertEquals(res.status_int, 200)
-
-        images = res_dict['images']
-        self.assertEquals(len(images), 1)
-
-        for k, v in fixture.iteritems():
-            self.assertEquals(v, images[0][k])
-
-    def test_get_index(self):
-        """Tests that the /images registry API returns list of
-        public images
-
-        """
-        fixture = {'id': 2,
-                   'name': 'fake image #2'}
-        req = webob.Request.blank('/images')
-        res = req.get_response(server.API())
-        res_dict = json.loads(res.body)
-        self.assertEquals(res.status_int, 200)
-
-        images = res_dict['images']
-        self.assertEquals(len(images), 1)
-
-        for k, v in fixture.iteritems():
-            self.assertEquals(v, images[0][k])
-
-    def test_get_details(self):
-        """Tests that the /images/detail registry API returns
-        a mapping containing a list of detailed image information
-
-        """
-        fixture = {'id': 2,
-                   'name': 'fake image #2',
-                   'is_public': True,
-                   'type': 'kernel',
-                   'status': 'active',
-                  }
-        req = webob.Request.blank('/images/detail')
-        res = req.get_response(server.API())
-        res_dict = json.loads(res.body)
-        self.assertEquals(res.status_int, 200)
-
-        images = res_dict['images']
-        self.assertEquals(len(images), 1)
-
-        for k, v in fixture.iteritems():
-            self.assertEquals(v, images[0][k])
-
-    def test_create_image(self):
-        """Tests that the /images POST registry API creates the image"""
-        fixture = {'name': 'fake public image',
-                   'is_public': True,
-                   'type': 'kernel',
-                  }
-
-        req = webob.Request.blank('/images')
-
-        req.method = 'POST'
-        req.body = json.dumps(dict(image=fixture))
-
-        res = req.get_response(server.API())
-
-        self.assertEquals(res.status_int, 200)
-
-        res_dict = json.loads(res.body)
-
-        for k, v in fixture.iteritems():
-            self.assertEquals(v, res_dict['image'][k])
-
-        # Test ID auto-assigned properly
-        self.assertEquals(3, res_dict['image']['id'])
-
-        # Test status was updated properly
-        self.assertEquals('active', res_dict['image']['status'])
-
-    def test_create_image_with_bad_status(self):
-        """Tests proper exception is raised if a bad status is set"""
-        fixture = {'id': 3,
-                   'name': 'fake public image',
-                   'is_public': True,
-                   'type': 'kernel',
-                   'status': 'bad status',
-                  }
-
-        req = webob.Request.blank('/images')
-
-        req.method = 'POST'
-        req.body = json.dumps(dict(image=fixture))
-
-        # TODO(jaypipes): Port Nova's Fault infrastructure
-        # over to Glance to support exception catching into
-        # standard HTTP errors.
-        res = req.get_response(server.API())
-        self.assertEquals(res.status_int, webob.exc.HTTPBadRequest.code)
-
-    def test_update_image(self):
-        """Tests that the /images PUT registry API updates the image"""
-        fixture = {'name': 'fake public image #2',
-                   'type': 'ramdisk',
-                  }
-
-        req = webob.Request.blank('/images/2')
-
-        req.method = 'PUT'
-        req.body = json.dumps(dict(image=fixture))
-
-        res = req.get_response(server.API())
-
-        self.assertEquals(res.status_int, 200)
-
-        res_dict = json.loads(res.body)
-
-        for k, v in fixture.iteritems():
-            self.assertEquals(v, res_dict['image'][k])
-
-    def test_update_image_not_existing(self):
-        """Tests proper exception is raised if attempt to update non-existing
-        image"""
-        fixture = {'id': 3,
-                   'name': 'fake public image',
-                   'is_public': True,
-                   'type': 'kernel',
-                   'status': 'bad status',
-                  }
-
-        req = webob.Request.blank('/images/3')
-
-        req.method = 'PUT'
-        req.body = json.dumps(dict(image=fixture))
-
-        # TODO(jaypipes): Port Nova's Fault infrastructure
-        # over to Glance to support exception catching into
-        # standard HTTP errors.
-        res = req.get_response(server.API())
-        self.assertEquals(res.status_int,
-                          webob.exc.HTTPNotFound.code)
-
-    def test_delete_image(self):
-        """Tests that the /images DELETE registry API deletes the image"""
-
-        # Grab the original number of images
-        req = webob.Request.blank('/images')
-        res = req.get_response(server.API())
-        res_dict = json.loads(res.body)
-        self.assertEquals(res.status_int, 200)
-
-        orig_num_images = len(res_dict['images'])
-
-        # Delete image #2
-        req = webob.Request.blank('/images/2')
-
-        req.method = 'DELETE'
-
-        res = req.get_response(server.API())
-
-        self.assertEquals(res.status_int, 200)
-
-        # Verify one less image
-        req = webob.Request.blank('/images')
-        res = req.get_response(server.API())
-        res_dict = json.loads(res.body)
-        self.assertEquals(res.status_int, 200)
-
-        new_num_images = len(res_dict['images'])
-        self.assertEquals(new_num_images, orig_num_images - 1)
-
-    def test_delete_image_not_existing(self):
-        """Tests proper exception is raised if attempt to delete non-existing
-        image"""
-
-        req = webob.Request.blank('/images/3')
-
-        req.method = 'DELETE'
-
-        # TODO(jaypipes): Port Nova's Fault infrastructure
-        # over to Glance to support exception catching into
-        # standard HTTP errors.
-        res = req.get_response(server.API())
-        self.assertEquals(res.status_int,
-                          webob.exc.HTTPNotFound.code)

=== modified file 'tools/pip-requires'
--- tools/pip-requires	2011-01-26 20:44:36 +0000
+++ tools/pip-requires	2011-01-31 19:42:44 +0000
@@ -6,7 +6,6 @@
 eventlet>=0.9.12
 lockfile==0.8
 python-daemon==1.5.5
-python-gflags>=1.3
 routes
 webob
 wsgiref