132 Commits

Author SHA1 Message Date
Jenkins
4efe3bfa7e Merge "Adding segment size as another x-object-manifest component" 2012-12-03 19:41:46 +00:00
Juan J. Martinez
994c691d66 Don't add trailing slash to auth URL.
Adding a trailing slash to the authentication URL may interfere with
auth service implementations not using /FOO/ but /FOO as authentication
URL.

OpenStack Object Storage API 1.0 doesn't specify that the auth URL must
end in a slash and swiftclient.client doesn't force it either.

Change-Id: I4e6b6d758d5ccc884e253880513e3d8763ffc2ff
Fixes: bug #1085827
2012-12-03 10:20:33 +00:00
yuan-zhou
94511a0624 Adding segment size as another x-object-manifest component
Fix bug 1082930

Change-Id: I2cee91a8f74a3f58379b1b4aefae9401ba5b02c1
2012-11-27 15:33:50 +08:00
Nick Craig-Wood
402d87c757 Stop loss of precision when writing 'x-object-meta-mtime'
str(float) isn't a good way of converting a float to a string with all the precision

Eg

    >>> f = os.path.getmtime("z")
    >>> f
    1347717491.343554
    >>> str(f)
    '1347717491.34'
    >>> "%f" % f
    '1347717491.343554'

Change-Id: I6eb02f7f6730eff814c348d1039eae4606642b52
2012-11-18 11:42:18 +00:00
Jenkins
0053b4cf0e Merge "Remove unused json_request." 2012-11-16 23:19:59 +00:00
Jenkins
4cd4093bd6 Merge "Force utf-8 encode of HTTPConnection params" 2012-11-16 23:13:09 +00:00
Chmouel Boudjnah
8e63b53a9b Remove unused json_request.
- This has been long delegated to python-keystoneclient for auth 2.0.

Change-Id: I92b1fc2db68192cfeefd623c59882f65a4e4405c
2012-11-16 14:47:27 +10:00
Jenkins
015dc502a9 Merge "tell nose to explicity test the 'tests' directory" 2012-11-16 01:41:30 +00:00
Jenkins
5427f7f501 Merge "Fixes setup compatibility issue on Windows" 2012-11-15 22:01:46 +00:00
Christian Berendt
1bbee8189c fixed inconsistencies in parameter descriptions
Change-Id: I208c7fe97c8ec543b5e1cd230527d3eceb52570f
2012-11-13 08:41:42 +01:00
John Dickinson
b4272711ed tell nose to explicity test the 'tests' directory
Change-Id: Ib6afa775defc521794da627952edbf69721b0874
2012-11-08 16:55:15 +01:00
Alessandro Pilotti
7253133837 Fixes setup compatibility issue on Windows
Fixes Bug #1052161

"python setup.py build" fails on Windows due to a hardcoded shell path:
/bin/sh

setup.py updated using openstack-common/update.py

Change-Id: I763dd5613d91a2523087173b196500648c477fa6
2012-11-06 20:08:11 +02:00
Tihomir Trifonov
8b42f8a40c Force utf-8 encode of HTTPConnection params
This patch forces swiftclient to encode to utf-8
all url and headers arguments, to avoid the
UnicodeDecodeError which is raised by '\r\n'.join([])
invoked in htplib.py.

Currently the affected projects are Horizon(upload file
with unicode name) and swiftclient CLI('swift post' with
unicode filename as header)

This is also a follow-up of this review:
    https://review.openstack.org/#/c/14216/

I'd still want to hear what the Swift core devs
think of it. Is it better to create a new
AutoEncodingHTTPConnection? Or to handle the connection
creation and make sure there are no unicode and utf-8
string at the same time. If these unicode checks have to
be added in the calling code(Dashboard, CLI), there are
so many places to be added, and also in all new commands
that might be exposed from the API.

Fixes bug 1008940

Change-Id: Ice2aa29024429d3e6f569a88d5cf8b4202537827
2012-11-02 21:33:32 +02:00
Steven Hardy
656b80bef3 swiftclient Connection : default optional arguments to None
Default the authurl/user/key constructor arguments for the
Connection class to None, as these are not required in the
preauthurl/preauthtoken case

Change-Id: I445a5d365212c365ecc691c0a670a226e2b7954a
2012-10-24 22:40:31 +01:00
Doug Hellmann
2be776c2e5 Add OpenStack trove classifier for PyPI
Add trove classifier to have the client listed among the
other OpenStack-related projets on PyPI.

Change-Id: I7b2a9b0e163b79593662bfa799f076f538e3d7ca
Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
2012-10-22 18:52:46 -04:00
Jenkins
a99a37f7f6 Merge " Fix swiftclient 400 error when OS_AUTH_URL is set." 2012-10-02 06:28:09 +00:00
Jenkins
57dfd21e1b Merge "Resolves issue with empty os_options for swift-bench & swift-dispersion-report" 2012-09-21 23:31:07 +00:00
Andy McCrae
fe7c535db3 Resolves issue with empty os_options for swift-bench & swift-dispersion-report
Fixes Bug 1044204

Change-Id: I5f0863776bc4e2953548bc7a3958141378a032a0
2012-09-20 10:05:03 +00:00
Donagh McCabe
3265ad5241 Catch authorization failures
Catch the most common authorization exceptions.

Fixes bug 1048560

Change-Id: I81c562d6093e94e827e6583dcb31db8408980476
2012-09-18 09:25:42 +01:00
Mark Washenberger
9b3c4f847d Do not use dictionaries as default parameters
Change-Id: I1e2b7065a7cfad2511fbcee669f666257ef291d0
2012-09-13 05:36:38 +00:00
Donagh McCabe
68d1550f15 Add region_name support
Add --os-region-name (and OS_REGION_NAME env) to bin/swift
Add region_name to the os_options in Connection class.

bug 1019832

Change-Id: Id8515d97e5351638dce10581c7368f61518e1fa7
2012-09-11 09:26:12 +01:00
David Kranz
4b4fbf0dc0 Allow endpoint type to be specified.
Fixes bug 1037690.

Change-Id: I36b3807b2f3234c778316f1e743d27304755aed8
2012-09-04 12:53:18 -04:00
Jenkins
c97a90c847 Merge "PEP8 issues fixed" 2012-08-29 17:26:41 +00:00
Chmouel Boudjnah
cec3a79b8b PEP8 cleanup.
Some trivial pep8 cleanup.

Change-Id: I0f02c0730bf889b2b89063bef6bcc8b71d36505c
2012-08-29 13:40:32 +02:00
Ray Chen
93b5997843 PEP8 issues fixed
1. Have a better indent in doc/source/conf.py
2. Fix an import issue

Change-Id: I5811c195157706d2a85c0fd47666e67f94b2c558
2012-08-29 13:43:15 +08:00
Darrell Bishop
c94ca0e298 Add ability to download without writing to disk.
This patch adds a "--no-download" option to the "download" command.
When given, all writing to disk is bypassed, while still actually
downloading the data and validating etags.

This can be handy when you're using the swift command-line client to
test out a swift cluster and don't want client-side disk writing to be a
bottle-neck (but you still want to know about any etag validation
failures).

Change-Id: I0a511f473a64820161d1eb529b995900742794f2
2012-08-28 13:41:50 -07:00
lrqrun
3207e36984 Fix PEP8 issues.
Fix some pep8 issues in doc/source/conf.py make the code looks pretty.

Change-Id: Icc5ce260aaae8a2c436f5146840ffde4e6ef2839
2012-08-28 20:00:49 +08:00
Jenkins
58baa42075 Merge "Add nosehtmloutput as a test dependency." 2012-08-28 06:05:23 +00:00
Dean Troyer
55f0886066 Change '_' to '-' in options
This changes every command-line option with a '_' in its name
and changes them to '-'.  The old option names are maintained
for backward compatibility but are no longer in the help text.

BP command-options

Change-Id: I79b3c03f59ce8e253aa0dcbf0c2ed5a56d71cd0c
2012-08-23 14:16:50 -05:00
yuxcer
8e2e97fd75 Fix swiftclient 400 error when OS_AUTH_URL is set.
Description: The swift command tool will set the auth version
        to 2 if OS_AUTH_URL is set even use -V 1 option to set Version
        to 1.So when use nova/glance client and swift client in the
        same shell, and export environment OS_AUTH_URL, it will lead
        swift client to raise 400 error if swift not use keystone
        for auth.
	Fixes bug 1034158

Change-Id: I8003ff2ad4ac25fd710f87c4dab1507f6040ed3d
2012-08-22 18:06:39 +08:00
Jenkins
46aad0e8fb Merge "Ensure Content-Length header when PUT/POST a container" 2012-08-22 00:04:17 +00:00
Clark Boylan
b0eb070655 Add nosehtmloutput as a test dependency.
Adding nosehtmloutput as a test dependency allows nose to output its
results to an html file. This will be used by Jenkins to save logs on
a different server.

Change-Id: I4292ba27db9371d5a8dae4b901a46165b9ee6721
2012-08-21 14:40:00 -07:00
Jenkins
6941260d07 Merge "Shuffle download order (of containers and objects)" 2012-08-17 22:41:58 +00:00
Darrell Bishop
9083beb41f Shuffle download order (of containers and objects)
When downloading the same containers or objects with multiple
invocations of the swift command-line client, you'll get better
throughput and avoid "hot spots" if each client randomizes its download
order.

Note that the marker must be picked *before* shuffling the containers or
objects.

Change-Id: I7240eda57a80e1708c2483827c6329fd57d5fc51
2012-08-16 21:39:00 -07:00
Darrell Bishop
9a3aa066c3 Add timing stats to verbose download output.
When using the swift command-line tool to evaluate a Swift cluster, it
can be very handy to get some insight into the download timing.  This
patch adds timing data to verbose output for the download command.  For
each downloaded file, the printed line will also contain:
 - The time it took to send the request and receive the header
 - The total time the request took (including writing the file out
   locally)
 - The average throughput of the download

Change-Id: Ib4a995623af973bb1eed4fb52c8c0e5da935964d
2012-08-16 21:30:54 -07:00
Sam Morrison
29c3af811c Ensure Content-Length header when PUT/POST a container
Fixes bug #951155

Change-Id: Ib1455ddb142137cc0946d50a66540eae6402f598
2012-08-15 15:02:49 +10:00
gholt
99b8253450 Make python-keystoneclient optional
A lot of us don't use Keystone.

Change-Id: Ifcd5fe609efbe950e935c0e0cfee200687b69eda
2012-08-14 15:07:54 +00:00
Darrell Bishop
c87458e229 Fix container delete throughput and 409 retries.
Fix race condition in _delete_container() where all elements of
object_queue have been removed, but the last one (per thread) may not
have actually been deleted yet when the container deletion thread calls
conn.delete_container(container).  Fixes bug 1032879.

Improves container deletion throughput by immediately deleting
containers with no objects instead of waiting for all pending object
deletes to complete.  Fixes bug 1032878.

Change-Id: I404229a4c608995294e0ada77724ac8afe8d6f3c
2012-08-03 19:34:40 -07:00
Jenkins
1f6096e063 Merge "Use keystoneclient for authentication." 2012-08-02 17:42:40 +00:00
Jenkins
b0aaa3a3c9 Merge "Removes the title "Swift Web" from landing page." 2012-07-16 18:34:49 +00:00
Clark Boylan
7618feaeb1 Consume version info from pkg_resources.
Documenation builds specify a version in doc/source/conf.py that is
used in appropriate places through out the documentation. Previously
this value had not been defined properly and documentation builds
failed. Retrieve the version info using pkg_resources and set it
properly.

Use openstack.common.version to consume the generated version information
for documentation. Additional, add a swiftclient.__version__ member which
will return the version of swiftclient being used.

Change-Id: I14f3abdf00da3f9ea7d0651efe76b08f69ddabae
2012-07-11 12:26:14 -05:00
Chmouel Boudjnah
c8163f4112 Use keystoneclient for authentication.
- This allows us to delegate all 2.0 authentication directly to the
  library without reimplementing ourselves.
- Support reusing a token / storage-url without re-authenticating every
  time via the switch os_storage_url os_auth_token.
- Allow auth via tenant_id instead of just tenant_name via the switch
  os_tenant_id.
- Refactor a bit to make it easier in the future to add new OS features
  (i.e: region).
- Implements blueprint use-keystoneclient-for-swiftclient.
- Fixes bug 1016641.

Change-Id: I532f38a68af884de25326aaac05a2050f5ffa1c7
2012-07-06 18:40:45 +00:00
annegentle
44e62db095 Removes the title "Swift Web" from landing page.
Also want to test the DocImpact flag for notifications.

Change-Id: I4e12d76050720bec5126db3c87391dbbe54773a2
2012-07-05 07:51:24 -04:00
Jenkins
c2a3fc56fc Merge "Now url encodes/decodes x-object-manifest values" 2012-07-04 09:41:04 +00:00
Jenkins
a325aad8a4 Merge "Add post-tag versioning." 2012-07-01 17:57:03 +00:00
gholt
36daad953a Now url encodes/decodes x-object-manifest values
Change-Id: I8ce7fa1cb0aba3aca622c7a793ee5d330fe4e265
2012-06-28 23:43:30 +00:00
Jenkins
47f8786cc9 Merge "Make swift exit on ctrl-c." 2012-06-27 19:52:24 +00:00
Samuel Merritt
f6c7fec991 Configurable concurrency for swift client.
The 'delete', 'download', and 'upload' commands use multiple threads
for concurrency. However, the number of threads was hardcoded at
10. This patch simply makes those configurable.

For example, if I'm downloading a lot of files but I don't want to
saturate the downstream on my Internet connection, I might choose to
use only 1 or 2 threads for object downloads. Conversely, if I'm
uploading a lot of small files across a fast network, I would want
lots of threads to speed things along.

The default number of threads is 10, so the default behavior is
unchanged.

Change-Id: I64c06741b24ca97fef5ded206d7e898bf5cab3b8
2012-06-27 12:31:21 -07:00
Jenkins
0519e58e2c Merge "Allow specify tenant:user in user." 2012-06-27 19:30:48 +00:00
Jenkins
2e05673e5c Merge "Make CLI exit nonzero on error." 2012-06-27 19:30:15 +00:00