11 files changed, 290 insertions, 141 deletions
diff --git a/doc/source/cli/command-objects/network-l3-conntrack-helper.rst b/doc/source/cli/command-objects/network-l3-conntrack-helper.rst
new file mode 100644
index 00000000..badbab63
--- /dev/null
+++ b/doc/source/cli/command-objects/network-l3-conntrack-helper.rst
@@ -0,0 +1,8 @@
+===========================
+network l3 conntrack helper
+===========================
+
+Network v2
+
+.. autoprogram-cliff:: openstack.network.v2
+   :command: network l3 conntrack helper *
diff --git a/doc/source/cli/command-objects/volume-attachment.rst b/doc/source/cli/command-objects/volume-attachment.rst
new file mode 100644
index 00000000..56224446
--- /dev/null
+++ b/doc/source/cli/command-objects/volume-attachment.rst
@@ -0,0 +1,8 @@
+=================
+volume attachment
+=================
+
+Block Storage v3
+
+.. autoprogram-cliff:: openstack.volume.v3
+   :command: volume attachment *
diff --git a/doc/source/cli/command-objects/volume-group-snapshot.rst b/doc/source/cli/command-objects/volume-group-snapshot.rst
new file mode 100644
index 00000000..02a33c1e
--- /dev/null
+++ b/doc/source/cli/command-objects/volume-group-snapshot.rst
@@ -0,0 +1,8 @@
+=====================
+volume group snapshot
+=====================
+
+Block Storage v3
+
+.. autoprogram-cliff:: openstack.volume.v3
+   :command: volume group snapshot *
diff --git a/doc/source/cli/command-objects/volume-group-type.rst b/doc/source/cli/command-objects/volume-group-type.rst
new file mode 100644
index 00000000..edb88dc7
--- /dev/null
+++ b/doc/source/cli/command-objects/volume-group-type.rst
@@ -0,0 +1,8 @@
+=================
+volume group type
+=================
+
+Block Storage v3
+
+.. autoprogram-cliff:: openstack.volume.v3
+   :command: volume group type *
diff --git a/doc/source/cli/command-objects/volume-group.rst b/doc/source/cli/command-objects/volume-group.rst
new file mode 100644
index 00000000..50bc830f
--- /dev/null
+++ b/doc/source/cli/command-objects/volume-group.rst
@@ -0,0 +1,23 @@
+============
+volume group
+============
+
+Block Storage v3
+
+.. autoprogram-cliff:: openstack.volume.v3
+   :command: volume group create
+
+.. autoprogram-cliff:: openstack.volume.v3
+   :command: volume group delete
+
+.. autoprogram-cliff:: openstack.volume.v3
+   :command: volume group list
+
+.. autoprogram-cliff:: openstack.volume.v3
+   :command: volume group failover
+
+.. autoprogram-cliff:: openstack.volume.v3
+   :command: volume group set
+
+.. autoprogram-cliff:: openstack.volume.v3
+   :command: volume group show
diff --git a/doc/source/cli/command-objects/volume-message.rst b/doc/source/cli/command-objects/volume-message.rst
new file mode 100644
index 00000000..5b1a8ace
--- /dev/null
+++ b/doc/source/cli/command-objects/volume-message.rst
@@ -0,0 +1,8 @@
+==============
+volume message
+==============
+
+Block Storage v3
+
+.. autoprogram-cliff:: openstack.volume.v3
+   :command: volume message *
diff --git a/doc/source/cli/commands.rst b/doc/source/cli/commands.rst
index 94a0b5a6..7e592152 100644
--- a/doc/source/cli/commands.rst
+++ b/doc/source/cli/commands.rst
@@ -153,12 +153,17 @@ referring to both Compute and Volume quotas.
 * ``user``: (**Identity**) individual cloud resources users
 * ``user role``: (**Identity**) roles assigned to a user
 * ``volume``: (**Volume**) block volumes
+* ``volume attachment``: (**Volume**) an attachment of a volumes to a server
 * ``volume backup``: (**Volume**) backup for volumes
-* ``volume backend capability``: (**volume**) volume backend storage capabilities
-* ``volume backend pool``: (**volume**) volume backend storage pools
+* ``volume backend capability``: (**Volume**) volume backend storage capabilities
+* ``volume backend pool``: (**Volume**) volume backend storage pools
 * ``volume backup record``: (**Volume**) volume record that can be imported or exported
-* ``volume backend``: (**volume**) volume backend storage
+* ``volume backend``: (**Volume**) volume backend storage
+* ``volume group``: (**Volume**) group of volumes
+* ``volume group snapshot``: (**Volume**) a point-in-time copy of a volume group
+* ``volume group type``: (**Volume**) deployment-specific types of volumes groups available
 * ``volume host``: (**Volume**) the physical computer for volumes
+* ``volume message``: (**Volume**) volume API internal messages detailing volume failure messages
 * ``volume qos``: (**Volume**) quality-of-service (QoS) specification for volumes
 * ``volume snapshot``: (**Volume**) a point-in-time copy of a volume
 * ``volume type``: (**Volume**) deployment-specific types of volumes available
diff --git a/doc/source/cli/data/cinder.csv b/doc/source/cli/data/cinder.csv
index 22fb84cf..9d79d1ba 100644
--- a/doc/source/cli/data/cinder.csv
+++ b/doc/source/cli/data/cinder.csv
@@ -1,104 +1,146 @@
-absolute-limits,limits show --absolute,Lists absolute limits for a user.
-availability-zone-list,availability zone list --volume,Lists all availability zones.
-backup-create,volume backup create,Creates a volume backup.
-backup-delete,volume backup delete,Removes a backup.
-backup-export,volume backup record export,Export backup metadata record.
-backup-import,volume backup record import,Import backup metadata record.
-backup-list,volume backup list,Lists all backups.
-backup-reset-state,volume backup set --state,Explicitly updates the backup state.
-backup-restore,volume backup restore,Restores a backup.
-backup-show,volume backup show,Show backup details.
-cgsnapshot-create,consistency group snapshot create,Creates a cgsnapshot.
-cgsnapshot-delete,consistency group snapshot delete,Removes one or more cgsnapshots.
-cgsnapshot-list,consistency group snapshot list,Lists all cgsnapshots.
-cgsnapshot-show,consistency group snapshot show,Shows cgsnapshot details.
-consisgroup-create,consistency group create,Creates a consistency group.
-consisgroup-create-from-src,consistency group create --consistency-group-snapshot,Creates a consistency group from a cgsnapshot or a source CG
-consisgroup-delete,consistency group delete,Removes one or more consistency groups.
-consisgroup-list,consistency group list,Lists all consistencygroups.
-consisgroup-show,consistency group show,Shows details of a consistency group.
-consisgroup-update,consistency group set,Updates a consistencygroup.
-create,volume create,Creates a volume.
-credentials,WONTFIX,Shows user credentials returned from auth.
-delete,volume delete,Removes one or more volumes.
-encryption-type-create,volume type create --encryption-provider --enc..,Creates encryption type for a volume type. Admin only.
-encryption-type-delete,volume type delete,Deletes encryption type for a volume type. Admin only.
-encryption-type-list,volume type list --encryption-type,Shows encryption type details for volume types. Admin only.
-encryption-type-show,volume type list --encryption-show,Shows encryption type details for volume type. Admin only.
-encryption-type-update,volume type set --encryption-provider --enc..,Update encryption type information for a volume type (Admin Only).
-endpoints,catalog list,Discovers endpoints registered by authentication service.
-extend,volume set --size,Attempts to extend size of an existing volume.
-extra-specs-list,volume type list --long,Lists current volume types and extra specs.
-failover-host,volume host failover,Failover a replicating cinder-volume host.
-force-delete,volume delete --force,"Attempts force-delete of volume, regardless of state."
-freeze-host,volume host set --disable,Freeze and disable the specified cinder-volume host.
-get-capabilities,volume backend capability show,Show capabilities of a volume backend. Admin only.
-get-pools,volume backend pool list,Show pool information for backends. Admin only.
-image-metadata,volume set --image-property,Sets or deletes volume image metadata.
-image-metadata-show,volume show,Shows volume image metadata.
-list,volume list,Lists all volumes.
-manage,volume create --remote-source k=v,Manage an existing volume.
-metadata,volume set --property k=v / volume unset --property k,Sets or deletes volume metadata.
-metadata-show,volume show,Shows volume metadata.
-metadata-update-all,volume set --property k=v,Updates volume metadata.
-migrate,volume migrate --host --force-copy --lock-volume <volume>,Migrates volume to a new host.
-qos-associate,volume qos associate,Associates qos specs with specified volume type.
-qos-create,volume qos create,Creates a qos specs.
-qos-delete,volume qos delete,Deletes a specified qos specs.
-qos-disassociate,volume qos disassociate,Disassociates qos specs from specified volume type.
-qos-disassociate-all,volume qos disassociate --all,Disassociates qos specs from all associations.
-qos-get-association,volume qos show,Gets all associations for specified qos specs.
-qos-key,volume qos set --property k=v / volume qos unset --property k,Sets or unsets specifications for a qos spec
-qos-list,volume qos list,Lists qos specs.
-qos-show,volume qos show,Shows a specified qos specs.
-quota-class-show,quota show --class,Lists quotas for a quota class.
-quota-class-update,quota set --class,Updates quotas for a quota class.
-quota-defaults,quota show --default,Lists default quotas for a tenant.
-quota-delete,,Delete the quotas for a tenant.
-quota-show,quota show,Lists quotas for a tenant.
-quota-update,quota set,Updates quotas for a tenant.
-quota-usage,,Lists quota usage for a tenant.
-rate-limits,limits show --rate,Lists rate limits for a user.
-readonly-mode-update,volume set --read-only-mode | --read-write-mode,Updates volume read-only access-mode flag.
-rename,volume set --name,Renames a volume.
-replication-promote,WONTFIX,Promote a secondary volume to primary for a relationship
-replication-reenable,WONTFIX,Sync the secondary volume with primary for a relationship
-reset-state,volume set --state,Explicitly updates the volume state.
-retype,volume type set --type,Changes the volume type for a volume.
-service-disable,volume service set --disable,Disables the service.
-service-enable,volume service set --enable,Enables the service.
-service-list,volume service list,Lists all services. Filter by host and service binary.
-set-bootable,volume set --bootable / --not-bootable,Update bootable status of a volume.
-show,volume show,Shows volume details.
-snapshot-create,snapshot create,Creates a snapshot.
-snapshot-delete,snapshot delete,Remove one or more snapshots.
-snapshot-list,snapshot list,Lists all snapshots.
-snapshot-manage,volume snapshot create --remote-source <key=value>,Manage an existing snapshot.
-snapshot-metadata,snapshot set --property k=v / snapshot unset --property k,Sets or deletes snapshot metadata.
-snapshot-metadata-show,snapshot show,Shows snapshot metadata.
-snapshot-metadata-update-all,snapshot set --property k=v,Updates snapshot metadata.
-snapshot-rename,snapshot set --name,Renames a snapshot.
-snapshot-reset-state,snapshot set --state,Explicitly updates the snapshot state.
-snapshot-show,snapshot show,Shows snapshot details.
-snapshot-unmanage,volume snapshot delete --remote,Stop managing a snapshot.
-thaw-host,volume host set --enable,Thaw and enable the specified cinder-volume host.
-transfer-accept,volume transfer accept,Accepts a volume transfer.
-transfer-create,volume transfer create,Creates a volume transfer.
-transfer-delete,volume transfer delete,Undoes a transfer.
-transfer-list,volume transfer list,Lists all transfers.
-transfer-show,volume transfer show,Show transfer details.
-type-access-add,volume type set --project,Adds volume type access for the given project.
-type-access-list,volume type show,Print access information about the given volume type.
-type-access-remove,volume type unset --project,Removes volume type access for the given project.
-type-create,volume type create,Creates a volume type.
-type-default,volume type list --default,List the default volume type.
-type-delete,volume type delete,Deletes a specified volume type.
-type-key,volume type set --property k=v / volume type unset --property k,Sets or unsets extra_spec for a volume type.
-type-list,volume type list,Lists available 'volume types'.
-type-show,volume type show,Show volume type details.
-type-update,volume type set,"Updates volume type name, description, and/or is_public."
-unmanage,volume delete --remote,Stop managing a volume.
-upload-to-image,image create --volume,Uploads volume to Image Service as an image.
-bash-completion,complete,Prints arguments for bash_completion.
-help,help,Shows help about this program or one of its subcommands.
-list-extensions,extension list --volume,Lists all available os-api extensions.
+absolute-limits,limits show --absolute,Lists absolute limits for a user.
+api-version,WONTFIX,Display the server API version information.
+availability-zone-list,availability zone list --volume,Lists all availability zones.
+attachment-complete,volume attachment complete,Complete an attachment for a cinder volume. (Supported by API versions 3.44 - 3.latest)
+attachment-create,volume attachment create,Create an attachment for a cinder volume. (Supported by API versions 3.27 - 3.latest)
+attachment-delete,volume attachment delete,Delete an attachment for a cinder volume. (Supported by API versions 3.27 - 3.latest)
+attachment-list,volume attachment list,Lists all attachments. (Supported by API versions 3.27 - 3.latest)
+attachment-show,volume attachment show,Show detailed information for attachment. (Supported by API versions 3.27 - 3.latest)
+attachment-update,volume attachment update,Update an attachment for a cinder volume. (Supported by API versions 3.27 - 3.latest)
+backup-create,volume backup create,Creates a volume backup.
+backup-delete,volume backup delete,Removes a backup.
+backup-export,volume backup record export,Export backup metadata record.
+backup-import,volume backup record import,Import backup metadata record.
+backup-list,volume backup list,Lists all backups.
+backup-reset-state,volume backup set --state,Explicitly updates the backup state.
+backup-restore,volume backup restore,Restores a backup.
+backup-show,volume backup show,Show backup details.
+backup-update,volume backup set,Updates a backup. (Supported by API versions 3.9 - 3.latest)
+cgsnapshot-create,consistency group snapshot create,Creates a cgsnapshot.
+cgsnapshot-delete,consistency group snapshot delete,Removes one or more cgsnapshots.
+cgsnapshot-list,consistency group snapshot list,Lists all cgsnapshots.
+cgsnapshot-show,consistency group snapshot show,Shows cgsnapshot details.
+cluster-disable,,Disables clustered services. (Supported by API versions 3.7 - 3.latest)
+cluster-enable,,Enables clustered services. (Supported by API versions 3.7 - 3.latest)
+cluster-list,,Lists clustered services with optional filtering. (Supported by API versions 3.7 - 3.latest)
+cluster-show,,Show detailed information on a clustered service. (Supported by API versions 3.7 - 3.latest)
+consisgroup-create,consistency group create,Creates a consistency group.
+consisgroup-create-from-src,consistency group create --consistency-group-snapshot,Creates a consistency group from a cgsnapshot or a source CG
+consisgroup-delete,consistency group delete,Removes one or more consistency groups.
+consisgroup-list,consistency group list,Lists all consistencygroups.
+consisgroup-show,consistency group show,Shows details of a consistency group.
+consisgroup-update,consistency group set,Updates a consistencygroup.
+create,volume create,Creates a volume.
+delete,volume delete,Removes one or more volumes.
+encryption-type-create,volume type create --encryption-provider --enc..,Creates encryption type for a volume type. Admin only.
+encryption-type-delete,volume type delete,Deletes encryption type for a volume type. Admin only.
+encryption-type-list,volume type list --encryption-type,Shows encryption type details for volume types. Admin only.
+encryption-type-show,volume type list --encryption-show,Shows encryption type details for volume type. Admin only.
+encryption-type-update,volume type set --encryption-provider --enc..,Update encryption type information for a volume type (Admin Only).
+extend,volume set --size,Attempts to extend size of an existing volume.
+extra-specs-list,volume type list --long,Lists current volume types and extra specs.
+failover-host,volume host failover,Failover a replicating cinder-volume host.
+force-delete,volume delete --force,"Attempts force-delete of volume regardless of state."
+freeze-host,volume host set --disable,Freeze and disable the specified cinder-volume host.
+get-capabilities,volume backend capability show,Show capabilities of a volume backend. Admin only.
+get-pools,volume backend pool list,Show pool information for backends. Admin only.
+group-create,volume group create,Creates a group. (Supported by API versions 3.13 - 3.latest)
+group-create-from-src,,Creates a group from a group snapshot or a source group. (Supported by API versions 3.14 - 3.latest)
+group-delete,volume group delete,Removes one or more groups. (Supported by API versions 3.13 - 3.latest)
+group-disable-replication,volume group set --disable-replication,Disables replication for group. (Supported by API versions 3.38 - 3.latest)
+group-enable-replication,volume group set --enable-replication,Enables replication for group. (Supported by API versions 3.38 - 3.latest)
+group-failover-replication,volume group failover,Fails over replication for group. (Supported by API versions 3.38 - 3.latest)
+group-list,volume group list,Lists all groups. (Supported by API versions 3.13 - 3.latest)
+group-list-replication-targets,volume group list --replication-targets,Lists replication targets for group. (Supported by API versions 3.38 - 3.latest)
+group-show,volume group show,Shows details of a group. (Supported by API versions 3.13 - 3.latest)
+group-snapshot-create,volume group snapshot create,Creates a group snapshot. (Supported by API versions 3.14 - 3.latest)
+group-snapshot-delete,volume group snapshot delete,Removes one or more group snapshots. (Supported by API versions 3.14 - 3.latest)
+group-snapshot-list,volume group snapshot list,Lists all group snapshots. (Supported by API versions 3.14 - 3.latest)
+group-snapshot-show,volume group snapshot show,Shows group snapshot details. (Supported by API versions 3.14 - 3.latest)
+group-specs-list,volume group type list,Lists current group types and specs. (Supported by API versions 3.11 - 3.latest)
+group-type-create,volume group type create,Creates a group type. (Supported by API versions 3.11 - 3.latest)
+group-type-default,volume group type list --default,List the default group type. (Supported by API versions 3.11 - 3.latest)
+group-type-delete,volume group type delete,Deletes group type or types. (Supported by API versions 3.11 - 3.latest)
+group-type-key,volume group type set,Sets or unsets group_spec for a group type. (Supported by API versions 3.11 - 3.latest)
+group-type-list,volume group type set,Lists available 'group types'. (Admin only will see private types) (Supported by API versions 3.11 - 3.latest)
+group-type-show,volume group type show,Show group type details. (Supported by API versions 3.11 - 3.latest)
+group-type-update,volume group type set,Updates group type name description and/or is_public. (Supported by API versions 3.11 - 3.latest)
+group-update,volume group set,Updates a group. (Supported by API versions 3.13 - 3.latest)
+image-metadata,volume set --image-property,Sets or deletes volume image metadata.
+image-metadata-show,volume show,Shows volume image metadata.
+list,volume list,Lists all volumes.
+list-filters,,List enabled filters. (Supported by API versions 3.33 - 3.latest)
+manage,volume create --remote-source k=v,Manage an existing volume.
+manageable-list,,Lists all manageable volumes. (Supported by API versions 3.8 - 3.latest)
+message-delete,volume message delete,Removes one or more messages. (Supported by API versions 3.3 - 3.latest)
+message-list,volume message list,Lists all messages. (Supported by API versions 3.3 - 3.latest)
+message-show,volume message show,Shows message details. (Supported by API versions 3.3 - 3.latest)
+metadata,volume set --property k=v / volume unset --property k,Sets or deletes volume metadata.
+metadata-show,volume show,Shows volume metadata.
+metadata-update-all,volume set --property k=v,Updates volume metadata.
+migrate,volume migrate --host --force-copy --lock-volume <volume>,Migrates volume to a new host.
+qos-associate,volume qos associate,Associates qos specs with specified volume type.
+qos-create,volume qos create,Creates a qos specs.
+qos-delete,volume qos delete,Deletes a specified qos specs.
+qos-disassociate,volume qos disassociate,Disassociates qos specs from specified volume type.
+qos-disassociate-all,volume qos disassociate --all,Disassociates qos specs from all associations.
+qos-get-association,volume qos show,Gets all associations for specified qos specs.
+qos-key,volume qos set --property k=v / volume qos unset --property k,Sets or unsets specifications for a qos spec
+qos-list,volume qos list,Lists qos specs.
+qos-show,volume qos show,Shows a specified qos specs.
+quota-class-show,quota show --class,Lists quotas for a quota class.
+quota-class-update,quota set --class,Updates quotas for a quota class.
+quota-defaults,quota show --default,Lists default quotas for a tenant.
+quota-delete,,Delete the quotas for a tenant.
+quota-show,quota show,Lists quotas for a tenant.
+quota-update,quota set,Updates quotas for a tenant.
+quota-usage,,Lists quota usage for a tenant.
+rate-limits,limits show --rate,Lists rate limits for a user.
+readonly-mode-update,volume set --read-only-mode | --read-write-mode,Updates volume read-only access-mode flag.
+rename,volume set --name,Renames a volume.
+reset-state,volume set --state,Explicitly updates the volume state.
+retype,volume type set --type,Changes the volume type for a volume.
+revert-to-snapshot,,Revert a volume to the specified snapshot. (Supported by API versions 3.40 - 3.latest)
+service-disable,volume service set --disable,Disables the service.
+service-enable,volume service set --enable,Enables the service.
+service-get-log,,(Supported by API versions 3.32 - 3.latest)
+service-list,volume service list,Lists all services. Filter by host and service binary.
+service-set-log,,(Supported by API versions 3.32 - 3.latest)
+set-bootable,volume set --bootable / --not-bootable,Update bootable status of a volume.
+show,volume show,Shows volume details.
+snapshot-create,snapshot create,Creates a snapshot.
+snapshot-delete,snapshot delete,Remove one or more snapshots.
+snapshot-list,snapshot list,Lists all snapshots.
+snapshot-manage,volume snapshot create --remote-source <key=value>,Manage an existing snapshot.
+snapshot-manageable-list,,Lists all manageable snapshots. (Supported by API versions 3.8 - 3.latest)
+snapshot-metadata,snapshot set --property k=v / snapshot unset --property k,Sets or deletes snapshot metadata.
+snapshot-metadata-show,snapshot show,Shows snapshot metadata.
+snapshot-metadata-update-all,snapshot set --property k=v,Updates snapshot metadata.
+snapshot-rename,snapshot set --name,Renames a snapshot.
+snapshot-reset-state,snapshot set --state,Explicitly updates the snapshot state.
+snapshot-show,snapshot show,Shows snapshot details.
+snapshot-unmanage,volume snapshot delete --remote,Stop managing a snapshot.
+summary,,Get volumes summary. (Supported by API versions 3.12 - 3.latest)
+thaw-host,volume host set --enable,Thaw and enable the specified cinder-volume host.
+transfer-accept,volume transfer accept,Accepts a volume transfer.
+transfer-create,volume transfer create,Creates a volume transfer.
+transfer-delete,volume transfer delete,Undoes a transfer.
+transfer-list,volume transfer list,Lists all transfers.
+transfer-show,volume transfer show,Show transfer details.
+type-access-add,volume type set --project,Adds volume type access for the given project.
+type-access-list,volume type show,Print access information about the given volume type.
+type-access-remove,volume type unset --project,Removes volume type access for the given project.
+type-create,volume type create,Creates a volume type.
+type-default,volume type list --default,List the default volume type.
+type-delete,volume type delete,Deletes a specified volume type.
+type-key,volume type set --property k=v / volume type unset --property k,Sets or unsets extra_spec for a volume type.
+type-list,volume type list,Lists available 'volume types'.
+type-show,volume type show,Show volume type details.
+type-update,volume type set,"Updates volume type name description and/or is_public."
+unmanage,volume delete --remote,Stop managing a volume.
+upload-to-image,image create --volume,Uploads volume to Image Service as an image.
+version-list,,List all API versions. (Supported by API versions 3.0 - 3.latest)
+work-cleanup,,Request cleanup of services with optional filtering. (Supported by API versions 3.24 - 3.latest)
+bash-completion,complete,Prints arguments for bash_completion.
+help,help,Shows help about this program or one of its subcommands.
+list-extensions,extension list --volume,Lists all available os-api extensions.
diff --git a/doc/source/cli/data/glance.csv b/doc/source/cli/data/glance.csv
index 994a8fda..27585b95 100644
--- a/doc/source/cli/data/glance.csv
+++ b/doc/source/cli/data/glance.csv
@@ -1,22 +1,58 @@
 explain,WONTFIX,Describe a specific model.
 image-create,image create,Create a new image.
+image-create-via-import,,EXPERIMENTAL: Create a new image via image import.
 image-deactivate,image set --deactivate,Deactivate specified image.
 image-delete,image delete,Delete specified image.
 image-download,image save,Download a specific image.
+image-import,,Initiate the image import taskflow.
 image-list,image list,List images you can access.
 image-reactivate,image set --activate,Reactivate specified image.
 image-show,image show,Describe a specific image.
+image-stage,,Upload data for a specific image to staging.
 image-tag-delete,image unset --tag <tag>,Delete the tag associated with the given image.
 image-tag-update,image set --tag <tag>,Update an image with the given tag.
 image-update,image set,Update an existing image.
 image-upload,,Upload data for a specific image.
+import-info,,Print import methods available from Glance.
 location-add,,Add a location (and related metadata) to an image.
 location-delete,,Remove locations (and related metadata) from an image.
 location-update,,Update metadata of an image's location.
+md-namespace-create,,Create a new metadata definitions namespace.
+md-namespace-delete,,Delete specified metadata definitions namespace with its contents.
+md-namespace-import,,Import a metadata definitions namespace from file or standard input.
+md-namespace-list,,List metadata definitions namespaces.
+md-namespace-objects-delete,,Delete all metadata definitions objects inside a specific namespace.
+md-namespace-properties-delete,,Delete all metadata definitions property inside a specific namespace.
+md-namespace-resource-type-list,,List resource types associated to specific namespace.
+md-namespace-show,,Describe a specific metadata definitions namespace.
+md-namespace-tags-delete,,Delete all metadata definitions tags inside a specific namespace.
+md-namespace-update,,Update an existing metadata definitions namespace.
+md-object-create,,Create a new metadata definitions object inside a namespace.
+md-object-delete,,Delete a specific metadata definitions object inside a namespace.
+md-object-list,,List metadata definitions objects inside a specific namespace.
+md-object-property-show,,Describe a specific metadata definitions property inside an object.
+md-object-show,,Describe a specific metadata definitions object inside a namespace.
+md-object-update,,Update metadata definitions object inside a namespace.
+md-property-create,,Create a new metadata definitions property inside a namespace.
+md-property-delete,,Delete a specific metadata definitions property inside a namespace.
+md-property-list,,List metadata definitions properties inside a specific namespace.
+md-property-show,,Describe a specific metadata definitions property inside a namespace.
+md-property-update,,Update metadata definitions property inside a namespace.
+md-resource-type-associate,,Associate resource type with a metadata definitions namespace.
+md-resource-type-deassociate,,Deassociate resource type with a metadata definitions namespace.
+md-resource-type-list,,List available resource type names.
+md-tag-create,,Add a new metadata definitions tag inside a namespace.
+md-tag-create-multiple,,Create new metadata definitions tags inside a namespace.
+md-tag-delete,,Delete a specific metadata definitions tag inside a namespace.
+md-tag-list,,List metadata definitions tags inside a specific namespace.
+md-tag-show,,Describe a specific metadata definitions tag inside a namespace.
+md-tag-update,,Rename a metadata definitions tag inside a namespace.
 member-create,image add project,Create member for a given image.
 member-delete,image remove project,Delete image member.
 member-list,,Describe sharing permissions by image.
 member-update,image set --accept --reject --status,Update the status of a member for a given image.
+stores-delete,,Delete image from specific store.
+stores-info,,Print available backends from Glance.
 task-create,,Create a new task.
 task-list,,List tasks you can access.
 task-show,,Describe a specific task.
diff --git a/doc/source/cli/data/neutron.csv b/doc/source/cli/data/neutron.csv
index 080114e2..402f4064 100644
--- a/doc/source/cli/data/neutron.csv
+++ b/doc/source/cli/data/neutron.csv
@@ -35,6 +35,23 @@ dhcp-agent-network-add,network agent add network,Add a network to a DHCP agent.
 dhcp-agent-network-remove,network agent remove network,Remove a network from a DHCP agent.
 ext-list,extension list,List all extensions.
 ext-show,extension show,Show information of a given resource.
+firewall-create,,Create a firewall.
+firewall-delete,,Delete a given firewall.
+firewall-list,,List firewalls that belong to a given tenant.
+firewall-policy-create,,Create a firewall policy.
+firewall-policy-delete,,Delete a given firewall policy.
+firewall-policy-insert-rule,,Insert a rule into a given firewall policy.
+firewall-policy-list,,List firewall policies that belong to a given tenant.
+firewall-policy-remove-rule,,Remove a rule from a given firewall policy.
+firewall-policy-show,,Show information of a given firewall policy.
+firewall-policy-update,,Update a given firewall policy.
+firewall-rule-create,,Create a firewall rule.
+firewall-rule-delete,,Delete a given firewall rule.
+firewall-rule-list,,List firewall rules that belong to a given tenant.
+firewall-rule-show,,Show information of a given firewall rule.
+firewall-rule-update,,Update a given firewall rule.
+firewall-show,,Show information of a given firewall.
+firewall-update,,Update a given firewall.
 flavor-associate,network flavor add profile,Add a Neutron service flavor with a flavor profile.
 flavor-create,network flavor create,Create a Neutron service flavor.
 flavor-delete,network flavor delete,Delete a given Neutron service flavor.
@@ -214,14 +231,6 @@ subnetpool-update,subnet pool set / subnet pool unset,Update subnetpool's inform
 tag-add,network set --tag,Add a tag into the resource.
 tag-remove,network unset --tag,Remove a tag on the resource.
 tag-replace,,Replace all tags on the resource.
-tap-flow-create,tapflow create,Create a tap flow
-tap-flow-delete,tapflow delete,Delete a tap flow
-tap-flow-list,tapflow list,List all tap flows
-tap-flow-show,tapflow show,Show details of the tap flow
-tap-service-create,tapservice create,Create a tap service
-tap-service-delete,tapservice delete,Delete a tap service
-tap-service-list,tapservice list,List all tap services
-tap-service-show,tapservice show,Show details of the tap service
 vpn-endpoint-group-create,,Create a VPN endpoint group.
 vpn-endpoint-group-delete,,Delete a given VPN endpoint group.
 vpn-endpoint-group-list,,List VPN endpoint groups that belong to a given tenant.
@@ -242,3 +251,12 @@ vpn-service-delete,,Delete a given VPN service.
 vpn-service-list,,List VPN service configurations that belong to a given tenant.
 vpn-service-show,,Show information of a given VPN service.
 vpn-service-update,,Update a given VPN service.
+
+tap-flow-create,tapflow create,Create a tap flow
+tap-flow-delete,tapflow delete,Delete a tap flow
+tap-flow-list,tapflow list,List all tap flows
+tap-flow-show,tapflow show,Show details of the tap flow
+tap-service-create,tapservice create,Create a tap service
+tap-service-delete,tapservice delete,Delete a tap service
+tap-service-list,tapservice list,List all tap services
+tap-service-show,tapservice show,Show details of the tap service
diff --git a/doc/source/cli/data/nova.csv b/doc/source/cli/data/nova.csv
index c319a4a6..83911f12 100644
--- a/doc/source/cli/data/nova.csv
+++ b/doc/source/cli/data/nova.csv
@@ -1,10 +1,10 @@
-add-fixed-ip,server add fixed ip,Add new IP address on a network to server.
 add-secgroup,server add security group,Add a Security Group to a server.
 agent-create,compute agent create,Create new agent build.
 agent-delete,compute agent delete,Delete existing agent build.
 agent-list,compute agent list,List all builds.
 agent-modify,compute agent set,Modify existing agent build.
 aggregate-add-host,aggregate add host,Add the host to the specified aggregate.
+aggregate-cache-images,,Request images be cached. (Supported by API versions '2.81' - '2.latest') [hint: use '-- os-compute-api-version' flag to show help message for proper version]
 aggregate-create,aggregate create,Create a new aggregate with the specified details.
 aggregate-delete,aggregate delete,Delete the aggregate.
 aggregate-list,aggregate list,Print a list of all aggregates.
@@ -15,12 +15,7 @@ aggregate-update,aggregate set / unset,Update the aggregate's name and optionall
 availability-zone-list,availability zone list,List all the availability zones.
 backup,server backup create,Backup a server by creating a 'backup' type snapshot.
 boot,server create,Boot a new server.
-cell-capacities,,Get cell capacities for all cells or a given cell.
-cell-show,,Show details of a given cell.
-clear-password,server set --root-password,Clear the admin password for a server from the metadata server.
-cloudpipe-configure,WONTFIX,Update the VPN IP/port of a cloudpipe instance.
-cloudpipe-create,WONTFIX,Create a cloudpipe instance for the given project.
-cloudpipe-list,WONTFIX,Print a list of all cloudpipe instances.
+clear-password,server set --root-password,Clear the admin password for a server from the metadata server. This action does not actually change the instance server password.
 console-log,console log show,Get console log output of a server.
 delete,server delete,Immediately shut down and delete specified server(s).
 diagnostics,openstack server show --diagnostics,Retrieve server diagnostics.
@@ -33,24 +28,19 @@ flavor-delete,flavor delete,Delete a specific flavor
 flavor-key,flavor set / unset,Set or unset extra_spec for a flavor.
 flavor-list,flavor list,Print a list of available 'flavors'
 flavor-show,flavor show,Show details about the given flavor.
-floating-ip-associate,server add floating ip,Associate a floating IP address to a server.
-floating-ip-disassociate,server remove floating ip,Disassociate a floating IP address from a server.
+flavor-update,,Update the description of an existing flavor. (Supported by API versions '2.55' - '2.latest') [hint: use '--os-compute-api- version' flag to show help message for proper version]
 force-delete,server delete,Force delete a server.
-get-mks-console,console url show --mks,Get an MKS console to a server.
-get-password,WONTFIX,Get the admin password for a server.
+get-mks-console,console url show --mks,Get an MKS console to a server. (Supported by API versions '2.8' - '2.latest') [hint: use ' --os-compute-api-version' flag to show help message for proper version]
+get-password,WONTFIX,Get the admin password for a server. This operation calls the metadata service to query metadata information and does not read password information from the server itself.
 get-rdp-console,console url show --rdp,Get a rdp console to a server.
 get-serial-console,console url show --serial,Get a serial console to a server.
 get-spice-console,console url show --spice,Get a spice console to a server.
-get-vnc-console,console url show --novnc | --xvpvnc,Get a vnc console to a server.
-host-action,,Perform a power action on a host.
-host-describe,host show,Describe a specific host.
+get-vnc-console,console url show --novnc,Get a vnc console to a server.
 host-evacuate,,Evacuate all instances from failed host.
 host-evacuate-live,,Live migrate all instances off the specified host to other available hosts.
-host-list,host list,List all hosts by service.
 host-meta,,Set or Delete metadata on all instances of a host.
 host-servers-migrate,,Cold migrate all instances off the specified host to other available hosts.
-host-update,host set,Update host settings.
-hypervisor-list,hypervisor list,List hypervisors.
+hypervisor-list,hypervisor list,List hypervisors. (Supported by API versions '2.0' - '2.latest')
 hypervisor-servers,,List servers belonging to specific hypervisors.
 hypervisor-show,hypervisor show,Display the details of the specified hypervisor.
 hypervisor-stats,hypervisor stats show,Get hypervisor statistics over all compute nodes.
@@ -58,6 +48,7 @@ hypervisor-uptime,,Display the uptime of the specified hypervisor.
 image-create,server image create,Create a new image by taking a snapshot of a running server.
 instance-action,,Show an action.
 instance-action-list,,List actions on a server.
+instance-usage-audit-log,,List/Get server usage audits.
 interface-attach,,Attach a network interface to a server.
 interface-detach,,Detach a network interface from a server.
 interface-list,port list --server,List interfaces attached to a server.
@@ -67,7 +58,6 @@ keypair-list,keypair list,Print a list of keypairs for a user
 keypair-show,keypair show,Show details about the given keypair.
 limits,limits show,Print rate and absolute limits.
 list,server list,List active servers.
-list-extensions,extension list,List all the os-api extensions that are available.
 list-secgroup,security group list,List Security Group(s) of a server.
 live-migration,,Migrate running server to a new machine.
 live-migration-abort,,Abort an on-going live migration.
@@ -86,7 +76,6 @@ quota-update,quota set,Update the quotas for a tenant/user.
 reboot,server reboot,Reboot a server.
 rebuild,server rebuild,"Shutdown, re-image, and re-boot a server."
 refresh-network,WONTFIX,Refresh server network information.
-remove-fixed-ip,server remove fixed ip,Remove an IP address from a server.
 remove-secgroup,server remove security group,Remove a Security Group from a server.
 rescue,server rescue,Reboots a server into rescue mode.
 reset-network,WONTFIX,Reset network of a server.
@@ -107,6 +96,7 @@ server-tag-delete,,Delete one or more tags from a server.
 server-tag-delete-all,,Delete all tags from a server.
 server-tag-list,,Get list of tags from a server.
 server-tag-set,,Set list of tags to a server.
+server-topology,openstack server show --topology,Retrieve server topology. (Supported by API versions '2.78' - '2.latest') [hint: use '-- os-compute-api-version' flag to show help message for proper version]
 service-delete,compute service delete,Delete the service.
 service-disable,compute service set --disable,Disable the service.
 service-enable,compute service set --enable,Enable the service.
@@ -121,22 +111,17 @@ start,server start,Start the server(s).
 stop,server stop,Stop the server(s).
 suspend,server suspend,Suspend a server.
 trigger-crash-dump,server dump create,Trigger crash dump in an instance.
-topology,openstack server show --topology,Retrieve server NUMA topology.
 unlock,server unlock,Unlock a server.
 unpause,server unpause,Unpause a server.
 unrescue,server unrescue,Restart the server from normal boot disk again.
 unshelve,server unshelve,Unshelve a server.
-update,server set / unset --description,Update or unset the description for a server.
-update,server set --name,Update the name for a server.
+update,server set / unset,Update the name or the description for a server.
 usage,usage show,Show usage data for a single tenant.
 usage-list,usage list,List usage data for all tenants.
 version-list,,List all API versions.
-virtual-interface-list,,Show virtual interface info about the given server.
 volume-attach,server add volume,Attach a volume to a server.
 volume-attachments,server show,List all the volumes attached to a server.
 volume-detach,server remove volume,Detach a volume from a server.
 volume-update,,Update volume attachment.
-x509-create-cert,WONTFIX,Create x509 cert for a user in tenant.
-x509-get-root-cert,WONTFIX,Fetch the x509 root cert.
-bash-completion,complete,Prints all of the commands and options to
+bash-completion,complete,Prints all of the commands and options to stdout so that the nova.bash_completion script doesn't have to hard code them.
 help,help,Display help about this program or one of its subcommands.