summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Updated from global requirements and fix env variables passthrought1.3.2OpenStack Proposal Bot2015-06-293-9/+10
| | | | Change-Id: I38c6902ae4c94e2332be300fcfb4d141700170c1
* Fix s3_token middleware parsing insecure option1.3.1Brant Knudson2015-04-202-2/+25
| | | | | | | | | The "insecure" option was being treated as a bool when it was actually provided as a string. The fix is to parse the string to a bool. Closes-Bug: 1411063 Change-Id: Id674f40532215788675c97a8fdfa91d4420347b3
* update defaultbranchDoug Hellmann2015-04-151-0/+2
| | | | Change-Id: I1743fe17301bcbf6a8c9ed8f1f7167c591e23aa5
* Merge "Add a FederatedBase v3 plugin"1.3.0Jenkins2015-03-243-0/+210
|\
| * Add a FederatedBase v3 pluginJamie Lennox2015-03-203-0/+210
| | | | | | | | | | | | | | With the out of tree federation plugins going on extract the basic federation workflow and required information that can be reused. Change-Id: I6fdb3a5c6d9f3e1d6fa3425fd05809155effed1f
* | Merge "Improve feedback message in SSL error"Jenkins2015-03-242-2/+21
|\ \ | |/ |/|
| * Improve feedback message in SSL errorRodrigo Duarte Sousa2015-03-202-2/+21
| | | | | | | | | | | | | | | | Adds the error message to give a hint to the user about what happened. Change-Id: I9ca56de8592e65194062038c81b468be72ffb2d9 Closes-Bug: 1297280
* | Merge "Rename requests mock object in testing"Jenkins2015-03-2021-230/+247
|\ \
| * | Rename requests mock object in testingJamie Lennox2015-03-1821-230/+247
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It has been mentioned a number of times that the self.requests naming for the requests_mock object is confusing between whether you are actually sending a request or are mocking a request. Rename all entries of the requests object to requests_mock. This cleans up a couple of entries where the older register_uri format was being used in favour of using the HTTP method as the requests_mock method. Change-Id: I315085b4088130b510f9dbd696011d983598372c
* | | Merge "Deprecate keystone CLI"Jenkins2015-03-201-7/+12
|\ \ \
| * | | Deprecate keystone CLIBrant Knudson2015-03-181-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The keystone CLI is now deprecated. Every time you run it it's going to print out an annoying message saying how deprecated it is. bp deprecate-cli Change-Id: Ife7ad2025f515dc716efe2b2dd275663c21402da
* | | | Merge "Add OS-SIMPLE-CERT support for v3."Jenkins2015-03-193-0/+89
|\ \ \ \ | |/ / / |/| | |
| * | | Add OS-SIMPLE-CERT support for v3.Brant Knudson2015-03-053-0/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was no API support for the OS-SIMPLE-CERT v3 extension. bp auth-token-use-client Change-Id: Ic3d36018fc2e5a5a0da8d37a7fa58b77b8fa8e15
* | | | Merge "Allow passing logger object to request"Jenkins2015-03-183-21/+93
|\ \ \ \
| * | | | Allow passing logger object to requestJamie Lennox2015-03-163-21/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It can become difficult to trace the client that created HTTP requests as the logging all goes through the keystoneclient.session logger. Allow passing the logger through the request function and make it able to be set via the adapter so it can be set once per client instantiation. Change-Id: Id45c315bee9a56f1c241210d667470751bf689d5 Closes-Bug: #1421868
* | | | | Clean arguments in test_federation.*.test_create()Marek Denis2015-03-181-16/+6
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | This applies to test_federation.IdentityProviderTests.test_create() and test_federation.MappingTests.test_create() Change-Id: Ie88c959626520fcec4ee64ffc73a8fc845c5a6d3
* | | | Merge "Implements subtree_as_ids and parents_as_ids"Jenkins2015-03-184-6/+140
|\ \ \ \ | |_|_|/ |/| | |
| * | | Implements subtree_as_ids and parents_as_idsRodrigo Duarte Sousa2015-03-134-6/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch implements the new ways to get the project's hierarchy: 'subtree_as_ids': If True, returns projects IDs down the hierarchy as a structured dictionay. 'parents_as_ids': If True, returns projects IDs up the hierarchy as a structured dictionay. Change-Id: Ia3afe994893dfca059cb8361f7ab1c14e28e1ad5 Implements: blueprint hierarchical-multitenancy-improvements
* | | | Extract BaseAuth out of Auth PluginJamie Lennox2015-03-172-25/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The basic Auth plugin for v3 tokens makes the assumption that you need to pass in some AuthMethod objects. This works well for most auth types where you want the plugin to construct the auth request for you. In the case of federation though we want to be able to have a rescoping plugin that will return an auth_ref and not take any auth_methods as arguments. Extract the most basic part of the Auth plugin into BaseAuth class that Auth and federation plugins can both inherit from. Change-Id: Ia8c8c614b8eb51170346ff5b1e20a1e7ebbb47de
* | | | Split v3 authentication file into moduleJamie Lennox2015-03-177-117/+197
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The V3 authentication plugins file contained the existing plugins as well as the base class. As we look to add new plugins it is simpler if we break this file up. Change-Id: I42b222a2012ea10491450d6b91c2008178dc7671
* | | | Merge "Federation Service Providers CRUD operations"Jenkins2015-03-163-0/+176
|\ \ \ \
| * | | | Federation Service Providers CRUD operationsSteve Martinelli2015-03-163-0/+176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement CRUD operations for Service Providers used in K2K. Implements: bp k2k-service-providers Change-Id: I514c64d2a412d12cff922a02c575f1764a1a23ae
* | | | | Crosslink to other sites that are owned by KeystoneDave Chen2015-03-141-0/+9
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add links to identity service and keystone middleware to the landing page. This indicates to the user that the three projects are related. Change-Id: I37bb4cd866524bad69f90c53e6a58d58202fc263 Co-Authored-By: Steve Martinelli <stevemar@ca.ibm.com> Partial-Bug: #1428321
* | | | Merge "Fix time issue in AccessInfo test"Jenkins2015-03-101-1/+1
|\ \ \ \
| * | | | Fix time issue in AccessInfo testJamie Lennox2015-03-111-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've only seen this happen once, however by making the token expiry 5 minutes in the future, then checking that it wont have expired in 300 seconds means that if the test happens all on the same second boundary then the test will fail. Just increase the time we're checking for by a second to ensure it doesn't happen. Change-Id: Iadeadfbacaf6f1b939c237919b52445c60c9bdd0
* | | | Merge "Creating parameter to list inherited role assignments"Jenkins2015-03-102-1/+22
|\ \ \ \
| * | | | Creating parameter to list inherited role assignmentshenriquetruta2015-02-232-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds the 'os_inherit_extension_inherited_to' parameter when calling the list role assignment method. It adds the following query to the URL: http://host:35357/v3/role_assignments?scope.OS-INHERIT:inherited_to=projects Co-Authored-By: Raildo Mascena <raildo@lsd.ufcg.edu.br> Change-Id: I9bfeecf4ae9da6a0d232f0cff80af64a16ec0829 Closes-bug: 1367868
* | | | | Merge "token signing support alternative message digest"Jenkins2015-03-101-9/+16
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | token signing support alternative message digestBrant Knudson2015-01-051-9/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The functions for creating signed tokens in common.cms always used sha256 for the message digest. This might be inadequate in the future so the digest algorithm shouldn't be hard-coded. A parameter is added to allow choosing a different digest algorithm. SecurityImpact Change-Id: Ie19d093d0494443ce4cd880ae1f92dffd5c361ef Related-Bug: #1362343
* | | | | Updated from global requirementsOpenStack Proposal Bot2015-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I750e817d2ff4e464f36584e5fd298f8037bd84db
* | | | | Merge "Import functional CLI tests from tempest"Jenkins2015-03-043-57/+143
|\ \ \ \ \
| * | | | | Import functional CLI tests from tempestJamie Lennox2015-02-263-57/+143
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are mostly unmodified other than: - fixing up the imports to work in the keystoneclient directories. - Setting the timeout value to 15 (the tempest default) as we don't have a CONF file to make it configurable. Take from tempest Commit: d3a8c7778217cceb84d995f1509e68bb8d7a403f Change-Id: Id2a4300b7c0a53b2da2f62c07a0ffb71798908b6 Implements: bp functional-testing
* | | | | Allow handling multiple service_typesJamie Lennox2015-02-263-2/+52
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the same service_type was mentioned in the catalog more than once then only the last entry would be parsed and any possible other matches would be lost. This was something that novaclient used to do, and as we are pushing sessions as the way that clients should all work we need to maintain that compatibility. Change-Id: I6964515ed1975bce1998897abfc02a1ec36e2584 Closes-Bug: #1425766
* | | | Merge "Make post_test_hook.sh executable"1.2.0Jenkins2015-02-231-0/+0
|\ \ \ \
| * | | | Make post_test_hook.sh executableJamie Lennox2015-02-201-0/+0
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Functional test job fails with permission denied trying to execute the post_test_hook. Set permissions +x. Change-Id: I9ef052daf73761ea1e4128fc1738278fc8fa2483
* | | | Merge "Add default body for non-abstract empty methods"Jenkins2015-02-231-0/+2
|\ \ \ \
| * | | | Add default body for non-abstract empty methodslin-hua-cheng2015-02-141-0/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Some non-abstract methods only have docstring with no content, this just add a default content to those function. Change-Id: Idcf5b9f6ed766d3bc1541e158bdd8e58b06223e2
* | | | Merge "Using correct keyword for region in v3"Jenkins2015-02-234-3/+37
|\ \ \ \
| * | | | Using correct keyword for region in v3Sergey Kraynev2015-02-124-3/+37
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keystone v3 and v2 have different keywords in endpoint dictionary. This patch adds ability for keystone client for correct work with old and new API. Change-Id: I886b4c7ac3cbe08ac1b88f490e9ca92a90256961 Closes-Bug: #1364463
* | | | Updated from global requirementsOpenStack Proposal Bot2015-02-201-1/+1
| |/ / |/| | | | | | | | Change-Id: If749314fbad1c0e1c55614fed10e7211c62559af
* | | Merge "Make remove_service_catalog private"Jenkins2015-02-131-2/+2
|\ \ \
| * | | Make remove_service_catalog privateJamie Lennox2015-02-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a utility function that is used for reducing the amount of data that is logged. It shouldn't be a public function. I think there is very little risk from this in terms of compatibility as it was only added recently. Change-Id: I003e9f11be478b1282ea9cf179f2dd13e1672a80
* | | | Merge "Create functional test base"Jenkins2015-02-138-2/+113
|\ \ \ \
| * | | | Create functional test baseJamie Lennox2015-02-138-2/+113
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Setup test runners to run unit tests by default and add a stub functional test that we can get gating. Change-Id: I6627925ab63340c880adc7c938a0b74faff47bc7 Implements: bp functional-testing
* | | | Ignore all failures removing catalog when logging tokenBrant Knudson2015-02-121-8/+13
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Operations could fail if the response was logged and had a 'token' field that's not a dict. The fix is to ignore all errors when trying to remove the service catalog from the response. Also, enhanced the service catalog removal code to support V2 tokens. Closes-Bug: 1420080 Change-Id: I35b971415744825e8e5f00f30dcf193d04ee699a
* | | Merge "Move tests to the unit subdirectory"Jenkins2015-02-1281-84/+84
|\ \ \
| * | | Move tests to the unit subdirectoryJamie Lennox2015-02-1181-84/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move all the existing tests to the unit/ subdirectory. This gives us some room to add a functional/ directory later with other tests. Change-Id: I0fb8d5b628eb8ee1f35f05f42d0c0ac9f285e8c3 Implements: functional-testing
* | | | Merge "Fix a comment error in cms.py"Jenkins2015-02-121-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix a comment error in cms.pyzhiyuan_cai2015-01-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The comment of function is_asn1_token says "Max length of the content using 2 octets is 7FFF or 32767", which should be 3FFF or 16383. Using Base64 string "MII" as the pki asn1 prefix, whose binary form is 0x3082+0b00, the two octets for content length will start with 0b00, so the max length is 0b0011+0xFFF(0x3FFF). Change-Id: I6c3cedc0243a60328e0e7bd45957616ad272f524
* | | | Merge "Reference identity plugins from __init__.py"Jenkins2015-02-105-18/+54
|\ \ \ \ | |_|/ / |/| | |
View Lorry Controller Status