summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Extract test token data from auth_token middleware"0.3.2Jenkins2013-08-222-327/+342
|\
| * Extract test token data from auth_token middlewareJamie Lennox2013-08-192-327/+342
| | | | | | | | | | | | This data can be used elsewhere as well. Change-Id: I38b6c782b6d38e9e7d091f1c045a13ca10dfcc85
* | Merge "Initial Trusts support"Jenkins2013-08-2211-21/+352
|\ \
| * | Initial Trusts supportSteven Hardy2013-08-2011-21/+352
| |/ | | | | | | | | | | | | | | | | Implements client support for the basic trusts API operations, note this does not include support for the roles subpath operations, support for those can be added in a subsequent patch. Change-Id: I0c6ba12bad5cc8f3f10697d2a3dcf4f3be8c7ece blueprint: delegation-impersonation-support
* | Merge "Restore client.py for backward compatibility"Jenkins2013-08-222-0/+31
|\ \ | |/ |/|
| * Restore client.py for backward compatibilityJamie Lennox2013-08-212-0/+31
| | | | | | | | | | | | | | | | | | Simply pull in HTTPClient from its new location. This also restores the tests that were modified back to there original form to make sure nothing has changed from the original. Fixes: bug 1211998 Change-Id: Ia3241a4352eb6b37c6489cd4dd1bc373de107e12
* | Make auth_token middleware fetching respect prefixJamie Lennox2013-08-192-14/+102
|/ | | | | | | | | | In auth_token middleware auth_prefix is only added to requests that go through the _json_request method. This doesn't include the two certificate fetching functions. Manually add the auth_prefix to both those requests. Closes-Bug: #1211615 Change-Id: I25d1b401598c9a443ddef0fc3259ba859aee8c76
* Merge "Fix a typo in fetch_revocation_list"Jenkins2013-08-161-2/+2
|\
| * Fix a typo in fetch_revocation_listMatthieu Huin2013-08-061-2/+2
| | | | | | | | Change-Id: Ida17b6246e6c8dc5ca9c170bd2694e4ff1f24381
* | Fix and enable Gating on H404Dirk Mueller2013-08-1513-145/+81
| | | | | | | | | | | | | | Enable gating on the Hacking H404 check - docstring should start with a summary. Change-Id: I80612a15bd11f689e9e9f4dc2ff812138630ddbd
* | Merge "Adds support for passing extra tenant attributes to keystone"Jenkins2013-08-163-15/+47
|\ \
| * | Adds support for passing extra tenant attributes to keystoneCharles V Bock2013-08-123-15/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch adds simple kwargs parsing to tenant update and create methods allowing users to exercise the extras functionality of keystone. As-per keystone data model docs: http://docs.openstack.org/developer/keystone/architecture.html#data-model Change-Id: I1c375c70a0ab4519626d2238d65fa0695f953dc5 Fixes: bug #1180317
* | | Merge "Don't cache tokens as invalid on network errors"Jenkins2013-08-152-3/+32
|\ \ \
| * | | Don't cache tokens as invalid on network errorsChmouel Boudjnah2013-08-092-3/+32
| | | | | | | | | | | | | | | | | | | | Closes-Bug: 1172802 Change-Id: Ifc04f565b96d58a7a2f477a216b57af7f8de6a8e
* | | | Merge "Fixes files with wrong bitmode"Jenkins2013-08-152-0/+0
|\ \ \ \
| * | | | Fixes files with wrong bitmodelawrancejing2013-08-132-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some modules have bitmode 755. Changed to 644 Change-Id: If8e64c0d27f4d114a4012a4ff34ff08acfec9f06
* | | | | Merge "Refactor verify signing dir logic"Jenkins2013-08-142-16/+46
|\ \ \ \ \
| * | | | | Refactor verify signing dir logicWu Wenxiang2013-08-142-16/+46
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a function AuthProtocol::verify_signing_dir() in keystoneclient/middleware/auth_token.py. It will be called both in init stage and in fetching signing cert scenario. Fixes bug 1201577 Change-Id: Ice0e8a93ba9d85c20de84cf8da3e9b0f2274b740
* | | | | Merge "Add a get_data function to Service Catalog"Jenkins2013-08-141-4/+20
|\ \ \ \ \
| * | | | | Add a get_data function to Service CatalogJamie Lennox2013-08-121-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Service catalog takes as a parameter the entire token. This makes it difficult to extract only the service catalog component without querying the catalog version, which should be unnecessary. Change-Id: I3ad428fcb3279e8aa607f67f58265a085ae63440
* | | | | | Merge "Extract basic request call"Jenkins2013-08-145-70/+205
|\ \ \ \ \ \
| * | | | | | Extract basic request callJamie Lennox2013-08-125-70/+205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a function out of the standard request call that handles common headers like user agent and logging. This makes future changes easier to digest. Change-Id: Ia25f997df64efdce27c8fb815e544922940145c3
* | | | | | | Merge "python3: Add basic compatibility support"Jenkins2013-08-144-5/+13
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | python3: Add basic compatibility supportChuck Short2013-08-044-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use six.iteritems to replace dictionary.iteritems() on python2 or dictionary.items() on python3. Change-Id: I623009200f3a90985a2c0178673df7d54b36a686 Signed-off-by: Chuck Short <chuck.short@canonical.com>
* | | | | | | Merge "Rename client.py to httpclient.py"Jenkins2013-08-138-39/+39
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Rename client.py to httpclient.pyJamie Lennox2013-08-108-39/+39
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The discoverable entry point is to be client.Client however adding this functionality to the current client.py is impossible as we end up with circular dependencies. This patch simply renames the current client.py to httpclient.py to make future patches that will modify client.py more readable. Required for: blueprint api-version-discovery Change-Id: Ibcea03f6e1df0ae05329297166a8b8117fc3ce7b
* | | | | | flake8: enable H201, H202, H802Dolph Mathews2013-08-121-4/+1
| |_|_|/ / |/| | | | | | | | | | | | | | Change-Id: I845720fd642c14fc021bd59809327eee97d43156
* | | | | Merge "Use flake8 in run_tests.sh and updated ignore flake8 rules with tox.ini"Jenkins2013-08-121-19/+17
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use flake8 in run_tests.sh and updated ignore flake8 rules with tox.iniJaime Gil de Sagredo Luna2013-08-021-19/+17
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9ec82e4ddbaa8c9f256ff962c48dfb556948b32d Fixes: bug #1180609
* | | | | Updated from global requirementsMonty Taylor2013-08-094-23/+21
| | | | | | | | | | | | | | | | | | | | Change-Id: If137689e5b9008c51cea16d41e648f0df490a247
* | | | | Merge "Make TestResponse properly inherit Response."Jenkins2013-08-082-28/+11
|\ \ \ \ \
| * | | | | Make TestResponse properly inherit Response.Jamie Lennox2013-08-062-28/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are a number of problems doing things like .json() if you don't inherit the correct parameters. Change-Id: I0dfc8ab6486090fbcd28792c18deae67e4769d53
* | | | | | Merge "Merge from Oslo-Incubator"Jenkins2013-08-084-10/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge from Oslo-IncubatorDirk Mueller2013-08-064-10/+14
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings in the latest Python 3.x related fixes from Oslo. Change-Id: If0207d3b29038483098632586613bba9aeb803f7
* | | | | Fix test_request_no_token_dummy cms dependency.Clark Boylan2013-08-071-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * tests/test_auth_token_middleware.py: test_request_no_token_dummy has a dependency on the keystone.common.cms module importing subprocess prior to running. The cms._ensure_subprocess() function does this. Call this function in the base test class's setUp method to ensure subprocess is imported before symbols from that module are needed. Doing this in the base setUp will ensure that this works for any additional tests with the same dependency. This fix is needed because testr runs tests in non deterministic order which means that each test needs to be able to run on its own (eg in its own process without any other tests running first) and they need to run without interfering any other tests (each test must properly clean up after itself). Prior to this commit test_request_no_token_dummy would fail when executed on its own. Closes-Bug: #1209300 Change-Id: I3cf669b94ed77ad0cd729ead0b4162a3f1b8819f
* | | | | Merge "Pass the default_project_id when managing User."Jenkins2013-08-062-7/+194
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Pass the default_project_id when managing User.Lin Hua Cheng2013-08-022-7/+194
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | User default_project_id for setting the default project of the User. Fixes bug 1205520 Change-Id: I176d88bb6897c36404d8915385cc791adf10c586
* | | | auth_uri (public ep) should not default to auth_* values (admin ep)Dolph Mathews2013-08-051-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1207517 by logging a warning when auth_uri (which should point to the public identity endpoint) falls back on auth_* values (which should point to the admin identity endpoint). Change-Id: I2b051ae10197206f6954672f22e5bff32e3f6c2a
* | | | Adds help in keystone_authtoken config optsThomas Goirand2013-08-051-22/+85
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The keystone_authtoken config options defined in keystoneclient/middleware/auth_token.py didn't have help strings. Without help, we couldn't generate documented config files via introspection. Fixes Bug1159039 Change-Id: I6d805432edf65db8161d6a6f4916185c4df6bb90
* | | Merge "Ec2Signer : Allow signature verification for older boto versions"Jenkins2013-08-022-0/+92
|\ \ \ | |/ / |/| |
| * | Ec2Signer : Allow signature verification for older boto versionsSteven Hardy2013-08-012-0/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the fix for bug #1197553, verification for older clients (which strip the port when formatting the request) fails. This conditionally reverts to the original behavior, by detecting the boto version via the User-Agent header, the default behavior will be the new behavior (which doesn't strip the port), but this will allow a less painful transition for clients/distros to the new boto version. Fixes bug #1205281 Change-Id: I54ac9c5ba91e697004f1346a8f2d685da488992a
* | | Merge "flake8: fix alphabetical imports and enable H306"Jenkins2013-08-0216-20/+22
|\ \ \ | |_|/ |/| |
| * | flake8: fix alphabetical imports and enable H306Dolph Mathews2013-08-0116-20/+22
| |/ | | | | | | Change-Id: I0f4fcc9796e8529e7217dc24abe95660633cad33
* | Merge "Add -u option in run_tests.sh"Jenkins2013-08-021-0/+7
|\ \
| * | Add -u option in run_tests.shWu Wenxiang2013-07-281-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | -u option used for update venv packages. Fixes bug #1205551 Change-Id: I2ef6e11c556bd90154a286eada6d37750caf5e19
* | | Merge "Drop webob from auth_token.py"Jenkins2013-08-012-7/+64
|\ \ \ | |_|/ |/| |
| * | Drop webob from auth_token.pyPete Zaitcev2013-07-262-7/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This came up as a packaging problem in Fedora. Now that Swift does not need python-webob RPM, some sites install a proxy node without. We add the proper webob dependency to the python-keystoneclient. Still, in the face of parallel installs, and we end patching setup.py and diverge from upstream, and we do not like it. It may be better just stick to WSGI protocol by small amount of hand-rolled code and drop WebOb altogether. Note that we keep WebOb in the testing code. The fix is purely about the stuff that runs inside a WSGI server. Therefore, requirements.txt continues having no WebOb (apparently, was forgotten before), but test-requirements.txt keeps WebOb in, and this patch changes nothing. Initial version of this patch produced an inexplicable drop in testing coverage and Chmouel put his foot down on it. We were unable to figure out why the drop happened. Most likely coverage simply lied about the previous percentages and getting rid of import webob permitted it a better analysis. So, we add some unrelated tests to bump coverage percentages up. Of course we add a targeted test for the new code too. For that one to work, we change how set_middleware() treats its fake_http argument. This version also adds comments rather than docstrings, because they need to source as context. Change-Id: Iba33b11e77b9910211983aa725c69d3886e1c7a7
* | | Correct mis-spell in commentsZhang Xin2013-07-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | In tests/v3/utils.py, parameterize() Fixes bug #1206895 Change-Id: I36e3d49209eb6896cb0e053bba9e4c966efea5db
* | | Merge "no logging on cms failure"Jenkins2013-07-312-2/+7
|\ \ \
| * | | no logging on cms failureAdam Young2013-07-262-2/+7
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Don't log in the keystoneclient.common.cms as there are some errors that are expected. Instead, log in the middleware bug 1189539 Change-Id: I1e80e2ab35e073d9b8d25fd16b31c64c34cd001d
View Lorry Controller Status