summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Unsupported 'message' Exception attribute in PY3"3.2.0Jenkins2017-08-291-3/+3
|\
| * Unsupported 'message' Exception attribute in PY3liuyamin2017-08-281-3/+3
| | | | | | | | | | | | | | | | | | | | The 'message' attribute has been deprecated and removed from Python3. Use six.text_type(e) instead of e.message. For more details, please check [1]: [1] https://www.python.org/dev/peps/pep-0352/ Change-Id: Ibd4e7f5fefa6b1dfb6258c5eacfa53cd3485d22c
* | Merge "Fix attachment_id returned by create and show volume"Jenkins2017-08-284-3/+29
|\ \
| * | Fix attachment_id returned by create and show volumeSteve Noyes2017-08-284-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The attachment_ids in the volume info returned by show volume were incorrect. It was showing the volume_id, not the actual attachment_id. This fix changes the attachment_ids returned by show volume to correctly reflect the attachment_id. Also, added a unit test for this, and added an attachment_id to the fake volume so that other tests wouldn't now fail. Closes-Bug: #1713082 Change-Id: I9ec36af5dd460d03d786aeeb3cc36a869c19ff62
* | | Enable F811, F821Eric Harney2017-08-235-7/+7
|/ / | | | | | | | | | | | | | | | | F811 is a little noisy with api_versions.wraps() decorated methods, but opting to disable it in these cases seems better than missing problems in the rest of the code. Change-Id: I9c46938ab2a442e55f96b5ab6c119c4475afaecd
* | Fix method/module redefinition errorsEric Harney2017-08-233-13/+2
| | | | | | | | | | | | | | | | | | | | These are caught by F811, but that test is currently disabled because it fails on @api_versions.wraps() decorated methods. Just clean up these errors for now. Change-Id: I42aed024352f798ebafddeb6f12880d8726360fe
* | Updated from global requirementsOpenStack Proposal Bot2017-08-231-3/+3
| | | | | | | | Change-Id: Iacb099eeea7cf67b9a2ee792cb8bfa751406f1f6
* | Merge "Enable H306"Jenkins2017-08-2243-64/+87
|\ \
| * | Enable H306Eric Harney2017-08-0143-64/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | Enforce ordering of imports with H306. For tests, this is mostly done by grouping test imports after other cinderclient imports. Change-Id: Ie40fda014d1aedb057e5b4ea1f27f999c84e6373
* | | Add an attachment_complete API callJohn Griffith2017-08-143-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new attachment_update method in Cinder's API creates an attachment object and populates it with the provided connector info. In addition, we set the volumes status to in-use and update the attachment object status to "attached". This isn't really accurate though, because we don't know if the volume is actually attached (connected) by the consumer or not. Also a big side effect here is that currently all of our tests and automation use volume-status to determine if a volume is fully connected/ready for use and that everything went well. It's used as an ack in most cases. This change goes back to using multiple states to signify where a an attachment is in it's life-cycle: 1. attachment_create We've created an empty attachment record but haven't done anything with it yet. 2. attachment_update We provided a connector and set up the TGT so that everything is ready for a consumer to connect/use it. 3. attachment_complete An ACK back from the consumer letting us know that they connected it successfully and are doing their thing. It would be cool to just key all these checks of the attachment object itself, and just use attachment_update to do so, maybe in the future? Change-Id: I3b28d2cb89a8d81c7cdec425f355c78bfdfe3450 Related-Bug: #1710295
* | | Fix wrong linksyfzhao2017-08-111-1/+1
| |/ |/| | | | | | | | | Some docs links have changed. We should update the wrong links in our codes. Change-Id: I2e43cd26e10e5be0452d611064e199f784ea0d34
* | Merge "Update reno for stable/pike"Jenkins2017-08-082-0/+7
|\ \
| * | Update reno for stable/pikeOpenStack Release Bot2017-07-282-0/+7
| | | | | | | | | | | | Change-Id: I311d140be18265b89867ead67bfc7e5e05d72725
* | | Merge "Support skip-validation for quota update"Jenkins2017-08-084-1/+55
|\ \ \
| * | | Support skip-validation for quota updatewangxiyuan2017-07-184-1/+55
| | | | | | | | | | | | | | | | | | | | | | | | Support skip-validation parameter for quota update. Change-Id: Iec4f1598987c632f45ad6eee751f78bedbf3ec26
* | | | Merge "Fix man page build"Jenkins2017-08-081-1/+1
|\ \ \ \
| * | | | Fix man page buildThomas Bechtold2017-07-291-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ia3b5ee2b6aaf17781d3de7546a9477f1c928092f moved cinder.rst from the doc/source/man directory into doc/source/cli, so we need to adjust the path in conf.py to avoid issues when running: python setup.py build_sphinx -b man Change-Id: I32ca20e0e184b11c68c9b81a9ff3d1247330ade4
* | | | Merge "Fix get_highest_client_server_version with Cinder API + uWSGI"Jenkins2017-08-042-12/+30
|\ \ \ \
| * | | | Fix get_highest_client_server_version with Cinder API + uWSGIIvan Kolodyazhny2017-08-042-12/+30
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get_highest_client_server_version should work with any endpoint type: cinder-api with eventlet, uWSGI, etc. This patch is based on python-novaclient patch [1]. In a future, we can deprecate get_highest_client_server_version in flavor of keystoneauth descovery feature. [1] Icba858b496855e2ffd71b35168e8057b28236119 Closes-Bug: #1708188 Change-Id: I9acf6dc84c32b25bfe3254eb0f97248736498d32
* | | | Merge "Added missing column 'Allocated'"Jenkins2017-08-031-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Added missing column 'Allocated'TommyLike2017-07-311-1/+1
| |/ / | | | | | | | | | | | | | | | | | | Added missing column 'Allocated' for quota usage command. Change-Id: Ic2656e2f849e834c7a576b0462d6e8a399a95006
* | | Merge "Updated from global requirements"Jenkins2017-08-012-2/+2
|\ \ \
| * | | Updated from global requirementsOpenStack Proposal Bot2017-07-282-2/+2
| |/ / | | | | | | | | | Change-Id: Ieb3b4460300e8ad8f606b2979262dd39b251cd8d
* | | Merge "Clean the redundant code in shell.py"Jenkins2017-08-011-12/+7
|\ \ \ | |/ / |/| |
| * | Clean the redundant code in shell.pyjunboli2017-07-271-12/+7
| | | | | | | | | | | | | | | | | | | | | In the file cinderclient/shell.py, packages requests and six are double imported. This patch is to clean the redundant code. Change-Id: I4bade57753a50245df1b4b82c4a8708d3b0acdba
* | | Merge "[Optimize] Adds interval and increase waiting time"Jenkins2017-07-281-1/+2
|\ \ \
| * | | [Optimize] Adds interval and increase waiting timeTommyLike2017-06-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gives more time to wait resource's status to change in functional testcases and adds default interval to reduce query amount. Change-Id: I2a29a2d04836fd1261d45e404341bb1aa657417b
* | | | Merge "Rearrange existing documentation to fit the new standard layout"3.1.0Jenkins2017-07-276-2/+82
|\ \ \ \
| * | | | Rearrange existing documentation to fit the new standard layoutchenxing2017-07-266-2/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The layout is configured to follow the design from this spec: https://specs.openstack.org/openstack/docs-specs/specs/pike/os-manuals-migration.html This change is necessary to continue the doc migration process. Change-Id: I5ab2e47b67baf90bdd808cb831493a010d23a070
* | | | | Merge "import content from cli-reference in openstack-manuals"Jenkins2017-07-273-1/+4469
|\ \ \ \ \ | |/ / / /
| * | | | import content from cli-reference in openstack-manualschenxing2017-07-263-1/+4469
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is part of the great doc migration from openstack-manuals to the individual repos. The changes are based on the spec here: https://specs.openstack.org/openstack/docs-specs/specs/pike/os-manuals-migration.html The cinder.rst file needs to be renamed index.rst so that the template that is being used by OpenStack manuals team will magically find the documentation. Change-Id: Ia3b5ee2b6aaf17781d3de7546a9477f1c928092f
* | | | | Merge "Make --profile load from environment variables"Jenkins2017-07-273-1/+10
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Make --profile load from environment variablesTovin Seven2017-07-273-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --profile argument can be loaded from OS_PROFILE environment variables to avoid repeating --profile in client commands. Co-Authored-By: Hieu LE <hieulq@vn.fujitsu.com> Change-Id: Ia9b469024395327ec0ee082ddaea3234fc3ca5a6
* | | | | Merge "Update cinder.rst and shell.rst"Jenkins2017-07-262-2/+27
|\ \ \ \ \
| * | | | | Update cinder.rst and shell.rstjunboli2017-07-262-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the file doc/source/man/cinder.rst, add cinder command examples, In the file doc/source/shell.rst, update OS_AUTH_URL and OS_VOLUME_API_VERSION Change-Id: I6ed2c5228daad8dd6dcab1d7278f8a0b049c0490
* | | | | | Merge "cinder show with attachments is a mess"Jenkins2017-07-263-3/+19
|\ \ \ \ \ \
| * | | | | | cinder show with attachments is a messJohn Griffith2017-07-033-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The show command currently just dumps the entire attachments dictionary into the output which is a real mess and completely screws up the displayed output (shell command). There's really no reason to do this, we can just give the attachment ID's and then when you're on the newer versions you can do an attachment-show for all the crazy details if you want. Keep in mind that the list command already shows the server-id we're attached too, but that might also be nice from the show command rather than jumping through multiple commands. To try and accomodate various use cases we'll also add an "attached_servers" field to the show command, but you'll have to coorelate manually from there. Change-Id: I45ac49d8d9a185c52727c5bc24a6a1323be83689 Closes-Bug: #1494941
* | | | | | | cinderclient might not return version for V2 APIj-griffith2017-07-263-3/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The get_server_version call in cidnerclient/client.py relies on either finding v 3.x or encountering an exception to revert back to v 2.0. It's not clear that this call will always raise if a non V3 capable Cinder is called, so just to be safe make sure we return a 2.0 response if there's no V3 reported back. Change-Id: I3b5fb895cad4b85d5f4ea286fb33f7dd0929e691 Closes-Bug: #1694729
* | | | | | | Merge "python-cinderclient doc unclear on Volume.attach"Jenkins2017-07-261-2/+23
|\ \ \ \ \ \ \
| * | | | | | | python-cinderclient doc unclear on Volume.attachnidhimittalhada2017-07-261-2/+23
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 'attach' method, documentation vaguely says "Set attachment metadata." Actually, this method should not be called directly by API users when attempting to attach a Cinder volume to a Nova instance, else the Nova and Cinder databases will become inconsistent. Instead attach function exists solely for use by consumers of Cinder services such as Nova, so that they can inform Cinder that they're now using one of Cinder's volumes. Hence correcting the doc text for attach function. Change-Id: I34af39f857b6b918de1129f5d210326b3e84d8e1 Closes-Bug: #1611613
* | | | | | | Merge "Fix support for Unicode value filters"Jenkins2017-07-261-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix support for Unicode value filtersjunboli2017-06-301-1/+1
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cinder supports Unicode value filters for API get-pools, therefore, Here needs to support Unicode value filters as well. Change-Id: I51df61f9465d84c408fc057443a37834c453de41 Closes-Bug: #1701427
* | | | | | | Merge "Handle AttributeError in _get_server_version_range"Jenkins2017-07-262-1/+17
|\ \ \ \ \ \ \
| * | | | | | | Handle AttributeError in _get_server_version_rangeMatt Riedemann2017-05-312-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | _get_server_version_range only supports a v3 client object because ServiceManager.server_api_version() is only implemented for the v3 client code. If you're trying to call this with a v1 or v2 client object, it will raise an AttributeError which is unhelpful for the end python API client. This change handles the AttributeError and returns a more useful error with an explanation of how the client code is wrong. We could alternatively set versions = None and let it return two empty APIVersion objects, but that seems confusing. This change opts to be explicit about the failure. Change-Id: I2266999df6332b8c5fb0ec808db69bcc847effb0 Closes-Bug: #1694739
* | | | | | | | Merge "Update URLs in documentation"Jenkins2017-07-267-16/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | Update URLs in documentationHangdong Zhang2017-07-207-16/+16
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update URLs according to OpenStack document migration BTW: Do some optimization as well (http -> https) Change-Id: I9239e2012442f3e459a21f50afd380c8f58a6a98
* | | | | | | | Merge "Support volume summary command"Jenkins2017-07-266-0/+54
|\ \ \ \ \ \ \ \
| * | | | | | | | Support volume summary commandwangxiyuan2017-07-126-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch added volume summary command support. Change-Id: I7cf6e149b9ce9cae21818c60146e6db9cc2904bd
* | | | | | | | | Merge "Updated from global requirements"Jenkins2017-07-251-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Updated from global requirementsOpenStack Proposal Bot2017-07-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib14f036bbc10a36a8e79fe6749f6b98b660caf7b