From 7319a40767641aa83d75cc99a807fd231f52f1ac Mon Sep 17 00:00:00 2001
From: Eric Harney <eharney@redhat.com>
Date: Mon, 15 Oct 2018 11:29:01 -0400
Subject: [PATCH] Re-enable shell UUID completion cache

This enables writing ids to a local completion
cache when using the cinderclient shell, which
allows tools/cinder.bash_completion to complete
commands such as
    cinder delete a<tab>

Volume ids are recorded on "cinder list" and
"cinder create" operations, similar for backup ids.

This functionality was unintentionally removed in
changes some time ago.  Labeled as Partial-Bug
because I haven't added name caching yet, which also
used to exist.

Partial-Bug: #1712835
Change-Id: Id56aa43b061758a00a2a8c9c92a5a33ab9f7ab84
(cherry picked from commit c4b37c2830fdd90b57383a93e09a8bd40ca41221)
---
 cinderclient/v3/shell.py | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/cinderclient/v3/shell.py b/cinderclient/v3/shell.py
index 71319e9e5..1de0a3f9d 100644
--- a/cinderclient/v3/shell.py
+++ b/cinderclient/v3/shell.py
@@ -23,6 +23,7 @@ import os
 from oslo_utils import strutils
 import six
 
+import cinderclient
 from cinderclient import api_versions
 from cinderclient import base
 from cinderclient import exceptions
@@ -175,6 +176,13 @@ def do_backup_list(cs, args):
     if show_count:
         print("Backup in total: %s" % total_count)
 
+    with cs.backups.completion_cache(
+            'uuid',
+            cinderclient.v3.volume_backups.VolumeBackup,
+            mode="w"):
+        for backup in backups:
+            cs.backups.write_to_completion_cache('uuid', backup.id)
+
 
 @utils.arg('--detail',
            action='store_true',
@@ -391,6 +399,12 @@ def do_list(cs, args):
         servers = [s.get('server_id') for s in vol.attachments]
         setattr(vol, 'attached_to', ','.join(map(str, servers)))
 
+    with cs.volumes.completion_cache('uuid',
+                                     cinderclient.v3.volumes.Volume,
+                                     mode="w"):
+        for vol in volumes:
+            cs.volumes.write_to_completion_cache('uuid', vol.id)
+
     if field_titles:
         # Remove duplicate fields
         key_list = ['ID']
@@ -641,6 +655,11 @@ def do_create(cs, args):
 
     utils.print_dict(info)
 
+    with cs.volumes.completion_cache('uuid',
+                                     cinderclient.v3.volumes.Volume,
+                                     mode="a"):
+        cs.volumes.write_to_completion_cache('uuid', volume.id)
+
 
 @utils.arg('volume',
            metavar='<volume>',
@@ -2403,6 +2422,12 @@ def do_backup_create(cs, args):
 
     utils.print_dict(info)
 
+    with cs.backups.completion_cache(
+            'uuid',
+            cinderclient.v3.volume_backups.VolumeBackup,
+            mode="a"):
+        cs.backups.write_to_completion_cache('uuid', backup.id)
+
 
 @utils.arg('volume', metavar='<volume>',
            help='Name or ID of volume to transfer.')