summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Updated from global requirements" into stable/kilokilo-eolstable/kiloJenkins2015-04-201-1/+1
|\
| * Updated from global requirementsOpenStack Proposal Bot2015-04-161-1/+1
| | | | | | | | Change-Id: Ia3fcf0a58927ed095fab07058374341379423e65
* | update defaultbranchDoug Hellmann2015-04-181-0/+1
| | | | | | | | Change-Id: I922ac748cb1d4287fff63eca406465e753c2ea68
* | Fixing the broken functional testsJohn Vrbanac2015-04-183-9/+23
|/ | | | | | | | | | | | | Adding creator_id for Secret and Order types Adding sub_status and sub_status_message for Order types This is a result of these attributes being added to the API. This change isn't aimed to support these fields, but rather just accepts the data so that it won't bork the tests. Actual support for using these fields should be addressed in a follow-up patch. Fixes bug 1441848 (cherry picked from commit f0fe464dd3b01db6effa302da710f1024408dbd7) Change-Id: I2340b7dd1dae3806418fa99bdaad73860dda5fbc
* Merge "Fix --decrypt command line option"3.0.3Jenkins2015-03-301-4/+4
|\
| * Fix --decrypt command line optionThomas Herve2015-03-301-4/+4
| | | | | | | | | | | | | | This patch fixes the --decrypt flag when retrieving a secret. Change-Id: Ie36a4522e984447653b54130ba466222566ed5da Closes-Bug: #1434629
* | Merge "Fix order creation on the command line"Jenkins2015-03-302-1/+11
|\ \
| * | Fix order creation on the command lineThomas Herve2015-03-302-1/+11
| |/ | | | | | | | | | | | | | | This patch adds a new --type argument to order creation which allows creating order again. Change-Id: I58429f70753cf87c951756579f8ff2837766720e Closes-Bug: #1434615
* | Don't ignore payload_content_encoding if setDouglas Mendizábal2015-03-272-17/+8
|/ | | | | | | | | Even though setting the payload_content_encoding is deprecated, we should not ignore it if set. Uncommented functional tests that found this bug. Removed a couple of tests because they were incorrect. Change-Id: Idd294909ddd622d3baf2e8df92c94f8f52ac5799 Closes-Bug: #1434652
* Merge "Consolidate Payload Exceptions"Jenkins2015-03-274-15/+10
|\
| * Consolidate Payload ExceptionsDouglas Mendizábal2015-03-264-15/+10
| | | | | | | | | | | | | | The current exceptions are too fine grained. This CR consolidates the two exceptions into a single PayloadException. Change-Id: I22cf7b51adf0866b76e4dcf494df74d449f3b9fe
* | Merge "Container negative tests"Jenkins2015-03-241-0/+126
|\ \
| * | Container negative testsThomas Dinkjian2015-03-231-0/+126
| | | | | | | | | | | | | | | | | | This contains all the negative container functional tests. Change-Id: Id72b9f42251dda19f2499a238db576d37be62a3e
* | | Merge "Second set of negative secrets tests."Jenkins2015-03-241-0/+177
|\ \ \ | |/ / | | / | |/ |/|
| * Second set of negative secrets tests.Thomas Dinkjian2015-03-201-0/+177
| | | | | | | | | | | | | | | | Adds several parameterized negative secret tests. Added small change in secrets to properly error handle empty payloads and payload as None. Change-Id: Ic1b6bde34c750e6e4965b4b61360ed193371d425
* | Merge "Updated from global requirements"Jenkins2015-03-232-7/+7
|\ \ | |/ |/|
| * Updated from global requirementsOpenStack Proposal Bot2015-03-212-7/+7
| | | | | | | | Change-Id: Ib7a32180168f58e0f93f1516b64a65d86bc13af3
* | First set of negative functional test for secretsThomas Dinkjian2015-03-202-2/+93
|/ | | | | | | Contains several negative functional tests for secrets. No parameterized tests are included in this change. Change-Id: I28ea5ff2c75bc790e1c91d85bcac0ca8dda76b08
* Merge "Removing assertItemsEqual workaround, fixed upstream"Jenkins2015-03-191-32/+0
|\
| * Removing assertItemsEqual workaround, fixed upstreamAdam Harwell2015-03-181-32/+0
| | | | | | | | | | | | | | | | Testtools switched to using unittest2 universally, which resolved the inconsistencies with the assertItemsEqual function's availability. This workaround code is no longer necessary. Change-Id: Ic426e9fca7e475b9a42f14fff89eecaafb7937ba
* | Fix smoke test for client with bad data setChellygel2015-03-182-9/+5
| | | | | | | | Change-Id: Ib7771d4fde8bfab17f743e7935e7089a3e00bb93
* | Fixed deprecated type and encoding test and encoding bugChellygel2015-03-184-13/+17
|/ | | | | | Binary payloads were being decoded into unicode improperly. Change-Id: I1aa60c8f2a04e1cc37391d5d3eca98253c3d333a
* Fixes tests on invalid payload secret creation and adds new exceptionChellygel2015-03-173-11/+18
| | | | | | | | Adding a new exception to cover the case of a payload being set to a list or int. Moved the zero case to the no payload tests as well. Functional test now verifies new exception is raised with bad types. Change-Id: Id026fd7a2004c6c30502a30bca96b6116d4bc9cf
* Ensuring secret ref is not none with payloadChellygel2015-03-171-1/+1
| | | | Change-Id: Id74aa4a990601fb1fdf3a3b43c63ffc1e2ca0db9
* Merge "Added new exception, renamed test, and adjusted test"Jenkins2015-03-173-6/+35
|\
| * Added new exception, renamed test, and adjusted testChellygel2015-03-173-6/+35
| | | | | | | | Change-Id: I0cb7699711b77bbd3f84023ac0371dcc4311e586
* | Merge "Fixed max payload size error"Jenkins2015-03-172-6/+4
|\ \ | |/
| * Fixed max payload size errorChellygel2015-03-162-6/+4
| | | | | | | | | | | | | | | | Functional tests were erroring out with the positive case for max payload size. I removed the content type and content encoding to resolve this issue. The test should pass as expected now Change-Id: I4a905a2ac23716a56791889132cc2607ac449440
* | Fix secret-store empty-key filtering bugAdam Harwell2015-03-161-2/+4
|/ | | | | | | | The "secret store" action filters out empty keys too early in the process, which can cause None to be passed as the content-encoding in some cases. Change-Id: I2bee838f9f9e9c4cf51109083f7e4dc8068f6711
* Merge "Enable usage of 'payload' path to fetch decrypted secrets"Jenkins2015-03-153-25/+38
|\
| * Enable usage of 'payload' path to fetch decrypted secretsJuan Antonio Osorio Robles2015-03-153-25/+38
| | | | | | | | | | | | | | | | | | | | | | | | This CR appends 'payload' to the path when sending a request to the server for decrypting a secret. APIImpact Implements: blueprint api-change-get-secrets-decrypted [1] https://blueprints.launchpad.net/barbican/+spec/api-change-get-secrets-decrypted Change-Id: Ibc06a0cd5a39a2beccac347f63f4460b944745e0
* | Merge "Don't use tempest log"Jenkins2015-03-142-3/+2
|\ \ | |/ |/|
| * Don't use tempest logDouglas Mendizábal2015-03-132-3/+2
| | | | | | | | | | | | | | Tempest has been updated to oslo_log so tempest.openstack.common.log is no longer available. Change-Id: I6163d5b2e0690fe6ff056f0bbd294552667ba8a6
* | Merge "Deprecate setting the payload type and encoding"Jenkins2015-03-134-38/+200
|\ \ | |/ |/|
| * Deprecate setting the payload type and encodingDouglas Mendizábal2015-03-114-38/+200
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deprecate manually setting the payload_content_type and payload_content_encoding properties of a secret. With this CR a user of the client only needs to provide the payload, and the client will figure out what the correct payload_content_type and payload_content_encoding values should be. Setting these properties for the user lets us avoid a lot of weird behaviors such as the one described in Bug #1419166, and also lets us avoid errors that happen when a user mismatches the payload and an incorrect content type. In the interest of backwards compatibility, these properties are still usable, but will log deprecation warnings. They should be removed in a future version after current users have had enough time to update their code bases. Change-Id: Ibfe3ad42e11bd83c002d0f1b69fb8a323a7b6f3d Closes-Bug: #1419166
* | Merge "Use functional_test.conf for devstack gate"Jenkins2015-03-133-4/+16
|\ \
| * | Use functional_test.conf for devstack gateDouglas Mendizábal2015-03-113-4/+16
| | | | | | | | | | | | Change-Id: I5f1149ea871e11294b5fa8501001e3113741de6d
* | | Merge "Fix when submitting with empty string, none and zero"Jenkins2015-03-112-1/+42
|\ \ \
| * | | Fix when submitting with empty string, none and zeroThomas Dinkjian2015-03-102-1/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes the way barbican client handles empty, none and zero. The client will now provide an error when trying to store an empty string or none payload. All other invalid payloads such as zero, int and array will return a 400 http code. Also added the negative tests that test this change. Change-Id: Icdef89b9171a6a95e16ab303fc4af118fc618255
* | | | Merge "Fix delete a secret that does not exist"Jenkins2015-03-102-0/+29
|\ \ \ \ | |/ / / |/| | |
| * | | Fix delete a secret that does not existThomas Dinkjian2015-03-092-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes the behavior of deleting a secret that does not exist. The secret uuid is now verified as a valid UUID. If it not a valid uuid it will result in a value error. A valid uuid will be allowed to go through to the server and a 404 will be returned if the secret does not exist. Change-Id: I35e7fa36714604c2beba044d0e8bb492233bb7a4
* | | | Merge "Do not filter empty strings"Jenkins2015-03-104-5/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Do not filter empty stringsJuan Antonio Osorio Robles2015-03-034-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Empty strings shouldn't be filtered from requests, as we have explicitly set some attributes to be optional and actually differentiate between null and empty attributes in the server side. So now, only attributes containing None are filtered and empty strings are actually passed to the server. Change-Id: Ia048d7de6bcbc12317930eeccc009b6b0db10e13 Closes-bug: #1420445
* | | | Merge "Pass correct api object to Container constructor"Jenkins2015-03-091-4/+4
|\ \ \ \
| * | | | Pass correct api object to Container constructorAdam Harwell2015-03-061-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifaf8d6217f12502813ca547edaa0c4ff489d71e1 Closes-bug: #1429286
* | | | | Merge "Refactor test modules"Jenkins2015-03-087-6/+6
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Refactor test modulesDouglas Mendizábal2015-03-067-6/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed test directory to tests to be consistent with other OpenStack client projects. Renamed some modules to match the pattern of test_<name of module under test>.py Change-Id: Ibdf25b4d4c229e417e428420bacb9419f8e4c5fc
* | | | Merge "Moved parameterized test from smoke to functional"Jenkins2015-03-072-24/+24
|\ \ \ \ | |/ / / |/| | |
| * | | Moved parameterized test from smoke to functionalThomas Dinkjian2015-03-062-24/+24
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | There was a parameterized test in our smoke tests section. I have moved the test from smoke to functional. Closes-Bug: #1420868 Change-Id: Idf704925b05a8e8b134a630b73ea849263c48831
* | | Merge "Additional requests-mock testing"Jenkins2015-03-051-90/+52
|\ \ \
View Lorry Controller Status