From bf67b80dbff7c8fdb7e4dcaa11bd1809f0cf7566 Mon Sep 17 00:00:00 2001
From: NiallBunting <niall.bunting@hpe.com>
Date: Tue, 8 Dec 2015 17:28:14 +0000
Subject: [PATCH] Disable suggestion of v1 help for v2 commands

Currently the client suggests 'Run `glance --os-image-api-version 1
help` for v1 help' at the end of every help message. This is could
be confusing for a v2 only command.

Therefore this patch disables it if the command does not exist in v1,
while keeping the message on the 'glance help' results.

Change-Id: I967e9ba35afb8dc40524bd1d13284e684b435f81
Closes-Bug: 1520602
---
 glanceclient/shell.py | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/glanceclient/shell.py b/glanceclient/shell.py
index b0028ca..1b41cac 100755
--- a/glanceclient/shell.py
+++ b/glanceclient/shell.py
@@ -630,13 +630,24 @@ class OpenStackImagesShell(object):
             else:
                 raise exc.CommandError("'%s' is not a valid subcommand" %
                                        args.command)
-            command = ' ' + command
         else:
             parser.print_help()
 
         if not args.os_image_api_version or args.os_image_api_version == '2':
-            print(("\nRun `glance --os-image-api-version 1 help%s`"
-                   " for v1 help") % (command or ''))
+            # NOTE(NiallBunting) This currently assumes that the only versions
+            # are one and two.
+            try:
+                if command is None:
+                    print("\nRun `glance --os-image-api-version 1 help`"
+                          " for v1 help")
+                else:
+                    self.get_subcommand_parser(1)
+                    if command in self.subcommands:
+                        command = ' ' + command
+                        print(("\nRun `glance --os-image-api-version 1 help%s`"
+                               " for v1 help") % (command or ''))
+            except ImportError:
+                pass
 
     def do_bash_completion(self, _args):
         """Prints arguments for bash_completion.