summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "python3: Add python3 compatibility."Jenkins2013-07-011-2/+3
|\
| * python3: Add python3 compatibility.Chuck Short2013-06-271-2/+3
| | | | | | | | | | | | | | | | Fix basestring/str idioms for both python2 and python3 (used by python-novaclient). Change-Id: I440c7c1c18660c3d73f699c0a02cbbfee331bfbf Signed-off-by: Chuck Short <chuck.short@canonical.com>
* | Merge "Fix tox.ini config"Jenkins2013-06-282-1/+2
|\ \
| * | Fix tox.ini configVictor Sergeyev2013-06-272-1/+2
| | | | | | | | | | | | | | | | | | | | | We found that if tests run with testr --subunit option it can cause wrong implementation of tests results. Change-Id: I98c3f3ed90e2291ef984f07a93c89d24da7855d9
* | | Merge "Improve usability when backdoor_port is nonzero"Jenkins2013-06-283-7/+189
|\ \ \ | |_|/ |/| |
| * | Improve usability when backdoor_port is nonzeroRaymond Pekowski2013-06-233-7/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users who may not know that configuring a backdoor_port with 0 allows multiple services to be enabled for the eventlet backdoor or who simply want a more predictable port assignment might like this patch. If the specified port is in use, it is incremented until a free port is found. This is a backdoor_port collision recovery scheme as opposed to the collision failure scheme that exists today. This related to I95fdb5ca: Add support for backdoor_port to be returned with a rpc call. Change-Id: I7ec346db3575995fa15483b617eea34c1e003bb0
* | | Add netaddr.IPAddress support to to_primitive()Dan Smith2013-06-273-0/+10
| |/ |/| | | | | | | | | | | | | | | | | This enlightens jsonutils.to_primitive() about how to serialize netaddr.IPAddress objects. Since these types are serializable in their native form with just string coercion, just do that here. Fixes bug 1195097 Change-Id: I358b0731e4d3774e5b36aefb5384fdfb75fd31b6
* | Merge "Refactor KombuStubs fixture."Jenkins2013-06-261-10/+22
|\ \
| * | Refactor KombuStubs fixture.Roman Podolyaka2013-06-261-10/+22
| | | | | | | | | | | | | | | | | | Fixes bug 1192924. Change-Id: Ic6d9715c945e620da20b43310e8e8ba79296e4ad
* | | Merge "Don't use mixture of cfg.Opt() deprecated args"Jenkins2013-06-261-24/+22
|\ \ \ | |/ / |/| |
| * | Don't use mixture of cfg.Opt() deprecated argsMark McLoughlin2013-06-251-24/+22
| | | | | | | | | | | | | | | | | | No need to make this any more ugly than it needs to be :) Change-Id: Ib7ef13bb5f04e1780565de805eb81413d7b21274
* | | Merge "Add network_utils.urlsplit"Jenkins2013-06-262-0/+34
|\ \ \
| * | | Add network_utils.urlsplitJulien Danjou2013-06-242-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This unfortunately needed if we want to parse URL with params and unknown schemes. Change-Id: Ia7d8212370201254e537e6f1dd9b15d669a3252f
* | | | Merge "Don't reconnect to exclusive fanout consumers."Jenkins2013-06-261-1/+24
|\ \ \ \
| * | | | Don't reconnect to exclusive fanout consumers.Michael Wilson2013-06-121-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See bug #1180166, basically we shouldn't be trying to reconnect to exclusive queues. Fixes: bug #1180166 Change-Id: I71ac5a150ea8c4d97a34404cb821ce8e8dfa152d
* | | | | Merge "Make AMQP based RPC consumer threads more robust"Jenkins2013-06-266-4/+222
|\ \ \ \ \
| * | | | | Make AMQP based RPC consumer threads more robustRaymond Pekowski2013-06-256-4/+222
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug 1189711 Should RPC consume_in_thread() be more fault tolerant? There are unprotected holes in the thread kicked off by RPC consume_in_thread such that an exception will kill the thread. This exists for both the service (TopicConsumer) and the new reply proxy (DirectConsumer) consumers. This patch plugs those holes as close to the base of the consumer thread as possible by catching all non-caught exceptions and retrying with sleeps between retries and some pacing of the log output to prevent log flooding. Change-Id: I0d6ec8a5e3a310314da201656ee862bb40b41616
* | | | | | Merge "Add IpFilter, IPNetnsExecFilter and EnvFilter"Jenkins2013-06-263-4/+250
|\ \ \ \ \ \
| * | | | | | Add IpFilter, IPNetnsExecFilter and EnvFilterDirk Mueller2013-06-203-4/+250
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These filters have been implemented in Quantum before: - IpFilter provides support for filtering ip commands - IpNetnsExecFilter is a chaining command filter that verifies that the command to be executed by ip netns exec is covered by other established filters. IpNetnsExecFilter has been restricted to ensure that the filter chains have all matching filters run as the same user. EnvFilter is a new filter derived from CommandFilter that allows a Command to be optionally prefixed by "env" and a specific list of environment variables. This is intended to replace the specific DnsmasqFilter and DnsmasqNetnsFilter in the future when all consumers have been updated. Implements bp rootwrap-quantum-features Change-Id: I0cf39967126e99a8dc53d21bee824a0fe2f63aa0
* | | | | | | Merge "rpc: remove some unused serialization code"Jenkins2013-06-261-6/+1
|\ \ \ \ \ \ \
| * | | | | | | rpc: remove some unused serialization codeMark McLoughlin2013-06-251-6/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first commit of Nova contains this code as https://github.com/openstack/nova/blob/bf6e6e7/nova/rpc.py#L149 try: publisher.send({'result': reply}) except TypeError: publisher.send( {'result': dict((k, repr(v)) for k, v in reply.__dict__.iteritems()) }) but when the kombu driver was first added, it became: https://github.com/openstack/nova/blob/9cb46c48/nova/rpc/impl_kombu.py#L717 try: msg = {'result': reply, 'failure': failure} except TypeError: msg = {'result': dict((k, repr(v)) for k, v in reply.__dict__.iteritems()), 'failure': failure} conn.direct_send(msg_id, msg) Obviously, TypeError can't be raised with the current code and we dump everything to json these days before passing down to kombu, qpid, etc. Change-Id: I932fbfbbe824fbd9de8d31f070878e9db853ee45
* | | | | | | Merge "Fixes crash when no help for an option"Jenkins2013-06-251-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Fixes crash when no help for an optionThomas Goirand2013-06-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When there is no help available for an option, the generator.py simply crashes. This fixes this by initialising opt_help. Fixes Bug1194524 Change-Id: I94c23973bdad603703f12e936b7e72fe0e81c3f0
* | | | | | | | Merge "Do not raise NEW exceptions"Jenkins2013-06-253-3/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Do not raise NEW exceptionsSergey Vilgelm2013-06-253-3/+13
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Raising NEW exception is bad practice, because we lose TraceBack. So all places like: except SomeException as e: raise e should be replaced by except SomeException: raise If we are doing some other actions before reraising we should store information about exception then do all actions and then reraise it. This is caused by eventlet bug. It lost information about exception if it switch threads. fixes bug 1191730 Change-Id: I7bce659591c4c3e4bc41e12d7d8390128c30e2e4
* | | | | | | Merge "Enable H202 hacking check"Jenkins2013-06-251-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Enable H202 hacking checkAnn Kamyshnikova2013-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no point to ignore this check because everything works correctly without it. Change-Id: I38b6f2314208b3bfb5898b2a08d7fe7c0f640e57
* | | | | | | | Merge "Replace nosetests with testr in tox.ini."Jenkins2013-06-253-15/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | Replace nosetests with testr in tox.ini.Victor Sergeyev2013-06-183-15/+18
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Config tox.ini updated to run testr instead of nosetests. File test-requirements.txt modified respectively. Config .testr.conf added. Testr allows for more flexible testing, more consistent use of the unittest protocol and, most importantly, faster testing via parallelism. Part of blueprint run-tests-script. Change-Id: Iba847d430a18458a1a68e6ef07541d29c0c01c64
* | | | | | | | Merge "Remove the unused plugins framework"Jenkins2013-06-258-501/+0
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Remove the unused plugins frameworkMark McLoughlin2013-06-198-501/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This framework was merged a year ago and AFAICT hasn't seen use beyond the two initial wikimedia extensions for Nova. The framework basically allows a way for a single plugin to register API extensions and notification hooks. Both of these can be done by directly using config opts like osapi_compute_extension and notification_driver so this framework really only helps if we expected to (and wanted to) lots of these plugins in the wild. Nova is the only project using this and we don't have an active maintainer listed in the MAINTAINERS file, so it seems like it's time to remove it from the incubator. Change-Id: I5552b5625e26f4821464807743545ec6f5117f2b
* | / / / / / Allow BaseTestCase use a different conf objectMark McLoughlin2013-06-255-41/+41
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new messaging work will register options like rpc_backend and, since the existing RPC API registers those options with CONF, we need to run the messaging tests with a different ConfigOpts object. It's actually probably pretty sane for all unit tests to use a per-test ConfigOpts object rather than cfg.CONF anyway. The kombu and zmq tests have an issue with this where they rely on being able to call self.config() before the base class setUp() is called. Fixing this properly is a little tricky, so for now, initialize self.conf early to cfg.CONF just for these tests. Change-Id: I7b2e3db7c21c511f3ab16ac866e0cc80846cbd80
* | | | | | Merge "Optionally reject messages on exception."Jenkins2013-06-244-17/+148
|\ \ \ \ \ \
| * | | | | | Optionally reject messages on exception.Sandy Walsh2013-06-204-17/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than blindly ack() all messages, consumers can be created that reject() the message if an exception occurs in the callback. Currently only implemented in kombu driver. Change-Id: I308dd794b50966e3a189d31b2b51fdac36cd7d3a
* | | | | | | Merge "Update kombu and anyjson"Jenkins2013-06-242-2/+18
|\ \ \ \ \ \ \
| * | | | | | | Update kombu and anyjsonDoug Hellmann2013-06-202-2/+18
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the kombu requirement based on the new value in the global requirements list. The new version of kombu we are using depends on anyjson>=0.3.3. Related to bug #1134575 Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com> Change-Id: I36211a2730bfc712e189d39893ab2af513ce3ba9 Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
* | | | | | | Merge "Creates a new file TESTING.rst."Jenkins2013-06-241-0/+88
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Creates a new file TESTING.rst.Anita Kuno2013-06-201-0/+88
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates a new file called TESTING.rst making the file discoverable. Contents of the file include very generic instructions to get newcomers started with testing. File also includes links, including the OpenStack wiki page on testing, encouraging the curious to access greater options for testing individual projects as well as greater flexibility in testing. Change-Id: I57ab249133eccd38fa5302809e06172ed6a7d89e
* | | | | / Ensure that DB configuration is backward compatibleGary Kotton2013-06-223-1/+42
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1193557 Change-Id: I483099b205c71d66cf97522307d8265abe83a488
* | | | | Merge "python3: Fix traceback while running python3."Jenkins2013-06-201-8/+10
|\ \ \ \ \
| * | | | | python3: Fix traceback while running python3.Chuck Short2013-06-171-8/+10
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Python3 enforces the distinction between byte strings and text strings more rigorously than python2. So use six.text_type where approiate and six.string_types. Change-Id: Iaab049fff97278d94fd7ab932a514949094a949a Signed-off-by: Chuck Short <chuck.short@canonical.com>
* | | | | Merge "Remove useless logging in networks_utils"Jenkins2013-06-201-5/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Remove useless logging in networks_utilsJulien Danjou2013-06-191-5/+0
| |/ / / | | | | | | | | | | | | | | | | Change-Id: Ia5a355557bf98b0152cb606ffd5c13d97fa71074 Signed-off-by: Julien Danjou <julien@danjou.info>
* / / / Remove unused zmq relay functionalityMark McLoughlin2013-06-171-26/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #1188029 This relay functionality appears to be completely unused and untested so just remove it. If we need it in future, we can restore it from the git history. Change-Id: I479d654aefdbd58c80946818b9a405eaa02644db
* | | Merge "Add a fixture for using of SQLite in-memory DB."Jenkins2013-06-172-19/+52
|\ \ \
| * | | Add a fixture for using of SQLite in-memory DB.Roman Podolyaka2013-06-122-19/+52
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Currently, SQLite DB in a file is used for testing of DB related code. Thus, in each test case we have to ensure that tearDown() drops all created tables, etc. It is much easier and cleaner to guarantee that DB is in the original state by creating it in memory instead. Change-Id: I6f0a9735a0fb31bef30842afff50c6089fa2bf92
* | | Refactors to_bytesZhongyue Luo2013-06-131-21/+23
| |/ |/| | | | | | | | | | | The original logic was not intuitive. Changed the code for better readability. Change-Id: I0d96105d4ff22eed827ed61466a26f69f33addd1
* | Merge "Handle relative path arguments in Killfilter"Jenkins2013-06-122-13/+36
|\ \
| * | Handle relative path arguments in KillfilterDirk Mueller2013-06-122-13/+36
| |/ | | | | | | | | | | | | | | | | | | | | | | KillFilter currently expects an absolute path to be specified for the process name to kill. This is inconvenient when the exact location of the running binary is not known or differs accross installs. Extend KillFilter to accept also commands in $PATH to be killed if the given argument is not absolute. Change-Id: I6b90206b587ff3f949af2c256a78ca21af31867a
* | Merge "Fix workarounds for some values"Jenkins2013-06-121-2/+3
|\ \