Merge "Remove deprecated volume commands and args"

Author: Zuul

doc/source/cli/backwards-incompatible.rst

@@ -73,12 +73,28 @@ Release 4.0
   * Removed in: 4.0
   * Commit: https://review.opendev.org/613644
 
-.. 1. Change ``volume transfer request accept`` to use new option ``--auth-key``
-..    rather than a second positional argument.
+10. Remove ``backup`` commands.
+    Use ``volume backup`` commands instead.
 
-..   * As of: 4.0
-..   * Remove in: <5.0>
-..   * Commit: <tbd>
+  * Removed in: 4.0
+  * Commit: https://review.opendev.org/612751
+
+11. Remove ``snapshot`` commands.
+    Use ``volume snapshot`` commands instead.
+
+  * Removed in: 4.0
+  * Commit: https://review.opendev.org/612751
+
+12. Remove ``volume create`` options ``--project``, ``--user``, ``--multi-attach``.
+
+  * Removed in: 4.0
+  * Commit: https://review.opendev.org/612751
+
+13. Change ``volume transfer request accept`` to use new option ``--auth-key``
+    rather than a second positional argument.
+
+  * Removed in: 4.0
+  * Commit: https://review.opendev.org/612751
 
 Release 3.12
 ------------

doc/source/cli/command-objects/backup.rst

@@ -46,14 +46,14 @@ def test_volume_backup_restore(self):
             'volume backup create -f json ' +
             vol_id
         ))
-        self.wait_for_status("backup", backup['id'], "available")
+        self.wait_for_status("volume backup", backup['id'], "available")
 
         # restore the backup
         backup_restored = json.loads(self.openstack(
             'volume backup restore -f json %s %s'
             % (backup['id'], vol_id)))
         self.assertEqual(backup_restored['backup_id'], backup['id'])
-        self.wait_for_status("backup", backup['id'], "available")
+        self.wait_for_status("volume backup", backup['id'], "available")
         self.wait_for_status("volume", backup_restored['volume_id'],
                              "available")
         self.addCleanup(self.openstack, 'volume delete %s' % vol_id)

doc/source/cli/command-objects/snapshot.rst

@@ -10,7 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from openstackclient.tests.functional.volume.v2 import test_snapshot as v2
+from openstackclient.tests.functional.volume.v2 import test_volume_snapshot as v2  # noqa
 from openstackclient.tests.functional.volume.v3 import common