Commit Graph

470 Commits

Author SHA1 Message Date
Flavio Percoco 7b19682984 Add license to setup.cfg
Glance client's setup.cfg was missing the license attribute. This commit
adds it to make it consistent with other clients and server libraries.
The value of the license attribute reflects the license in the LICENSE
file.

Change-Id: Ia2e8c3be4fe7eaf0db5eb397646068c83076c2ff
2014-06-30 08:51:11 +02:00
Stuart McLaren 6626f38cda Fix CA certificate handling
If --os-cacert was passed to the cli the following error was
triggered: "cafile must be None or a byte string". This is
because 'load_verify_locations' requires a byte string to
be passed in.

We fix this by explicitly converting the argument to a byte
string.

We do this in 'VerifiedHTTPSConnection' rather than sooner, eg
during arg handling, as it will no longer be required should we
move to a different http library (eg requests).

Fixes bug 1301849.

Change-Id: I9014f5d040cae9f0b6f03d8f13de8419597560cb
2014-06-25 13:45:46 +00:00
Jenkins dbefc1a3b1 Merge "Fix help text in image-create" 2014-06-10 19:46:58 +00:00
Jenkins c4e3edcdd5 Merge "Python 3: use next(foo) instead of foo.next()" 2014-06-09 04:24:58 +00:00
Jenkins 08aaa468d1 Merge "Remove auth token from http logging" 2014-06-04 18:36:51 +00:00
Juan Manuel Olle 083986ad7e Fix help text in image-create
Image-create help text makes reference of a non existing
parameter --copy_from

Change-Id: I26d584c350734bb26a6cf965a2198f0782dd0a9f
2014-06-03 17:15:01 -03:00
Cyril Roelandt 7f3153c5ea Python 3: use next(foo) instead of foo.next()
This is compatible with both versions of Python.

Change-Id: I50f9b2fa0c2333010c10eb4db34d972aa379f0e3
2014-06-02 00:57:54 +02:00
Jenkins 803eed6083 Merge "Finalize Python3 support" 2014-05-28 16:57:34 +00:00
Tom Leaman 6149e1db31 Remove auth token from http logging
This redacts the X-Auth-Token header value from the logs by replacing
it with '***'.

Change-Id: I6b80cc94d42a44f9db801de78fa23218e6eca0ee
2014-05-27 15:09:06 +00:00
Jenkins 8f89a14c9f Merge "fixed typos found by RETF rules" 2014-05-22 09:05:15 +00:00
Jenkins e9e933145e Merge "Return request ID to callers" 2014-05-20 21:42:11 +00:00
Jenkins d84311f1f1 Merge "Remove py3k module" 2014-05-20 15:10:59 +00:00
Frederic Lepied 628c541a69 Finalize Python3 support
Set the environment variable PYTHONHASHSEED to 0 to have
predictive tests under Python 3.

Change-Id: Ia15a9383e0f20bd0e4572e9f9b9772f1704dff86
2014-05-20 16:42:10 +02:00
Christian Berendt afcf3a5611 fixed typos found by RETF rules
rules are avaialble at https://en.wikipedia.org/wiki/Wikipedia:AutoWikiBrowser/Typos

Change-Id: I70245e5ddf342762eb76d8e2e74b6363767726ef
2014-05-05 10:55:02 +02:00
OpenStack Proposal Bot b68d13bf83 Updated from global requirements
Change-Id: Ied7b0c3e2b0fc13abb04c859ec6887d7a8533c15
2014-04-30 02:46:18 +00:00
Dirk Mueller 7bdf2526b7 Remove py3k module
This module is obsolete and has been dropped from oslo-incubator.
Use six instead (which is already done here).

Change-Id: I8e0b49cdfbddcf2d44a601ad06be2e75897905fc
2014-04-28 18:23:46 +02:00
Chris Buccella f0635ecf39 Return request ID to callers
Currently, calls (create, get, etc.) return only the Image to a
caller. In order to log a mapping the request IDs of both glanceclient
and the caller, the x-openstack-request-id header value is needed on
the server side. This change allows that value to be bubbled up and
returned to the caller so that the appropriate logging can occur.
The return_req_id parameter can be set by services that are logging
request IDs. Glance's request ID will then be returned via the
return_req_id parameter.

This is a prerequisite for Log Request ID Mappings nova-spec to
be completed; Change Ib9b820a0feeb0c0e828ed3e4fab8261f8761ba9a

Change I43be05c351f901cee5509c76cff6d69f060c0b3f is an example of
a caller using this.

Implements: blueprint return-req-id
Change-Id: Ia82aa14db5f0e453010514fffb9a25d7b0fc2fd1
2014-04-25 10:26:40 -04:00
Jenkins f2e0610628 Merge "Fix the parameter order of assertEqual in glanceclient v2 test" 2014-04-23 16:05:58 +00:00
Jenkins ae2b5d046a Merge "Fix the parameter order of assertEqual in glanceclient test" 2014-04-21 09:12:09 +00:00
Jenkins 59b04bde11 Merge "Fix for invalid literal ValueError parsing ipv6 url(s)" 2014-04-17 02:40:29 +00:00
Jenkins a70f9c57a6 Merge "Adding network_utils module from oslo-incubator" 2014-04-17 02:40:27 +00:00
Jenkins 306c5d20dc Merge "Sync with oslo-incubator" 2014-04-17 02:40:25 +00:00
Davanum Srinivas 078819cf9e Fix for invalid literal ValueError parsing ipv6 url(s)
Switch to using network_utils for splitting the URL. The code
in oslo-incubator supports ipv6 urls

Change-Id: I76be6173b97eb000319d30b4e9232a5a7c4a5aba
Closes-Bug: #1298137
2014-04-02 21:38:20 -04:00
Davanum Srinivas 58ee451286 Adding network_utils module from oslo-incubator
Needed for fixing bug 1298137

Change-Id: I6803f1af8b0ff036bed634c8aa1cffc52bc508e0
2014-04-02 21:36:10 -04:00
Davanum Srinivas ff0c87eeca Sync with oslo-incubator
Head of oslo-incubator is commit id:
2fd457bf2ccbeb2b84ffb204778b6417cd5405ba

includes a fix for gettextutil.Message handling of deep copy
failures and adding a license header

Change-Id: Ie89de1f95bb6fb9d11058413e682c441c39524f1
2014-04-02 21:30:22 -04:00
Eiichi Aikawa 5528ba536f Fix the parameter order of assertEqual in glanceclient v1 test
On assertEqual, the order of parameters should be (expected, observed).
But, some part of glanceclient v1 test were written with invalid order.
This patch fixes this problem.

Change-Id: If361309041a257c56bfc1fbbccf1b905839b0c18
Partially-bug: #1277104
2014-03-17 17:14:14 +09:00
Jenkins 59c1103655 Merge "Improve help strings" 2014-03-16 17:16:54 +00:00
Jenkins 8ecc8ae250 Merge "Sync with Oslo" 2014-03-10 15:47:19 +00:00
Jenkins 2929cc1961 Merge "Python 3: do not use __builtin__" 2014-03-08 09:44:04 +00:00
Jenkins 23b1b67128 Merge "Python3: do not use the 'file' type" 2014-03-08 07:14:35 +00:00
Cyril Roelandt 3c16d23293 Sync with Oslo
This will help with porting to Python 3. List of merged commits:

04a1abe59ac39890f57d2eed57d3d1b12bb5d757
12bcdb71ffbe9ee1688beed1f0ddb0c198822682
2cfc1a78d8063cf20083cf7df796d730a576551c
302c7c80b503b8090e8118e45061e8903b5339a9
35dc1d797209f0b22ff3ed3b8a6059961563daee
3b248dd683d83fd564f740ea58565d1bc0bd6cc0
4246ce0f373aa8f8955a99a3b6288a32547d8e80
6650435004af149284f0badb2bb8c89005cc7dab
6d55e26aa379fd043c66d1b7c5bf59a1b4a54632
71c22e9b2fbf04fc91a7343d3de0e0c7f10e3988
84d461e859e4b1eb1a00b9b141df61c37da84d2d
8575d87af49ea276341908f83c8c51db13afca44
885828af2297b20a3f9f8e8f6647f7291f784743
8b2b0b743e84ceed7841cf470afed6a5da8e1d07
9f1e7eb4112067423f845bd99ec52256db1c8bb1
bd5dad97585208ea5e86d636f3dc3b669e361a41
be81d6ba70152e5cdd7e8e9d789b9733c6ff527f
bec3a5eb8157c0c552c6392ccf0da342ffb8da26
c178e567cb48d3bc67dcf06bcbb4c6a97df9f434

Closes-Bug: 1289690
Change-Id: I39fa5e3fa46ffe9448b381ed54759cb4270cc898
2014-03-08 05:06:30 +01:00
Cyril Roelandt 9b9b647c9d Python 3: do not use __builtin__
Use six.moves.builtins instead, this works with both Python 2 and 3.

Change-Id: I17cdf651edbf7907e2b8b3d6aec9ace8a76b0110
Closes-Bug: 1289107
2014-03-07 04:06:29 +01:00
OpenStack Jenkins c18536eacb Updated from global requirements
Change-Id: Ifb298bbb37a94e1d4f5e537b7f4eb086da4c95a9
2014-03-05 19:29:33 +00:00
Jenkins a9dee7948d Merge "test_shell: remove a deprecated keyword argument" 2014-03-04 18:43:04 +00:00
Cyril Roelandt 2df7840cfa Python3: do not use the 'file' type
It does not exist in Python 3, so we have to use a workaround.

Change-Id: Ib41b5d12102707004b354835265861710aaba568
Closes-Bug: 1287728
2014-03-04 15:41:46 +01:00
Jenkins 9c9b70f0a4 Merge "Python 3: do not use the unicode() function" 2014-03-04 09:18:06 +00:00
Jenkins 4f9fc84118 Merge "Replace file with open, which is Python 3 compatible" 2014-03-04 04:22:07 +00:00
Cyril Roelandt 21c422f730 Python 3: do not use the unicode() function
It is Python2-specific, and should not be used in code intended to be portable.

Change-Id: Ibebef1a7e51a7444538275d22d444c926b8b4dec
Closes-Bug: 1284677
2014-03-03 19:12:39 +01:00
Jenkins 46bf452710 Merge "Only show progress bar for local image files" 2014-02-27 11:55:40 +00:00
Eiichi Aikawa 900dc612d7 Fix the parameter order of assertEqual in glanceclient v2 test
On assertEqual, the order of parameters should be (expected, observed).
But, some part of glanceclient v2 test were written with invalid order.
This patch fixes this problem.

Partially Close-bug: #1277104

Change-Id: Iae3fb9dda28b67a07f527b15ca83d9cca3e867d4
2014-02-27 15:02:58 +09:00
Andreas Jaeger 2c53246184 Improve help strings
Make help strings consistent to use "." at end of string.

Fix capitalization of API in one help string.

Change-Id: I7cc5289d881c5e58aad9c69b4668584cdeb0b376
2014-02-26 13:57:58 +01:00
Jenkins 8b76817c17 Merge "Python 3: Fix JsonPatch-related issues" 2014-02-25 10:06:15 +00:00
Jenkins 875fcf46ee Merge "Python3: define a __next__() method for VerboseIteratorWrapper" 2014-02-25 10:06:14 +00:00
Eiichi Aikawa 3576b1bdcb Fix the parameter order of assertEqual in glanceclient test
On assertEqual, the order of parameters should be (expected, observed).
But, some part of glanceclient test were written with invalid order.
This patch fixes this problem.

Change-Id: I7722fdce766ce3cc5bc9944dc72d7d0af0b09f69
Partially-bug: #1277104
2014-02-25 16:18:19 +09:00
Cyril Roelandt 23ad1d6db7 Python3: define a __next__() method for VerboseIteratorWrapper
In Python 3, __next__() has replaced next(). Also, call the next() function
rather than the next() method.

Closes-Bug: #1281866
Change-Id: I92b44508c9c875f16ad89ef8410d2c38092ab23d
2014-02-20 16:15:43 +01:00
Cyril Roelandt ecf2868fb3 test_shell: remove a deprecated keyword argument
The 'version' keyword argument of argparse.ArgumentParser is deprecated. It was
set to 'None' anyway, so just remove it.

Closes-Bug: #1281856
Change-Id: I6e5af0d90e9b1e7a6a60d5183c13299101148442
2014-02-19 01:54:08 +01:00
Cyril Roelandt 3cced6085d Python 3: Fix JsonPatch-related issues
In Python 3, the generated JSON patches have a different representation than
those generated with Python 2. For instance, the patch generated in
test_patch_should_replace_missing_core_properties() is:

    '[{"op": "replace", "value": "red", "path": "/color"}]'

in Python 2, but:

    '[{"path": "/color", "value": "red", "op": "replace"}]'

in Python 3. Therefore, the comparison fails, and the test fail. We fix the
tests by comparing JsonPatch objects rather than strings.

Closes-Bug: #1281374
Change-Id: Id435e87664b2d2aa0ba69f2df1c1fad431651963
2014-02-19 01:43:23 +01:00
Cyril Roelandt fe006e0671 Pass bytes to tempfile.NamedTemporaryFile().write()
This method takes bytes as input; the current code fails in Python 3.

Closes-Bug: #1281372
Change-Id: I070d9e9e07523c124f3168b55048fb9d1b338f69
2014-02-18 03:00:03 +01:00
Alex Gaynor d465d60867 Replace file with open, which is Python 3 compatible
Change-Id: I471ae9b372f88a508d4654b1a18c6da90397a828
2014-02-13 06:59:18 -08:00
Jeremy Stanley b8a850c5b3 Remove tox locale overrides
* tox.ini: The LANG, LANGUAGE and LC_ALL environment overrides were
introduced originally during the testr migration in an attempt to be
conservative about the possibility that locale settings in the
calling environment could cause consistency problems for test runs.
In actuality, this should be unnecessary and any place where it does
cause issues ought to be considered an actual bug. Also, having
these in the configuration actively causes older pip to have
problems with non-ASCII content in some package metadata files under
Python 3, so drop it now.

Change-Id: I6be8e42167191096b16d0f16e8c89e85aeedd74c
Closes-Bug: #1277495
2014-02-10 03:09:45 +00:00