summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Discard null endpoints (bug 1152632)Dolph Mathews2013-03-153-3/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a v2 client passed {..., "adminurl": null, ...} in a endpoint-create request, then the null value was being persisted on an endpoint with a different interface value (i.e. a publicly facing endpoint would have an "adminurl": null value inexplicably attached to it.) This change simply pops null urls from the endpoint and discards them. Change-Id: Idd0964b6ec34fbc8b979253d32f655ea9797f259
* | | | | | | | extracting user and trust ids into normalized fieldsAdam Young2013-03-1514-108/+214
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These fields are used for queries, and may need to be indexed Also moves the delete token for... functions into the base class for controllers. Removed the token API revoke token call as that needed access to other APIs. Logic was moved into the controller. Bug 1152801 Change-Id: I59c360fe5aef905dfa30cb55ee54ff1fbe64dc58
* | | | | | | Merge "xml_body returns backtrace on XMLSyntaxError"Jenkins2013-03-152-1/+26
|\ \ \ \ \ \ \
| * | | | | | | xml_body returns backtrace on XMLSyntaxErrorDavid Höppner2013-03-142-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Protected against XMLSyntaxError that can occur in from_xml. Return a validation error (400) instead of an internal server error (500). Change-Id: Ic5160f4f6c810e96b74dbf9563547ac739a54c5e Fixes: bug #1101043
* | | | | | | | Merge "Fixes bug 1151747: broken XML translation for resource collections"Jenkins2013-03-156-6/+162
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixes bug 1151747: broken XML translation for resource collectionsGuang Yee2013-03-136-6/+162
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Special-case "links" when converting a collection from JSON to XML and vice versa. Change-Id: I7ab1f50c1da3ec389930c1bf45d498551c4cf954
* | | | | | | | Merge "Remove duplicate password/token opts."Jenkins2013-03-152-10/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove duplicate password/token opts.Dan Prince2013-03-142-10/+7
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consolidate the 'auth' method option registration in config.py. This makes it so we don't have to catch Exceptions when the default 'auth' options are registered twice and avoids some log WARNING messages as well. Fixes LP Bug #1154406. Change-Id: I301328ec3ec4823dd7fbec1e639e2841516352e5
* | | | | | | | No parent exception to wrapAdam Young2013-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I60b3555e032a126554a57bf5ef7a2e636cf9f5db
* | | | | | | | Merge "Remove TODO that didn't land in grizzly"Jenkins2013-03-141-1/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove TODO that didn't land in grizzlyDolph Mathews2013-03-041-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was intended to be removed during grizzly by utilizing centralized policy storage on /v3/policies -- but such a feature hasn't been implemented yet beyond the API. Change-Id: Ie696bc671fc1d6fd05cc1dda376d2be945097845
* | | | | | | | | Merge "quiet route logging on skipped tests"Jenkins2013-03-141-0/+3
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | quiet route logging on skipped testsAdam Young2013-03-131-0/+3
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: I0ab9886d9b546a787230300d3dd2f4715241e483
* | | | | | | | Merge "duplicated trust tests"Jenkins2013-03-141-286/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | duplicated trust testsAdam Young2013-03-141-286/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the code in this file duplicates tests in test_v3_auth in addition, these tests are not in keeping with the style of the v3 tests in general Change-Id: Id904b07f54eb0aacfd299595313500ad89306f3a
* | | | | | | | | Merge "Migrate roles from metadata to user_project_metadata"Jenkins2013-03-142-4/+236
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Migrate roles from metadata to user_project_metadataJason Cannavale2013-03-132-4/+236
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | migration 017 did not migrate existing roles from the metadata table that was created in 001. Adding a migration (20) that compares the roles in the metadata table (if any) and joins them to the new user_project_metadata role that matches the user and tenant from the old table. Also adding subsequent tests to check both of the issues above. bug 1131087 Change-Id: I00ea6043d949c9c358827e25f05c63515fe5dea8
* | | | | | | | | | Merge "Added test cases to improve LDAP project testing"Jenkins2013-03-141-1/+48
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Added test cases to improve LDAP project testingBrad Topol2013-03-121-1/+48
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes Bug1154216 Change-Id: I1d29643fc71e901ace20ea11d31c66c2f2349447
* | | | | | | | | Merge "Switch to final 1.1.0 oslo.config release"Jenkins2013-03-131-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | 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
* | | | | | | | Merge "Ensure tokens are revoked for relevant v3 api calls"Jenkins2013-03-132-5/+356
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Ensure tokens are revoked for relevant v3 api callsHenry Nash2013-03-132-5/+356
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A number of the v3 apis were not yet revoking tokens that would be invalidated by their actions, including: - grant/revoke role - delete group - add/remove user to group A seperate bug has been rasied with regard to revoking tokens when a role is deleted, since this needs much more plumbing to implement. Fixes Bug #1093493 Change-Id: Icf0792821829045d5bdecf686ec470ce54f9c9af
* | | | | | | Merge "Filter out legacy_endpoint_id (bug 1152635)"Jenkins2013-03-132-0/+15
|\ \ \ \ \ \ \
| * | | | | | | Filter out legacy_endpoint_id (bug 1152635)Dolph Mathews2013-03-122-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I176c3f4fec0a1fa544efb11cffd4837dedf8cace
* | | | | | | | Merge "Catch and log server exceptions"Jenkins2013-03-131-2/+6
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Catch and log server exceptionsBen Nemec2013-03-121-2/+6
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1133041 Exceptions from the keystone WSGI server can occur and not be logged. This means keystone will appear to silently crash, so this change catches these exceptions and logs them so the user can determine the cause of the crash. Change-Id: Iecc4b8062fa4e7dbe021627613412b5dfc635432
* | | | | | | Merge "Explain LDAP page_size & default value"Jenkins2013-03-131-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Explain LDAP page_size & default valueDolph Mathews2013-03-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If7746bf92c29e824369777764877a414dc7a5d6e
* | | | | | | Merge "Improve tests for api protection and filtering"Jenkins2013-03-124-190/+393
|\ \ \ \ \ \ \
| * | | | | | | Improve tests for api protection and filteringHenry Nash2013-03-124-190/+393
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fills out some more tests for both these areas. To make it easier for any v3 tests to do their own authentication, moved the auth builder utility functions from test_v3_auth into test_v3.RestfulTestCase. Also fixed an issue that meant the api filtering on a boolean would not work. Fixes Bug #1132080 Fixes Bug #1132372 Change-Id: I7bb7b5ba61adfc6a9c496a5547a0ca3fcfbab209
* | | | | | | Merge "add belongs_to check"Jenkins2013-03-122-3/+47
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | add belongs_to checkAdam Young2013-03-112-3/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 1081943 The belongs_to check was lost as part of the v3 API work. It looks like it was broken to begin with. Fixed Change-Id: I4e40758fa9136b76b515100b461a36d6c31b578e
* | | | | | | Merge "remove spurious roles check"Jenkins2013-03-121-2/+0
|\ \ \ \ \ \ \
| * | | | | | | remove spurious roles checkAdam Young2013-03-081-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia4909478703d5fe9fb4fec7377c4030cf67eae7b
* | | | | | | | Merge "cleanup trusts in controllers"Jenkins2013-03-121-2/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | cleanup trusts in controllersAdam Young2013-03-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1eff618d1e6cef2eb10ae7e737b0ca0beaca1d4d
* | | | | | | | Revert "update tests/__init__.py to verify openssl version"Adam Young2013-03-111-41/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 72ec89ba301af203ae956bfc84eca19e4919cf24. Change-Id: I46b40440a355be5b459822e77e8df28394a8cdb3
* | | | | | | | Revert "from tests import"Adam Young2013-03-1119-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d8599dcda06514a9687af3f714e55ff7580af9db. Change-Id: Iddb881070a91b9761a567a7d3b6d906e228af9f6
* | | | | | | | Merge "Fix folsom -> grizzly role table migration issues (bug 1119789)"Jenkins2013-03-112-0/+54
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix folsom -> grizzly role table migration issues (bug 1119789)William Kelly2013-03-082-0/+54
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: Id7e5b3354d9139afa0a69b283924f363847cef56
* | | | | | | | Merge "Run keystone server in debug mode."Jenkins2013-03-111-1/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Run keystone server in debug mode.Nachiappan VR N2013-03-091-1/+4
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | keystone currently not able be to started in debug mode because pydev package in pycharm-debug.egg is removed. Fix is provided with the correct import statement. Fixes Bug #1135306 Change-Id: I5588b768a4807b79ae1dabd7550cbee7d2c7505e
* | | | | | | | Merge "bug 1133526"Jenkins2013-03-112-2/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | bug 1133526Malini Bhandaru2013-03-082-2/+18
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modify "expires" to "expires_at", most of the changes were already done by Guang-yee, added a pki-token-id test Change-Id: Ib3f39620db18aaea6b0cb5d0ae9c290afd870605
* | | | | | | | Merge "Make Keystone return v3 as part of the version api"Jenkins2013-03-114-91/+197
|\ \ \ \ \ \ \ \
| * | | | | | | | Make Keystone return v3 as part of the version apiHenry Nash2013-03-094-91/+197
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The keystone "get version" api currently fails to list v3 as a supported api. It should now do this, along with v2 (which is, of course, still supported) Fixes Bug #1148186 Change-Id: Ie88bf941123702d2f7e2ecf6cecb1fa937ca1e52
* | | | | | | | Merge "Make getting user-domain roles backend independant"Jenkins2013-03-115-35/+128
|\ \ \ \ \ \ \ \
| * | | | | | | | Make getting user-domain roles backend independantHenry Nash2013-03-045-35/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is nothing backend specific in geting the list of roles for a user-domain, so we should move this function into backends core. This also has the affect of now ensuring that the kvs and ldap support will work, provided the specific backend supports roles on users and domains. This is true today for kvs, but support in ldap for domains is gated by other bugs. Fixes bug #1131769 Change-Id: Id99accb33fd7cd8d6c37e64e140552c5bfe68349
* | | | | | | | | Merge "from tests import"Jenkins2013-03-1119-24/+24
|\ \ \ \ \ \ \ \ \