From c28ed25e3a6f2d9cf5fc349c544354a9d07aa957 Mon Sep 17 00:00:00 2001
From: Matt Riedemann <mriedem.os@gmail.com>
Date: Thu, 1 Aug 2019 14:15:32 -0400
Subject: [PATCH] Fix <id> description for --block-device-mapping

The <id> portion of a --block-device-mapping value can be
the resource name or id since the code uses the appropriate
type-specific find_resource utility to lookup the resource
based on the value given.

This change simply fixes the description of <id> to mention
it's name or id rather than just "UUID". My guess is the
description was originally copied from novaclient where id
must be an id since name resolution does not happen in novaclient.

Change-Id: I567f6f6efb3a3b6d387133d21aa81354b2d753bc
---
 openstackclient/compute/v2/server.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index a0afa389f6..fee2b27d4a 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -575,13 +575,12 @@ class CreateServer(command.ShowOne):
             # NOTE(RuiChen): Add '\n' at the end of line to put each item in
             #                the separated line, avoid the help message looks
             #                messy, see _SmartHelpFormatter in cliff.
-            # FIXME(mriedem): Technically <id> can be the name or ID.
             help=_('Create a block device on the server.\n'
                    'Block device mapping in the format\n'
                    '<dev-name>=<id>:<type>:<size(GB)>:<delete-on-terminate>\n'
                    '<dev-name>: block device name, like: vdb, xvdc '
                    '(required)\n'
-                   '<id>: UUID of the volume, volume snapshot or image '
+                   '<id>: Name or ID of the volume, volume snapshot or image '
                    '(required)\n'
                    '<type>: volume, snapshot or image; default: volume '
                    '(optional)\n'