755 Commits

Author SHA1 Message Date
Claudiu Belu
b3921b26e8 Installs futures only for python 2.7 and 2.6
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
2016-09-27 16:28:11 +00:00
Anh Tran
ab7a8b2453 TrivialFix: Removed redundant 'the'
Change-Id: I3b3c0e7e4d5c8a1934378e2083a64bb686754f18
2016-09-27 16:10:14 +07:00
zheng yin
a9f21662df remove swiftclient/openstack/common/* in the .coveragerc
There is no swiftclient/openstack/common/* in python-swiftclient.
Therefore, I remove "omit=swiftclient/openstack/common/*"
in the .coveragerc.

Change-Id: Ibf4e4e499cb5538fcd8b1680285294c8a09ad401
2016-09-21 15:48:35 +08:00
Jenkins
27f9178ec8 Merge "Update help text around container ACL syntax" 2016-09-19 21:24:50 +00:00
Jenkins
0ec6b7b162 Merge "Make tempurl subcommand insist on whole number seconds" 2016-09-15 02:34:01 +00:00
Mohit Motiani
371f0e3482 Update help text around container ACL syntax
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
2016-09-14 17:13:12 -07:00
Jenkins
714bf0cd4b Merge "Fix intermittent test failure" 2016-09-14 20:46:57 +00:00
Jenkins
b679959d35 Merge "Make object option dependent on container in usage strings" 2016-09-14 20:46:52 +00:00
Jenkins
cacb3a3a15 Merge "Make tempurl command check for valid object path" 2016-09-14 20:45:43 +00:00
Alistair Coles
e41158d79e Make tempurl subcommand insist on whole number seconds
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
2016-09-14 18:17:40 +01:00
Alistair Coles
4c955751d3 Make tempurl command check for valid object path
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
2016-09-14 16:24:22 +01:00
Ji-Wei
5eb0f3debc Fix order of arguments in assertIs
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
2016-09-09 17:30:46 +08:00
Jenkins
2737fae96e Merge "Make options arguments truely optional" 2016-09-08 14:33:05 +00:00
Alistair Coles
cb0cdca7aa Make object option dependent on container in usage strings
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
2016-09-08 11:09:25 +01:00
Nandini Tata
aa88677018 Fixed inconsistent positional arguments naming
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
2016-09-07 21:09:41 +00:00
Christian Schwede
89ff29e788 Make options arguments truely optional
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
2016-09-06 07:38:08 +00:00
Jenkins
0feb83a00c Merge "Change Examples from headings to topics" 2016-09-05 18:55:01 +00:00
Tim Burke
209677e6a8 Fix intermittent test failure
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
2016-09-01 11:18:16 -07:00
John Dickinson
cbd71a8b5a authors/changelog updates for 3.1.0 release
Change-Id: I75ba58d194ea99b17c862cefcd9943e38e3f1ff0
2016-09-01 08:53:24 -07:00
Jenkins
92544c58c5 Merge "Accept gzip-encoded API responses" 2016-09-01 03:18:18 +00:00
Jenkins
98085c961f Merge "Convert numeric and boolean header values to strings" 2016-08-31 00:58:02 +00:00
Jenkins
39b9db35a0 Merge "Add swift tempurl and swift auth command docstring" 2016-08-30 23:21:40 +00:00
Tim Burke
f728027bed Accept gzip-encoded API responses
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
2016-08-30 15:38:55 -07:00
zheng yin
8753c4dea3 Add swift tempurl and swift auth command docstring
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
2016-08-30 20:57:35 +00:00
Tim Burke
7cd7df410a Change Examples from headings to topics
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
2016-08-26 13:50:31 -07:00
Jenkins
20e0c515bf Merge "client: renew token on 401 even if retries is 0" 2016-08-26 17:37:41 +00:00
Jenkins
19cd127294 Merge "boolean logic cleanup in service.Swift[Copy|Post]Object" 2016-08-25 22:47:41 +00:00
Jenkins
9cdeedab7d Merge "Use mock patch to handle get_auth_keystone" 2016-08-25 22:26:54 +00:00
Jenkins
a2371cc6d8 Merge "Fix examples and missing code-block" 2016-08-25 20:29:54 +00:00
Clay Gerrard
96f0031e64 boolean logic cleanup in service.Swift[Copy|Post]Object
Change-Id: I07e74536502ec2479b22a825f684703d65924563
2016-08-25 13:15:44 -07:00
Tim Burke
ab60e08e2e Convert numeric and boolean header values to strings
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
2016-08-25 11:32:08 -07:00
Joel Wright
daed43a44a Fix examples and missing code-block
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
2016-08-25 11:27:49 +00:00
Jamie Lennox
fd675b2c5a Use mock patch to handle get_auth_keystone
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
2016-08-25 17:18:20 +10:00
Jenkins
5acefd27e4 Merge "Strip leading/trailing whitespace from headers" 2016-08-25 04:24:16 +00:00
Jenkins
b57044a853 Merge "Add copy object method" 2016-08-24 23:59:34 +00:00
Marek Kaleta
4a2465fb12 Add copy object method
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
2016-08-23 14:37:11 -07:00
Tim Burke
8fbe118cea Strip leading/trailing whitespace from headers
New versions of requests will raise an InvalidHeader error otherwise.

Change-Id: Idf3bcd8ac359bdda9a847bf99a78988943374134
Closes-Bug: #1614280
Closes-Bug: #1613814
2016-08-19 19:53:11 +00:00
Andreas Jaeger
b1539d9c0f Move other-requirements.txt to bindep.txt
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
2016-08-12 21:14:25 +02:00
John Dickinson
ed4ee79273 reenable sidebar links
uses new method from https://review.openstack.org/#/c/340509/

Change-Id: I4d19b71b632546fc2e5d5dac2b0d8d43152dabed
2016-08-11 15:15:06 -07:00
Jenkins
2766744ba1 Merge "Fix unicode issues in tempurl command" 2016-08-07 23:43:13 +00:00
Jenkins
92178ac17c Merge "Add --json option to swift capabilities / swift info" 2016-08-06 00:10:32 +00:00
Tim Burke
335570e511 Add --json option to swift capabilities / swift info
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
2016-08-02 16:18:44 -07:00
zheng yin
d460db84ed Modify assert
For example: self.assertEqual(a,None) is equal to self.assertIsNone(a)

Change-Id: I063145d034979cf3d36645a00a30cc27defac7c4
2016-07-26 22:23:43 +08:00
Tim Burke
dca4ea5fd6 Fix unicode issues in tempurl command
Previously, we weren't encoding paths and keys as UTF-8, which would
trigger a UnicodeEncodeError on py27.

Change-Id: I2fad428369406c2ae32343a5e943ffb2cd1ca6ef
2016-07-19 12:52:51 -07:00
Jenkins
20ec344699 Merge "Add other-requirements.txt" 2016-07-13 17:44:45 +00:00
Shashirekha Gundur
5be9b7e310 fixing nit picks in python-swiftclient doc
Change-Id: Ifde19be175ea828a3137951a0382492434727b5b
2016-07-07 22:15:45 +00:00
Jenkins
0746b9b166 Merge "Add python version constraint python>=2.7" 2016-07-07 17:12:59 +00:00
Tim Burke
b9403105af Add other-requirements.txt
Change-Id: I6f273d41fc32bcb86f1b272d0a9000dbdaf5ce66
2016-07-05 21:59:19 -07:00
Cheng Li
13494098e2 Add python version constraint python>=2.7
The 'swift' command from v3.0.0 does not work in Python 2.6,
bacause some code is incompatible with Python 2.6
This patch is to add a constraint of python version

Change-Id: I5197cba0c2cd3135d08498df827a52f8bba98d4d
Closes-bug: #1590334
2016-07-06 02:16:52 +00:00
yuyafei
f4f2e6c261 Add __ne__ built-in function
In Python 3 __ne__ by default delegates to __eq__ and inverts the
result, but in Python 2 they urge you to define __ne__ when you
define __eq__ for it to work properly [1].There are no implied
relationships among the comparison operators. The truth of x==y
does not imply that x!=y is false. Accordingly, when defining
__eq__(), one should also define __ne__() so that the operators
will behave as expected.
[1]https://docs.python.org/2/reference/datamodel.html#object.__ne__

Change-Id: I5485022f010cdcb88c0d4ebe5c44a39a1bf242b0
2016-07-05 14:58:42 +08:00