summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Replace assertTrue(a in b) with assertIn(a, b)Anh Tran2016-10-031-4/+4
| | | | Change-Id: I9726c9c051eea9264200ab27b3e556c68d5c927f
* Merge "Require newer version of oslosphinx"Jenkins2016-09-291-1/+1
|\
| * Require newer version of oslosphinxOndřej Nový2016-09-271-1/+1
| | | | | | | | | | | | | | This newer version contains show_other_versions option, which is used in conf.py Change-Id: Iad82206cbed81d13e80e62b7faaca9dcc736ea15
* | Merge "Installs futures only for python 2.7 and 2.6"Jenkins2016-09-291-1/+1
|\ \
| * | Installs futures only for python 2.7 and 2.6Claudiu Belu2016-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The futures library is native to python 3 and it doesn't have to be installed from pypi. If the futures library is installed, it can cause issues when used. Changes the futures' library requirement to match the one in global requirements. [1] [1] https://github.com/openstack/requirements/blob/master/global-requirements.txt Change-Id: I8f13d63a303b71f7bdd8c3e67c15d0a0df5ea7a9 Closes-Bug: #1628107
* | | Remove redundant space in docstringAnh Tran2016-09-281-4/+4
|/ / | | | | | | | | | | TrivialFix Change-Id: I7012fb7bbbedfba30b8e0450a449787e9076f4ef
* | TrivialFix: Removed redundant 'the'Anh Tran2016-09-272-3/+3
|/ | | | Change-Id: I3b3c0e7e4d5c8a1934378e2083a64bb686754f18
* remove swiftclient/openstack/common/* in the .coveragerczheng yin2016-09-211-1/+0
| | | | | | | | There is no swiftclient/openstack/common/* in python-swiftclient. Therefore, I remove "omit=swiftclient/openstack/common/*" in the .coveragerc. Change-Id: Ibf4e4e499cb5538fcd8b1680285294c8a09ad401
* Merge "Update help text around container ACL syntax"Jenkins2016-09-191-3/+5
|\
| * Update help text around container ACL syntaxMohit Motiani2016-09-141-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch add the information about the syntax of provding read and write access to the users within a project. The current status is: account:* does not work with tempauth account does not work with keystoneauth Furthermore, the concept of "account" is fuzzy. It could be a "project", but even that doesn't distinguish between a project id and a project name. Change-Id: I4462230fe05aa4a742e825f5b6312deb93bc1170 Closes-Bug: #1587677
* | Merge "Make tempurl subcommand insist on whole number seconds"Jenkins2016-09-152-8/+25
|\ \
| * | Make tempurl subcommand insist on whole number secondsAlistair Coles2016-09-142-8/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the tempurl subcommand would dump a traceback due to a TypeError if the seconds option was not an int value. With this patch it will now return the same error message as if the seconds option were negative or not a number. Also changes the error message to state that the seconds option should be a "whole number" rather than a "positive integer", since 0 is a valid value. Change-Id: Ie940d470f2be8006aa8eb7fe242f092457aeae21 Closes-Bug: #1621817
* | | Merge "Fix intermittent test failure"Jenkins2016-09-141-3/+7
|\ \ \
| * | | Fix intermittent test failureTim Burke2016-09-011-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The mock needs to be initialized before calling main, or we get a race to create it between all the uu_threads Change-Id: If7649da13ed9276d7f0e005e999770e09c022a3f
* | | | Merge "Make object option dependent on container in usage strings"Jenkins2016-09-141-4/+4
|\ \ \ \
| * | | | Make object option dependent on container in usage stringsAlistair Coles2016-09-081-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In usage messages, it only makes sense to have an object option if the container option has been specified. Fixes the parentheses to indicate this. Change-Id: I550ba99879ea6ce5489617a94cec36b66be270c8 Related-Change: Ie84a90eb0278dd2cdf5775948572bb140f8d2c4b
* | | | | Merge "Make tempurl command check for valid object path"Jenkins2016-09-144-12/+60
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Make tempurl command check for valid object pathAlistair Coles2016-09-144-12/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the supplied path is not of the form /v1/a/c/o then swift tempurl subcommand will now return an error message. Also removes redundant check for seconds parameter being an int from shell.py because the same check is made when calling utils.generate_temp_url. Drive-by fix for missing param definition for generate_temp_url. Change-Id: I41f4389948b01fadaa5fc4939ea12e0ed2167345 Related-Change: I0fb2ce125fe12d660e4deb778265016bdd5ff31b
* | | | | Fix order of arguments in assertIsJi-Wei2016-09-091-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some tests used incorrect order assertIs(observed, expected). The correct order expected by testtools is assertIs(expected, observed, message='') Assert that expected is observed. Parameters: expected The expected value. observed The observed value. message An optional message describing the error. https://docs.python.org/2/library/unittest.html Change-Id: I5f406336b7804c13ca042dd0c6b30645a711c5f2
* | | | | Merge "Make options arguments truely optional"Jenkins2016-09-082-9/+33
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | Make options arguments truely optionalChristian Schwede2016-09-062-9/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the options help, info and debug must exist in the options dictionary; however it might be that this is not the case if a method is imported externally. This patch fixes this. Also support using a storage URL or path as an argument for tempurl, and adding a test to verify correct output in both cases. Related-Bug: 1607519 Related-Bug: 1607523 Closes-Bug: 1607521 Change-Id: I0fb2ce125fe12d660e4deb778265016bdd5ff31b
* | | | Fixed inconsistent positional arguments namingNandini Tata2016-09-071-18/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When printing the help menu for Swift commands, it is confusing to see both positional arguments and options not distinguished. The positional arguments are supposed to be enclosed in angular braces <>, options in square braces [] and optional positional arguments in [<>]. Change-Id: Ie84a90eb0278dd2cdf5775948572bb140f8d2c4b
* | | | Merge "Change Examples from headings to topics"Jenkins2016-09-051-61/+53
|\ \ \ \ | |/ / / |/| | |
| * | | Change Examples from headings to topicsTim Burke2016-08-261-61/+53
| |/ / | | | | | | | | | | | | | | | | | | | | | Previously, they appeared in the table of contents, which seemed unnecessary. Additionally, de-dent the bullet list for stat since it looked weird. Change-Id: Ief5d480beb4a7daa2fd87c27019601332f087602
* | | authors/changelog updates for 3.1.0 release3.1.0John Dickinson2016-09-014-1/+105
| | | | | | | | | | | | Change-Id: I75ba58d194ea99b17c862cefcd9943e38e3f1ff0
* | | Merge "Accept gzip-encoded API responses"Jenkins2016-09-014-6/+65
|\ \ \
| * | | Accept gzip-encoded API responsesTim Burke2016-08-304-6/+65
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we would accept gzip-encoded responses, but only because we were letting requests decode *all* responses (even object data). This restores the previous capability, but with tighter controls about which requests will accept gzipped responses and where the decoding happens. Change-Id: I4fd8b97207b9ab01b1bcf825cc16efd8ad46344a Related-Bug: 1282861 Related-Bug: 1338464
* | | Merge "Convert numeric and boolean header values to strings"Jenkins2016-08-313-4/+21
|\ \ \
| * | | Convert numeric and boolean header values to stringsTim Burke2016-08-253-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recently, requests got a bit more picky about what types of data it will accept as header values [1]. The reasons for this are generally sound; str()ing arbitrary objects just before pushing them out a socket may not do what the developer wanted/expected. However, there are a few standard types that developers may be sending that we should convert for them as a convenience. Now, we'll convert all int, float, and bool values to strings before sending them on to requests. Change-Id: I6c2f451009cb03cb78812f54e4ed8566076de821 Closes-Bug: 1614932
* | | | Merge "Add swift tempurl and swift auth command docstring"Jenkins2016-08-301-0/+43
|\ \ \ \ | |_|/ / |/| | |
| * | | Add swift tempurl and swift auth command docstringzheng yin2016-08-301-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Swift has commands including 'swift tempurl' and 'swift auth', but it has no 'swift tempurl' and 'swift auth' in doc/source/cli.rst. Therefore, I add them and their examples. Change-Id: I9a935b648556e2718727d25ac553c860ebbadd82
* | | | Merge "client: renew token on 401 even if retries is 0"Jenkins2016-08-262-4/+82
|\ \ \ \
| * | | | client: renew token on 401 even if retries is 0Julien Danjou2016-06-072-4/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gnocchi uses a client with retries=0 to maximize throughtput and not retry N times on e.g. 404 when checking existence of an object. However, this as the side effect of never renewing the token since there' no retry on 401 either. This patches change the behavior so that 401 errors are always retried, whatever the retries value is. Closes-Bug: #1589926 Change-Id: Ie06adf4cf17ea4592b5bbd7bbde9828e5e134e3e
* | | | | Merge "boolean logic cleanup in service.Swift[Copy|Post]Object"Jenkins2016-08-251-5/+4
|\ \ \ \ \
| * | | | | boolean logic cleanup in service.Swift[Copy|Post]ObjectClay Gerrard2016-08-251-5/+4
| | |_|/ / | |/| | | | | | | | | | | | | Change-Id: I07e74536502ec2479b22a825f684703d65924563
* | | | | Merge "Use mock patch to handle get_auth_keystone"Jenkins2016-08-251-133/+144
|\ \ \ \ \
| * | | | | Use mock patch to handle get_auth_keystoneJamie Lennox2016-08-251-133/+144
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting c.get_auth_keystone = fake_get_auth_keystone is setting a new method on the module. This information is not reset between test runs and therefore has the potential to corrupt other tests. Use mock patch so that the mock is reset after the test is complete. Change-Id: Ifb9ba72634cf477c72dda080b5aed8f8e3a7ac89
* | | | | Merge "Fix examples and missing code-block"Jenkins2016-08-252-1/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix examples and missing code-blockJoel Wright2016-08-252-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a missing code-block section in the capabilities section of service-api.rst, and fixes the import of walk in the upload.py examples to support both python2 and python3. Change-Id: I572769f971f84e0029f2948e42c130e73517f434
* | | | | Merge "Strip leading/trailing whitespace from headers"Jenkins2016-08-252-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Strip leading/trailing whitespace from headersTim Burke2016-08-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New versions of requests will raise an InvalidHeader error otherwise. Change-Id: Idf3bcd8ac359bdda9a847bf99a78988943374134 Closes-Bug: #1614280 Closes-Bug: #1613814
* | | | | Merge "Add copy object method"Jenkins2016-08-2411-6/+914
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add copy object methodMarek Kaleta2016-08-2311-6/+914
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement copy object method in swiftclient Connection, Service and CLI. Although COPY functionality can be accomplished with 'X-Copy-From' header in PUT request, using copy is more convenient especially when using copy for updating object metadata non-destructively. Closes-Bug: 1474939 Change-Id: I1338ac411f418f4adb3d06753d044a484a7f32a4
* | | | Move other-requirements.txt to bindep.txtAndreas Jaeger2016-08-121-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default filename for documenting binary dependencies has been changed from "other-requirements.txt" to "bindep.txt" with the release of bindep 2.1.0. While the previous name is still supported, it will be deprecated. Move the file around to follow this change. Note that this change is self-testing, the OpenStack CI infrastructure will use a "bindep.txt" file to setup nodes for testing. For more information about bindep, see also: http://docs.openstack.org/infra/manual/drivers.html#package-requirements http://docs.openstack.org/infra/bindep/ As well as this announcement: http://lists.openstack.org/pipermail/openstack-dev/2016-August/101590.html Change-Id: I384cdb39c1f65218bb5c6f76afc381c1799b623e
* | | | reenable sidebar linksJohn Dickinson2016-08-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | uses new method from https://review.openstack.org/#/c/340509/ Change-Id: I4d19b71b632546fc2e5d5dac2b0d8d43152dabed
* | | | Merge "Fix unicode issues in tempurl command"Jenkins2016-08-072-50/+137
|\ \ \ \
| * | | | Fix unicode issues in tempurl commandTim Burke2016-07-192-50/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we weren't encoding paths and keys as UTF-8, which would trigger a UnicodeEncodeError on py27. Change-Id: I2fad428369406c2ae32343a5e943ffb2cd1ca6ef
* | | | | Merge "Add --json option to `swift capabilities` / `swift info`"Jenkins2016-08-063-20/+55
|\ \ \ \ \
| * | | | | Add --json option to `swift capabilities` / `swift info`Tim Burke2016-08-023-20/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This lets us do things like: $ swift info --json | jq '[.swift.policies[].name]' [ "Standard-Replica", "EC" ] Also, escape more dashes in the man page, so they won't be misinterpreted as hyphens. Change-Id: Ic7690bdbcfc55f55e5dde9bc11bb0644085973ce
* | | | | | Modify assertzheng yin2016-07-261-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For example: self.assertEqual(a,None) is equal to self.assertIsNone(a) Change-Id: I063145d034979cf3d36645a00a30cc27defac7c4