From 6b3b9ccdeb806df1114587d4666c73bffdaad67c Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Tue, 23 Apr 2024 12:33:10 +0100 Subject: [PATCH] trivial: Remove trailing spaces, mixed tabs/spaces We also remove "empty" JSON bodies since they don't show anything useful and can't be linted. PS: Don't worry about us changing release notes: reno has handled this for some time and only cares about when the note was added (or deleted), not when it was changed. Change-Id: I869f6e4a47af3ef3168978bdb03f387d5bb2947f Signed-off-by: Stephen Finucane --- api-ref/source/v2/qos-specs-v2-qos-specs.inc | 3 +-- api-ref/source/v2/quota-sets.inc | 3 +-- api-ref/source/v2/samples/qos-unset-response.json | 0 .../source/v2/samples/quotas-delete-response.json | 0 .../volume-os-migrate_volume_completion-request.json | 2 +- api-ref/source/v3/samples/volume-detach-request.json | 12 ++++++------ .../volume-os-migrate_volume_completion-request.json | 2 +- .../v3.55/volume-transfers-create-request.json | 8 ++++---- .../v3.57/volume-transfers-create-request.json | 10 +++++----- api-ref/source/v3/volumes-v3-volumes.inc | 2 +- .../v3.55/volume-transfers-create-request.json.tpl | 2 +- .../v3.55/volume-transfers-create-response.json.tpl | 2 +- .../v3.55/volume-transfers-show-response.json.tpl | 2 +- .../v3.57/volume-transfers-create-request.json.tpl | 8 ++++---- .../v3.57/volume-transfers-create-response.json.tpl | 8 ++++---- .../v3.57/volume-transfers-show-response.json.tpl | 8 ++++---- .../volume/drivers/dell_emc/vnx/mocked_cinder.yaml | 2 -- .../unit/volume/drivers/dell_emc/vnx/mocked_vnx.yaml | 12 ++---------- .../drivers/macrosan-storage-driver.rst | 2 +- .../VMEM-6000-drivers-removed-9b6675ff7ae5f960.yaml | 2 +- releasenotes/notes/bug-1518213-a5bf2ea0d008f329.yaml | 2 +- ..._consistency_group_failures-bb2a976dfe9454a4.yaml | 2 +- .../notes/get-driver-opts-924f72346ca1e459.yaml | 4 ++-- ...hnas-deprecate-iscsi-driver-cd521b3a2ba948f3.yaml | 2 +- ...ilities-report-optimization-d1c18d9f62ef71aa.yaml | 2 +- releasenotes/source/ocata.rst | 2 +- tools/fast8.sh | 2 +- 27 files changed, 47 insertions(+), 59 deletions(-) delete mode 100644 api-ref/source/v2/samples/qos-unset-response.json delete mode 100644 api-ref/source/v2/samples/quotas-delete-response.json diff --git a/api-ref/source/v2/qos-specs-v2-qos-specs.inc b/api-ref/source/v2/qos-specs-v2-qos-specs.inc index 8303d386c8c..d1c4ce797da 100644 --- a/api-ref/source/v2/qos-specs-v2-qos-specs.inc +++ b/api-ref/source/v2/qos-specs-v2-qos-specs.inc @@ -69,8 +69,7 @@ Request Example Response Example ---------------- -.. literalinclude:: ./samples/qos-unset-response.json - :language: javascript +There is no body content for the response of a successful PUT operation. Get all associations for QoS specification diff --git a/api-ref/source/v2/quota-sets.inc b/api-ref/source/v2/quota-sets.inc index a514e9c07ed..77de1fedc43 100644 --- a/api-ref/source/v2/quota-sets.inc +++ b/api-ref/source/v2/quota-sets.inc @@ -146,8 +146,7 @@ Request Response Example ---------------- -.. literalinclude:: ./samples/quotas-delete-response.json - :language: javascript +There is no body content for the response of a successful DELETE operation. Get default quotas ~~~~~~~~~~~~~~~~~~ diff --git a/api-ref/source/v2/samples/qos-unset-response.json b/api-ref/source/v2/samples/qos-unset-response.json deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/api-ref/source/v2/samples/quotas-delete-response.json b/api-ref/source/v2/samples/quotas-delete-response.json deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/api-ref/source/v2/samples/volume-os-migrate_volume_completion-request.json b/api-ref/source/v2/samples/volume-os-migrate_volume_completion-request.json index e938453f167..142d298d440 100644 --- a/api-ref/source/v2/samples/volume-os-migrate_volume_completion-request.json +++ b/api-ref/source/v2/samples/volume-os-migrate_volume_completion-request.json @@ -1,6 +1,6 @@ { "os-migrate_volume_completion": { "new_volume": "2b955850-f177-45f7-9f49-ecb2c256d161", - "error": false, + "error": false } } diff --git a/api-ref/source/v3/samples/volume-detach-request.json b/api-ref/source/v3/samples/volume-detach-request.json index 88f4119a324..f2e9937a0af 100644 --- a/api-ref/source/v3/samples/volume-detach-request.json +++ b/api-ref/source/v3/samples/volume-detach-request.json @@ -1,6 +1,6 @@ -{ - "os-detach": { - "attachment_id": "d8777f54-84cf-4809-a679-468ffed56cf1" - } -} - +{ + "os-detach": { + "attachment_id": "d8777f54-84cf-4809-a679-468ffed56cf1" + } +} + diff --git a/api-ref/source/v3/samples/volume-os-migrate_volume_completion-request.json b/api-ref/source/v3/samples/volume-os-migrate_volume_completion-request.json index e938453f167..142d298d440 100644 --- a/api-ref/source/v3/samples/volume-os-migrate_volume_completion-request.json +++ b/api-ref/source/v3/samples/volume-os-migrate_volume_completion-request.json @@ -1,6 +1,6 @@ { "os-migrate_volume_completion": { "new_volume": "2b955850-f177-45f7-9f49-ecb2c256d161", - "error": false, + "error": false } } diff --git a/api-ref/source/v3/samples/volume_transfers/v3.55/volume-transfers-create-request.json b/api-ref/source/v3/samples/volume_transfers/v3.55/volume-transfers-create-request.json index cf3d5067e10..fd6ca0c7c37 100644 --- a/api-ref/source/v3/samples/volume_transfers/v3.55/volume-transfers-create-request.json +++ b/api-ref/source/v3/samples/volume_transfers/v3.55/volume-transfers-create-request.json @@ -1,6 +1,6 @@ { - "transfer": { - "volume_id": "1bb4acc9-9fa4-4b4d-8992-3259b69c8372", - "name": "first volume" + "transfer": { + "volume_id": "1bb4acc9-9fa4-4b4d-8992-3259b69c8372", + "name": "first volume" } -} \ No newline at end of file +} diff --git a/api-ref/source/v3/samples/volume_transfers/v3.57/volume-transfers-create-request.json b/api-ref/source/v3/samples/volume_transfers/v3.57/volume-transfers-create-request.json index 1b2824f6b0a..a727de8f4d9 100644 --- a/api-ref/source/v3/samples/volume_transfers/v3.57/volume-transfers-create-request.json +++ b/api-ref/source/v3/samples/volume_transfers/v3.57/volume-transfers-create-request.json @@ -1,7 +1,7 @@ { - "transfer": { - "volume_id": "80d68197-b67e-4c8e-bbb9-030b2581f921", - "name": "first volume", - "no_snapshots": false + "transfer": { + "volume_id": "80d68197-b67e-4c8e-bbb9-030b2581f921", + "name": "first volume", + "no_snapshots": false } -} \ No newline at end of file +} diff --git a/api-ref/source/v3/volumes-v3-volumes.inc b/api-ref/source/v3/volumes-v3-volumes.inc index a5546e1ba5a..979197873f6 100644 --- a/api-ref/source/v3/volumes-v3-volumes.inc +++ b/api-ref/source/v3/volumes-v3-volumes.inc @@ -518,7 +518,7 @@ Preconditions belong to a group, have snapshots or be disassociated from snapshots after volume transfer. -- The ``cascade`` option can be passed in the request if you want +- The ``cascade`` option can be passed in the request if you want all snapshots of this volume to be deleted automatically, which should allow the volume deletion to succeed. diff --git a/cinder/tests/functional/api_sample_tests/samples/volume_transfers/v3.55/volume-transfers-create-request.json.tpl b/cinder/tests/functional/api_sample_tests/samples/volume_transfers/v3.55/volume-transfers-create-request.json.tpl index 4afca5acd39..5cb8a5a64e1 100644 --- a/cinder/tests/functional/api_sample_tests/samples/volume_transfers/v3.55/volume-transfers-create-request.json.tpl +++ b/cinder/tests/functional/api_sample_tests/samples/volume_transfers/v3.55/volume-transfers-create-request.json.tpl @@ -1,5 +1,5 @@ { - "transfer": { + "transfer": { "volume_id": "%(volume_id)s", "name": "first volume" } diff --git a/cinder/tests/functional/api_sample_tests/samples/volume_transfers/v3.55/volume-transfers-create-response.json.tpl b/cinder/tests/functional/api_sample_tests/samples/volume_transfers/v3.55/volume-transfers-create-response.json.tpl index fb372ddcb50..0886d00d058 100644 --- a/cinder/tests/functional/api_sample_tests/samples/volume_transfers/v3.55/volume-transfers-create-response.json.tpl +++ b/cinder/tests/functional/api_sample_tests/samples/volume_transfers/v3.55/volume-transfers-create-response.json.tpl @@ -15,6 +15,6 @@ ], "name": "first volume", "volume_id": "%(uuid)s", - "no_snapshots": false + "no_snapshots": false } } diff --git a/cinder/tests/functional/api_sample_tests/samples/volume_transfers/v3.55/volume-transfers-show-response.json.tpl b/cinder/tests/functional/api_sample_tests/samples/volume_transfers/v3.55/volume-transfers-show-response.json.tpl index 2b58106326e..cf569368595 100644 --- a/cinder/tests/functional/api_sample_tests/samples/volume_transfers/v3.55/volume-transfers-show-response.json.tpl +++ b/cinder/tests/functional/api_sample_tests/samples/volume_transfers/v3.55/volume-transfers-show-response.json.tpl @@ -14,6 +14,6 @@ ], "name": "first volume", "volume_id": "%(uuid)s", - "no_snapshots": false + "no_snapshots": false } } diff --git a/cinder/tests/functional/api_sample_tests/samples/volume_transfers/v3.57/volume-transfers-create-request.json.tpl b/cinder/tests/functional/api_sample_tests/samples/volume_transfers/v3.57/volume-transfers-create-request.json.tpl index 870fecb3462..0d43289f175 100644 --- a/cinder/tests/functional/api_sample_tests/samples/volume_transfers/v3.57/volume-transfers-create-request.json.tpl +++ b/cinder/tests/functional/api_sample_tests/samples/volume_transfers/v3.57/volume-transfers-create-request.json.tpl @@ -1,7 +1,7 @@ { - "transfer": { - "volume_id": "%(volume_id)s", - "name": "first volume", - "no_snapshots": false + "transfer": { + "volume_id": "%(volume_id)s", + "name": "first volume", + "no_snapshots": false } } diff --git a/cinder/tests/functional/api_sample_tests/samples/volume_transfers/v3.57/volume-transfers-create-response.json.tpl b/cinder/tests/functional/api_sample_tests/samples/volume_transfers/v3.57/volume-transfers-create-response.json.tpl index bb6132af2df..ad759413bde 100644 --- a/cinder/tests/functional/api_sample_tests/samples/volume_transfers/v3.57/volume-transfers-create-response.json.tpl +++ b/cinder/tests/functional/api_sample_tests/samples/volume_transfers/v3.57/volume-transfers-create-response.json.tpl @@ -15,9 +15,9 @@ ], "name": "first volume", "volume_id": "%(uuid)s", - "no_snapshots": false, - "destination_project_id": null, - "source_project_id": "%(uuid)s", - "accepted": false + "no_snapshots": false, + "destination_project_id": null, + "source_project_id": "%(uuid)s", + "accepted": false } } diff --git a/cinder/tests/functional/api_sample_tests/samples/volume_transfers/v3.57/volume-transfers-show-response.json.tpl b/cinder/tests/functional/api_sample_tests/samples/volume_transfers/v3.57/volume-transfers-show-response.json.tpl index eca94d4f2f2..51ffe51f2d1 100644 --- a/cinder/tests/functional/api_sample_tests/samples/volume_transfers/v3.57/volume-transfers-show-response.json.tpl +++ b/cinder/tests/functional/api_sample_tests/samples/volume_transfers/v3.57/volume-transfers-show-response.json.tpl @@ -14,9 +14,9 @@ ], "name": "first volume", "volume_id": "%(uuid)s", - "destination_project_id": null, - "source_project_id": "%(uuid)s", - "accepted": false, - "no_snapshots": false + "destination_project_id": null, + "source_project_id": "%(uuid)s", + "accepted": false, + "no_snapshots": false } } diff --git a/cinder/tests/unit/volume/drivers/dell_emc/vnx/mocked_cinder.yaml b/cinder/tests/unit/volume/drivers/dell_emc/vnx/mocked_cinder.yaml index e08977dfed0..f2dd7d8f7bf 100644 --- a/cinder/tests/unit/volume/drivers/dell_emc/vnx/mocked_cinder.yaml +++ b/cinder/tests/unit/volume/drivers/dell_emc/vnx/mocked_cinder.yaml @@ -504,8 +504,6 @@ test_update_migrated_volume_smp: test_create_group_snap: -test_create_cgsnapshot: - test_create_cloned_cg: test_create_cloned_group: diff --git a/cinder/tests/unit/volume/drivers/dell_emc/vnx/mocked_vnx.yaml b/cinder/tests/unit/volume/drivers/dell_emc/vnx/mocked_vnx.yaml index cbeb9606236..72654eacb5e 100644 --- a/cinder/tests/unit/volume/drivers/dell_emc/vnx/mocked_vnx.yaml +++ b/cinder/tests/unit/volume/drivers/dell_emc/vnx/mocked_vnx.yaml @@ -1648,8 +1648,6 @@ test_delete_snapshot_adapter: *test_delete_snapshot test_restore_snapshot_adapter: *test_restore_snapshot -test_create_cgsnapshot: *test_create_cg_snapshot - test_do_create_cgsnap: *test_create_cg_snapshot test_do_delete_cgsnap: @@ -1901,16 +1899,12 @@ test_terminate_connection: get_sg: *sg_terminate_connection test_terminate_connection_force_detach: - sg: &sg_terminate_connection_force_detach_1 - _properties: - existed: True - sg: &sg_terminate_connection_force_detach_2 + sg: &sg_terminate_connection_force_detach _properties: existed: True sgs: &sgs_terminate_connection_force_detach _methods: - shadow_copy: [*sg_terminate_connection_force_detach_1, - *sg_terminate_connection_force_detach_2] + shadow_copy: [*sg_terminate_connection_force_detach] vnx: _methods: get_sg: *sgs_terminate_connection_force_detach @@ -2141,8 +2135,6 @@ test_create_cg_from_cgsnapshot: test_create_group_from_group_snapshot: -test_create_cgsnapshot: - test_create_group_snapshot: test_delete_group_snapshot: diff --git a/doc/source/configuration/block-storage/drivers/macrosan-storage-driver.rst b/doc/source/configuration/block-storage/drivers/macrosan-storage-driver.rst index 456b12e5c7c..c0f94f1ebd3 100644 --- a/doc/source/configuration/block-storage/drivers/macrosan-storage-driver.rst +++ b/doc/source/configuration/block-storage/drivers/macrosan-storage-driver.rst @@ -1,4 +1,4 @@ -========================================== +========================================== MacroSAN Fibre Channel and iSCSI drivers ========================================== diff --git a/releasenotes/notes/VMEM-6000-drivers-removed-9b6675ff7ae5f960.yaml b/releasenotes/notes/VMEM-6000-drivers-removed-9b6675ff7ae5f960.yaml index 95a5269b268..b3069b405c7 100644 --- a/releasenotes/notes/VMEM-6000-drivers-removed-9b6675ff7ae5f960.yaml +++ b/releasenotes/notes/VMEM-6000-drivers-removed-9b6675ff7ae5f960.yaml @@ -1,3 +1,3 @@ --- upgrade: - - Violin Memory 6000 array series drivers are removed. + - Violin Memory 6000 array series drivers are removed. diff --git a/releasenotes/notes/bug-1518213-a5bf2ea0d008f329.yaml b/releasenotes/notes/bug-1518213-a5bf2ea0d008f329.yaml index 923b82f2603..8bfc4589020 100644 --- a/releasenotes/notes/bug-1518213-a5bf2ea0d008f329.yaml +++ b/releasenotes/notes/bug-1518213-a5bf2ea0d008f329.yaml @@ -1,3 +1,3 @@ --- features: - - Added Keystone v3 support for Swift backup driver in single user mode. + - Added Keystone v3 support for Swift backup driver in single user mode. diff --git a/releasenotes/notes/bug-1837524-strowize-create_consistency_group_failures-bb2a976dfe9454a4.yaml b/releasenotes/notes/bug-1837524-strowize-create_consistency_group_failures-bb2a976dfe9454a4.yaml index 2b912d2ad6b..77b6d5b2d51 100644 --- a/releasenotes/notes/bug-1837524-strowize-create_consistency_group_failures-bb2a976dfe9454a4.yaml +++ b/releasenotes/notes/bug-1837524-strowize-create_consistency_group_failures-bb2a976dfe9454a4.yaml @@ -2,5 +2,5 @@ fixes: - | `Bug #1837524 `_: - IBM Spectrum Virtualize Family: Fixed create_consistency_group if + IBM Spectrum Virtualize Family: Fixed create_consistency_group if the volume has mirror copy and mdisk_grp_name=many. diff --git a/releasenotes/notes/get-driver-opts-924f72346ca1e459.yaml b/releasenotes/notes/get-driver-opts-924f72346ca1e459.yaml index c822fdcb109..7a2d666aee1 100644 --- a/releasenotes/notes/get-driver-opts-924f72346ca1e459.yaml +++ b/releasenotes/notes/get-driver-opts-924f72346ca1e459.yaml @@ -1,5 +1,5 @@ -features: +features: - | - Seagate driver: Added support for ``get_driver_options`` api call + Seagate driver: Added support for ``get_driver_options`` api call - | Lenovo driver: Return additional configuration options from ``get_driver_options`` call diff --git a/releasenotes/notes/hnas-deprecate-iscsi-driver-cd521b3a2ba948f3.yaml b/releasenotes/notes/hnas-deprecate-iscsi-driver-cd521b3a2ba948f3.yaml index d870efb6dc0..75420c11b64 100644 --- a/releasenotes/notes/hnas-deprecate-iscsi-driver-cd521b3a2ba948f3.yaml +++ b/releasenotes/notes/hnas-deprecate-iscsi-driver-cd521b3a2ba948f3.yaml @@ -1,7 +1,7 @@ --- upgrade: - The Hitachi NAS iSCSI driver has been marked as unsupported and is - now deprecated. ``enable_unsupported_drivers`` will need to be set to + now deprecated. ``enable_unsupported_drivers`` will need to be set to ``True`` in cinder.conf to continue to use it. deprecations: - The Hitachi NAS iSCSI driver has been marked as unsupported and is now diff --git a/releasenotes/notes/huawei-backend-capabilities-report-optimization-d1c18d9f62ef71aa.yaml b/releasenotes/notes/huawei-backend-capabilities-report-optimization-d1c18d9f62ef71aa.yaml index f9c0f500f8d..f7d351e92b3 100644 --- a/releasenotes/notes/huawei-backend-capabilities-report-optimization-d1c18d9f62ef71aa.yaml +++ b/releasenotes/notes/huawei-backend-capabilities-report-optimization-d1c18d9f62ef71aa.yaml @@ -1,3 +1,3 @@ --- features: - - Optimize backend reporting capabilities for Huawei drivers. + - Optimize backend reporting capabilities for Huawei drivers. diff --git a/releasenotes/source/ocata.rst b/releasenotes/source/ocata.rst index 50fa7162fbd..635b1d2eb71 100644 --- a/releasenotes/source/ocata.rst +++ b/releasenotes/source/ocata.rst @@ -686,7 +686,7 @@ Upgrade Notes .. releasenotes/notes/remove-eqlx-deprecated-options-89ba02c41d4da62a.yaml @ b'c5630ce51dd7b3902bbf204707a3ae6674884109' -- +- Removing the Dell EqualLogic driver's deprecated configuration options. Please replace old options in your cinder.conf with the new one. diff --git a/tools/fast8.sh b/tools/fast8.sh index 24fab0395fb..1a55c396d16 100755 --- a/tools/fast8.sh +++ b/tools/fast8.sh @@ -15,7 +15,7 @@ CHANGED="" CHANGED+="$(git diff --name-only HEAD~${NUM_COMMITS} \*.py | tr '\n' ' ')" while [[ -z $CHANGED ]]; do - # Search back until we find a commit containing python files + # Search back until we find a commit containing python files NUM_COMMITS=$((NUM_COMMITS + 1)) CHANGED+="$(git diff --name-only HEAD~${NUM_COMMITS} \*.py | tr '\n' ' ')" ; done