summaryrefslogtreecommitdiff
path: root/glanceclient/shell.py
Commit message (Collapse)AuthorAgeFilesLines
* Get endpoint if os_image_url is not setNiall Bunting2016-05-241-1/+10
| | | | | | | | | | If env['OS_IMAGE_URL'] is not set then None is returned. This is then used ignoring the endpoint_type, service_type and region_name. This patch will use those values if the endpoint is None. Change-Id: I76cc527b05d2be75d3dbc33123a0d71be97fe25c Closes-bug: #1579768 (cherry picked from commit a862196cfb7f7323b1864b4c1660c39850487a64)
* Merge "Fix missing of debug info after we use session" into stable/mitakaJenkins2016-05-111-0/+6
|\
| * Fix missing of debug info after we use sessionCao ShuFeng2016-04-261-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After the introduce of this patch set[1], cli user can't get debug info even --debug is passed. With the patch set[1], the request action will be performed in keystoneclient.session.Session. However the default log level of keystoneclient module is WARNING, so user can't get debug info from keystoneclient.session.Session. This change set the root log level to DEBUG when --debug is passed. [1]: https://review.openstack.org/#/c/262220/ Change-Id: I0db0fd7ab07a0d61082b86829a671d8dbc0f2963 Closes-bug: 1551076 (cherry picked from commit 87c8c933bd9b79a2cf06f9f0bc02160b21e8920d)
* | Re-enable stacktracing when --debug is usedStuart McLaren2016-03-301-10/+2
|/ | | | | | | | | | | | | | | | | | | | | | Commit 1f89beb6098f4f6a8d8c2912392b273bc068b2e3 introduced the behaviour that a stacktrace is printed if an exception is encountered. This helped make the client more supportable: $ glance --debug image-list . . . File "glanceclient/common/http.py", line 337, in get_http_client xxx NameError: global name 'xxx' is not defined global name 'xxx' is not defined The behaviour was lost at some point. This patch re-enables it. Change-Id: I25fc8624797909d606590747f54b9cf649ade079 Closes-bug: 1563830 (cherry picked from commit ca0989c52376a1d499cd0cc176f60b7ff8257275)
* Merge "Use session when not specified token or endpoint"Jenkins2016-02-011-94/+84
|\
| * Use session when not specified token or endpointDarja Shakhray2016-01-141-94/+84
| | | | | | | | | | | | | | | | | | | | When no token or endpoint, it creates a session and from there taken the necessary values. This commit proposes to transfer a session in such cases. This will avoid unnecessary actions and some of the problems. Change-Id: Idc874b6c01e915e52904604d59e8e0b460e71621 Partial-bug: #1519546
* | use keystoneclient exceptions instead of oslo-incubator codeSteve Martinelli2015-12-271-1/+1
|/ | | | | | | | | | depending on any oslo-incubator code from another project is dangerous. keystoneclient makes its exceptions public and it's not recommended to use any code from keystoneclient.openstack.common.apiclient since it's maintained by oslo-incubator. Change-Id: Ibfd9d364d3199fb485987edef06e1de916e57ee5
* Disable suggestion of v1 help for v2 commandsNiallBunting2015-12-091-3/+14
| | | | | | | | | | | | Currently the client suggests 'Run `glance --os-image-api-version 1 help` for v1 help' at the end of every help message. This is could be confusing for a v2 only command. Therefore this patch disables it if the command does not exist in v1, while keeping the message on the 'glance help' results. Change-Id: I967e9ba35afb8dc40524bd1d13284e684b435f81 Closes-Bug: 1520602
* Merge "Fix typo in 'help' in python-glanceclient"Jenkins2015-11-271-3/+2
|\
| * Fix typo in 'help' in python-glanceclientDarja Shakhray2015-11-271-3/+2
| | | | | | | | | | | | | | | | Fix typo `glance --os-image-api-version 1 helpNone` in help in python-glanceclient. Change-Id: I21bd7a7a5809e7c5fca4c8df1275321a9014bc6f Closes-bug: #1506049
* | Merge "Use common identity parameters fro keystone client"Jenkins2015-11-051-98/+6
|\ \
| * | Use common identity parameters fro keystone clientkairat_kushaev2015-09-281-98/+6
| | | | | | | | | | | | | | | | | | | | | The common identity params need to be requested from keystone client instead of storing them in glance client. Change-Id: If1260fb1e01b1fff798e9ce170e58ac62521d97d
* | | Import i18n functions directlykairat_kushaev2015-10-161-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As stated in i18n guide it is normal to import i18n functions (_, _LW..) directly and we can include i18n functions in hacking exceptions. Also there is no need to make exceptions for six moves because pep8 passes correctly without it. Change-Id: I9c9aa490f1447bb7ae221809df7bc110c27d1336
* | | Merge "print usage when no argument is specified for python3"Jenkins2015-10-141-1/+2
|\ \ \
| * | | print usage when no argument is specified for python3Zhiqiang Fan2015-10-091-1/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running just 'glance' under python3, we will get the error: ERROR: 'Namespace' object has no attribute 'func' This is because map() is used to decode sys.argv, but under Python3 it returns a map object which is an iterable. Some code later tries to use this in a boolean context and it will always return True, even if it's empty. Change-Id: I2f03e462cb813833b75b9f2de7badd10b10cddff Closes-Bug: #1295356
* | | Use the subcomand parsed args instead of the baseFlavio Percoco2015-10-121-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass the subcomand's arguments instead of the base ones to the endpoint creation call when quering the `/versions` endpoint. Passing the wrong arguments will end in the auth_requirement not being identified and an error 'Expected Endpoint' will be raised as no endpoint will be gotten from keystone. This patch also removes an unnecessary mock in the test code related to this fix. Depends-On Iefeb9bc123f8c65fecd0cba585ecd3eb349b23a6 Change-Id: I46088130b9175798e3719e43f48dc474fbc8a251 Closes-bug: #1504058
* | Merge "Replace exception_to_str with oslo.utils function"Jenkins2015-09-301-1/+1
|\ \
| * | Replace exception_to_str with oslo.utils functionkairat_kushaev2015-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The oslo.utils function has exception_to_unicode that can replace glance util function exception_to_str. So we don't to have this exception_to_str function in glance anymore. Change-Id: I332bc55558087920fdd6ae2d822bece5166f5ba6
* | | Merge "Add check Identity validate when get schemas"Jenkins2015-09-291-0/+3
|\ \ \ | |_|/ |/| |
| * | Add check Identity validate when get schemasTakeaki Matsumoto2015-07-241-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Glance client don't check Identity validate when get schemas. So when you exec "glance image-create" with invalid credentials in glance-api.conf, it returns "unrecognized arguments: --foo". It is difficult to debug such message. This change makes invalid credentials error clear. Change-Id: Ib641333cd8d51f459df70306a1eeda250ada5ca1 Closes-Bug: 1467719
* | | Merge "No auth when token and endpoint are passed"Jenkins2015-09-251-11/+6
|\ \ \
| * | | No auth when token and endpoint are passedFlavio Percoco2015-09-251-11/+6
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The latest change to the auth_required logic introduced a bug were even when the token and endpoint were passed, authentication was being required. This patch fixes that issue and makes sure that authentication is not required when these 2 arguements are present. Closes-bug: #1499540 Change-Id: I4c9c15ba526378970da5461511ed922d42c5a9f9
* | | Add period in help messageAtsushi SAKAI2015-09-191-2/+2
|/ / | | | | | | | | | | | | Command help message uses help and CLI-Reference generation. and in convention, help message stops with period ".". Change-Id: I652afdb5e4d69a0476a0a2dc313ae60ece3b7bbc
* | Fixes CLI client called without subcommandsErno Kuvaja2015-09-111-2/+3
| | | | | | | | | | | | | | | | | | | | | | If CLI client is called without any subcommands or arguments it will fail with """'Namespace' object has no attribute 'command'""". This is coming from the getattr which does not have alternate value specified. Closes-Bug: #1494259 Change-Id: I461f0d4a91f3af2224bafc14a88572a8e4a3c051
* | Print the reverting back to v1 to stderrErno Kuvaja2015-09-091-1/+1
| | | | | | | | | | | | | | Printing to stderr to fix the download issue. Change-Id: I2916bb100ac451378db82291855078f2b37466bd Closes-Bug: #1488914
* | Don't make `help` require auth parametersFlavio Percoco2015-09-091-35/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | The `help` command was behaving a bit funky. This patch re-orders the code a bit so that the `help` command will be parsed at the very beginning before running other commands and checks. It also allows to get help without downloading/checking schemas and without requiring auth credentials (previously required by the schema operations). Change-Id: Ib7b10d4d80f15e6b75bb8644d7d916bef09413d6 Closes-bug: #1490457
* | Consider `--os-token` when using v2Flavio Percoco2015-09-041-10/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | The `_cache_schemas` call currently forces authentication even when the `auth_token` and `os_image_url` are passed. Instead of handling forced authentications, let the client use the passed arguments and authenticate only once if needed. This was not caught by the existing tests because the call to `_cache_schemas` was mocked. Change-Id: I93cec9a68cafc0992d14dab38114d03e25f1e5da Closes-bug: #1490462
* | Check if v2 is available and fallbackFlavio Percoco2015-09-041-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have a basic implementation for a fallback mechanism that will use v1 rather than v2 when downloading schema files from glance-api fails. However, this is not sound. If the schemas are cached already, we won't check if v2 is available and fail to fallback. This patch fixes the aforementioned issue by getting the list of available versions from the server only when the API versions was not explicitly specified through the CLI. That is, for all commands that don't pass `--os-image-api-version 2`, we'll check v2's availability and we'll fallback to v1 if it isn't available. This patch also changes how we handle `/versions` calls in the client. The server has been, incorrectly, replying to requests to `/version` with a 300 error, which ended up in the client re-raising such exception. While I think 300 shouldn't raise an exception, I think we should handle that in a spearate patch. Therefore, this patch just avoids raising such exception when `/version` is explicitly called. This fallback behaviour and the check on `/versions` will be removed in future versions of the client. The later depends on this bug[0] being fixed. [0] https://bugs.launchpad.net/glance/+bug/1491350 Closes-bug: #1489381 Change-Id: Ibeba6bc86db2a97b8a2b4bd042248464cd792e5e
* | Password should be prompted onceFlavio Percoco2015-09-011-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's a corner case where password may be requested twice. In a fresh environment, when schemas have not be downloaded for v2, the client will ask for a password to download the schemas and then it'll ask for the password again to run the actual command. This happens because we parse the CLI arguments twice to make sure we're parsing them for the right client version. This patch checks if the password is unset in the newly parsed arguments and if it's been set in the previously parsed ones. In this case it keeps the set password. I believe this approach is safer than re-using the already parsed arguements which may have been parsed for a different API version (might happen because we fallback to v1 if v2 is not available). Change-Id: I080253170e3e84a90363e5bb494cf137895fe2e7 Closes-bug: #1488892
* | Remove custom SSL compression handlingStuart McLaren2015-08-261-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Custom SSL handling was introduced because disabling SSL layer compression provided an approximately five fold performance increase in some cases. Without SSL layer compression disabled the image transfer would be CPU bound -- with the CPU performing the DEFLATE algorithm. This would typically limit image transfers to < 20 MB/s. When --no-ssl-compression was specified the client would not negotiate any compression algorithm during the SSL handshake with the server which would remove the CPU bottleneck and transfers could approach wire speed. In order to support '--no-ssl-compression' two totally separate code paths exist depending on whether this is True or False. When SSL compression is disabled, rather than using the standard 'requests' library, we enter some custom code based on pyopenssl and httplib in order to disable compression. This patch/spec proposes removing the custom code because: * It is a burden to maintain Eg adding new code such as keystone session support is more complicated * It can introduce additional failure modes We have seen some bugs related to the 'custom' certificate checking * Newer Operating Systems disable SSL for us. Eg. While Debian 7 defaulted to compression 'on', Debian 8 has compression 'off'. This makes both servers and client less likely to have compression enabled. * Newer combinations of 'requests' and 'python' do this for us Requests disables compression when backed by a version of python which supports it (>= 2.7.9). This makes clients more likely to disable compression out-of-the-box. * It is (in principle) possible to do this on older versions too If pyopenssl, ndg-httpsclient and pyasn1 are installed on older operating system/python combinations, the requests library should disable SSL compression on the client side. * Systems that have SSL compression enabled may be vulnerable to the CRIME (https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2012-4929) attack. Installations which are security conscious should be running the Glance server with SSL disabled. Full Spec: https://review.openstack.org/#/c/187674 Blueprint: remove-custom-client-ssl-handling Change-Id: I7e7761fc91b0d6da03939374eeedd809534f6edf
* | Use API v2 as defaultFei Long Wang2015-08-111-7/+20
|/ | | | | | | | | | Now we have claimed v2 is the current API version of Glance, we should change the Glance client as well to be consistent with Glance server. DocImpact Change-Id: I09c9e409d149e2d797785591183e06c13229b7f7
* Enable flake8 checksDarja Shakhray2015-07-211-3/+1
| | | | | | | | | | | | This commit enables new flake8 checks: * E265 block comment should start with '# ' * H405 multi line docstring summary not separated with an empty line * E123 closing bracket does not match indentation of opening bracket's line * H238 old style class declaration, use new style (inherit from `object`) * E128 continuation line under-indented for visual indent and makes related changes in the code. Change-Id: Ie993afc930f6b74d7a990bcaa9fc0e9f5ba1585c
* Import only modules and update tox.iniCindy Pallares2015-06-171-2/+1
| | | | | | | | | As stated in the OpenStack Hacking Guidelines, it is prefered that only modules should be imported. Also updated tox.ini to ignore opestack/common among others. Change-Id: I2f0a603c31052eadee581c11880c0ec6bd392829
* Merge "Improve import related error handling"Jenkins2015-05-261-9/+24
|\
| * Improve import related error handlingStuart McLaren2015-05-081-9/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there was a problem importing a library we would incorrectly raise an unsupported version error: $ glance --os-image-api-version 1 image-list "1" is not a supported API version. Example values are "1" or "2". We should change this to provide information on the failed import, eg: $ glance --os-image-api-version 1 image-list No module named badimport We also now raise the full stacktrace in this case if '--debug' is passed on the command line. Change-Id: I1c687ae6c5da239090b0b7a4a855b3271a9076da Related-bug: 1402632
* | Do not crash on homedir mkdirThomas Goirand2015-05-141-1/+9
|/ | | | | | | | | | | Glanceclient is trying to create ~/.glanceclient, and crashes if it can't do that. In some environment (for example, when building the package under Jenkins), writing on $HOME is simply not allowed, and Glanceclient can simply ignore it. This patch allows the mkdir() to fail, which fixes the issue. Closes-Bug: #1446096 Change-Id: Ib3591fb4e54ccd2fe63a1a4815551ac10ef5b961
* Merge "Remove duplicate 'a' in the help string of --os-image-url"Jenkins2015-03-101-1/+1
|\
| * Remove duplicate 'a' in the help string of --os-image-urlChristian Berendt2015-01-201-1/+1
| | | | | | | | | | | | | | Instead of 'url contains a a version number' it should be 'url contains a version number'. Change-Id: I7caa350954a37e2af90c656ceb698d9ab772e463
* | Merge "Remove graduated gettextutils from openstack/common"Jenkins2015-03-031-1/+2
|\ \
| * | Remove graduated gettextutils from openstack/commonIan Cordasco2015-02-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use oslo.i18n package and handle different versions properly in glanceclient._i18n. The oslo namespace is being deprecated so imports will be oslo_i18n going forward. For older versions of oslo.i18n though, we will still be able to import i18n from oslo. Change-Id: Id56d34ccf447dc6f7becafb74d6a30e8a1642030
* | | Merge "Strip json and html from error messages"Jenkins2015-03-011-13/+15
|\ \ \
| * | | Strip json and html from error messagesd34dh0r532015-02-161-13/+15
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Error messages were being passed with either JSON or HTML formatting leading to an unpleasant user experience. This strips the JSON or HTML tags and presents the clean error message to the user. Rewrote the lispy function to be more pythonic, added test cases and cleaned up some pep8 violations. Removed commented out cruft from a previous version of this patch. Changed the HTML details from a set to a list in order to ensure the ordering of the exception details. Added code to eliminate the duplicate detail messages from the list and reordered the assertion string to match actual output. Refactored duplicate elimination code to be more readable and reliable. Some reworking of the duplication elimination loop to make it more readable. Removed unneeded conditional to filter out empty elements. Change-Id: I79985b3e305cb30328a3c16b025315a8e969243d Closes-Bug: 1398838
* | | Merge "Fixed CLI help for bash-completion"Jenkins2015-02-231-1/+2
|\ \ \
| * | | Fixed CLI help for bash-completionYvonne Stachowski2015-01-281-1/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running 'glance help' the following lines were displayed: bash-completion Prints all of the commands and options to stdout so that the The help now prints: bash-completion Prints arguments for bash_completion. similar to other Openstack CLIs (such as Cinder and Trove). Change-Id: I1b1d60e23a3662675c5e81a332e9fd8360f6c7b1
* | | Merge "Return 130 for keyboard interrupt"Jenkins2015-02-061-1/+1
|\ \ \
| * | | Return 130 for keyboard interruptRakesh H S2015-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When keyboard interrupt is received by glanceclient, the return code as of now is 1. But since the client was terminated by an keyboard interrupt, the return code should be 130. (http://tldp.org/LDP/abs/html/exitcodes.html) It is useful when people are writing automation test cases and want to validate based on the return code. Change-Id: Ia70116ab6f0708a0ce6eeaed07c1e7a56e68c9f4 Closes-Bug: #1373231
* | | | Change oslo.utils to oslo_utilsLouis Taylor2015-02-051-2/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | The oslo.utils libraries are moving away from namespace packages. This requires oslo.utils>=1.2.0 bp drop-namespace-packages Change-Id: I803df61e91eabb96329d859aef6bea03530fb84f
* | | Use utils.exit rather than print+sys.exitLouis Taylor2015-02-031-4/+2
| |/ |/| | | | | | | | | | | | | | | | | | | | | This replaces the use of a pattern along the lines of print(error message) sys.exit(1) in a couple of place in the shell. utils.exit does much the same job, but outputs to stderr. Change-Id: I1d3b52e0685772c10aa806a8f208eb6dd7a0e7ef
* | Remove openstack.common.importutilsLouis Taylor2015-01-281-1/+1
| | | | | | | | | | | | This module now lives in oslo.utils, so import it from there. Change-Id: I41fa4897fc820596fb010336044ff4c493017d5a
* | Remove openstack.common.strutilsLouis Taylor2015-01-271-2/+2
|/ | | | | | | This module now lives in oslo.utils, so import it from there instead. Co-Authored-By: Ian Cordasco <ian.cordasco@rackspace.com> Change-Id: Ib35dc840992433542490670781badd9529ec8947
View Lorry Controller Status