From c4d21897f59bd5ee29123de55d83f2221f4c4e0f Mon Sep 17 00:00:00 2001
From: wangyao <wangyao@cmss.chinamobile.com>
Date: Tue, 7 Nov 2017 19:27:52 +0800
Subject: [PATCH] Add proper message when delete instance or cluster

According bug description, not like nova-delete when use trove-delete
there is no message or alert is generated. To solve this problem, I
added some message when normally execute deleting instance or cluster.

Change-Id: I572a24116fd1abec220f49a3f9705a5c071155bf
Closes-Bug: #1569669
---
 troveclient/utils.py    |  7 +++++++
 troveclient/v1/shell.py | 16 ++++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/troveclient/utils.py b/troveclient/utils.py
index 69e0b3d3..bad5c51d 100644
--- a/troveclient/utils.py
+++ b/troveclient/utils.py
@@ -324,3 +324,10 @@ def decode_data(data):
 
     # py27 & py34 seem to understand bytearray the same
     return bytearray([item for item in base64.b64decode(data)])
+
+
+def do_action_with_msg(action, success_msg):
+    """Helper to run an action with return message."""
+
+    action
+    print(success_msg)
diff --git a/troveclient/v1/shell.py b/troveclient/v1/shell.py
index ba693c92..1cb9057f 100644
--- a/troveclient/v1/shell.py
+++ b/troveclient/v1/shell.py
@@ -407,7 +407,9 @@ def do_cluster_shrink(cs, args):
 def do_delete(cs, args):
     """Deletes an instance."""
     instance = _find_instance(cs, args.instance)
-    cs.instances.delete(instance)
+    msg = _("Request to delete instance %s "
+            "has been accepted.") % instance.id
+    utils.do_action_with_msg(cs.instances.delete(instance), msg)
 
 
 @utils.arg('instance', metavar='<instance>',
@@ -416,8 +418,10 @@ def do_delete(cs, args):
 def do_force_delete(cs, args):
     """Force delete an instance."""
     instance = _find_instance(cs, args.instance)
+    msg = _("Request to force delete instance %s "
+            "has been accepted.") % instance.id
     cs.instances.reset_status(instance)
-    cs.instances.delete(instance)
+    utils.do_action_with_msg(cs.instances.delete(instance), msg)
 
 
 @utils.arg('instance', metavar='<instance>',
@@ -438,7 +442,9 @@ def do_reset_status(cs, args):
 def do_cluster_delete(cs, args):
     """Deletes a cluster."""
     cluster = _find_cluster(cs, args.cluster)
-    cs.clusters.delete(cluster)
+    msg = _("Request to delete cluster %s "
+            "has been accepted.") % cluster.id
+    utils.do_action_with_msg(cs.clusters.delete(cluster), msg)
 
 
 @utils.arg('cluster', metavar='<cluster>',
@@ -447,8 +453,10 @@ def do_cluster_delete(cs, args):
 def do_cluster_force_delete(cs, args):
     """Force delete a cluster"""
     cluster = _find_cluster(cs, args.cluster)
+    msg = _("Request to force delete cluster %s "
+            "has been accepted.") % cluster.id
     cs.clusters.reset_status(cluster)
-    cs.clusters.delete(cluster)
+    utils.do_action_with_msg(cs.clusters.delete(cluster), msg)
 
 
 @utils.arg('cluster', metavar='<cluster>',