summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | cfg: clean up None value handlingMark McLoughlin2012-08-131-23/+13
| | | | | | | | | | | | | | | | | | | | | | | | Remove the need for an internal NoneValue class by making the existence of the 'default' or 'override' keys signify whether a default or override is set. Change-Id: Iacf49553df5ba8414307904a3ee334c7b8c55758
* | | Merge "Allow set_default and set_override to use None"Jenkins2012-08-132-4/+68
|\| |
| * | Allow set_default and set_override to use NoneVishvananda Ishaya2012-08-112-4/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current implementation interprets set_default('foo', None) and set_override('foo', None) as 'clear the existing default or override', which makes it impossible to override a value with None. This patch adds support for overriding with a None value by adding a special internal class. set_override('foo', None) will now override the existing value with None. This is a slight change to the existing behavior, so this patch adds two calls for the old functionality of clearing defaults and overrides. Example syntax for the new calls are shown below: conf.clear_default('foo') conf.clear_override('foo') The patch also updates the tests to reflect the change in functionality and adds new tests to verify the new functionality. Fixes bug 1035478 Change-Id: Iee5e20e44da9bef6b86e0483ab0b48b625fe503c
* | | Tilde expansion for --config-file and --config-dirMark McLoughlin2012-08-112-6/+51
|/ / | | | | | | | | | | | | | | | | Fixes bug #1012671 Allow a filename starting with ~ or ~user to be passed for --config-file or --config-dir. Change-Id: I67705401ed1c35c0cc2161095e36616552740aba
* | Merge "Make receiver spawning in impl_zmq more robust/clean."Jenkins2012-08-101-19/+26
|\ \
| * | Make receiver spawning in impl_zmq more robust/clean.Eric Windisch2012-08-011-19/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The receiver spawning had some faulty and complex logic which this patch improves. The old logic was logging detection of a zmq-receiver socket, although the code was also launching a receiver daemon. It was also doing dirty things such as intentionally doing a return to trigger a finally block. Change-Id: Ic044710679c43753240a2b9d909088af5317cbf4
* | | Support for marshalling datetime while preserving microseconds.SandyWalsh2012-08-102-0/+24
| | | | | | | | | | | | | | | | | | Needed for performance measurement via "inflight" service. Change-Id: I5c1a8395b4cbc5fc0f8649b3af8130f45dd401bb
* | | Merge "Add import_opt() method to ConfigOpts"Jenkins2012-08-105-0/+102
|\ \ \ | |_|/ |/| |
| * | Add import_opt() method to ConfigOptsMark McLoughlin2012-07-315-0/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 "Fix meaningless test case"Jenkins2012-08-061-1/+1
|\ \ \
| * | | Fix meaningless test caseMate Lakat2012-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related to fixing bug 1031351 The testcase was meaningless. Change-Id: I7b88b86a600fac0c30bcac354262ac00593b495c
* | | | Add multiple-driver support to the notifier api.Andrew Bogott2012-08-0210-341/+159
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move all of the functionality previously provided by the list_notifier into the basic notifier api. Move and restructure tests accordingly. Remove the list_notifier file and test file. For bug 1025820 Change-Id: Idf7cb975dd78e9951188781622a4d10ca466b154
* | | Merge "Install a qualified except hook."Jenkins2012-08-022-6/+35
|\ \ \
| * | | Install a qualified except hook.Mate Lakat2012-08-012-6/+35
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1031351. As an Exception is raised, it was not visible in the log, because it wasn't qualified. The fix sets up the exception hook to be qualified as the product_name. Change-Id: Ie8061d003b05ea8b00db5d8ed8fa445ccc822942
* | | Merge "Copy eventlet_backdoor into common from nova."Jenkins2012-08-021-0/+78
|\ \ \
| * | | Copy eventlet_backdoor into common from nova.Angus Salkeld2012-08-021-0/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is debugging utility only used by service.py in nova. (needed in openstack-common to move service.py to common) Change-Id: I9a7a84a5f34517abf91d87e9d817d7e763e22829 Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
* | | | Merge "Fix errors reported by pyflakes."Jenkins2012-08-021-3/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Fix errors reported by pyflakes.Bhuvan Arumugam2012-08-011-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * openstack/common/setup.py get_reqs_from_files(): Remove unused variable. get_reqs_from_files(): Use local variables in a conventional way, to prevent errors like: local variable 'datestamp' is assigned to but never used. Change-Id: I44e137d383b96e1601b7bded1e36e84ff14a8f68
* | | | Merge "Remove bogus conf argument from create_consumer()"Jenkins2012-08-011-4/+2
|\ \ \ \
| * | | | Remove bogus conf argument from create_consumer()Mark McLoughlin2012-08-011-4/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #1031713 Commit 0b11668 in nova added a conf parameter to the create_consumer() method in the base class, but not to the implementations. Looks to be a random thinko. Change-Id: I92b87eed2f7708af696e02e229bf6daa0d305fdd
* | | | Merge "Use function registration for policy checks"Jenkins2012-08-012-102/+219
|\ \ \ \ | |_|/ / |/| | |
| * | | Use function registration for policy checksKevin L. Mitchell2012-07-302-102/+219
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original policy framework allowed new policy checks to be created through inheritance. This is somewhat clunky and unnecessary in Python. This change refactors policy.py to allow new policy checks to be registered using an @register() decorator. One consequence is that HttpBrain is deprecated. Care has been taken to ensure backwards compatibility; deprecation warnings will be emitted for uses of HttpBrain or the inheritance- based checks. Change-Id: I3ccef5868906ef64a3c24d6c92533471e89682ba
* | | Reduce test_zmq's reponse timeout.Eric Windisch2012-08-011-0/+1
| |/ |/| | | | | | | | | | | | | | | | | | | | | The rpc response timeout in Nova's fake_flags.py was 5 seconds. This was lost in the transition to openstack-common, is no longer set globally. As in test_kombu.py, this should be set in test_zmq.py The default value is much higher than it needs to be for the purposes of testing. A lower value fails faster, resulting in faster tests in the event of failures. Change-Id: I106919d36acd19b702be85e453e949495db70ea9
* | Merge "Remove code to clear basicConfig root log handlers"Jenkins2012-07-311-11/+0
|\ \
| * | Remove code to clear basicConfig root log handlersDan Prince2012-07-311-11/+0
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes some old Nova specific code to clear out the log handlers from Nova's logging basicConfig. This code is arguably Nova specific and doesn't really belong in openstack-common's generic logging configuration. Additionally, This code was actually removing the root logger used by some command line tools and binaries and hiding log messages that should have otherwise gone to the console. Fixes LP Bug #1029577. Change-Id: Ia3531bea41a2226798f3910803a4323f1984e767
* | Merge "Copy LoopingCall from nova for service.py"Jenkins2012-07-312-0/+140
|\ \
| * | Copy LoopingCall from nova for service.pyAngus Salkeld2012-07-312-0/+140
| |/ | | | | | | | | Change-Id: Ib6683324f92345c17cfd7234d08070b48ffb4d3e Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
* | Merge "Remove unnecessary register_opts from test_zmq"Jenkins2012-07-311-2/+0
|\ \ | |/ |/|
| * Remove unnecessary register_opts from test_zmqEric Windisch2012-07-251-2/+0
| | | | | | | | | | | | | | The calls to register_opts are no longer required, and are no longer called from the tests of other rpc mechanisms. Change-Id: I40fe63d43aad8fcf37d5332a1aa05e2b3068f01a
* | Merge "don't throw exceptions if %(color)s tag is used"Jenkins2012-07-302-2/+60
|\ \
| * | don't throw exceptions if %(color)s tag is usedSean Dague2012-07-272-2/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Use BaseTestCase for all tests which override config"Jenkins2012-07-304-38/+19
|\ \ \
| * | | Use BaseTestCase for all tests which override configMark McLoughlin2012-07-204-38/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #1027120 We already have nice helper methods for overriding config and cleaning up the overrides, so let's use them. Change-Id: Ibd501743d1c4ec21cb2b0d22382cb681ee5768ed
* | | | 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-242-7/+6
| |/ |/| | | | | | | | | | | | | | | | | 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-232-12/+25
|\ \ | | | | | | | | | | | | | | | | | | * 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-182-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Update iteritems test case to actually test iteritems.Russell Bryant2012-07-181-11/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch updates the jsonutils.to_primitive() test case for when an object has an iteritems() method. The previous implementation was mostly a copy of another test and didn't actually test calling iteritems() at all. Now it does. This is used by NovaBase in nova.db.sqlalchemy.models. Related to nova blueprint no-db-messaging. Change-Id: Ie1d71b859219392ab35b82dd3c7932b30e759c89
* | | Merge "Make test_zmq bind/send to 127.0.0.1"Jenkins2012-07-231-0/+3
|\ \ \
| * | | Make test_zmq bind/send to 127.0.0.1Eric Windisch2012-07-201-0/+3
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default, the impl_zmq driver binds to '*' (0.0.0.0); For the purposes of testing, we only need to bind to 127.0.0.1. Binding to all interfaces could be potentially dangerous, may simply not work in some environments, etc. In particular, we do not want our Jenkins slaves to be listening on public interfaces. rpc_zmq_host is set to 127.0.0.1 as well, which avoids hostname resolution. Normally, rpc_zmq_host is set to socket.hostname, which normally should resolve to localhost, but we do not want to test that here. Change-Id: I1224799bb399ceaf79088dd622be4b6823f29a41
* / | 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
* | Merge "Add test-options from Nova /w pyzmq"Jenkins2012-07-202-0/+7
|\ \ | |/ |/|
| * Add test-options from Nova /w pyzmqEric Windisch2012-07-172-0/+7
| | | | | | | | Change-Id: Ieebefee89483e5abbcefe1bb9059d89c91dc04df
* | fix bug lp:1019348,update openstack-common to support pep8 1.3.Yaguang Tang2012-07-1816-109/+111
|/ | | | | | also,this patch turns off pep8 E125 check. Change-Id: I22d2a94d89530586d614af39af17ae542c5e0cbf
* cfg: allow empty config valuesMark McLoughlin2012-07-172-1/+7
| | | | | | | | | | | | | | 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-152-17/+33
| | | | | | | | | | | 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-163-4/+12
| | | | | | | | | | | 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
|\