summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix and enable H401"0.3.1Jenkins2013-06-2814-63/+65
|\
| * Fix and enable H401Dirk Mueller2013-06-2714-63/+65
| | | | | | | | | | | | Remove leading spaces from doc comments. Change-Id: I75b055c0d64dda478c63839d44158e301900107f
* | Merge "Use Python 3.x compatible print syntax"Jenkins2013-06-285-20/+22
|\ \
| * | Use Python 3.x compatible print syntaxDirk Mueller2013-06-235-20/+22
| | | | | | | | | | | | | | | | | | | | | | | | Adding an extra pair of braces helps here to let Python 3.x interpret it as print function, while not confusing the Python 2.x print operator. Change-Id: I05af267ecfbcc80753726743fdf82c330350afcb
* | | Merge "Unmock requests when testing complete."Jenkins2013-06-282-16/+34
|\ \ \
| * | | Unmock requests when testing complete.Jamie Lennox2013-06-242-16/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Any other tests running will unexpectedly have mocks installed for requests otherwise. Make the time mock behave the same way whilst there. Change-Id: Iec4f35c51ed4650a35ae2780637192c82042a980
* | | | Merge "List groups by domain in keystoneclient."Jenkins2013-06-272-2/+27
|\ \ \ \ | |_|_|/ |/| | |
| * | | List groups by domain in keystoneclient.Nachiappan2013-06-242-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently keystone support filtering of groups by domain. This fix is to add support in keystone-client for filtering groups by domain. Fixes Bug #1180581 Change-Id: I3906e2474d968426d06d498928ce2c7094c6fbe9
* | | | Merge "Fix the cache interface to use time= by default."Jenkins2013-06-262-15/+21
|\ \ \ \
| * | | | Fix the cache interface to use time= by default.Chmouel Boudjnah2013-06-212-15/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Historically the swift cache conection used the argument timeout= for the cache timeout, but this has been unified with the official python memcache client with time= since grizzly, we still need to handle folsom for a while until this could get removed. Fixes bug 1193032 Change-Id: Ia9d544a0277beb197ed9824d7c1266d12968393d
* | | | | Merge "python3: Introduce py33 to tox.ini"Jenkins2013-06-261-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | python3: Introduce py33 to tox.iniChuck Short2013-06-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce py33 to tox.ini to make testing with python3 easier. Change-Id: I86a790c6f03ee43b0dcbf05122e4e279426003c9 Signed-off-by: Chuck Short <chuck.short@canonical.com>
* | | | | Merge "Python-2.6 compatibility for tests/test_keyring.py"0.3.0Jenkins2013-06-231-7/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Python-2.6 compatibility for tests/test_keyring.pySascha Peilicke2013-06-171-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TestCase.setUpClass() and unittest.SkipTest are features added in 2.7. Calling super(KeyringTest, cls).setUpClass() could have never worked since tests.utils.TestCase doesn't implement that (class) method. Change-Id: Ifbb0465be24fd13ad68d52c0d7fa4c5090d0f694
* | | | | Implements v3 auth client.lin-hua-cheng2013-06-2022-502/+2383
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for domain scoping. Enhancement on AccessInfo to support reading v2/v3 token information. Enhancement on ServiceCatalog for reading/filtering v2/v3 service catalog information. Change-Id: Ibb678b9933d3673e37d0fba857a152a3c5d2b4f4
* | | | Change memcache config entry name in Keystone to be consistent with Osloxingzhou2013-06-203-15/+16
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, Keystone-Client is using 'memcache_servers' config option to store the memcache server info, while in OSLO project, it is using 'memcached_servers' to config the same option. It is better to change keystone-client's 'memcache_servers' to 'memcached_servers' to keep consistent between these two projects. Change-Id: I93ca0aa368f95a3ccf6de6984262057e61f75ffe Fixes: Bug 1172793
* | | Fix memcache encryption middlewareBryan D. Payne2013-06-195-273/+277
|/ / | | | | | | | | | | | | | | | | | | This fixes lp1175367 and lp1175368 by redesigning the memcache crypt middleware to not do dangerous things. It is forward compatible, but will invalidate any existing ephemeral encrypted or signed memcache entries. Change-Id: Ice8724949a48bfad3b8b7c41b5f50a18a9ad9f42 Signed-off-by: Bryan D. Payne <bdpayne@acm.org>
* | Merge "Use AuthRef for some client fields"Jenkins2013-06-154-24/+29
|\ \
| * | Use AuthRef for some client fieldsJulien Danjou2013-06-114-24/+29
| | | | | | | | | | | | | | | | | | | | | This tackles some TODO items left over. Change-Id: Ib062744acbf56f05d09857d244b78b35c0ef4d39 Signed-off-by: Julien Danjou <julien@danjou.info>
* | | Merge "Provide keystone CLI man page."Jenkins2013-06-143-19/+78
|\ \ \
| * | | Provide keystone CLI man page.Jakub Ruzicka2013-06-133-19/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolves: bug 1185142 Implements blueprint: clients-man-pages Provide basic but hopefully useful man page. shell.rst was merged into and replaced by the man page in HTML docs. Change-Id: I0a90e4638cc7e4ed9c02c5abd7d84a4079e5f50d
* | | | Merge "Cleanup shell's authentication check."Jenkins2013-06-142-68/+56
|\ \ \ \ | |/ / / |/| | |
| * | | Cleanup shell's authentication check.Jamie Lennox2013-06-122-68/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original logic for whether shell had enough information to authenticate a user was confusing and will be very difficult to extend to other forms of authentication. Change-Id: I88763a651e494e60070a30f0824505acb09310cb
* | | | Merge "Fix optional keyring support, add basic keyring tests"Jenkins2013-06-132-16/+138
|\ \ \ \ | |/ / / |/| | |
| * | | Fix optional keyring support, add basic keyring testsRob Crittenden2013-06-102-16/+138
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 06d9437e8388b369546d760607f17cb5022750e9 made using a keyring optional by adding a function to handle the imports. The problem is that import needs to be available at a global level for it to be usable in other parts of the code. The function is replaced by a top-level try/except. Fixing the imports isn't enough to get keyring support working because in get_auth_ref_from_keyring() the wrong token was being used when evaluating token expiration. It was using the token already in the HTTPClient object and not the one returned from the keyring. Some simple tests were added to prevent future regressions. These tests will be skipped if the keyring or pickle packages are not installed. Change-Id: I1fe2c9e5cdf275df2047018368da2e4b3d2d6de2 Fixes: bug #1183072
* | | Merge "Allow keystoneclient to work with older keystone installs"Jenkins2013-06-111-1/+4
|\ \ \ | |/ / |/| |
| * | Allow keystoneclient to work with older keystone installsBrian Lamar2013-03-251-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Older keystone installs may return 501 for GET / instead of 300 like today. We should be able to assume that if 501 is returned the server will support v2.0 only. Fixes bug 1159911 Change-Id: If264840d8678a490264f1bdb62f1b51c362619e1
* | | Merge "Add find() method to CrudManager"Jenkins2013-06-062-0/+50
|\ \ \
| * | | Add find() method to CrudManagerDean Troyer2013-05-302-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a find() methods to CrudManager to maintain compatability with existing CLI lookups using utils.find_resource(). Change-Id: Ia9b38b975bb88fb361f3471b66f98c7e81bbc6de
* | | | Merge "Fix unused imports(flake8 F401, F999)"0.2.5Jenkins2013-06-0314-31/+18
|\ \ \ \
| * | | | Fix unused imports(flake8 F401, F999)Dolph Mathews2013-06-0314-31/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - F401: imported but unused - F999: syntax error in doctest Fixing a couple of the F401's simply required fixing the doctests syntax where the imports were actually in use. Change-Id: If78abbb143daf8d005a71c5ab52836df29c5e0cd
* | | | | Merge "Fix --version to output version"Jenkins2013-06-031-18/+2
|\ \ \ \ \
| * | | | | Fix --version to output versionAndy McCrae2013-06-031-18/+2
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Change-Id: I7d8dc83ac7c2ad7519633d136c1c32ce8537dce8 Fixes: bug 1182675
* | | | | Merge "Fix line continuations (flake8 E125, E126)"Jenkins2013-06-037-31/+25
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Fix line continuations (flake8 E125, E126)Dolph Mathews2013-06-037-31/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - E125: continuation line does not distinguish itself from next logical line - E126: continuation line over-indented for hanging indent Change-Id: I626a6d5d57db927e8b239f90569b5601c772f28b
* | | | Merge "Enumerate ignored flake8 rules"Jenkins2013-05-311-1/+18
|\ \ \ \ | |/ / /
| * | | Enumerate ignored flake8 rulesDolph Mathews2013-05-281-1/+18
| |/ / | | | | | | | | | | | | | | | | | | | | | We were previously ignoring all F* and H* rules; this patch specifically identifies them so that we can eliminate them one by one, without introducing regressions along the way. Change-Id: Iaf9ee17acf44aba1c93c1af50c84bd8216544b89
* | | Merge "Make ManagerWithFind abstract and fix TokenManager"Jenkins2013-05-312-1/+9
|\ \ \
| * | | Make ManagerWithFind abstract and fix TokenManagerAlessio Ababilov2013-05-192-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ManagerWithFind requires list() method in its descendants. Make it abstract and fix its improper descendant TokenManager that do not implement list(). Change-Id: I83ae47d894c02d5cd1eb0da437dd05796d0b0160 Fixes: bug #1180393
* | | | Merge "Missing command descriptions for 'token-get' and 'endpoint-get'"Jenkins2013-05-301-0/+3
|\ \ \ \
| * | | | Missing command descriptions for 'token-get' and 'endpoint-get'xingzhou2013-05-271-0/+3
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using command "keystone help token-get" and "keystone help endpoint-get", the description of these commands are missing. The main reason is that keystoneclient is using the command action method's method doc as the command description. In keystoneclient/v2_0/shell.py, the two commands' action method are 'do_endpoint_get' and 'do_token_get'. These two methods have a decorator of "require_service_catalog" which is a function wrapper, and this decorator has changed the origin __doc__ of the wrapped function by default Modify "require_service_catalog" to change the __doc__ back to the origin function's __doc__ Change-Id: I9977a3d279529b2066667cd2ffe44dd953b4d2fb Fixes: Bug 1182107
* | | | Merge "Check Expiry"0.2.4Jenkins2013-05-2823-136/+199
|\ \ \ \
| * | | | Check ExpiryAdam Young2013-05-2823-136/+199
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly checks the expiry on the tokens, and rejects tokens that have expired had to regenerate the sample data for the tokens as they all had been generated with values that are now expired. bug 1179615 Change-Id: Ie06500d446f55fd0ad67ea540c92d8cfc57483f4
* | | | Merge " Rename requires files to standard names."Jenkins2013-05-284-4/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Rename requires files to standard names.Carlos D. Garza2013-05-244-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename tools/pip-requires to requirements.txt and tools/test-requires to test-requirements.txt. These are standard files, and tools in the general world are growing intelligence about them. Change-Id: If5c7080fea7c5ca5935b3c064e368cb837a9c16b Fixes: bug #1179008
* | | | Merge "Suggestion of a new arguments display in the help, to reflect ↵Jenkins2013-05-251-1/+2
|\ \ \ \ | |/ / / |/| | | | | | | required ones Fix bug 1182130"
| * | | Suggestion of a new arguments display in the help, to reflect required onesChristophe Sauthier2013-05-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fix bug 1182130 Change-Id: I9823d057aff11e7d90c8098ea31cdbf4d709c39f
* | | | Merge "Default signing_dir to secure temp dir (bug 1181157)"Jenkins2013-05-221-3/+5
|\ \ \ \
| * | | | Default signing_dir to secure temp dir (bug 1181157)Dolph Mathews2013-05-221-3/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: I1a29f50b07a60de3d0519bf40074dbea92fa8656
* | | | | Merge "Only add logging handlers if there currently aren't any"Jenkins2013-05-221-1/+1
|\ \ \ \ \
View Lorry Controller Status