summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Cache tokens using memorycache from oslo."0.2.3Jenkins2013-03-183-107/+53
|\
| * Cache tokens using memorycache from oslo.Vishvananda Ishaya2013-03-153-107/+53
| | | | | | | | | | | | | | | | | | | | | | Verifying tokens accounts for a significant portion of the time taken by the various api servers. This uses the simple memory cache from oslo so that there is a simple default cache even if memcached is not deployed. Also cleans up the tests and removes unnecessary fakes. DocImpact Change-Id: I501c14f2f51da058cb574c32d49dd769e6f6ad86
* | Merge "Doc info and other readability improvements"Jenkins2013-03-151-40/+27
|\ \
| * | Doc info and other readability improvementsHenry Nash2013-03-131-40/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A few good suggestions were made on the final round of reviews on the previous patch to add v3 token support, but were not implemented. This patch applies these, which should not create any functional change. Fixes Bug #1154768 Change-Id: Ie5408a5477d176bd28b2c385e49cd29b39c0de39
* | | Merge "update v3 domains - remove public/private namespace"Jenkins2013-03-152-12/+4
|\ \ \
| * | | update v3 domains - remove public/private namespaceSteve Martinelli2013-03-042-12/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | removed the private namespace options that were lingering in create/update/tests it should now adhere to the v3 api specs Change-Id: I853c2b8a13bc657e9cd2a3f24e6eb7deb68a4c5c
* | | | Merge "Retry http_request and json_request failure."Jenkins2013-03-151-23/+26
|\ \ \ \ | |_|_|/ |/| | |
| * | | Retry http_request and json_request failure.Vishvananda Ishaya2013-03-121-23/+26
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Temporary network outages or keystone server restarts can lead to a connection refused in auth_token middleware. Rather than failing immediately, this patch attempts to retry a few times. Fixes bug 1150299 Change-Id: I2ecf0d7745290976efcb3e3cd6511817a53d3e0a
* | | Merge "Use v2.0 api by default in auth_token middleware"Jenkins2013-03-142-2/+3
|\ \ \
| * | | Use v2.0 api by default in auth_token middlewareDan Prince2013-03-122-2/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes an issue that crept in with d782a99 where auth_token started defaulting to the v3.0 API by default when no version was specified. Given that bin/keystone still defaults to using the v2.0 API it seems like auth_token.py should too. Fixes LP Bug #1154144 Change-Id: Ia5620bccc182bbc73cb60dcccb1f701304450e5a
* | | Merge "Make auth_token lazy load the auth_version."Jenkins2013-03-142-3/+20
|\ \ \
| * | | Make auth_token lazy load the auth_version.Dan Prince2013-03-132-3/+20
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates recent changes to the auth_token middleware (this is a regression in d782a99) so that self.auth_version is lazy loaded. This fixes issues where other openstack services would fail to startup correctly if Keystone is not running. The issue was auth_token was trying to make a request to '/' to get versions information on startup to "autodetect" the correct version to use. This patch fixes startup issues by moving the version detection so that it is lazy loaded right before it is actually used. This issue should fix SmokeStack :) Fixes LP Bug #1154806. Change-Id: Ib24f5386fa1ffe0e0365548840f0cfeaae36f548
* | | Make keystone client handle the response code 300.Nachiappan VR N2013-03-132-1/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keystone discover command currently fails to list the keystone server. Fix is made such that client handle the response code 300 from the keystone server. Fixes Bug #1136476 Change-Id: Iada31f1e274aade90aa4b4be2a136793a0ba64d7
* | | Switch to final 1.1.0 oslo.config releaseMark McLoughlin2013-03-121-1/+1
|/ / | | | | | | | | | | | | | | | | Fixes bug #1128256 oslo.config has now been released to PyPI in time for Grizzly RC1 so we can switch to using it directly. Change-Id: I655f831718ae5f4e25e941ee206fe195214a9a91
* | Fix auth-token middleware to understand v3 tokensHenry Nash2013-03-1118-356/+1080
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that the Identity server supports v3 tokens, the auth_token middleware should permit the in-line validation of such a token. This essentially means just setting any new environment items that correspond to the new attributes that may be in a v3 token (such as domains), as well as allowing for the slight format differences. Most of the work in this change is actually in the unit tests, where it was important to try and enable the existing tests to be run against an auth_token middleware configured for both v2 and v3. This meant restructing the test class so that the token format is separated from the individual tests and is initialized by the class Setup(). Since there are some new signed token formats included in this testing, a new set of the signed tokens was generated. Fixes Bug #1132390 Change-Id: I78b232d30f5310c39089fbbc8e56c23df291f89f
* | help text improvementsAlan Pevec2013-03-082-11/+12
| | | | | | | | | | | | | | | | | | from comments in Ibbc7fab2033d8f037262b465b98d1713579adfc2 v2: synced to the README manpage will be updated in https://review.openstack.org/#/c/20976 Change-Id: I33006a4b935b9272fd99775936a17b3cfd08e294
* | Merge "Remove test dep on name of dir (bug 1124283)"Jenkins2013-03-072-4/+4
|\ \
| * | Remove test dep on name of dir (bug 1124283)Dolph Mathews2013-03-042-6/+4
| |/ | | | | | | | | | | | | | | | | | | | | The name of the project's directory was previously hardcoded into the tests, so tests would fail if executed from another directory (such as "python-keystoneclient-master", as checked-out by keystone for integration testing). Also, the tests should now be executable on Windows. Change-Id: I0a1e052054e509b0f795fd13f95a804e0c255907
* | Merge "Switch to oslo.config."Jenkins2013-03-061-1/+1
|\ \
| * | Switch to oslo.config.Dan Prince2013-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | The oslo-config package has been renamed. Switch to the new version. (should fix SmokeStack). Change-Id: Ied8804035d748932e7763cbaa9a7e295a887f1f5
* | | Merge "Work better in server env with no keyrings"Jenkins2013-03-061-12/+12
|\ \ \
| * | | Work better in server env with no keyringsDavanum Srinivas2013-03-041-12/+12
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | We should not try loading keyrings if we dont' have to. We certainly should not print messages if keyrings are not even needed Fix for LP# 1145071 Change-Id: I700a2b40620359f6f1fbe03c6a6239d162ddea61
* | | Merge "Save test_auth_token_middleware from unlimited recursion"Jenkins2013-03-061-4/+2
|\ \ \ | |_|/ |/| |
| * | Save test_auth_token_middleware from unlimited recursionAlessio Ababilov2013-02-191-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For Python 2.6, BaseAuthTokenMiddlewareTest will be equal to AdjustedBaseAuthTokenMiddlewareTest in BaseAuthTokenMiddlewareTest.setUp thus leading to infinite recursion. Also, parent's setUp was incorrectly called by BaseAuthTokenMiddlewareTest.setUp twice: at the beginning and at the end of the function. Change-Id: I63fce65866ef9d8aebe9eb60f7ceb17463de0989 Fixes: bug #1130200
* | | Sync memorycache and timeutils from oslo.Vishvananda Ishaya2013-03-012-3/+144
| |/ |/| | | | | Change-Id: Ibc61b07fe65d97f9a0eb60e514e29bc12b2f9f4a
* | Improve error message for missing endpointDoug Hellmann2013-02-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | Horizon logs an error when it wants an endpoint that the client can't find, but the error does not say which endpoint is missing. This change includes more details in the error message to make debugging from the horizon logs easier. Change-Id: I6f0aacd469500238f13a2178a220268d86d31fe5 Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
* | Merge "Update oslo-config version."Jenkins2013-02-211-1/+1
|\ \
| * | Update oslo-config version.Russell Bryant2013-02-201-1/+1
| | | | | | | | | | | | | | | | | | | | | Update the version of oslo-config in pip-requires. This update includes a fix for a bug that breaks oslo.config imports. Change-Id: If36de2965a50a975437bc498d9894325e6d20e98
* | | Fix selef to self in class.Chmouel Boudjnah2013-02-201-1/+1
|/ / | | | | | | Change-Id: I1fec9908fb1aa915158996d57fdd82cfdf483535
* | Merge "Use oslo-config-2013.1b3"Jenkins2013-02-196-1801/+16
|\ \
| * | Use oslo-config-2013.1b3Alan Pevec2013-02-176-1801/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cfg API is now available via the oslo-config library, so switch to it and remove the copied-and-pasted version. Removes the load of copied-and-pasted cfg from each application in authtoken middleware. Depends on oslo-config deployments: Nova I4815aeb8a9341a31a250e920157f15ee15cfc5bc Glance I4815aeb8a9341a31a250e920157f15ee15cfc5bc Quantum I4815aeb8a9341a31a250e920157f15ee15cfc5bc Cinder I4815aeb8a9341a31a250e920157f15ee15cfc5bc 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. Change-Id: I18c450174277c8e2d15ed93879da6cd92074c27a
* | | Merge "Implements token expiration handling"Jenkins2013-02-193-7/+73
|\ \ \ | |_|/ |/| |
| * | Implements token expiration handlingJulien Danjou2013-02-013-7/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements handling of token expiration. Once the token is expired, this will request automatically for a new one. A special case is introduced if the user specified a token when the client is initialized: this is the auth_token_from_user. In this case, we can't know the expiration date, so we just assume it will never expire and don't handle it ourself. Change-Id: I3771ff5d669da015d4aa259de422c5d81aed3eb4 Signed-off-by: Julien Danjou <julien@danjou.info>
* | | Merge "Added missing unit tests for shell.py"Jenkins2013-02-194-4/+1011
|\ \ \
| * | | Added missing unit tests for shell.pyVasyl Khomenko2013-02-154-4/+1011
| | | | | | | | | | | | | | | | | | | | | | | | blueprint python-keystoneclient-unittests Change-Id: I47a205c027251c5282522ea73ee79c937383dc94
* | | | Merge "sync README with "keystone help""Jenkins2013-02-171-3/+18
|\ \ \ \ | |_|_|/ |/| | |
| * | | sync README with "keystone help"Alan Pevec2013-02-111-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There are few new options and --no-cache was renamed to --os-cache in commit d734821c99aade7cd4285a5fd51736c475707dcd Change-Id: Ibbc7fab2033d8f037262b465b98d1713579adfc2
* | | | Merge "Use install_venv_common.py from oslo."Jenkins2013-02-163-173/+259
|\ \ \ \
| * | | | Use install_venv_common.py from oslo.Matthew Treinish2013-02-063-173/+259
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This syncs install_venv_common.py from oslo and reworks the tools/install_venv.py script to use the new library. Change-Id: Ia8c2674b4abed8de754e92ea795130cdb065a720
* | | | | Merge "Allow configure auth_token http connect timeout."Jenkins2013-02-163-3/+11
|\ \ \ \ \
| * | | | | Allow configure auth_token http connect timeout.Chmouel Boudjnah2013-02-143-3/+11
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | - Fixes bug 939613. Change-Id: Ic8cfc36e02212eeb987e509893369c0a47d9209a
* | | | | Merge "Update .coveragerc"Jenkins2013-02-161-1/+2
|\ \ \ \ \
| * | | | | Update .coveragercAlessio Ababilov2013-02-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set up proper source and omit options. Change-Id: Ieb6e514849e6fc054ce563806243d29f4ff2075c Implements: blueprint update-coveragerc
* | | | | | Merge "If you specify the --debug argument, it doesn't show the body of a ↵Jenkins2013-02-161-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | POST request. The body (string rep) is at 'data' in the kwargs dict. 'body' was deleted prior to this call."
| * | | | | | If you specify the --debug argument, it doesn't show the body of a POST ↵Ruby Loo2013-01-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | request. The body (string rep) is at 'data' in the kwargs dict. 'body' was deleted prior to this call. Change-Id: Ieea3d11f5246ee785e41df3bc54ac61200808354 Fixes: bug #1104313
* | | | | | | Merge "Fix how python 2.6 doesn't have assertDictEqual"Jenkins2013-02-161-0/+28
|\ \ \ \ \ \ \
| * | | | | | | Fix how python 2.6 doesn't have assertDictEqualJoshua Harlow2013-01-281-0/+28
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I2e3a3dcc173bb5eae0b3e19f1c0eadc496a17e73
* | | | | | | Merge "Remove useless import"Jenkins2013-02-151-1/+0
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Remove useless importJulien Danjou2013-01-221-1/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5925021c69883c4086e552389e987c7052ccb1cd Signed-off-by: Julien Danjou <julien@danjou.info>
* | | | | | Fix debug with requests.Chmouel Boudjnah2013-02-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - From http://docs.python.org/2/library/functions.html#hasattr : hasattr(object, name) -- The arguments are an object and a string. - Fixes bug 1124084. Change-Id: I47283abff440abdf827598c2497519f3de510baf