summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into merge-branchfeature/keystoneauth_integrationBrant Knudson2015-08-0668-1215/+1329
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: keystoneclient/exceptions.py keystoneclient/fixture/discovery.py keystoneclient/fixture/v2.py keystoneclient/fixture/v3.py keystoneclient/middleware/auth_token.py keystoneclient/middleware/s3_token.py keystoneclient/tests/unit/test_auth_token_middleware.py keystoneclient/tests/unit/test_memcache_crypt.py keystoneclient/tests/unit/test_s3_token_middleware.py requirements.txt test-requirements.txt Change-Id: Ib51acebaac7966bf37c1562fa15b9061df6a7aa5
| * Merge "Use UUID values in v3 test fixtures"Jenkins2015-08-064-136/+125
| |\
| | * Use UUID values in v3 test fixturesJamie Lennox2015-07-254-136/+125
| | | | | | | | | | | | | | | | | | | | | | | | The fixtures will automatically stub UUID values for required token fields, so we can check for those returned values rather than specify fixed string values. Change-Id: I8a6cc675c6c8ee14772a38d8fc38475885ebc605
| * | Deprecate openstack.common.apiclientBrant Knudson2015-08-051-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | Deprecate the apiclient from oslo-incubator so we can get rid of it. bp deprecations Change-Id: I1c761933816da03b6c625f14d0aac43f206e88d7
| * | Move apiclient.base.Resource into keystoneclientBrant Knudson2015-08-052-97/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | keystoneclient is using apiclient.base and in order to properly deprecate and eventually get rid of apiclient we need to move the symbols that keystoneclient uses out of apiclient. This change moves apiclient.base.Resource into keystoneclient.base by merging apiclient.base.Resource into the existing keystoneclient.base.Resource. apiclient.base.Resource is now renaming keystoneclient.base.Resource for backwards-compatibility. Change-Id: Id479711b7c9437aaf171def6976aab8b303ec56d
| * | oslo-incubator apiclient.exceptions to keystoneclient.exceptionsBrant Knudson2015-08-052-452/+495
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Applications are using exceptions out of keystoneclient.openstack.common.apiclient.exceptions so it's part of the public interface. But since it's from oslo-incubator it's not considered stable. Since keystoneclient is all stable this creates bad situation. With this change, all the symbols out of apiclient.exceptions are moved into keystoneclient.exceptions rather than the other way around (keystoneclient.exceptions used to re-export all of apiclient.exceptions). Now we're in control of the apiclient.exceptions and keystoneclient.exceptions that applications are using. Closes-Bug: 1481806 Change-Id: Ib3afa86b9d276f6a45d1ecd6f9157ee02ec8570d
| * | Proper deprecation for HTTPClient session and adapter propertiesBrant Knudson2015-08-042-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HTTPClient's forwarded session and adapter properties weren't properly deprecated since the deprecations was only mentioned in the docstring. Proper deprecation requires use of warnings/ debtcollector and documentation. bp deprecations Change-Id: Iea76d7bbc3bdeb13f7fdb097f13e007b4dd85c8d
| * | Proper deprecation for HTTPClient.request methodsBrant Knudson2015-08-046-42/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HTTPClient.request and related methods weren't properly deprecated since they were only mentioned in the docstrings. Proper deprecation requires use of warnings/debtcollector and documentation. Also, fixed places where the deprecated request method was called. bp deprecations Change-Id: I0a16933252937ca046793bb6eb2e5cc5da03c9ae
| * | Proper deprecation for HTTPClient.tenant_id|nameBrant Knudson2015-08-041-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HTTPClient tenant_id and tenant_name properties weren't properly deprecated since they were only mentioned in the docstring. Proper deprecation requires use of warnings/debtcollector and documentation. bp deprecations Change-Id: I3c2f87df14bc9f8ffd82b99919fd1048123d0669
| * | Proper deprecation for HTTPClient tenant_id, tenant_name parametersBrant Knudson2015-08-049-33/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HTTPClient() tenant_id and tenant_name parameters weren't properly deprecated since they were only mentioned in the docstring. Proper deprecation requires use of warnings/debtcollector and documentation. Also fixed a bunch of places in the tests where tenant_id and tenant_name were still being used despite being deprecated. bp deprecations Change-Id: I9c4f596b8ff10aede6c417886638a942cb18044c
| * | Updated from global requirementsOpenStack Proposal Bot2015-08-041-1/+1
| | | | | | | | | | | | Change-Id: Idb9238ef74d67dc2bccf5ca49ada78507dfdf373
| * | Merge "Fix tests passing user, project, and token"Jenkins2015-08-033-12/+4
| |\ \
| | * | Fix tests passing user, project, and tokenBrant Knudson2015-07-263-12/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests were creating httpclient.HTTPClient() using username, token, and project, but if you pass a token then username and project are going to be ignored since there's no need to auth. Make the tests more understandable by removing the ignored and useless parameters. bp deprecations Change-Id: Ide3f4be4dd00db89f551d014876625cff296f6a7
| * | | Merge "Proper deprecation for httpclient.request()"Jenkins2015-08-032-3/+16
| |\ \ \ | | |/ /
| | * | Proper deprecation for httpclient.request()Brant Knudson2015-07-262-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | httpclient.request() wasn't properly deprecated since it was only mentioned in a comment. Proper deprecation requires use of warnings/debtcollector and documentation. bp deprecations Change-Id: Id35d64a8b2d536c5de90e398b2a7680fa30881d6
| * | | Merge "Proper deprecation for Dicover.raw_version_data unstable parameter"Jenkins2015-08-032-2/+11
| |\ \ \ | | |/ /
| | * | Proper deprecation for Dicover.raw_version_data unstable parameterBrant Knudson2015-07-262-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dicover.raw_version_data()'s unstable parameter wasn't properly deprecated since it was only mentioned in the docstring. Prope deprecation requires use of warnings/debtcollector and documentation. Also, fixed a place where the deprecated function could be used. bp deprecations Change-Id: I42dd7c1831bcfc3c637572eb112353b8760ed8d0
| * | | Clarify setting socket_optionsBrant Knudson2015-08-021-22/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a lot of code that would have no effect if kwargs already had socket_options set. To make the code clearer, only execute the code if it's going to have an effect. Change-Id: Ic42f5a0bac07113aff59d36d19293dc6d65cd58a
| * | | Remove check for requests versionBrant Knudson2015-08-021-23/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | requirements.txt has requests>=2.5.2, so requests version is always going to be >= 2.4.1 and there's no need to check it. Change-Id: I8069cfbd54ce716979bc991d137bd2e71790a1e4
| * | | Updated from global requirementsOpenStack Proposal Bot2015-07-292-2/+2
| | | | | | | | | | | | | | | | Change-Id: I08cdf12dad7fc99cddc55580ea9a99fefd79a399
| * | | Merge "Set reasonable defaults for TCP Keep-Alive"Jenkins2015-07-271-3/+28
| |\ \ \ | | |/ / | |/| |
| | * | Set reasonable defaults for TCP Keep-AliveIan Cordasco2015-07-231-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we simply turned on TCP Keep-Alive which relied on per-distribution, per-operating system defaults for keep-alive options. Here we set reasonable defaults since long running processes can get stuck for hours on end by using system defaults. This also adds comments around the options to explain why they're being set. Closes-bug: 1477275 Related-bug: 1323862 Change-Id: Ibd53ae2d4d2455db0ebc9951e5c764befc57850f
| * | | Proper deprecation for Dicover.available_versions()Brant Knudson2015-07-262-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dicover.available_versions() wasn't properly deprecated since it was only mentioned in the docstring. Proper deprecation requires use of warnings/debtcollector and documentation. bp deprecations Change-Id: Ifbcedec1d464435ebb9bcec779fadac0dfb28909
| * | | Proper deprecation for is_ans1_tokenBrant Knudson2015-07-261-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is_ans1_token wasn't properly deprecated since it used LOG.warn rather than warnings/debtcollector. Proper deprecation requires use of warnings and documentation. bp deprecations Change-Id: I81be2844014745a5951ce91a336e9e9ecf4d5328
| * | | Proper deprecation for client.HTTPClientBrant Knudson2015-07-261-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client.HTTPClient wasn't properly deprecated since all it had was a comment in the code. Proper deprecation requires use of warnings and documentation. bp deprecations Change-Id: I1c50c1441b23a79831e6e1df749084130e4b9af7
| * | | Proper deprecation for Manager.apiBrant Knudson2015-07-262-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | base.Manager's api property wasn't properly deprecated since all it had was documentation. Proper deprecation requires use of warnings and documentation. bp deprecations Change-Id: Ic5e218151e9b3f3b66f78729052680691d5ad582
| * | | Stop using Manager.apiBrant Knudson2015-07-264-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | base.Manager's api is documented as being deprecated, but there was still code using it. Deprecated function must not be used. bp deprecations Change-Id: I58678626b55f3cd11f4fdbcddbe4cc9461692fbf
| * | | Proper deprecation for BaseIdentityPlugin trust_id propertyBrant Knudson2015-07-264-5/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BaseIdentityPlugin's trust_id property wasn't properly deprecated since all it had was a comment in the code. Proper deprecation requires use of warnings and documentation. Where the plugins already provide their own trust_id, the property needs to be un-deprecated. bp deprecations Change-Id: I15d4e019bfc5542990120ba39be65ad83cf040d5
| * | | Proper deprecation for BaseIdentityPlugin username, password, token_id ↵Brant Knudson2015-07-264-10/+173
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | properties BaseIdentityPlugin's username, password, and token_id properties weren't properly deprecated since all they had was a comment in the code. Proper deprecation requires use of warnings and documentation. Where the plugins already provide their own properties, the properties need to be un-deprecated. bp deprecations Change-Id: Ic9fce89b8544d8c01f16e8f9c2f9dd2659d03c18
| * | | Proper deprecations for modulesBrant Knudson2015-07-265-10/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use debtcollector and update docs for deprecating the apiclient, apiclient.exceptions, middleware.s3_token, and v2_0.shell modules. bp deprecations Change-Id: I84e8eac39a209210542f19de08d4c3de15a9dcac
| * | | Merge "Prevent attempts to "filter" list() calls by globally unique IDs"Jenkins2015-07-255-0/+50
| |\ \ \
| | * | | Prevent attempts to "filter" list() calls by globally unique IDsDolph Mathews2015-07-195-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This use case isn't covered by our current APIs: GET /entities?id={entity_id} Because we have a dedicated API for that: GET /entities/{entity_id} But our list() methods generally support **kwargs, which are passed as query parameters to keystone. When an 'id' is passed to keystone as a query parameter, keystone rightly ignores it and returns an unfiltered collection. This change raises a client-side TypeError (as you'd expect when you try to pass a keyword argument that a function isn't expecting), and includes a helpful suggestion to try calling get() instead. Change-Id: I100b69bbf571ad6de49ccc5ad1099c20b877d13d Closes-Bug: 1452298
| * | | | Proper deprecation for AccessInfo management_url propertyBrant Knudson2015-07-243-10/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AccessInfo's management_url parameter wasn't properly deprecated since all it had was a comment in the code. Proper deprecation requires use of warnings and documentation. bp deprecations Change-Id: I0ee07c5adc6a7c91f8b23b291eea76f4ae7b3b89
| * | | | Proper deprecation for AccessInfo auth_url propertyBrant Knudson2015-07-243-10/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly deprecate accessing AccessInfo's auth_url parameter. bp deprecations Change-Id: I3824904f517434b507587cf73d4389b72f73f22b
| * | | | Stop using deprecated AccessInfo.auth_url and management_urlBrant Knudson2015-07-241-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The comments for the auth_url and management_url properties say that they're deprecated and to use the service catalog, but internal code was using the deprecated function. The code needs to be changed to use non-deprecated function. bp deprecations Change-Id: I6ada821fe305650d22e58a55192332f0f4986537
| * | | | Proper deprecation for AccessInfo scoped propertyBrant Knudson2015-07-244-10/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly deprecate constructing AccessInfo's scoped parameter. bp deprecations Change-Id: I8f81c75eb8e758feb9d4c62ce7f041957562e766
| * | | | Proper deprecation for AccessInfo region_name parameterBrant Knudson2015-07-241-2/+14
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly deprecate constructing AccessInfo with region_name parameter. bp deprecations Change-Id: Ic5f48a4f5354beb8be68c2fd788bf0a974501917
| * | | Deprecations fixture support calling deprecated functionBrant Knudson2015-07-242-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes a test is expected to call deprecated function, such as when testing that deprecated function still works. Now the test can tell the Deprecations fixture that it's calling deprecated function. Change-Id: Ic7486b74f681989eb5110dfeaf8dae0e5d7ae50e
| * | | Merge "Unit tests catch deprecated function usage"Jenkins2015-07-237-1/+38
| |\ \ \
| | * | | Unit tests catch deprecated function usageBrant Knudson2015-06-307-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than continue to call deprecated functions without knowing it, have the unit tests fail when deprecated function is used. This will ensure that code isn't added that calls deprecated functions. Change-Id: If9f58e30a08a88778e4ae3fc01399ad90997e812
| * | | | Merge "Add get_token_data to token CRUD"Jenkins2015-07-234-14/+58
| |\ \ \ \
| | * | | | Add get_token_data to token CRUDJamie Lennox2015-07-154-14/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We already have the validate method that returns an AccessInfo object. For auth_token middleware it would be simpler if the client returned simply the token data so it presented the same way as other sources of token data. It would also help with the keystoneauth transition in auth_token as we could bypass the keystoneclient.AccessInfo objects. Closes-Bug: #1475041 Change-Id: Ifbe7a7004937d910739c325cc04ae7264a4498e0
| * | | | | Merge "Remove unused time_patcher"Jenkins2015-07-231-5/+0
| |\ \ \ \ \
| | * | | | | Remove unused time_patcherBoris Bobrov2015-07-231-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no reason to patch time now, tests succeed without it Change-Id: I3cf3017b5f86bae35276037c60cfec8dc3be20ae
| * | | | | | Updated from global requirementsOpenStack Proposal Bot2015-07-231-2/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | Change-Id: I772ee10288955bae1f3f3707eb1b34573df03e60
| * | | | | Make OAuth testcase use actual request headersBoris Bobrov2015-07-221-16/+4
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OAuth test verifies that access_token manager's methods make requests with certain parameters. It is supposed to use values from mocked http handler and compare them with referential values acquired from oauth client. But instead of using values from mocked handler, it used the values from oauth client and compared them with values from the client acquired using attributes, basically testing oauthlib and not access_token manager's methods. Make the test compare correct values and remove check of timestamp, which was useless because it is always mocked in tests and not provided in actual requests. As a consequence, use of get_oauth_params, which changed in oauthlib 1.0 and blocked the gate, was removed. Closes-Bug: 1477177 Closes-Bug: 1477247 Change-Id: I5e049163f84fde5827104fd4a6441222eb08468f
| * | | | Merge "Switch from deprecated oslo_utils.timeutils.strtime"Jenkins2015-07-163-9/+14
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Switch from deprecated oslo_utils.timeutils.strtimeBrant Knudson2015-06-303-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The oslo_utils.timeutils.strtime function is deprecated as of oslo_utils 1.7. DeprecationWarning: Using function/method 'oslo_utils.timeutils.strtime()' is deprecated in version '1.6' and will be removed in a future version: use either datetime.datetime.isoformat() or datetime.datetime.strftime() instead Closes-Bug: 1469867 Change-Id: I97897728703547414a621b6687989cff07e01b3e
| * | | | Merge "Switch from deprecated isotime"Jenkins2015-07-169-19/+56
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| |
| | * | Switch from deprecated isotimeBrant Knudson2015-06-309-19/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | oslo_utils.timeutils.isotime() is deprecated as of 1.6 so we need to stop using it. The deprecation message says to use datetime.datetime.isoformat() instead, but the format of the string generated by isoformat isn't the same as the format of the string generated by isotime. The string is used in tokens and other public APIs and we can't change it without potentially breaking clients. So the workaround is to copy the current implementation from oslo_utils.timeutils.isotime() to keystone.common.utils.isotime(). Change-Id: I34b12b96de3ea21beaf935ed8a9f6bae2fe0d0bc Closes-Bug: 1461251