Address issues from volume backend commands

This fixes some minor issues in release notes and the command list for
the new volume backend commands.

Also sorts the fakes used for volume unit tests to allow for multiple
command update patches to hopefully reduce the odds of merge conflicts.

Change-Id: Ic6e40f4c639368338cf085c68c17038f81da5361
Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>

Author: stmcginnis

doc/source/cli/commands.rst

@@ -156,7 +156,8 @@ referring to both Compute and Volume quotas.
 * ``user role``: (**Identity**) roles assigned to a user
 * ``volume``: (**Volume**) block volumes
 * ``volume backup``: (**Volume**) backup for volumes
-* ``volume backend``: (**volume**) volume backend storage
+* ``volume backend capability``: (**volume**) volume backend storage capabilities
+* ``volume backend pool``: (**volume**) volume backend storage pools
 * ``volume host``: (**Volume**) the physical computer for volumes
 * ``volume qos``: (**Volume**) quality-of-service (QoS) specification for volumes
 * ``volume snapshot``: (**Volume**) a point-in-time copy of a volume

openstackclient/tests/unit/volume/v2/fakes.py

@@ -290,47 +290,47 @@ def create_one_pool(attrs=None):
 class FakeVolumeClient(object):
 
     def __init__(self, **kwargs):
-        self.volumes = mock.Mock()
-        self.volumes.resource_class = fakes.FakeResource(None, {})
+        self.auth_token = kwargs['token']
+        self.management_url = kwargs['endpoint']
+        self.availability_zones = mock.Mock()
+        self.availability_zones.resource_class = fakes.FakeResource(None, {})
+        self.backups = mock.Mock()
+        self.backups.resource_class = fakes.FakeResource(None, {})
+        self.capabilities = mock.Mock()
+        self.capabilities.resource_class = fakes.FakeResource(None, {})
+        self.cgsnapshots = mock.Mock()
+        self.cgsnapshots.resource_class = fakes.FakeResource(None, {})
+        self.consistencygroups = mock.Mock()
+        self.consistencygroups.resource_class = fakes.FakeResource(None, {})
         self.extensions = mock.Mock()
         self.extensions.resource_class = fakes.FakeResource(None, {})
         self.limits = mock.Mock()
         self.limits.resource_class = fakes.FakeResource(None, {})
-        self.volume_snapshots = mock.Mock()
-        self.volume_snapshots.resource_class = fakes.FakeResource(None, {})
-        self.backups = mock.Mock()
-        self.backups.resource_class = fakes.FakeResource(None, {})
-        self.volume_types = mock.Mock()
-        self.volume_types.resource_class = fakes.FakeResource(None, {})
-        self.volume_type_access = mock.Mock()
-        self.volume_type_access.resource_class = fakes.FakeResource(None, {})
-        self.volume_encryption_types = mock.Mock()
-        self.volume_encryption_types.resource_class = (
-            fakes.FakeResource(None, {}))
-        self.restores = mock.Mock()
-        self.restores.resource_class = fakes.FakeResource(None, {})
+        self.pools = mock.Mock()
+        self.pools.resource_class = fakes.FakeResource(None, {})
         self.qos_specs = mock.Mock()
         self.qos_specs.resource_class = fakes.FakeResource(None, {})
-        self.availability_zones = mock.Mock()
-        self.availability_zones.resource_class = fakes.FakeResource(None, {})
-        self.transfers = mock.Mock()
-        self.transfers.resource_class = fakes.FakeResource(None, {})
-        self.services = mock.Mock()
-        self.services.resource_class = fakes.FakeResource(None, {})
-        self.quotas = mock.Mock()
-        self.quotas.resource_class = fakes.FakeResource(None, {})
         self.quota_classes = mock.Mock()
         self.quota_classes.resource_class = fakes.FakeResource(None, {})
-        self.consistencygroups = mock.Mock()
-        self.consistencygroups.resource_class = fakes.FakeResource(None, {})
-        self.cgsnapshots = mock.Mock()
-        self.cgsnapshots.resource_class = fakes.FakeResource(None, {})
-        self.auth_token = kwargs['token']
-        self.management_url = kwargs['endpoint']
-        self.capabilities = mock.Mock()
-        self.capabilities.resource_class = fakes.FakeResource(None, {})
-        self.pools = mock.Mock()
-        self.pools.resource_class = fakes.FakeResource(None, {})
+        self.quotas = mock.Mock()
+        self.quotas.resource_class = fakes.FakeResource(None, {})
+        self.restores = mock.Mock()
+        self.restores.resource_class = fakes.FakeResource(None, {})
+        self.services = mock.Mock()
+        self.services.resource_class = fakes.FakeResource(None, {})
+        self.transfers = mock.Mock()
+        self.transfers.resource_class = fakes.FakeResource(None, {})
+        self.volume_encryption_types = mock.Mock()
+        self.volume_encryption_types.resource_class = (
+            fakes.FakeResource(None, {}))
+        self.volume_snapshots = mock.Mock()
+        self.volume_snapshots.resource_class = fakes.FakeResource(None, {})
+        self.volume_type_access = mock.Mock()
+        self.volume_type_access.resource_class = fakes.FakeResource(None, {})
+        self.volume_types = mock.Mock()
+        self.volume_types.resource_class = fakes.FakeResource(None, {})
+        self.volumes = mock.Mock()
+        self.volumes.resource_class = fakes.FakeResource(None, {})
 
 
 class TestVolume(utils.TestCommand):

releasenotes/notes/volume-backend-c5faae0b31556a24.yaml

@@ -1,11 +1,11 @@
 ---
 features:
   - |
-    A new command, ``openstack volume backend capability show <host>`` was
-    added which will provide a list of all capabilities that can be configured
+    Add ``openstack volume backend capability show <host>`` command that
+    provides a list of all capabilities that can be configured
     for the requested backend. The required `<host>` parameter takes the form
     `host@backend-name`.
   - |
-    A new command, ``openstack volume backend pool list`` was added which will
-    provide a list of all backend storage pools. The optional ``-long``
+    Add ``openstack volume backend pool list`` command that provides
+    a list of all backend storage pools. The optional ``--long``
     parameter includes some basic configuration and stats for each pool.