summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | 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
|\ \
| * | Fix workarounds for some valuesJulien Danjou2013-06-071-2/+3
| | | | | | | | | | | | | | | | | | | | | This fixes the default values for hostnames and paths. Change-Id: I434a4f0269e2d0a3a667056233078ff01d0cdb72 Signed-off-by: Julien Danjou <julien@danjou.info>
* | | Merge "Add a funcutils file for working with functions."Jenkins2013-06-123-0/+221
|\ \ \ | |_|/ |/| |
| * | Add a funcutils file for working with functions.Joshua Harlow2013-06-093-0/+221
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multiple projects are starting to copy around the various function utilities that exist in nova and elsewhere. It would seem appropriate that there exist a helper file in oslo that was used instead as a central place for this type of code. Change-Id: Ia83f26da16b0c868506ecf90e1aaf8affecf3617
* | | Merge "Allow exceptions to hop up cells"Jenkins2013-06-122-3/+55
|\ \ \
| * | | Allow exceptions to hop up cellsMatthew Sherborne2013-06-122-3/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an exception happens in an RPC call using nova cells, it can travel back up several RPC boundaries. eg, child-cell=>parent-cell=>nova-api Before this patch if an exception (eg. AggregateNotFound) was raised in the bottom layer, the next layer up would turn it into a special exception ( AggregateNotFound_Remote ), then in the final layer, it would see this as an unrecognizable exception and raise RemoteException. After this patch, at each layer where the expeption is deserialized, it'll recognize exceptions with the _Remote postfix, and leave them as they are, instead of turning them into RemoteExceptions. It also preserves the exception's original __module__ now. Change-Id: I158a80f1cec20d3e1805b565ffddaffd7a15295b
* | | | Merge "Add slugify to strutils"Jenkins2013-06-122-0/+45
|\ \ \ \ | |/ / / |/| | |
| * | | Add slugify to strutilsAlessio Ababilov2013-06-112-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | This function will be used in apiclient library. Change-Id: I19f976eda896e7bede07510aafebe4931e512351
* | | | Merge "Remove the amqp_rpc_single_reply_queue option from Havana"Jenkins2013-06-113-223/+65
|\ \ \ \
| * | | | Remove the amqp_rpc_single_reply_queue option from HavanaRaymond Pekowski2013-06-053-223/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | blueprint amqp-rpc-fast-reply-queue As part of the Grizzly code review for the above blueprint (Idb09a714), the Grizzly code base is "aware" of this feature in terms of receiving RPCs and provided with an option for enabling it on the RPC send side. It was decided that in Havana the option would be removed, RPCs would only be sent using the new functionality yet awareness of prior functionality be retained for the receiving of RPCs. This code change implements the Havana piece. Change-Id: I5f2a8e432cf84a637c1aa813656c1cbc8db6e7eb
* | | | | Merge "zmq: remove someone unused code from ZmqClient"Jenkins2013-06-111-5/+3
|\ \ \ \ \
| * | | | | zmq: remove someone unused code from ZmqClientMark McLoughlin2013-06-061-5/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The socket_type and bind constructor args are never used. We always supply a value for the envelope argument. Change-Id: Ide2e11170a3415ef347f85bfcce759cdd55d1225
* | | | | Merge "Add can_send_version() to RpcProxy."Jenkins2013-06-112-0/+15
|\ \ \ \ \
| * | | | | Add can_send_version() to RpcProxy.Russell Bryant2013-06-112-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a helper method to the RpcProxy class. This is a little nicer to use for checking to see if a given message is copmatible with the set version cap. Change-Id: Ic44d76f4181351dff367f2d1181a3d508a11db78
* | | | | | Merge "Remove explicit distribute depend."Jenkins2013-06-111-3/+0
|\ \ \ \ \ \
| * | | | | | Remove explicit distribute depend.Monty Taylor2013-06-111-3/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Causes issues with the recent re-merge with setuptools. Advice from upstream is to stop doing explicit depends. Change-Id: Ic98d17bf6e5576590c3fcbd7957da0bef28b9851
* | | | | | Merge "Enable hacking H404 test."Jenkins2013-06-1134-426/+331
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Enable hacking H404 test.Dina Belova2013-06-1134-426/+331
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | H404 - multi line docstring should start with a summary. Change-Id: I2099e1ee81ff9657f7a07401b8e8f3327d03bdbd
* | | | | | Merge "Raise a DeprecationWarning when openstack.common.deprecated is imported"Jenkins2013-06-111-0/+21
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Raise a DeprecationWarning when openstack.common.deprecated is importedFlaper Fesp2013-06-111-0/+21
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now have a deprecated package in Oslo where deprecated modules / packages will be moved. In order to make this more clear and warn users, this patch adds a warning in deprecated's __init__.py module. Change-Id: Id7097da1b034499fec1b6d44a358223476d9ba83