From d5a17b457059424aba0ad78f21061dd8d8948cb1 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Sun, 10 Feb 2013 18:55:24 -0500 Subject: [PATCH] Use oslo-config-2013.1b3 The cfg API is now available via the oslo-config library, so switch to it and remove the copied-and-pasted version. Add the 2013.1b3 tarball to tools/pip-requires - this will be changed to 'oslo-config>=2013.1' when oslo-config is published to pypi. This will happen in time for grizzly final. Add dependency_links to setup.py so that oslo-config can be installed from the tarball URL specified in pip-requires. Remove the 'deps = pep8==1.3.3' from tox.ini as it means all the other deps get installed with easy_install which can't install oslo-config from the URL. Retain dummy cfg.py file until keystoneclient middleware has been updated (I18c450174277c8e2d15ed93879da6cd92074c27a). Change-Id: I4815aeb8a9341a31a250e920157f15ee15cfc5bc --- bin/cinder-clear-rabbit-queues | 4 +- bin/cinder-manage | 3 +- cinder/api/middleware/auth.py | 3 +- cinder/api/middleware/sizelimit.py | 3 +- cinder/db/api.py | 4 +- cinder/db/base.py | 4 +- cinder/exception.py | 2 +- cinder/flags.py | 3 +- cinder/image/image_utils.py | 4 +- cinder/openstack/common/cfg.py | 1718 +---------------- cinder/openstack/common/iniparser.py | 130 -- cinder/openstack/common/lockutils.py | 3 +- cinder/openstack/common/log.py | 4 +- cinder/openstack/common/notifier/api.py | 4 +- .../openstack/common/notifier/log_notifier.py | 3 +- cinder/openstack/common/rpc/__init__.py | 4 +- cinder/openstack/common/rpc/amqp.py | 3 +- cinder/openstack/common/rpc/impl_kombu.py | 2 +- cinder/openstack/common/rpc/impl_qpid.py | 2 +- cinder/openstack/common/rpc/impl_zmq.py | 3 +- cinder/openstack/common/rpc/matchmaker.py | 4 +- cinder/policy.py | 4 +- cinder/quota.py | 4 +- cinder/scheduler/driver.py | 4 +- cinder/scheduler/host_manager.py | 4 +- cinder/scheduler/manager.py | 4 +- cinder/scheduler/scheduler_options.py | 4 +- cinder/scheduler/simple.py | 4 +- cinder/scheduler/weights/capacity.py | 4 +- cinder/service.py | 3 +- cinder/test.py | 3 +- cinder/tests/api/v1/test_volume_metadata.py | 2 +- cinder/tests/declare_flags.py | 3 +- cinder/tests/runtime_flags.py | 3 +- cinder/tests/test_flags.py | 2 +- cinder/tests/test_service.py | 3 +- cinder/tests/test_wsgi.py | 3 +- cinder/volume/api.py | 3 +- cinder/volume/driver.py | 4 +- cinder/volume/drivers/coraid.py | 14 +- cinder/volume/drivers/emc/emc_smis_common.py | 3 +- cinder/volume/drivers/glusterfs.py | 3 +- cinder/volume/drivers/lvm.py | 3 +- cinder/volume/drivers/netapp/iscsi.py | 5 +- cinder/volume/drivers/netapp/nfs.py | 5 +- cinder/volume/drivers/nexenta/volume.py | 3 +- cinder/volume/drivers/nfs.py | 3 +- cinder/volume/drivers/rbd.py | 4 +- .../volume/drivers/san/hp/hp_3par_common.py | 3 +- cinder/volume/drivers/san/san.py | 3 +- cinder/volume/drivers/san/solaris.py | 4 +- cinder/volume/drivers/solidfire.py | 3 +- cinder/volume/drivers/storwize_svc.py | 3 +- cinder/volume/drivers/windows.py | 3 +- cinder/volume/drivers/xenapi/sm.py | 3 +- cinder/volume/drivers/xiv.py | 3 +- cinder/volume/drivers/zadara.py | 7 +- cinder/volume/iscsi.py | 3 +- cinder/volume/manager.py | 4 +- cinder/wsgi.py | 2 +- openstack-common.conf | 2 +- setup.py | 2 + tools/conf/extract_opts.py | 4 +- tools/install_venv_common.py | 2 +- tools/pip-requires | 1 + tox.ini | 1 - 66 files changed, 113 insertions(+), 1954 deletions(-) delete mode 100644 cinder/openstack/common/iniparser.py diff --git a/bin/cinder-clear-rabbit-queues b/bin/cinder-clear-rabbit-queues index e61da9a73..aa701706a 100755 --- a/bin/cinder-clear-rabbit-queues +++ b/bin/cinder-clear-rabbit-queues @@ -40,14 +40,14 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'cinder', '__init__.py')): gettext.install('cinder', unicode=1) +from oslo.config import cfg + from cinder import context from cinder import exception from cinder import flags -from cinder.openstack.common import cfg from cinder.openstack.common import log as logging from cinder.openstack.common import rpc - delete_exchange_opt = \ cfg.BoolOpt('delete_exchange', default=False, diff --git a/bin/cinder-manage b/bin/cinder-manage index fd98d3382..8ee329dfd 100755 --- a/bin/cinder-manage +++ b/bin/cinder-manage @@ -74,12 +74,13 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'cinder', '__init__.py')): gettext.install('cinder', unicode=1) +from oslo.config import cfg + from cinder import context from cinder import db from cinder.db import migration from cinder import exception from cinder import flags -from cinder.openstack.common import cfg from cinder.openstack.common import log as logging from cinder.openstack.common import rpc from cinder import utils diff --git a/cinder/api/middleware/auth.py b/cinder/api/middleware/auth.py index cd93866fb..6c6e23862 100644 --- a/cinder/api/middleware/auth.py +++ b/cinder/api/middleware/auth.py @@ -20,17 +20,16 @@ Common Auth Middleware. """ import os +from oslo.config import cfg import webob.dec import webob.exc from cinder.api.openstack import wsgi from cinder import context from cinder import flags -from cinder.openstack.common import cfg from cinder.openstack.common import log as logging from cinder import wsgi as base_wsgi - use_forwarded_for_opt = cfg.BoolOpt( 'use_forwarded_for', default=False, diff --git a/cinder/api/middleware/sizelimit.py b/cinder/api/middleware/sizelimit.py index 247991262..7133e8f94 100644 --- a/cinder/api/middleware/sizelimit.py +++ b/cinder/api/middleware/sizelimit.py @@ -18,15 +18,14 @@ Request Body limiting middleware. """ +from oslo.config import cfg import webob.dec import webob.exc from cinder import flags -from cinder.openstack.common import cfg from cinder.openstack.common import log as logging from cinder import wsgi - #default request size is 112k max_request_body_size_opt = cfg.IntOpt('osapi_max_request_body_size', default=114688, diff --git a/cinder/db/api.py b/cinder/db/api.py index 065083e17..373be1220 100644 --- a/cinder/db/api.py +++ b/cinder/db/api.py @@ -43,12 +43,12 @@ these objects be simple dictionaries. """ +from oslo.config import cfg + from cinder import exception from cinder import flags -from cinder.openstack.common import cfg from cinder import utils - db_opts = [ cfg.StrOpt('db_backend', default='sqlalchemy', diff --git a/cinder/db/base.py b/cinder/db/base.py index 8b9d437c6..edfbeb626 100644 --- a/cinder/db/base.py +++ b/cinder/db/base.py @@ -18,11 +18,11 @@ """Base class for classes that need modular database access.""" +from oslo.config import cfg + from cinder import flags -from cinder.openstack.common import cfg from cinder.openstack.common import importutils - db_driver_opt = cfg.StrOpt('db_driver', default='cinder.db', help='driver to use for database access') diff --git a/cinder/exception.py b/cinder/exception.py index 7e5d02c9f..86d6d12d9 100644 --- a/cinder/exception.py +++ b/cinder/exception.py @@ -24,10 +24,10 @@ SHOULD include dedicated exception logging. """ +from oslo.config import cfg import webob.exc from cinder import flags -from cinder.openstack.common import cfg from cinder.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/cinder/flags.py b/cinder/flags.py index 30de8b240..71be5753e 100644 --- a/cinder/flags.py +++ b/cinder/flags.py @@ -30,8 +30,7 @@ import os import socket import sys -from cinder.openstack.common import cfg - +from oslo.config import cfg FLAGS = cfg.CONF diff --git a/cinder/image/image_utils.py b/cinder/image/image_utils.py index dad7d42d8..417f2b90c 100644 --- a/cinder/image/image_utils.py +++ b/cinder/image/image_utils.py @@ -29,13 +29,13 @@ import os import re import tempfile +from oslo.config import cfg + from cinder import exception from cinder import flags -from cinder.openstack.common import cfg from cinder.openstack.common import log as logging from cinder import utils - LOG = logging.getLogger(__name__) image_helper_opt = [cfg.StrOpt('image_conversion_dir', diff --git a/cinder/openstack/common/cfg.py b/cinder/openstack/common/cfg.py index 617e7147c..c35dcb845 100644 --- a/cinder/openstack/common/cfg.py +++ b/cinder/openstack/common/cfg.py @@ -1,6 +1,6 @@ # vim: tabstop=4 shiftwidth=4 softtabstop=4 -# Copyright 2012 Red Hat, Inc. +# Copyright 2013 Red Hat, Inc. # # 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 @@ -14,1718 +14,4 @@ # License for the specific language governing permissions and limitations # under the License. -r""" -Configuration options which may be set on the command line or in config files. - -The schema for each option is defined using the Opt sub-classes, e.g.: - -:: - - common_opts = [ - cfg.StrOpt('bind_host', - default='0.0.0.0', - help='IP address to listen on'), - cfg.IntOpt('bind_port', - default=9292, - help='Port number to listen on') - ] - -Options can be strings, integers, floats, booleans, lists or 'multi strings':: - - enabled_apis_opt = cfg.ListOpt('enabled_apis', - default=['ec2', 'osapi_compute'], - help='List of APIs to enable by default') - - DEFAULT_EXTENSIONS = [ - 'nova.api.openstack.compute.contrib.standard_extensions' - ] - osapi_compute_extension_opt = cfg.MultiStrOpt('osapi_compute_extension', - default=DEFAULT_EXTENSIONS) - -Option schemas are registered with the config manager at runtime, but before -the option is referenced:: - - class ExtensionManager(object): - - enabled_apis_opt = cfg.ListOpt(...) - - def __init__(self, conf): - self.conf = conf - self.conf.register_opt(enabled_apis_opt) - ... - - def _load_extensions(self): - for ext_factory in self.conf.osapi_compute_extension: - .... - -A common usage pattern is for each option schema to be defined in the module or -class which uses the option:: - - opts = ... - - def add_common_opts(conf): - conf.register_opts(opts) - - def get_bind_host(conf): - return conf.bind_host - - def get_bind_port(conf): - return conf.bind_port - -An option may optionally be made available via the command line. Such options -must registered with the config manager before the command line is parsed (for -the purposes of --help and CLI arg validation):: - - cli_opts = [ - cfg.BoolOpt('verbose', - short='v', - default=False, - help='Print more verbose output'), - cfg.BoolOpt('debug', - short='d', - default=False, - help='Print debugging output'), - ] - - def add_common_opts(conf): - conf.register_cli_opts(cli_opts) - -The config manager has two CLI options defined by default, --config-file -and --config-dir:: - - class ConfigOpts(object): - - def __call__(self, ...): - - opts = [ - MultiStrOpt('config-file', - ...), - StrOpt('config-dir', - ...), - ] - - self.register_cli_opts(opts) - -Option values are parsed from any supplied config files using -openstack.common.iniparser. If none are specified, a default set is used -e.g. glance-api.conf and glance-common.conf:: - - glance-api.conf: - [DEFAULT] - bind_port = 9292 - - glance-common.conf: - [DEFAULT] - bind_host = 0.0.0.0 - -Option values in config files override those on the command line. Config files -are parsed in order, with values in later files overriding those in earlier -files. - -The parsing of CLI args and config files is initiated by invoking the config -manager e.g.:: - - conf = ConfigOpts() - conf.register_opt(BoolOpt('verbose', ...)) - conf(sys.argv[1:]) - if conf.verbose: - ... - -Options can be registered as belonging to a group:: - - rabbit_group = cfg.OptGroup(name='rabbit', - title='RabbitMQ options') - - rabbit_host_opt = cfg.StrOpt('host', - default='localhost', - help='IP/hostname to listen on'), - rabbit_port_opt = cfg.IntOpt('port', - default=5672, - help='Port number to listen on') - - def register_rabbit_opts(conf): - conf.register_group(rabbit_group) - # options can be registered under a group in either of these ways: - conf.register_opt(rabbit_host_opt, group=rabbit_group) - conf.register_opt(rabbit_port_opt, group='rabbit') - -If it no group attributes are required other than the group name, the group -need not be explicitly registered e.g. - - def register_rabbit_opts(conf): - # The group will automatically be created, equivalent calling:: - # conf.register_group(OptGroup(name='rabbit')) - conf.register_opt(rabbit_port_opt, group='rabbit') - -If no group is specified, options belong to the 'DEFAULT' section of config -files:: - - glance-api.conf: - [DEFAULT] - bind_port = 9292 - ... - - [rabbit] - host = localhost - port = 5672 - use_ssl = False - userid = guest - password = guest - virtual_host = / - -Command-line options in a group are automatically prefixed with the -group name:: - - --rabbit-host localhost --rabbit-port 9999 - -Option values in the default group are referenced as attributes/properties on -the config manager; groups are also attributes on the config manager, with -attributes for each of the options associated with the group:: - - server.start(app, conf.bind_port, conf.bind_host, conf) - - self.connection = kombu.connection.BrokerConnection( - hostname=conf.rabbit.host, - port=conf.rabbit.port, - ...) - -Option values may reference other values using PEP 292 string substitution:: - - opts = [ - cfg.StrOpt('state_path', - default=os.path.join(os.path.dirname(__file__), '../'), - help='Top-level directory for maintaining nova state'), - cfg.StrOpt('sqlite_db', - default='nova.sqlite', - help='file name for sqlite'), - cfg.StrOpt('sql_connection', - default='sqlite:///$state_path/$sqlite_db', - help='connection string for sql database'), - ] - -Note that interpolation can be avoided by using '$$'. - -Options may be declared as required so that an error is raised if the user -does not supply a value for the option. - -Options may be declared as secret so that their values are not leaked into -log files:: - - opts = [ - cfg.StrOpt('s3_store_access_key', secret=True), - cfg.StrOpt('s3_store_secret_key', secret=True), - ... - ] - -This module also contains a global instance of the ConfigOpts class -in order to support a common usage pattern in OpenStack:: - - from cinder.openstack.common import cfg - - opts = [ - cfg.StrOpt('bind_host', default='0.0.0.0'), - cfg.IntOpt('bind_port', default=9292), - ] - - CONF = cfg.CONF - CONF.register_opts(opts) - - def start(server, app): - server.start(app, CONF.bind_port, CONF.bind_host) - -Positional command line arguments are supported via a 'positional' Opt -constructor argument:: - - >>> conf = ConfigOpts() - >>> conf.register_cli_opt(MultiStrOpt('bar', positional=True)) - True - >>> conf(['a', 'b']) - >>> conf.bar - ['a', 'b'] - -It is also possible to use argparse "sub-parsers" to parse additional -command line arguments using the SubCommandOpt class: - - >>> def add_parsers(subparsers): - ... list_action = subparsers.add_parser('list') - ... list_action.add_argument('id') - ... - >>> conf = ConfigOpts() - >>> conf.register_cli_opt(SubCommandOpt('action', handler=add_parsers)) - True - >>> conf(args=['list', '10']) - >>> conf.action.name, conf.action.id - ('list', '10') - -""" - -import argparse -import collections -import copy -import functools -import glob -import os -import string -import sys - -from cinder.openstack.common import iniparser - - -class Error(Exception): - """Base class for cfg exceptions.""" - - def __init__(self, msg=None): - self.msg = msg - - def __str__(self): - return self.msg - - -class ArgsAlreadyParsedError(Error): - """Raised if a CLI opt is registered after parsing.""" - - def __str__(self): - ret = "arguments already parsed" - if self.msg: - ret += ": " + self.msg - return ret - - -class NoSuchOptError(Error, AttributeError): - """Raised if an opt which doesn't exist is referenced.""" - - def __init__(self, opt_name, group=None): - self.opt_name = opt_name - self.group = group - - def __str__(self): - if self.group is None: - return "no such option: %s" % self.opt_name - else: - return "no such option in group %s: %s" % (self.group.name, - self.opt_name) - - -class NoSuchGroupError(Error): - """Raised if a group which doesn't exist is referenced.""" - - def __init__(self, group_name): - self.group_name = group_name - - def __str__(self): - return "no such group: %s" % self.group_name - - -class DuplicateOptError(Error): - """Raised if multiple opts with the same name are registered.""" - - def __init__(self, opt_name): - self.opt_name = opt_name - - def __str__(self): - return "duplicate option: %s" % self.opt_name - - -class RequiredOptError(Error): - """Raised if an option is required but no value is supplied by the user.""" - - def __init__(self, opt_name, group=None): - self.opt_name = opt_name - self.group = group - - def __str__(self): - if self.group is None: - return "value required for option: %s" % self.opt_name - else: - return "value required for option: %s.%s" % (self.group.name, - self.opt_name) - - -class TemplateSubstitutionError(Error): - """Raised if an error occurs substituting a variable in an opt value.""" - - def __str__(self): - return "template substitution error: %s" % self.msg - - -class ConfigFilesNotFoundError(Error): - """Raised if one or more config files are not found.""" - - def __init__(self, config_files): - self.config_files = config_files - - def __str__(self): - return ('Failed to read some config files: %s' % - string.join(self.config_files, ',')) - - -class ConfigFileParseError(Error): - """Raised if there is an error parsing a config file.""" - - def __init__(self, config_file, msg): - self.config_file = config_file - self.msg = msg - - def __str__(self): - return 'Failed to parse %s: %s' % (self.config_file, self.msg) - - -class ConfigFileValueError(Error): - """Raised if a config file value does not match its opt type.""" - pass - - -def _fixpath(p): - """Apply tilde expansion and absolutization to a path.""" - return os.path.abspath(os.path.expanduser(p)) - - -def _get_config_dirs(project=None): - """Return a list of directors where config files may be located. - - :param project: an optional project name - - If a project is specified, following directories are returned:: - - ~/.${project}/ - ~/ - /etc/${project}/ - /etc/ - - Otherwise, these directories:: - - ~/ - /etc/ - """ - cfg_dirs = [ - _fixpath(os.path.join('~', '.' + project)) if project else None, - _fixpath('~'), - os.path.join('/etc', project) if project else None, - '/etc' - ] - - return filter(bool, cfg_dirs) - - -def _search_dirs(dirs, basename, extension=""): - """Search a list of directories for a given filename. - - Iterator over the supplied directories, returning the first file - found with the supplied name and extension. - - :param dirs: a list of directories - :param basename: the filename, e.g. 'glance-api' - :param extension: the file extension, e.g. '.conf' - :returns: the path to a matching file, or None - """ - for d in dirs: - path = os.path.join(d, '%s%s' % (basename, extension)) - if os.path.exists(path): - return path - - -def find_config_files(project=None, prog=None, extension='.conf'): - """Return a list of default configuration files. - - :param project: an optional project name - :param prog: the program name, defaulting to the basename of sys.argv[0] - :param extension: the type of the config file - - We default to two config files: [${project}.conf, ${prog}.conf] - - And we look for those config files in the following directories:: - - ~/.${project}/ - ~/ - /etc/${project}/ - /etc/ - - We return an absolute path for (at most) one of each the default config - files, for the topmost directory it exists in. - - For example, if project=foo, prog=bar and /etc/foo/foo.conf, /etc/bar.conf - and ~/.foo/bar.conf all exist, then we return ['/etc/foo/foo.conf', - '~/.foo/bar.conf'] - - If no project name is supplied, we only look for ${prog.conf}. - """ - if prog is None: - prog = os.path.basename(sys.argv[0]) - - cfg_dirs = _get_config_dirs(project) - - config_files = [] - if project: - config_files.append(_search_dirs(cfg_dirs, project, extension)) - config_files.append(_search_dirs(cfg_dirs, prog, extension)) - - return filter(bool, config_files) - - -def _is_opt_registered(opts, opt): - """Check whether an opt with the same name is already registered. - - The same opt may be registered multiple times, with only the first - registration having any effect. However, it is an error to attempt - to register a different opt with the same name. - - :param opts: the set of opts already registered - :param opt: the opt to be registered - :returns: True if the opt was previously registered, False otherwise - :raises: DuplicateOptError if a naming conflict is detected - """ - if opt.dest in opts: - if opts[opt.dest]['opt'] != opt: - raise DuplicateOptError(opt.name) - return True - else: - return False - - -def set_defaults(opts, **kwargs): - for opt in opts: - if opt.dest in kwargs: - opt.default = kwargs[opt.dest] - break - - -class Opt(object): - - """Base class for all configuration options. - - An Opt object has no public methods, but has a number of public string - properties: - - name: - the name of the option, which may include hyphens - dest: - the (hyphen-less) ConfigOpts property which contains the option value - short: - a single character CLI option name - default: - the default value of the option - positional: - True if the option is a positional CLI argument - metavar: - the name shown as the argument to a CLI option in --help output - help: - an string explaining how the options value is used - """ - multi = False - - def __init__(self, name, dest=None, short=None, default=None, - positional=False, metavar=None, help=None, - secret=False, required=False, deprecated_name=None): - """Construct an Opt object. - - The only required parameter is the option's name. However, it is - common to also supply a default and help string for all options. - - :param name: the option's name - :param dest: the name of the corresponding ConfigOpts property - :param short: a single character CLI option name - :param default: the default value of the option - :param positional: True if the option is a positional CLI argument - :param metavar: the option argument to show in --help - :param help: an explanation of how the option is used - :param secret: true iff the value should be obfuscated in log output - :param required: true iff a value must be supplied for this option - :param deprecated_name: deprecated name option. Acts like an alias - """ - self.name = name - if dest is None: - self.dest = self.name.replace('-', '_') - else: - self.dest = dest - self.short = short - self.default = default - self.positional = positional - self.metavar = metavar - self.help = help - self.secret = secret - self.required = required - if deprecated_name is not None: - self.deprecated_name = deprecated_name.replace('-', '_') - else: - self.deprecated_name = None - - def __ne__(self, another): - return vars(self) != vars(another) - - def _get_from_config_parser(self, cparser, section): - """Retrieves the option value from a MultiConfigParser object. - - This is the method ConfigOpts uses to look up the option value from - config files. Most opt types override this method in order to perform - type appropriate conversion of the returned value. - - :param cparser: a ConfigParser object - :param section: a section name - """ - return self._cparser_get_with_deprecated(cparser, section) - - def _cparser_get_with_deprecated(self, cparser, section): - """If cannot find option as dest try deprecated_name alias.""" - if self.deprecated_name is not None: - return cparser.get(section, [self.dest, self.deprecated_name]) - return cparser.get(section, [self.dest]) - - def _add_to_cli(self, parser, group=None): - """Makes the option available in the command line interface. - - This is the method ConfigOpts uses to add the opt to the CLI interface - as appropriate for the opt type. Some opt types may extend this method, - others may just extend the helper methods it uses. - - :param parser: the CLI option parser - :param group: an optional OptGroup object - """ - container = self._get_argparse_container(parser, group) - kwargs = self._get_argparse_kwargs(group) - prefix = self._get_argparse_prefix('', group) - self._add_to_argparse(container, self.name, self.short, kwargs, prefix, - self.positional, self.deprecated_name) - - def _add_to_argparse(self, container, name, short, kwargs, prefix='', - positional=False, deprecated_name=None): - """Add an option to an argparse parser or group. - - :param container: an argparse._ArgumentGroup object - :param name: the opt name - :param short: the short opt name - :param kwargs: the keyword arguments for add_argument() - :param prefix: an optional prefix to prepend to the opt name - :param position: whether the optional is a positional CLI argument - :raises: DuplicateOptError if a naming confict is detected - """ - def hyphen(arg): - return arg if not positional else '' - - args = [hyphen('--') + prefix + name] - if short: - args.append(hyphen('-') + short) - if deprecated_name: - args.append(hyphen('--') + prefix + deprecated_name) - - try: - container.add_argument(*args, **kwargs) - except argparse.ArgumentError as e: - raise DuplicateOptError(e) - - def _get_argparse_container(self, parser, group): - """Returns an argparse._ArgumentGroup. - - :param parser: an argparse.ArgumentParser - :param group: an (optional) OptGroup object - :returns: an argparse._ArgumentGroup if group is given, else parser - """ - if group is not None: - return group._get_argparse_group(parser) - else: - return parser - - def _get_argparse_kwargs(self, group, **kwargs): - """Build a dict of keyword arguments for argparse's add_argument(). - - Most opt types extend this method to customize the behaviour of the - options added to argparse. - - :param group: an optional group - :param kwargs: optional keyword arguments to add to - :returns: a dict of keyword arguments - """ - if not self.positional: - dest = self.dest - if group is not None: - dest = group.name + '_' + dest - kwargs['dest'] = dest - else: - kwargs['nargs'] = '?' - kwargs.update({'default': None, - 'metavar': self.metavar, - 'help': self.help, }) - return kwargs - - def _get_argparse_prefix(self, prefix, group): - """Build a prefix for the CLI option name, if required. - - CLI options in a group are prefixed with the group's name in order - to avoid conflicts between similarly named options in different - groups. - - :param prefix: an existing prefix to append to (e.g. 'no' or '') - :param group: an optional OptGroup object - :returns: a CLI option prefix including the group name, if appropriate - """ - if group is not None: - return group.name + '-' + prefix - else: - return prefix - - -class StrOpt(Opt): - """ - String opts do not have their values transformed and are returned as - str objects. - """ - pass - - -class BoolOpt(Opt): - - """ - Bool opts are set to True or False on the command line using --optname or - --noopttname respectively. - - In config files, boolean values are case insensitive and can be set using - 1/0, yes/no, true/false or on/off. - """ - - _boolean_states = {'1': True, 'yes': True, 'true': True, 'on': True, - '0': False, 'no': False, 'false': False, 'off': False} - - def __init__(self, *args, **kwargs): - if 'positional' in kwargs: - raise ValueError('positional boolean args not supported') - super(BoolOpt, self).__init__(*args, **kwargs) - - def _get_from_config_parser(self, cparser, section): - """Retrieve the opt value as a boolean from ConfigParser.""" - def convert_bool(v): - value = self._boolean_states.get(v.lower()) - if value is None: - raise ValueError('Unexpected boolean value %r' % v) - - return value - - return [convert_bool(v) for v in - self._cparser_get_with_deprecated(cparser, section)] - - def _add_to_cli(self, parser, group=None): - """Extends the base class method to add the --nooptname option.""" - super(BoolOpt, self)._add_to_cli(parser, group) - self._add_inverse_to_argparse(parser, group) - - def _add_inverse_to_argparse(self, parser, group): - """Add the --nooptname option to the option parser.""" - container = self._get_argparse_container(parser, group) - kwargs = self._get_argparse_kwargs(group, action='store_false') - prefix = self._get_argparse_prefix('no', group) - kwargs["help"] = "The inverse of --" + self.name - self._add_to_argparse(container, self.name, None, kwargs, prefix, - self.positional, self.deprecated_name) - - def _get_argparse_kwargs(self, group, action='store_true', **kwargs): - """Extends the base argparse keyword dict for boolean options.""" - - kwargs = super(BoolOpt, self)._get_argparse_kwargs(group, **kwargs) - - # metavar has no effect for BoolOpt - if 'metavar' in kwargs: - del kwargs['metavar'] - - if action != 'store_true': - action = 'store_false' - - kwargs['action'] = action - - return kwargs - - -class IntOpt(Opt): - - """Int opt values are converted to integers using the int() builtin.""" - - def _get_from_config_parser(self, cparser, section): - """Retrieve the opt value as a integer from ConfigParser.""" - return [int(v) for v in self._cparser_get_with_deprecated(cparser, - section)] - - def _get_argparse_kwargs(self, group, **kwargs): - """Extends the base argparse keyword dict for integer options.""" - return super(IntOpt, - self)._get_argparse_kwargs(group, type=int, **kwargs) - - -class FloatOpt(Opt): - - """Float opt values are converted to floats using the float() builtin.""" - - def _get_from_config_parser(self, cparser, section): - """Retrieve the opt value as a float from ConfigParser.""" - return [float(v) for v in - self._cparser_get_with_deprecated(cparser, section)] - - def _get_argparse_kwargs(self, group, **kwargs): - """Extends the base argparse keyword dict for float options.""" - return super(FloatOpt, self)._get_argparse_kwargs(group, - type=float, **kwargs) - - -class ListOpt(Opt): - - """ - List opt values are simple string values separated by commas. The opt value - is a list containing these strings. - """ - - class _StoreListAction(argparse.Action): - """ - An argparse action for parsing an option value into a list. - """ - def __call__(self, parser, namespace, values, option_string=None): - if values is not None: - values = [a.strip() for a in values.split(',')] - setattr(namespace, self.dest, values) - - def _get_from_config_parser(self, cparser, section): - """Retrieve the opt value as a list from ConfigParser.""" - return [[a.strip() for a in v.split(',')] for v in - self._cparser_get_with_deprecated(cparser, section)] - - def _get_argparse_kwargs(self, group, **kwargs): - """Extends the base argparse keyword dict for list options.""" - return Opt._get_argparse_kwargs(self, - group, - action=ListOpt._StoreListAction, - **kwargs) - - -class MultiStrOpt(Opt): - - """ - Multistr opt values are string opts which may be specified multiple times. - The opt value is a list containing all the string values specified. - """ - multi = True - - def _get_argparse_kwargs(self, group, **kwargs): - """Extends the base argparse keyword dict for multi str options.""" - kwargs = super(MultiStrOpt, self)._get_argparse_kwargs(group) - if not self.positional: - kwargs['action'] = 'append' - else: - kwargs['nargs'] = '*' - return kwargs - - def _cparser_get_with_deprecated(self, cparser, section): - """If cannot find option as dest try deprecated_name alias.""" - if self.deprecated_name is not None: - return cparser.get(section, [self.dest, self.deprecated_name], - multi=True) - return cparser.get(section, [self.dest], multi=True) - - -class SubCommandOpt(Opt): - - """ - Sub-command options allow argparse sub-parsers to be used to parse - additional command line arguments. - - The handler argument to the SubCommandOpt contructor is a callable - which is supplied an argparse subparsers object. Use this handler - callable to add sub-parsers. - - The opt value is SubCommandAttr object with the name of the chosen - sub-parser stored in the 'name' attribute and the values of other - sub-parser arguments available as additional attributes. - """ - - def __init__(self, name, dest=None, handler=None, - title=None, description=None, help=None): - """Construct an sub-command parsing option. - - This behaves similarly to other Opt sub-classes but adds a - 'handler' argument. The handler is a callable which is supplied - an subparsers object when invoked. The add_parser() method on - this subparsers object can be used to register parsers for - sub-commands. - - :param name: the option's name - :param dest: the name of the corresponding ConfigOpts property - :param title: title of the sub-commands group in help output - :param description: description of the group in help output - :param help: a help string giving an overview of available sub-commands - """ - super(SubCommandOpt, self).__init__(name, dest=dest, help=help) - self.handler = handler - self.title = title - self.description = description - - def _add_to_cli(self, parser, group=None): - """Add argparse sub-parsers and invoke the handler method.""" - dest = self.dest - if group is not None: - dest = group.name + '_' + dest - - subparsers = parser.add_subparsers(dest=dest, - title=self.title, - description=self.description, - help=self.help) - - if not self.handler is None: - self.handler(subparsers) - - -class OptGroup(object): - - """ - Represents a group of opts. - - CLI opts in the group are automatically prefixed with the group name. - - Each group corresponds to a section in config files. - - An OptGroup object has no public methods, but has a number of public string - properties: - - name: - the name of the group - title: - the group title as displayed in --help - help: - the group description as displayed in --help - """ - - def __init__(self, name, title=None, help=None): - """Constructs an OptGroup object. - - :param name: the group name - :param title: the group title for --help - :param help: the group description for --help - """ - self.name = name - if title is None: - self.title = "%s options" % title - else: - self.title = title - self.help = help - - self._opts = {} # dict of dicts of (opt:, override:, default:) - self._argparse_group = None - - def _register_opt(self, opt, cli=False): - """Add an opt to this group. - - :param opt: an Opt object - :param cli: whether this is a CLI option - :returns: False if previously registered, True otherwise - :raises: DuplicateOptError if a naming conflict is detected - """ - if _is_opt_registered(self._opts, opt): - return False - - self._opts[opt.dest] = {'opt': opt, 'cli': cli} - - return True - - def _unregister_opt(self, opt): - """Remove an opt from this group. - - :param opt: an Opt object - """ - if opt.dest in self._opts: - del self._opts[opt.dest] - - def _get_argparse_group(self, parser): - if self._argparse_group is None: - """Build an argparse._ArgumentGroup for this group.""" - self._argparse_group = parser.add_argument_group(self.title, - self.help) - return self._argparse_group - - def _clear(self): - """Clear this group's option parsing state.""" - self._argparse_group = None - - -class ParseError(iniparser.ParseError): - def __init__(self, msg, lineno, line, filename): - super(ParseError, self).__init__(msg, lineno, line) - self.filename = filename - - def __str__(self): - return 'at %s:%d, %s: %r' % (self.filename, self.lineno, - self.msg, self.line) - - -class ConfigParser(iniparser.BaseParser): - def __init__(self, filename, sections): - super(ConfigParser, self).__init__() - self.filename = filename - self.sections = sections - self.section = None - - def parse(self): - with open(self.filename) as f: - return super(ConfigParser, self).parse(f) - - def new_section(self, section): - self.section = section - self.sections.setdefault(self.section, {}) - - def assignment(self, key, value): - if not self.section: - raise self.error_no_section() - - self.sections[self.section].setdefault(key, []) - self.sections[self.section][key].append('\n'.join(value)) - - def parse_exc(self, msg, lineno, line=None): - return ParseError(msg, lineno, line, self.filename) - - def error_no_section(self): - return self.parse_exc('Section must be started before assignment', - self.lineno) - - -class MultiConfigParser(object): - def __init__(self): - self.parsed = [] - - def read(self, config_files): - read_ok = [] - - for filename in config_files: - sections = {} - parser = ConfigParser(filename, sections) - - try: - parser.parse() - except IOError: - continue - self.parsed.insert(0, sections) - read_ok.append(filename) - - return read_ok - - def get(self, section, names, multi=False): - rvalue = [] - for sections in self.parsed: - if section not in sections: - continue - for name in names: - if name in sections[section]: - if multi: - rvalue = sections[section][name] + rvalue - else: - return sections[section][name] - if multi and rvalue != []: - return rvalue - raise KeyError - - -class ConfigOpts(collections.Mapping): - - """ - Config options which may be set on the command line or in config files. - - ConfigOpts is a configuration option manager with APIs for registering - option schemas, grouping options, parsing option values and retrieving - the values of options. - """ - - def __init__(self): - """Construct a ConfigOpts object.""" - self._opts = {} # dict of dicts of (opt:, override:, default:) - self._groups = {} - - self._args = None - - self._oparser = None - self._cparser = None - self._cli_values = {} - self.__cache = {} - self._config_opts = [] - - def _pre_setup(self, project, prog, version, usage, default_config_files): - """Initialize a ConfigCliParser object for option parsing.""" - - if prog is None: - prog = os.path.basename(sys.argv[0]) - - if default_config_files is None: - default_config_files = find_config_files(project, prog) - - self._oparser = argparse.ArgumentParser(prog=prog, usage=usage) - self._oparser.add_argument('--version', - action='version', - version=version) - - return prog, default_config_files - - def _setup(self, project, prog, version, usage, default_config_files): - """Initialize a ConfigOpts object for option parsing.""" - - self._config_opts = [ - MultiStrOpt('config-file', - default=default_config_files, - metavar='PATH', - help='Path to a config file to use. Multiple config ' - 'files can be specified, with values in later ' - 'files taking precedence. The default files ' - ' used are: %s' % (default_config_files, )), - StrOpt('config-dir', - metavar='DIR', - help='Path to a config directory to pull *.conf ' - 'files from. This file set is sorted, so as to ' - 'provide a predictable parse order if individual ' - 'options are over-ridden. The set is parsed after ' - 'the file(s), if any, specified via --config-file, ' - 'hence over-ridden options in the directory take ' - 'precedence.'), - ] - self.register_cli_opts(self._config_opts) - - self.project = project - self.prog = prog - self.version = version - self.usage = usage - self.default_config_files = default_config_files - - def __clear_cache(f): - @functools.wraps(f) - def __inner(self, *args, **kwargs): - if kwargs.pop('clear_cache', True): - self.__cache.clear() - return f(self, *args, **kwargs) - - return __inner - - def __call__(self, - args=None, - project=None, - prog=None, - version=None, - usage=None, - default_config_files=None): - """Parse command line arguments and config files. - - Calling a ConfigOpts object causes the supplied command line arguments - and config files to be parsed, causing opt values to be made available - as attributes of the object. - - The object may be called multiple times, each time causing the previous - set of values to be overwritten. - - Automatically registers the --config-file option with either a supplied - list of default config files, or a list from find_config_files(). - - If the --config-dir option is set, any *.conf files from this - directory are pulled in, after all the file(s) specified by the - --config-file option. - - :param args: command line arguments (defaults to sys.argv[1:]) - :param project: the toplevel project name, used to locate config files - :param prog: the name of the program (defaults to sys.argv[0] basename) - :param version: the program version (for --version) - :param usage: a usage string (%prog will be expanded) - :param default_config_files: config files to use by default - :returns: the list of arguments left over after parsing options - :raises: SystemExit, ConfigFilesNotFoundError, ConfigFileParseError, - RequiredOptError, DuplicateOptError - """ - - self.clear() - - prog, default_config_files = self._pre_setup(project, - prog, - version, - usage, - default_config_files) - - self._setup(project, prog, version, usage, default_config_files) - - self._cli_values = self._parse_cli_opts(args) - - self._parse_config_files() - - self._check_required_opts() - - def __getattr__(self, name): - """Look up an option value and perform string substitution. - - :param name: the opt name (or 'dest', more precisely) - :returns: the option value (after string subsititution) or a GroupAttr - :raises: NoSuchOptError,ConfigFileValueError,TemplateSubstitutionError - """ - return self._get(name) - - def __getitem__(self, key): - """Look up an option value and perform string substitution.""" - return self.__getattr__(key) - - def __contains__(self, key): - """Return True if key is the name of a registered opt or group.""" - return key in self._opts or key in self._groups - - def __iter__(self): - """Iterate over all registered opt and group names.""" - for key in self._opts.keys() + self._groups.keys(): - yield key - - def __len__(self): - """Return the number of options and option groups.""" - return len(self._opts) + len(self._groups) - - def reset(self): - """Clear the object state and unset overrides and defaults.""" - self._unset_defaults_and_overrides() - self.clear() - - @__clear_cache - def clear(self): - """Clear the state of the object to before it was called. - - Any subparsers added using the add_cli_subparsers() will also be - removed as a side-effect of this method. - """ - self._args = None - self._cli_values.clear() - self._oparser = argparse.ArgumentParser() - self._cparser = None - self.unregister_opts(self._config_opts) - for group in self._groups.values(): - group._clear() - - @__clear_cache - def register_opt(self, opt, group=None, cli=False): - """Register an option schema. - - Registering an option schema makes any option value which is previously - or subsequently parsed from the command line or config files available - as an attribute of this object. - - :param opt: an instance of an Opt sub-class - :param cli: whether this is a CLI option - :param group: an optional OptGroup object or group name - :return: False if the opt was already register, True otherwise - :raises: DuplicateOptError - """ - if group is not None: - group = self._get_group(group, autocreate=True) - return group._register_opt(opt, cli) - - if _is_opt_registered(self._opts, opt): - return False - - self._opts[opt.dest] = {'opt': opt, 'cli': cli} - - return True - - @__clear_cache - def register_opts(self, opts, group=None): - """Register multiple option schemas at once.""" - for opt in opts: - self.register_opt(opt, group, clear_cache=False) - - @__clear_cache - def register_cli_opt(self, opt, group=None): - """Register a CLI option schema. - - CLI option schemas must be registered before the command line and - config files are parsed. This is to ensure that all CLI options are - show in --help and option validation works as expected. - - :param opt: an instance of an Opt sub-class - :param group: an optional OptGroup object or group name - :return: False if the opt was already register, True otherwise - :raises: DuplicateOptError, ArgsAlreadyParsedError - """ - if self._args is not None: - raise ArgsAlreadyParsedError("cannot register CLI option") - - return self.register_opt(opt, group, cli=True, clear_cache=False) - - @__clear_cache - def register_cli_opts(self, opts, group=None): - """Register multiple CLI option schemas at once.""" - for opt in opts: - self.register_cli_opt(opt, group, clear_cache=False) - - def register_group(self, group): - """Register an option group. - - An option group must be registered before options can be registered - with the group. - - :param group: an OptGroup object - """ - if group.name in self._groups: - return - - self._groups[group.name] = copy.copy(group) - - @__clear_cache - def unregister_opt(self, opt, group=None): - """Unregister an option. - - :param opt: an Opt object - :param group: an optional OptGroup object or group name - :raises: ArgsAlreadyParsedError, NoSuchGroupError - """ - if self._args is not None: - raise ArgsAlreadyParsedError("reset before unregistering options") - - if group is not None: - self._get_group(group)._unregister_opt(opt) - elif opt.dest in self._opts: - del self._opts[opt.dest] - - @__clear_cache - def unregister_opts(self, opts, group=None): - """Unregister multiple CLI option schemas at once.""" - for opt in opts: - self.unregister_opt(opt, group, clear_cache=False) - - def import_opt(self, name, module_str, group=None): - """Import an option definition from a module. - - Import a module and check that a given option is registered. - - This is intended for use with global configuration objects - like cfg.CONF where modules commonly register options with - CONF at module load time. If one module requires an option - defined by another module it can use this method to explicitly - declare the dependency. - - :param name: the name/dest of the opt - :param module_str: the name of a module to import - :param group: an option OptGroup object or group name - :raises: NoSuchOptError, NoSuchGroupError - """ - __import__(module_str) - self._get_opt_info(name, group) - - @__clear_cache - def set_override(self, name, override, group=None): - """Override an opt value. - - Override the command line, config file and default values of a - given option. - - :param name: the name/dest of the opt - :param override: the override value - :param group: an option OptGroup object or group name - :raises: NoSuchOptError, NoSuchGroupError - """ - opt_info = self._get_opt_info(name, group) - opt_info['override'] = override - - @__clear_cache - def set_default(self, name, default, group=None): - """Override an opt's default value. - - Override the default value of given option. A command line or - config file value will still take precedence over this default. - - :param name: the name/dest of the opt - :param default: the default value - :param group: an option OptGroup object or group name - :raises: NoSuchOptError, NoSuchGroupError - """ - opt_info = self._get_opt_info(name, group) - opt_info['default'] = default - - @__clear_cache - def clear_override(self, name, group=None): - """Clear an override an opt value. - - Clear a previously set override of the command line, config file - and default values of a given option. - - :param name: the name/dest of the opt - :param group: an option OptGroup object or group name - :raises: NoSuchOptError, NoSuchGroupError - """ - opt_info = self._get_opt_info(name, group) - opt_info.pop('override', None) - - @__clear_cache - def clear_default(self, name, group=None): - """Clear an override an opt's default value. - - Clear a previously set override of the default value of given option. - - :param name: the name/dest of the opt - :param group: an option OptGroup object or group name - :raises: NoSuchOptError, NoSuchGroupError - """ - opt_info = self._get_opt_info(name, group) - opt_info.pop('default', None) - - def _all_opt_infos(self): - """A generator function for iteration opt infos.""" - for info in self._opts.values(): - yield info, None - for group in self._groups.values(): - for info in group._opts.values(): - yield info, group - - def _all_cli_opts(self): - """A generator function for iterating CLI opts.""" - for info, group in self._all_opt_infos(): - if info['cli']: - yield info['opt'], group - - def _unset_defaults_and_overrides(self): - """Unset any default or override on all options.""" - for info, group in self._all_opt_infos(): - info.pop('default', None) - info.pop('override', None) - - def find_file(self, name): - """Locate a file located alongside the config files. - - Search for a file with the supplied basename in the directories - which we have already loaded config files from and other known - configuration directories. - - The directory, if any, supplied by the config_dir option is - searched first. Then the config_file option is iterated over - and each of the base directories of the config_files values - are searched. Failing both of these, the standard directories - searched by the module level find_config_files() function is - used. The first matching file is returned. - - :param basename: the filename, e.g. 'policy.json' - :returns: the path to a matching file, or None - """ - dirs = [] - if self.config_dir: - dirs.append(_fixpath(self.config_dir)) - - for cf in reversed(self.config_file): - dirs.append(os.path.dirname(_fixpath(cf))) - - dirs.extend(_get_config_dirs(self.project)) - - return _search_dirs(dirs, name) - - def log_opt_values(self, logger, lvl): - """Log the value of all registered opts. - - It's often useful for an app to log its configuration to a log file at - startup for debugging. This method dumps to the entire config state to - the supplied logger at a given log level. - - :param logger: a logging.Logger object - :param lvl: the log level (e.g. logging.DEBUG) arg to logger.log() - """ - logger.log(lvl, "*" * 80) - logger.log(lvl, "Configuration options gathered from:") - logger.log(lvl, "command line args: %s", self._args) - logger.log(lvl, "config files: %s", self.config_file) - logger.log(lvl, "=" * 80) - - def _sanitize(opt, value): - """Obfuscate values of options declared secret""" - return value if not opt.secret else '*' * len(str(value)) - - for opt_name in sorted(self._opts): - opt = self._get_opt_info(opt_name)['opt'] - logger.log(lvl, "%-30s = %s", opt_name, - _sanitize(opt, getattr(self, opt_name))) - - for group_name in self._groups: - group_attr = self.GroupAttr(self, self._get_group(group_name)) - for opt_name in sorted(self._groups[group_name]._opts): - opt = self._get_opt_info(opt_name, group_name)['opt'] - logger.log(lvl, "%-30s = %s", - "%s.%s" % (group_name, opt_name), - _sanitize(opt, getattr(group_attr, opt_name))) - - logger.log(lvl, "*" * 80) - - def print_usage(self, file=None): - """Print the usage message for the current program.""" - self._oparser.print_usage(file) - - def print_help(self, file=None): - """Print the help message for the current program.""" - self._oparser.print_help(file) - - def _get(self, name, group=None): - if isinstance(group, OptGroup): - key = (group.name, name) - else: - key = (group, name) - try: - return self.__cache[key] - except KeyError: - value = self._substitute(self._do_get(name, group)) - self.__cache[key] = value - return value - - def _do_get(self, name, group=None): - """Look up an option value. - - :param name: the opt name (or 'dest', more precisely) - :param group: an OptGroup - :returns: the option value, or a GroupAttr object - :raises: NoSuchOptError, NoSuchGroupError, ConfigFileValueError, - TemplateSubstitutionError - """ - if group is None and name in self._groups: - return self.GroupAttr(self, self._get_group(name)) - - info = self._get_opt_info(name, group) - opt = info['opt'] - - if isinstance(opt, SubCommandOpt): - return self.SubCommandAttr(self, group, opt.dest) - - if 'override' in info: - return info['override'] - - values = [] - if self._cparser is not None: - section = group.name if group is not None else 'DEFAULT' - try: - value = opt._get_from_config_parser(self._cparser, section) - except KeyError: - pass - except ValueError as ve: - raise ConfigFileValueError(str(ve)) - else: - if not opt.multi: - # No need to continue since the last value wins - return value[-1] - values.extend(value) - - name = name if group is None else group.name + '_' + name - value = self._cli_values.get(name) - if value is not None: - if not opt.multi: - return value - - # argparse ignores default=None for nargs='*' - if opt.positional and not value: - value = opt.default - - return value + values - - if values: - return values - - if 'default' in info: - return info['default'] - - return opt.default - - def _substitute(self, value): - """Perform string template substitution. - - Substitute any template variables (e.g. $foo, ${bar}) in the supplied - string value(s) with opt values. - - :param value: the string value, or list of string values - :returns: the substituted string(s) - """ - if isinstance(value, list): - return [self._substitute(i) for i in value] - elif isinstance(value, str): - tmpl = string.Template(value) - return tmpl.safe_substitute(self.StrSubWrapper(self)) - else: - return value - - def _get_group(self, group_or_name, autocreate=False): - """Looks up a OptGroup object. - - Helper function to return an OptGroup given a parameter which can - either be the group's name or an OptGroup object. - - The OptGroup object returned is from the internal dict of OptGroup - objects, which will be a copy of any OptGroup object that users of - the API have access to. - - :param group_or_name: the group's name or the OptGroup object itself - :param autocreate: whether to auto-create the group if it's not found - :raises: NoSuchGroupError - """ - group = group_or_name if isinstance(group_or_name, OptGroup) else None - group_name = group.name if group else group_or_name - - if not group_name in self._groups: - if not group is None or not autocreate: - raise NoSuchGroupError(group_name) - - self.register_group(OptGroup(name=group_name)) - - return self._groups[group_name] - - def _get_opt_info(self, opt_name, group=None): - """Return the (opt, override, default) dict for an opt. - - :param opt_name: an opt name/dest - :param group: an optional group name or OptGroup object - :raises: NoSuchOptError, NoSuchGroupError - """ - if group is None: - opts = self._opts - else: - group = self._get_group(group) - opts = group._opts - - if not opt_name in opts: - raise NoSuchOptError(opt_name, group) - - return opts[opt_name] - - def _parse_config_files(self): - """Parse the config files from --config-file and --config-dir. - - :raises: ConfigFilesNotFoundError, ConfigFileParseError - """ - config_files = list(self.config_file) - - if self.config_dir: - config_dir_glob = os.path.join(self.config_dir, '*.conf') - config_files += sorted(glob.glob(config_dir_glob)) - - config_files = [_fixpath(p) for p in config_files] - - self._cparser = MultiConfigParser() - - try: - read_ok = self._cparser.read(config_files) - except iniparser.ParseError as pe: - raise ConfigFileParseError(pe.filename, str(pe)) - - if read_ok != config_files: - not_read_ok = filter(lambda f: f not in read_ok, config_files) - raise ConfigFilesNotFoundError(not_read_ok) - - def _check_required_opts(self): - """Check that all opts marked as required have values specified. - - :raises: RequiredOptError - """ - for info, group in self._all_opt_infos(): - opt = info['opt'] - - if opt.required: - if ('default' in info or 'override' in info): - continue - - if self._get(opt.dest, group) is None: - raise RequiredOptError(opt.name, group) - - def _parse_cli_opts(self, args): - """Parse command line options. - - Initializes the command line option parser and parses the supplied - command line arguments. - - :param args: the command line arguments - :returns: a dict of parsed option values - :raises: SystemExit, DuplicateOptError - - """ - self._args = args - - for opt, group in self._all_cli_opts(): - opt._add_to_cli(self._oparser, group) - - return vars(self._oparser.parse_args(args)) - - class GroupAttr(collections.Mapping): - - """ - A helper class representing the option values of a group as a mapping - and attributes. - """ - - def __init__(self, conf, group): - """Construct a GroupAttr object. - - :param conf: a ConfigOpts object - :param group: an OptGroup object - """ - self._conf = conf - self._group = group - - def __getattr__(self, name): - """Look up an option value and perform template substitution.""" - return self._conf._get(name, self._group) - - def __getitem__(self, key): - """Look up an option value and perform string substitution.""" - return self.__getattr__(key) - - def __contains__(self, key): - """Return True if key is the name of a registered opt or group.""" - return key in self._group._opts - - def __iter__(self): - """Iterate over all registered opt and group names.""" - for key in self._group._opts.keys(): - yield key - - def __len__(self): - """Return the number of options and option groups.""" - return len(self._group._opts) - - class SubCommandAttr(object): - - """ - A helper class representing the name and arguments of an argparse - sub-parser. - """ - - def __init__(self, conf, group, dest): - """Construct a SubCommandAttr object. - - :param conf: a ConfigOpts object - :param group: an OptGroup object - :param dest: the name of the sub-parser - """ - self._conf = conf - self._group = group - self._dest = dest - - def __getattr__(self, name): - """Look up a sub-parser name or argument value.""" - if name == 'name': - name = self._dest - if self._group is not None: - name = self._group.name + '_' + name - return self._conf._cli_values[name] - - if name in self._conf: - raise DuplicateOptError(name) - - try: - return self._conf._cli_values[name] - except KeyError: - raise NoSuchOptError(name) - - class StrSubWrapper(object): - - """ - A helper class exposing opt values as a dict for string substitution. - """ - - def __init__(self, conf): - """Construct a StrSubWrapper object. - - :param conf: a ConfigOpts object - """ - self.conf = conf - - def __getitem__(self, key): - """Look up an opt value from the ConfigOpts object. - - :param key: an opt name - :returns: an opt value - :raises: TemplateSubstitutionError if attribute is a group - """ - value = getattr(self.conf, key) - if isinstance(value, self.conf.GroupAttr): - raise TemplateSubstitutionError( - 'substituting group %s not supported' % key) - return value - - -CONF = ConfigOpts() +from oslo.config.cfg import * diff --git a/cinder/openstack/common/iniparser.py b/cinder/openstack/common/iniparser.py deleted file mode 100644 index 9bf399f0c..000000000 --- a/cinder/openstack/common/iniparser.py +++ /dev/null @@ -1,130 +0,0 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - -# Copyright 2012 OpenStack LLC. -# -# 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. - - -class ParseError(Exception): - def __init__(self, message, lineno, line): - self.msg = message - self.line = line - self.lineno = lineno - - def __str__(self): - return 'at line %d, %s: %r' % (self.lineno, self.msg, self.line) - - -class BaseParser(object): - lineno = 0 - parse_exc = ParseError - - def _assignment(self, key, value): - self.assignment(key, value) - return None, [] - - def _get_section(self, line): - if line[-1] != ']': - return self.error_no_section_end_bracket(line) - if len(line) <= 2: - return self.error_no_section_name(line) - - return line[1:-1] - - def _split_key_value(self, line): - colon = line.find(':') - equal = line.find('=') - if colon < 0 and equal < 0: - return self.error_invalid_assignment(line) - - if colon < 0 or (equal >= 0 and equal < colon): - key, value = line[:equal], line[equal + 1:] - else: - key, value = line[:colon], line[colon + 1:] - - value = value.strip() - if ((value and value[0] == value[-1]) and - (value[0] == "\"" or value[0] == "'")): - value = value[1:-1] - return key.strip(), [value] - - def parse(self, lineiter): - key = None - value = [] - - for line in lineiter: - self.lineno += 1 - - line = line.rstrip() - if not line: - # Blank line, ends multi-line values - if key: - key, value = self._assignment(key, value) - continue - elif line[0] in (' ', '\t'): - # Continuation of previous assignment - if key is None: - self.error_unexpected_continuation(line) - else: - value.append(line.lstrip()) - continue - - if key: - # Flush previous assignment, if any - key, value = self._assignment(key, value) - - if line[0] == '[': - # Section start - section = self._get_section(line) - if section: - self.new_section(section) - elif line[0] in '#;': - self.comment(line[1:].lstrip()) - else: - key, value = self._split_key_value(line) - if not key: - return self.error_empty_key(line) - - if key: - # Flush previous assignment, if any - self._assignment(key, value) - - def assignment(self, key, value): - """Called when a full assignment is parsed""" - raise NotImplementedError() - - def new_section(self, section): - """Called when a new section is started""" - raise NotImplementedError() - - def comment(self, comment): - """Called when a comment is parsed""" - pass - - def error_invalid_assignment(self, line): - raise self.parse_exc("No ':' or '=' found in assignment", - self.lineno, line) - - def error_empty_key(self, line): - raise self.parse_exc('Key cannot be empty', self.lineno, line) - - def error_unexpected_continuation(self, line): - raise self.parse_exc('Unexpected continuation line', - self.lineno, line) - - def error_no_section_end_bracket(self, line): - raise self.parse_exc('Invalid section (must end with ])', - self.lineno, line) - - def error_no_section_name(self, line): - raise self.parse_exc('Empty section name', self.lineno, line) diff --git a/cinder/openstack/common/lockutils.py b/cinder/openstack/common/lockutils.py index 16964edbd..7b0b22a01 100644 --- a/cinder/openstack/common/lockutils.py +++ b/cinder/openstack/common/lockutils.py @@ -25,13 +25,12 @@ import time import weakref from eventlet import semaphore +from oslo.config import cfg -from cinder.openstack.common import cfg from cinder.openstack.common import fileutils from cinder.openstack.common.gettextutils import _ from cinder.openstack.common import log as logging - LOG = logging.getLogger(__name__) diff --git a/cinder/openstack/common/log.py b/cinder/openstack/common/log.py index 93c604485..3638b8c98 100644 --- a/cinder/openstack/common/log.py +++ b/cinder/openstack/common/log.py @@ -40,13 +40,13 @@ import stat import sys import traceback -from cinder.openstack.common import cfg +from oslo.config import cfg + from cinder.openstack.common.gettextutils import _ from cinder.openstack.common import jsonutils from cinder.openstack.common import local from cinder.openstack.common import notifier - _DEFAULT_LOG_FORMAT = "%(asctime)s %(levelname)8s [%(name)s] %(message)s" _DEFAULT_LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S" diff --git a/cinder/openstack/common/notifier/api.py b/cinder/openstack/common/notifier/api.py index b1415d599..aa6c87d02 100644 --- a/cinder/openstack/common/notifier/api.py +++ b/cinder/openstack/common/notifier/api.py @@ -15,7 +15,8 @@ import uuid -from cinder.openstack.common import cfg +from oslo.config import cfg + from cinder.openstack.common import context from cinder.openstack.common.gettextutils import _ from cinder.openstack.common import importutils @@ -23,7 +24,6 @@ from cinder.openstack.common import jsonutils from cinder.openstack.common import log as logging from cinder.openstack.common import timeutils - LOG = logging.getLogger(__name__) notifier_opts = [ diff --git a/cinder/openstack/common/notifier/log_notifier.py b/cinder/openstack/common/notifier/log_notifier.py index ae9b45b28..800ab5dcc 100644 --- a/cinder/openstack/common/notifier/log_notifier.py +++ b/cinder/openstack/common/notifier/log_notifier.py @@ -13,12 +13,11 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo.config import cfg -from cinder.openstack.common import cfg from cinder.openstack.common import jsonutils from cinder.openstack.common import log as logging - CONF = cfg.CONF diff --git a/cinder/openstack/common/rpc/__init__.py b/cinder/openstack/common/rpc/__init__.py index acc2daafc..8815f7ef6 100644 --- a/cinder/openstack/common/rpc/__init__.py +++ b/cinder/openstack/common/rpc/__init__.py @@ -25,9 +25,9 @@ For some wrappers that add message versioning to rpc, see: rpc.proxy """ -from cinder.openstack.common import cfg -from cinder.openstack.common import importutils +from oslo.config import cfg +from cinder.openstack.common import importutils rpc_opts = [ cfg.StrOpt('rpc_backend', diff --git a/cinder/openstack/common/rpc/amqp.py b/cinder/openstack/common/rpc/amqp.py index f31ab939f..809cea4e3 100644 --- a/cinder/openstack/common/rpc/amqp.py +++ b/cinder/openstack/common/rpc/amqp.py @@ -33,14 +33,13 @@ import uuid from eventlet import greenpool from eventlet import pools from eventlet import semaphore +from oslo.config import cfg -from cinder.openstack.common import cfg from cinder.openstack.common import excutils from cinder.openstack.common.gettextutils import _ from cinder.openstack.common import local from cinder.openstack.common.rpc import common as rpc_common - LOG = logging.getLogger(__name__) diff --git a/cinder/openstack/common/rpc/impl_kombu.py b/cinder/openstack/common/rpc/impl_kombu.py index f3759cb21..1b1340aac 100644 --- a/cinder/openstack/common/rpc/impl_kombu.py +++ b/cinder/openstack/common/rpc/impl_kombu.py @@ -28,8 +28,8 @@ import kombu import kombu.connection import kombu.entity import kombu.messaging +from oslo.config import cfg -from cinder.openstack.common import cfg from cinder.openstack.common.gettextutils import _ from cinder.openstack.common import network_utils from cinder.openstack.common.rpc import amqp as rpc_amqp diff --git a/cinder/openstack/common/rpc/impl_qpid.py b/cinder/openstack/common/rpc/impl_qpid.py index 01f8a22c2..338e872b3 100644 --- a/cinder/openstack/common/rpc/impl_qpid.py +++ b/cinder/openstack/common/rpc/impl_qpid.py @@ -23,10 +23,10 @@ import uuid import eventlet import greenlet +from oslo.config import cfg import qpid.messaging import qpid.messaging.exceptions -from cinder.openstack.common import cfg from cinder.openstack.common.gettextutils import _ from cinder.openstack.common import jsonutils from cinder.openstack.common.rpc import amqp as rpc_amqp diff --git a/cinder/openstack/common/rpc/impl_zmq.py b/cinder/openstack/common/rpc/impl_zmq.py index f3f3b9e90..d3327ebc7 100644 --- a/cinder/openstack/common/rpc/impl_zmq.py +++ b/cinder/openstack/common/rpc/impl_zmq.py @@ -24,14 +24,13 @@ import uuid import eventlet from eventlet.green import zmq import greenlet +from oslo.config import cfg -from cinder.openstack.common import cfg from cinder.openstack.common.gettextutils import _ from cinder.openstack.common import importutils from cinder.openstack.common import jsonutils from cinder.openstack.common.rpc import common as rpc_common - # for convenience, are not modified. pformat = pprint.pformat Timeout = eventlet.timeout.Timeout diff --git a/cinder/openstack/common/rpc/matchmaker.py b/cinder/openstack/common/rpc/matchmaker.py index 2c0aac5bb..cefee69ed 100644 --- a/cinder/openstack/common/rpc/matchmaker.py +++ b/cinder/openstack/common/rpc/matchmaker.py @@ -23,9 +23,9 @@ import itertools import json import logging -from cinder.openstack.common import cfg -from cinder.openstack.common.gettextutils import _ +from oslo.config import cfg +from cinder.openstack.common.gettextutils import _ matchmaker_opts = [ # Matchmaker ring file diff --git a/cinder/policy.py b/cinder/policy.py index a427c3cff..9b2b4defd 100644 --- a/cinder/policy.py +++ b/cinder/policy.py @@ -17,13 +17,13 @@ """Policy Engine For Cinder""" +from oslo.config import cfg + from cinder import exception from cinder import flags -from cinder.openstack.common import cfg from cinder.openstack.common import policy from cinder import utils - policy_opts = [ cfg.StrOpt('policy_file', default='policy.json', diff --git a/cinder/quota.py b/cinder/quota.py index f4b00b826..a8c99bb6e 100644 --- a/cinder/quota.py +++ b/cinder/quota.py @@ -20,15 +20,15 @@ import datetime +from oslo.config import cfg + from cinder import db from cinder import exception from cinder import flags -from cinder.openstack.common import cfg from cinder.openstack.common import importutils from cinder.openstack.common import log as logging from cinder.openstack.common import timeutils - LOG = logging.getLogger(__name__) quota_opts = [ diff --git a/cinder/scheduler/driver.py b/cinder/scheduler/driver.py index a5329ff0e..b2e3efe01 100644 --- a/cinder/scheduler/driver.py +++ b/cinder/scheduler/driver.py @@ -21,15 +21,15 @@ Scheduler base class that all Schedulers should inherit from """ +from oslo.config import cfg + from cinder import db from cinder import flags -from cinder.openstack.common import cfg from cinder.openstack.common import importutils from cinder.openstack.common import timeutils from cinder import utils from cinder.volume import rpcapi as volume_rpcapi - scheduler_driver_opts = [ cfg.StrOpt('scheduler_host_manager', default='cinder.scheduler.host_manager.HostManager', diff --git a/cinder/scheduler/host_manager.py b/cinder/scheduler/host_manager.py index 66926f215..9245f9a44 100644 --- a/cinder/scheduler/host_manager.py +++ b/cinder/scheduler/host_manager.py @@ -19,17 +19,17 @@ Manage hosts in the current zone. import UserDict +from oslo.config import cfg + from cinder import db from cinder import exception from cinder import flags -from cinder.openstack.common import cfg from cinder.openstack.common import log as logging from cinder.openstack.common.scheduler import filters from cinder.openstack.common.scheduler import weights from cinder.openstack.common import timeutils from cinder import utils - host_manager_opts = [ cfg.ListOpt('scheduler_default_filters', default=[ diff --git a/cinder/scheduler/manager.py b/cinder/scheduler/manager.py index c2c7732ea..6966e2d84 100644 --- a/cinder/scheduler/manager.py +++ b/cinder/scheduler/manager.py @@ -21,19 +21,19 @@ Scheduler Service """ +from oslo.config import cfg + from cinder import context from cinder import db from cinder import exception from cinder import flags from cinder import manager -from cinder.openstack.common import cfg from cinder.openstack.common import excutils from cinder.openstack.common import importutils from cinder.openstack.common import log as logging from cinder.openstack.common.notifier import api as notifier from cinder.volume import rpcapi as volume_rpcapi - LOG = logging.getLogger(__name__) scheduler_driver_opt = cfg.StrOpt('scheduler_driver', diff --git a/cinder/scheduler/scheduler_options.py b/cinder/scheduler/scheduler_options.py index 039831b1d..9b05bb717 100644 --- a/cinder/scheduler/scheduler_options.py +++ b/cinder/scheduler/scheduler_options.py @@ -26,12 +26,12 @@ import datetime import json import os +from oslo.config import cfg + from cinder import flags -from cinder.openstack.common import cfg from cinder.openstack.common import log as logging from cinder.openstack.common import timeutils - scheduler_json_config_location_opt = cfg.StrOpt( 'scheduler_json_config_location', default='', diff --git a/cinder/scheduler/simple.py b/cinder/scheduler/simple.py index 6f93972e3..c9a7009c7 100644 --- a/cinder/scheduler/simple.py +++ b/cinder/scheduler/simple.py @@ -21,15 +21,15 @@ Simple Scheduler """ +from oslo.config import cfg + from cinder import db from cinder import exception from cinder import flags -from cinder.openstack.common import cfg from cinder.scheduler import chance from cinder.scheduler import driver from cinder import utils - simple_scheduler_opts = [ cfg.IntOpt("max_gigabytes", default=10000, diff --git a/cinder/scheduler/weights/capacity.py b/cinder/scheduler/weights/capacity.py index 8d37997d4..e2042e9cd 100644 --- a/cinder/scheduler/weights/capacity.py +++ b/cinder/scheduler/weights/capacity.py @@ -22,11 +22,11 @@ number and the weighing has the opposite effect of the default. import math +from oslo.config import cfg + from cinder import flags -from cinder.openstack.common import cfg from cinder.openstack.common.scheduler import weights - capacity_weight_opts = [ cfg.FloatOpt('capacity_weight_multiplier', default=1.0, diff --git a/cinder/service.py b/cinder/service.py index 32ee0b300..4056f4495 100644 --- a/cinder/service.py +++ b/cinder/service.py @@ -29,12 +29,12 @@ import time import eventlet import greenlet +from oslo.config import cfg from cinder import context from cinder import db from cinder import exception from cinder import flags -from cinder.openstack.common import cfg from cinder.openstack.common import importutils from cinder.openstack.common import log as logging from cinder.openstack.common import rpc @@ -42,7 +42,6 @@ from cinder import utils from cinder import version from cinder import wsgi - LOG = logging.getLogger(__name__) service_opts = [ diff --git a/cinder/test.py b/cinder/test.py index 3887091d0..967eadca3 100644 --- a/cinder/test.py +++ b/cinder/test.py @@ -29,17 +29,16 @@ import uuid import mox import nose.plugins.skip +from oslo.config import cfg import stubout from cinder import flags -from cinder.openstack.common import cfg from cinder.openstack.common import log as logging from cinder.openstack.common import timeutils from cinder import service from cinder import tests from cinder.tests import fake_flags - test_opts = [ cfg.StrOpt('sqlite_clean_db', default='clean.sqlite', diff --git a/cinder/tests/api/v1/test_volume_metadata.py b/cinder/tests/api/v1/test_volume_metadata.py index 97c7075e6..4dc09a874 100644 --- a/cinder/tests/api/v1/test_volume_metadata.py +++ b/cinder/tests/api/v1/test_volume_metadata.py @@ -17,6 +17,7 @@ import uuid +from oslo.config import cfg import webob from cinder.api import extensions @@ -24,7 +25,6 @@ from cinder.api.v1 import volume_metadata from cinder.api.v1 import volumes import cinder.db from cinder import exception -from cinder.openstack.common import cfg from cinder.openstack.common import jsonutils from cinder import test from cinder.tests.api import fakes diff --git a/cinder/tests/declare_flags.py b/cinder/tests/declare_flags.py index ee4733fc1..4f569c026 100644 --- a/cinder/tests/declare_flags.py +++ b/cinder/tests/declare_flags.py @@ -16,8 +16,9 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo.config import cfg + from cinder import flags -from cinder.openstack.common import cfg FLAGS = flags.FLAGS FLAGS.register_opt(cfg.IntOpt('answer', default=42, help='test flag')) diff --git a/cinder/tests/runtime_flags.py b/cinder/tests/runtime_flags.py index 4327561fc..ad2994cde 100644 --- a/cinder/tests/runtime_flags.py +++ b/cinder/tests/runtime_flags.py @@ -16,8 +16,9 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo.config import cfg + from cinder import flags -from cinder.openstack.common import cfg FLAGS = flags.FLAGS FLAGS.register_opt(cfg.IntOpt('runtime_answer', default=54, help='test flag')) diff --git a/cinder/tests/test_flags.py b/cinder/tests/test_flags.py index 2a7d68672..161904848 100644 --- a/cinder/tests/test_flags.py +++ b/cinder/tests/test_flags.py @@ -17,9 +17,9 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo.config import cfg from cinder import flags -from cinder.openstack.common import cfg from cinder import test FLAGS = flags.FLAGS diff --git a/cinder/tests/test_service.py b/cinder/tests/test_service.py index e49382a3a..38bdff33e 100644 --- a/cinder/tests/test_service.py +++ b/cinder/tests/test_service.py @@ -21,18 +21,17 @@ Unit Tests for remote procedure calls using queue """ import mox +from oslo.config import cfg from cinder import context from cinder import db from cinder import exception from cinder import flags from cinder import manager -from cinder.openstack.common import cfg from cinder import service from cinder import test from cinder import wsgi - test_service_opts = [ cfg.StrOpt("fake_manager", default="cinder.tests.test_service.FakeManager", diff --git a/cinder/tests/test_wsgi.py b/cinder/tests/test_wsgi.py index 0060442f9..d5a80b0d9 100644 --- a/cinder/tests/test_wsgi.py +++ b/cinder/tests/test_wsgi.py @@ -23,12 +23,13 @@ import ssl import tempfile import unittest import urllib2 + +from oslo.config import cfg import webob import webob.dec from cinder.api.middleware import fault from cinder import exception -from cinder.openstack.common import cfg from cinder import test from cinder import utils import cinder.wsgi diff --git a/cinder/volume/api.py b/cinder/volume/api.py index ffd9d8bc1..e07682282 100644 --- a/cinder/volume/api.py +++ b/cinder/volume/api.py @@ -22,12 +22,13 @@ Handles all requests relating to volumes. import functools +from oslo.config import cfg + from cinder.db import base from cinder.db.sqlalchemy import models from cinder import exception from cinder import flags from cinder.image import glance -from cinder.openstack.common import cfg from cinder.openstack.common import excutils from cinder.openstack.common import log as logging from cinder.openstack.common import rpc diff --git a/cinder/volume/driver.py b/cinder/volume/driver.py index b136d4a66..670ba298a 100644 --- a/cinder/volume/driver.py +++ b/cinder/volume/driver.py @@ -24,15 +24,15 @@ import os import socket import time +from oslo.config import cfg + from cinder import exception from cinder import flags from cinder.image import image_utils -from cinder.openstack.common import cfg from cinder.openstack.common import log as logging from cinder import utils from cinder.volume.configuration import Configuration - LOG = logging.getLogger(__name__) volume_opts = [ diff --git a/cinder/volume/drivers/coraid.py b/cinder/volume/drivers/coraid.py index 829f0961a..8471a0b66 100644 --- a/cinder/volume/drivers/coraid.py +++ b/cinder/volume/drivers/coraid.py @@ -20,21 +20,21 @@ Require : Coraid EtherCloud ESM, Coraid VSX and Coraid SRX. Author : Jean-Baptiste RANSY """ +import cookielib +import os +import time +import urllib2 + +from oslo.config import cfg + from cinder import context from cinder import exception from cinder import flags -from cinder.openstack.common import cfg from cinder.openstack.common import jsonutils from cinder.openstack.common import log as logging from cinder.volume import driver from cinder.volume import volume_types -import cookielib -import os -import time -import urllib2 - - LOG = logging.getLogger(__name__) FLAGS = flags.FLAGS diff --git a/cinder/volume/drivers/emc/emc_smis_common.py b/cinder/volume/drivers/emc/emc_smis_common.py index 98323978f..113200203 100644 --- a/cinder/volume/drivers/emc/emc_smis_common.py +++ b/cinder/volume/drivers/emc/emc_smis_common.py @@ -24,11 +24,12 @@ It supports VNX and VMAX arrays. """ import time + +from oslo.config import cfg from xml.dom.minidom import parseString from cinder import exception from cinder import flags -from cinder.openstack.common import cfg from cinder.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/cinder/volume/drivers/glusterfs.py b/cinder/volume/drivers/glusterfs.py index 5731687eb..6e127e184 100644 --- a/cinder/volume/drivers/glusterfs.py +++ b/cinder/volume/drivers/glusterfs.py @@ -18,9 +18,10 @@ import errno import os +from oslo.config import cfg + from cinder import exception from cinder import flags -from cinder.openstack.common import cfg from cinder.openstack.common import log as logging from cinder.volume.drivers import nfs diff --git a/cinder/volume/drivers/lvm.py b/cinder/volume/drivers/lvm.py index f85efc8f7..0e79573f6 100644 --- a/cinder/volume/drivers/lvm.py +++ b/cinder/volume/drivers/lvm.py @@ -24,10 +24,11 @@ import math import os import re +from oslo.config import cfg + from cinder import exception from cinder import flags from cinder.image import image_utils -from cinder.openstack.common import cfg from cinder.openstack.common import log as logging from cinder import utils from cinder.volume import driver diff --git a/cinder/volume/drivers/netapp/iscsi.py b/cinder/volume/drivers/netapp/iscsi.py index f2f5396fd..701af63a0 100644 --- a/cinder/volume/drivers/netapp/iscsi.py +++ b/cinder/volume/drivers/netapp/iscsi.py @@ -24,16 +24,15 @@ ONTAP 7-mode storage systems with installed iSCSI licenses. """ import time +import uuid +from oslo.config import cfg import suds from suds import client from suds.sax import text -import uuid - from cinder import exception from cinder import flags -from cinder.openstack.common import cfg from cinder.openstack.common import log as logging from cinder.volume import driver from cinder.volume.drivers.netapp.api import NaApiError diff --git a/cinder/volume/drivers/netapp/nfs.py b/cinder/volume/drivers/netapp/nfs.py index f6ff74e13..e08981e58 100644 --- a/cinder/volume/drivers/netapp/nfs.py +++ b/cinder/volume/drivers/netapp/nfs.py @@ -19,13 +19,14 @@ Volume driver for NetApp NFS storage. """ import os +import time + +from oslo.config import cfg import suds from suds.sax import text -import time from cinder import exception from cinder import flags -from cinder.openstack.common import cfg from cinder.openstack.common import log as logging from cinder.volume.drivers.netapp.api import NaApiError from cinder.volume.drivers.netapp.api import NaElement diff --git a/cinder/volume/drivers/nexenta/volume.py b/cinder/volume/drivers/nexenta/volume.py index 4a91d1c58..2b752314f 100644 --- a/cinder/volume/drivers/nexenta/volume.py +++ b/cinder/volume/drivers/nexenta/volume.py @@ -22,9 +22,10 @@ .. moduleauthor:: Yuriy Taraday """ +from oslo.config import cfg + from cinder import exception from cinder import flags -from cinder.openstack.common import cfg from cinder.openstack.common import log as logging from cinder.volume import driver from cinder.volume.drivers import nexenta diff --git a/cinder/volume/drivers/nfs.py b/cinder/volume/drivers/nfs.py index f296efb1d..0c1df91da 100755 --- a/cinder/volume/drivers/nfs.py +++ b/cinder/volume/drivers/nfs.py @@ -19,9 +19,10 @@ import errno import hashlib import os +from oslo.config import cfg + from cinder import exception from cinder import flags -from cinder.openstack.common import cfg from cinder.openstack.common import log as logging from cinder.volume import driver diff --git a/cinder/volume/drivers/rbd.py b/cinder/volume/drivers/rbd.py index 98f24660a..b467f53e9 100644 --- a/cinder/volume/drivers/rbd.py +++ b/cinder/volume/drivers/rbd.py @@ -19,15 +19,15 @@ import os import tempfile import urllib +from oslo.config import cfg + from cinder import exception from cinder import flags from cinder.image import image_utils -from cinder.openstack.common import cfg from cinder.openstack.common import log as logging from cinder import utils from cinder.volume import driver - LOG = logging.getLogger(__name__) rbd_opts = [ diff --git a/cinder/volume/drivers/san/hp/hp_3par_common.py b/cinder/volume/drivers/san/hp/hp_3par_common.py index 7203f299a..4d6280571 100644 --- a/cinder/volume/drivers/san/hp/hp_3par_common.py +++ b/cinder/volume/drivers/san/hp/hp_3par_common.py @@ -43,17 +43,16 @@ import uuid from eventlet import greenthread from hp3parclient import exceptions as hpexceptions +from oslo.config import cfg from cinder import context from cinder import exception from cinder import flags -from cinder.openstack.common import cfg from cinder.openstack.common import lockutils from cinder.openstack.common import log as logging from cinder import utils from cinder.volume import volume_types - LOG = logging.getLogger(__name__) hp3par_opts = [ diff --git a/cinder/volume/drivers/san/san.py b/cinder/volume/drivers/san/san.py index 22a245deb..fbd9c2ead 100644 --- a/cinder/volume/drivers/san/san.py +++ b/cinder/volume/drivers/san/san.py @@ -24,15 +24,14 @@ controller on the SAN hardware. We expect to access it over SSH or some API. import random from eventlet import greenthread +from oslo.config import cfg from cinder import exception from cinder import flags -from cinder.openstack.common import cfg from cinder.openstack.common import log as logging from cinder import utils from cinder.volume.driver import ISCSIDriver - LOG = logging.getLogger(__name__) san_opts = [ diff --git a/cinder/volume/drivers/san/solaris.py b/cinder/volume/drivers/san/solaris.py index 315ef3c12..ca478cd18 100644 --- a/cinder/volume/drivers/san/solaris.py +++ b/cinder/volume/drivers/san/solaris.py @@ -12,13 +12,13 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo.config import cfg + from cinder import exception from cinder import flags -from cinder.openstack.common import cfg from cinder.openstack.common import log as logging from cinder.volume.drivers.san.san import SanISCSIDriver - LOG = logging.getLogger(__name__) solaris_opts = [ diff --git a/cinder/volume/drivers/solidfire.py b/cinder/volume/drivers/solidfire.py index fa4dce238..ebcf23d74 100644 --- a/cinder/volume/drivers/solidfire.py +++ b/cinder/volume/drivers/solidfire.py @@ -25,10 +25,11 @@ import string import time import uuid +from oslo.config import cfg + from cinder import context from cinder import exception from cinder import flags -from cinder.openstack.common import cfg from cinder.openstack.common import log as logging from cinder.volume.drivers.san.san import SanISCSIDriver from cinder.volume import volume_types diff --git a/cinder/volume/drivers/storwize_svc.py b/cinder/volume/drivers/storwize_svc.py index 82f763e58..b3c1a61a4 100644 --- a/cinder/volume/drivers/storwize_svc.py +++ b/cinder/volume/drivers/storwize_svc.py @@ -45,10 +45,11 @@ import re import string import time +from oslo.config import cfg + from cinder import context from cinder import exception from cinder import flags -from cinder.openstack.common import cfg from cinder.openstack.common import excutils from cinder.openstack.common import log as logging from cinder import utils diff --git a/cinder/volume/drivers/windows.py b/cinder/volume/drivers/windows.py index 78992d639..89038b052 100644 --- a/cinder/volume/drivers/windows.py +++ b/cinder/volume/drivers/windows.py @@ -23,9 +23,10 @@ This driver requires ISCSI target role installed import os import sys +from oslo.config import cfg + from cinder import exception from cinder import flags -from cinder.openstack.common import cfg from cinder.openstack.common import log as logging from cinder.volume import driver diff --git a/cinder/volume/drivers/xenapi/sm.py b/cinder/volume/drivers/xenapi/sm.py index 73f1e484f..8435eae0f 100644 --- a/cinder/volume/drivers/xenapi/sm.py +++ b/cinder/volume/drivers/xenapi/sm.py @@ -16,16 +16,15 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo.config import cfg from cinder import exception from cinder import flags from cinder.image import glance -from cinder.openstack.common import cfg from cinder.openstack.common import log as logging from cinder.volume import driver from cinder.volume.drivers.xenapi import lib as xenapi_lib - LOG = logging.getLogger(__name__) xenapi_opts = [ diff --git a/cinder/volume/drivers/xiv.py b/cinder/volume/drivers/xiv.py index c98fa28eb..be5975a74 100644 --- a/cinder/volume/drivers/xiv.py +++ b/cinder/volume/drivers/xiv.py @@ -24,9 +24,10 @@ Volume driver for IBM XIV storage systems. """ +from oslo.config import cfg + from cinder import exception from cinder import flags -from cinder.openstack.common import cfg from cinder.openstack.common import importutils from cinder.openstack.common import log as logging from cinder.volume.drivers.san import san diff --git a/cinder/volume/drivers/zadara.py b/cinder/volume/drivers/zadara.py index 620298767..e991f8d16 100644 --- a/cinder/volume/drivers/zadara.py +++ b/cinder/volume/drivers/zadara.py @@ -23,17 +23,16 @@ This driver requires VPSA with API ver.12.06 or higher. import httplib +from lxml import etree +from oslo.config import cfg + from cinder import exception from cinder import flags -from cinder.openstack.common import cfg from cinder.openstack.common import log as logging from cinder import utils from cinder.volume import driver from cinder.volume import iscsi -from lxml import etree - - LOG = logging.getLogger("cinder.volume.driver") zadara_opts = [ diff --git a/cinder/volume/iscsi.py b/cinder/volume/iscsi.py index 04e2417a2..59fa6095c 100644 --- a/cinder/volume/iscsi.py +++ b/cinder/volume/iscsi.py @@ -22,9 +22,10 @@ Helper code for the iSCSI volume driver. import os import re +from oslo.config import cfg + from cinder import exception from cinder import flags -from cinder.openstack.common import cfg from cinder.openstack.common import log as logging from cinder import utils diff --git a/cinder/volume/manager.py b/cinder/volume/manager.py index 5fd95f5f6..4e4f3de91 100644 --- a/cinder/volume/manager.py +++ b/cinder/volume/manager.py @@ -41,12 +41,13 @@ intact. import sys import traceback +from oslo.config import cfg + from cinder import context from cinder import exception from cinder import flags from cinder.image import glance from cinder import manager -from cinder.openstack.common import cfg from cinder.openstack.common import excutils from cinder.openstack.common import importutils from cinder.openstack.common import lockutils @@ -58,7 +59,6 @@ from cinder.volume.configuration import Configuration from cinder.volume import utils as volume_utils from cinder.volume import volume_types - LOG = logging.getLogger(__name__) QUOTAS = quota.QUOTAS diff --git a/cinder/wsgi.py b/cinder/wsgi.py index 248703737..bcd63006a 100644 --- a/cinder/wsgi.py +++ b/cinder/wsgi.py @@ -29,6 +29,7 @@ import time import eventlet import eventlet.wsgi import greenlet +from oslo.config import cfg from paste import deploy import routes.middleware import webob.dec @@ -36,7 +37,6 @@ import webob.exc from cinder import exception from cinder import flags -from cinder.openstack.common import cfg from cinder.openstack.common import log as logging from cinder import utils diff --git a/openstack-common.conf b/openstack-common.conf index 12d9bafb5..a74b81022 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -1,7 +1,7 @@ [DEFAULT] # The list of modules to copy from openstack-common -modules=cfg,exception,excutils,gettextutils,importutils,iniparser,jsonutils,local,rootwrap,rpc,timeutils,log,setup,notifier,context,network_utils,policy,uuidutils,lockutils,fileutils,gettextutils,scheduler,scheduler.filters,scheduler.weights,install_venv_common,flakes,version +modules=exception,excutils,gettextutils,importutils,jsonutils,local,rootwrap,rpc,timeutils,log,setup,notifier,context,network_utils,policy,uuidutils,lockutils,fileutils,gettextutils,scheduler,scheduler.filters,scheduler.weights,install_venv_common,flakes,version # The base module to hold the copy of openstack.common base=cinder diff --git a/setup.py b/setup.py index c86d32edf..564c27881 100644 --- a/setup.py +++ b/setup.py @@ -21,6 +21,7 @@ import setuptools from cinder.openstack.common import setup as common_setup requires = common_setup.parse_requirements() +depend_links = common_setup.parse_dependency_links() project = 'cinder' filters = [ @@ -62,6 +63,7 @@ setuptools.setup( cmdclass=common_setup.get_cmdclass(), packages=setuptools.find_packages(exclude=['bin', 'smoketests']), install_requires=requires, + dependency_links=depend_links, entry_points={ 'cinder.scheduler.filters': filters, 'cinder.scheduler.weights': weights, diff --git a/tools/conf/extract_opts.py b/tools/conf/extract_opts.py index 2c71e2b9c..a92e53fc3 100644 --- a/tools/conf/extract_opts.py +++ b/tools/conf/extract_opts.py @@ -24,9 +24,9 @@ import socket import sys import textwrap -from cinder.openstack.common import cfg -from cinder.openstack.common import importutils +from oslo.config import cfg +from cinder.openstack.common import importutils STROPT = "StrOpt" BOOLOPT = "BoolOpt" diff --git a/tools/install_venv_common.py b/tools/install_venv_common.py index 34ec14279..11888be9c 100644 --- a/tools/install_venv_common.py +++ b/tools/install_venv_common.py @@ -31,7 +31,7 @@ if os.path.exists(os.path.join(possible_topdir, "cinder", sys.path.insert(0, possible_topdir) -from cinder.openstack.common import cfg +from oslo.config import cfg class InstallVenv(object): diff --git a/tools/pip-requires b/tools/pip-requires index 5b80e490c..0077a6f2a 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -22,3 +22,4 @@ setuptools_git>=0.4 python-glanceclient>=0.5.0,<2 python-keystoneclient>=0.2.0 rtslib>=2.1.fb27 +http://tarballs.openstack.org/oslo-config/oslo-config-2013.1b3.tar.gz#egg=oslo-config diff --git a/tox.ini b/tox.ini index 936ba66a4..105e300e6 100644 --- a/tox.ini +++ b/tox.ini @@ -13,7 +13,6 @@ deps = -r{toxinidir}/tools/pip-requires commands = /bin/bash run_tests.sh -N -P {posargs} [testenv:pep8] -deps = pep8==1.3.3 commands = python tools/hacking.py --ignore=N4,E125,E126,E711,E712 --repeat --show-source \ --exclude=.venv,.tox,dist,doc,openstack,*egg . -- 2.45.2