summaryrefslogtreecommitdiffstats
path: root/openstack
Commit message (Collapse)AuthorAgeFilesLines
* Add import_opt() method to ConfigOptsMark McLoughlin2012-07-311-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related to blueprint cfg-global-object When using the global config object pattern, you often have modules which define options that are referenced in other options. So, for example if module A defined option 'foo' and module be needed to reference that option, you might do: import A print CONF.foo However, this makes it entirely unclear to the casual reader why module A was imported. Nova has a flags.DECLARE() function that helps with this problem by allowing you to do: flags.DECLARE('foo', 'A') The function simply imports module A and checks that the 'foo' option is now defined in the global config object. This is fine, but it is also implicit that this function applies to the global config object. Instead, let's do the following: CONF.import_opt('foo', 'A') Change-Id: I7b98f5be71068bbde70cc0eab991eaebb577de52
* Merge "don't throw exceptions if %(color)s tag is used"Jenkins2012-07-301-2/+6
|\
| * don't throw exceptions if %(color)s tag is usedSean Dague2012-07-271-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed bug #1030078 If the log format strings include the %(color)s key in them and you enable file logging, your log files won't work, and instead you'll see exceptions on the console as the default python log handler doesn't support that keyword. This approach stubs out the extra keywords to be empty strings to avoid the KeyError. Tests are also added to demonstrate the KeyError as defined behavior, and test that color codes can be passed. Change-Id: Ia5dbaee9c530e243e2121667c8a54e6f9d66e1e7
* | fix the qpid_heartbeat option so that it's effectivePádraig Brady2012-07-301-1/+1
|/ | | | | | | | The 'hearbeat' typo caused this setting to be ineffective. This bug has been present since the initial nova qpid implementation. Fixes bug: 1030430 Change-Id: Ibb9d7484b9d11a6904cc9e2a8dde6d9164ee05b1
* Remove unused importsJoe Gordon2012-07-264-4/+0
| | | | Change-Id: Ia2900e50263950ba40ba86e685640cacaa2137a7
* Modifies _is_opt_registered fcn to check for duplicate optsGiampaolo Lauria2012-07-241-1/+4
| | | | | | | | | | This change fixes bug 999307 Currently, the check for duplicate options is done by checking whether they are the same object. The proposed fix is to check whether all the object fields have the same value. Change-Id: I2b72d630a0c8821df1d81e25d316d8d9195be492
* Merge changes I536e1ca0,Ifb878368,Ie1d71b85Jenkins2012-07-231-2/+4
|\ | | | | | | | | | | | | * changes: Add missing convert_instances arg. Track to_primitive() depth after iteritems(). Update iteritems test case to actually test iteritems.
| * Add missing convert_instances arg.Russell Bryant2012-07-181-1/+3
| | | | | | | | | | | | | | | | When calling jsonutils.to_primitive() recursively, the convert_instances argument should be passed along. This change fixes one place where it was not. Change-Id: I536e1ca05bb4e613fba71298797879587e8b4b00
| * Track to_primitive() depth after iteritems().Russell Bryant2012-07-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change jsonutils.to_primitive() to increase the recursion depth counter when calling to_primitive() on the result of iteritems() from the current element. Previously, the only time the counter was increased was when converting the __dict__ from an object. The iteritems() case risks cycles, as well. I hit a problem with this when trying to call to_primitive on an instance of nova.db.sqlalchemy.models.Instance. An Instance includes a reference to InstanceInfoCache, which has a reference back to the Instance. Without this change, to_primitive() would raise an exception for an Instance due to excessive recursion. Related to nova blueprint no-db-messaging. Change-Id: Ifb878368d97e92ab6c361a4dd5f5ab2e68fc16e2
* | Enable fanout_cast and fanout_cast_to_server to provide topicGary Kotton2012-07-231-4/+8
|/ | | | | | | The code would make use of the self.topic instead of allowing the user to define the topic. Change-Id: Ibdd4fab6dd019d223c3256d70f123829939056d2
* fix bug lp:1019348,update openstack-common to support pep8 1.3.Yaguang Tang2012-07-187-33/+34
| | | | | | also,this patch turns off pep8 E125 check. Change-Id: I22d2a94d89530586d614af39af17ae542c5e0cbf
* cfg: allow empty config valuesMark McLoughlin2012-07-171-1/+2
| | | | | | | | | | | | | | Fixes bug #1025522 Commit 83044a7 caused this to stop working in Quantum: api_extensions_path = and could only be worked around with: api_extensions_path = "" Change-Id: I8c1a57225a2c135e6baf567b8e71d61e974da4e2
* Don't switch to list_notifier unless necessary.Andrew Bogott2012-07-151-9/+17
| | | | | | | | | | | Some notification tests depend on a different, single notifier being used. So, don't switch to the list notifier just because we loaded this class; only switch if an actual plugin needs it. Also: improved the test that makes sure all this notifier-switching doesn't break the notifier that was present in the first place. Change-Id: I170477bccb3ad9505fe6dbfbc214f77c09f6862f
* Use strtime() in to_primitive() for datetime objs.Russell Bryant2012-07-161-1/+3
| | | | | | | | | | | This patch updates jsonutils.to_primitive() to use timeutils.strtime() to convert a datimetime object to a string instead of just using str(). This ensures that we can easily convert the string back to a datetime using timeutils.parse_strtime(). Required for the nova blueprint no-db-messaging. Change-Id: I725b333695930e12e2832378102514326fec639c
* Merge "Add additional usage info on rpc_zmq_host flag"Jenkins2012-07-161-1/+2
|\
| * Add additional usage info on rpc_zmq_host flagEric Windisch2012-07-131-1/+2
| | | | | | | | Change-Id: I8f1f3b42de7253c993e2afa44ed1c0ad4dbbb74f
* | Merge "Restore register_opts on impl_zmq module load"Jenkins2012-07-161-0/+3
|\ \
| * | Restore register_opts on impl_zmq module loadEric Windisch2012-07-131-0/+3
| | | | | | | | | | | | Change-Id: I6acdf1445e1f03246476292b38d7c52a29934af1
* | | Merge "Minor pep8 cleanup in rpc."Jenkins2012-07-151-1/+1
|\ \ \
| * | | Minor pep8 cleanup in rpc.Andrew Bogott2012-07-082-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Removed a space, reordered an import. Change-Id: I418d1f7c6a5a3b8ef231c88b4ef28114ca0eb7cd
* | | | Merge "pep8 cleanup in the plugin code"Jenkins2012-07-152-2/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | pep8 cleanup in the plugin codeAndrew Bogott2012-07-082-2/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | The nova hacking test turned up one alphabetization error that I missed previously. Also, our path-altering process caused one line to exceed 80 characters when copied into nova; that line is shorter now. Change-Id: Ia3acfc25ecc5ba388526766dae3ed03792e906e3
* | / Fix typo made in 372d11e990Eric Windisch2012-07-131-1/+1
| |/ |/| | | | | Change-Id: Iba232257595bb3084052a21a560f2f5551b5f1eb
* | Fix import order of gettextutils in amqp.pyEric Windisch2012-07-131-1/+1
| | | | | | | | Change-Id: I53ca8308fb61c53274ca1e3d801f22c9b65d41aa
* | Add more rpc version docs.Russell Bryant2012-07-131-0/+39
| | | | | | | | | | | | | | This patch adds some additional documentation, including some examples, on making changes to versioned RPC APIs. Change-Id: I5f40b11e07538f36d0f1299f7e822b408bf8e96a
* | Merge "Add SKIP_GENERATE_AUTHORS option to setup.py"Jenkins2012-07-131-11/+15
|\ \
| * | Add SKIP_GENERATE_AUTHORS option to setup.pyDan Prince2012-07-131-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates the generate_authors function in setup.py so that it will skip generation of the authors file if the SKIP_GENERATE_AUTHORS env variable is set. Authors doesn't currently take that long to generate but having the option to explicitly skip it (regardless of whether .git is there) seems like a good addition. Change-Id: Ie18064d2450cecc86f18d0b10e1ce473253d1a51
* | | Add SKIP_WRITE_GIT_CHANGELOG option to setup.pyDan Prince2012-07-131-6/+10
|/ / | | | | | | | | | | | | | | | | | | | | | | Updates the write_git_changelog function in setup.py so that it will skip changelog generation if the SKIP_WRITE_GIT_CHANGELOG env variable is set. The motivation for this change is to speed up running sdist which gets executed at the begining of a tox run. Some projects (like Nova) can take between 10-20 seconds to generate a changelog in this fashion. Change-Id: I2e75060d303bc8fae784129e8e42f09922a8b09e
* | Fix missing gettextutils in several modules.Eric Windisch2012-07-1210-0/+11
| | | | | | | | | | | | Fixes bug 1021453. Change-Id: I05771a588746a0e43fec0078c5c7152dd9d33b9f
* | Merge "Fix line length for pep8 compliance after cloning into other projects"Jenkins2012-07-113-5/+11
|\ \
| * | Fix line length for pep8 compliance after cloning into other projectsDoug Hellmann2012-07-113-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are a few lines that are close to the length limit so they pass the PEP8 check under the common repository but fail the check after the code is cloned into another project such as ceilometer. These changes adjust the lines to give more space to allow the merge into the other projects to go ahead without breaking the pep8 gating tests. Change-Id: I33a05f5b51120114cc8ceffd0bf1b1ef462ed636 Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
* | | Merge "Add 'filedecoder' method to the jsonutils wrapper module."Jenkins2012-07-111-1/+5
|\ \ \
| * | | Add 'filedecoder' method to the jsonutils wrapper module.Tim Daly Jr2012-06-261-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #1017765 After version 3.3.2, the anyjson library will throw a KeyError if filedecoder isn't present. The filedecoder is just like the decoder except it takes a file instead of a string, like json.load() instead of json.loads(). Change-Id: I7bd012a7b4afa9b1ec987c3e6393cc922b5dadff
* | | | Merge "cfg: Fix typo in documentation"Jenkins2012-07-111-2/+2
|\ \ \ \
| * | | | cfg: Fix typo in documentationVincent Untz2012-07-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with with -> with Change-Id: I7a524c024b05639ec7ab4d57b6a52f70a95d2235
* | | | | Merge "Fix import order."Jenkins2012-07-111-1/+1
|\ \ \ \ \
| * | | | | Fix import order.Russell Bryant2012-07-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix import order in rpc.common. They must be alphabetical. Nova tests for this and caught it when i synced in the latest changes. Change-Id: I0dbd6b5004d754d0bd2d1861905db3405c64e3d4
* | | | | | Merge "Improve exception from importutils.import_class()."Jenkins2012-07-111-1/+3
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Improve exception from importutils.import_class().Russell Bryant2012-06-191-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ImportError raised by import_class() attempted to tell you what the original error was by just doing str() on the original exception. Sometimes that's helpful, but sometimes a full traceback is needed. This patch includes a traceback for debugging purposes. Change-Id: I00cefb9ebf9d6a71ef491204d81765e30e7941f6
* | | | | | Merge "Add common plugin framework."Jenkins2012-07-114-0/+280
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Add common plugin framework.Andrew Bogott2012-07-084-0/+280
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For blueprint novaplugins. It turns out that most of the plugin framework applies equally well to other projects, so it's going into Nova via common so that other projects can pull it in with a minimum of fuss. Change-Id: Ia4455a8ca0b8c1c3e4b0b9647e8cacaf0a47c914
* | | | | | Rework the version consumer functionality.Monty Taylor2012-07-111-80/+123
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved the version routines into a class for better structure. Added caching/memoization logic so that pkg_resources/git doesn't get called more than is necessary. Added periodic-based caching that will only cause the meta info refs to be checked at most once a day, to reduce network load for developers. (The information in the meta refs should really only change once a month, and this will only affect local developer workstation version reporting, so we should be fine here. Added a deferred version string class and function to allow for consuming of the version string but doing the calculation only when it is requested, based on test runs in glance. Change-Id: I6a436c8817f6904959727a76d876b807ec545ee9
* | | | | Fix Zmq so it doesn't rely on nova flagsJason Kölker2012-07-101-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Embeded newlines in logging makes me cry * String formatting uses parens not curly braces * Fix LP1023039 * Hard skip Zmq tests so jenkins passes. Someone will have to fix. Change-Id: I9b12ac47b02edf1d8dba7236550deb8ee33f5e07
* | | | | Merge "Switch common files to using jsonutils."Jenkins2012-07-107-19/+20
|\ \ \ \ \
| * | | | | Switch common files to using jsonutils.Andrew Bogott2012-07-037-19/+20
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For blueprint use-common-jsonutils Pretty much just a search and replace. Change-Id: I66f63e7b0ff82a37d8a6b9acef94f4e10a45bf90
* | | | | Fix up pre-versioning based on testing in glance.Monty Taylor2012-07-091-7/+15
| | | | | | | | | | | | | | | | | | | | Change-Id: I137fee43509f079cb4b2def452cf23b6705cdda5
* | | | | Add a new module for use in consuming versioninfo.Monty Taylor2012-07-081-0/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new tag-based versioning produces files that we can consume that tell us the versioning. That's all well and good, but what good is automatically generated versioning if there are no apis to consume it. This is derived from work to add those to nova and python-swiftclient. Change-Id: I91568ef28a9ed7e7365f66bca2294670df6e0c41
* | | | | Move get_context_from_function_and_args() to context.pyAndrew Bogott2012-07-033-21/+18
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Word on the street is that exception.py may soon be deprecated, and context.py is a better place anyway. (Also removed an import of utils.py because /it/ imports exception.py.) Change-Id: I856fc6f4558cc01ddca350ee4cfd4684db47475b
* | | | Merge "Fix missing RPCException from raise"Jenkins2012-07-021-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix missing RPCException from raiseEric Windisch2012-06-281-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ia850b07d29459b760d24f9bffdd88e4176cb7faf