From c80b0c7133599affc624801a196b11aa9f8ad768 Mon Sep 17 00:00:00 2001 From: Trinath Somanchi Date: Mon, 13 Mar 2017 15:30:24 +0530 Subject: [PATCH] vnfd-delete gives ambiguous success message When a single vnfd is deleted, the following success message is delivered. $> tacker vnfd-delete cirros-vnfd-multi-vdu All vnfd(s) deleted successfully The above success message has to modified to " All specified %(resource)s(s) %(msg)s successfully? " Change-Id: I48443622b718a1d6a1476f53c6378b67ce0d82e4 Closes-Bug: #1672302 --- tackerclient/tacker/v1_0/__init__.py | 2 +- tackerclient/tests/unit/test_cli10.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tackerclient/tacker/v1_0/__init__.py b/tackerclient/tacker/v1_0/__init__.py index 80f4732e..884dd98a 100644 --- a/tackerclient/tacker/v1_0/__init__.py +++ b/tackerclient/tacker/v1_0/__init__.py @@ -560,7 +560,7 @@ class DeleteCommand(TackerCommand): msg += err_msg raise exceptions.CommandError(msg) else: - print((_('All %(resource)s(s) %(msg)s successfully') + print((_('All specified %(resource)s(s) %(msg)s successfully') % {'msg': self.deleted_msg.get(self.resource, 'deleted'), 'resource': self.resource})) return diff --git a/tackerclient/tests/unit/test_cli10.py b/tackerclient/tests/unit/test_cli10.py index 6c28ab19..667c6261 100644 --- a/tackerclient/tests/unit/test_cli10.py +++ b/tackerclient/tests/unit/test_cli10.py @@ -617,7 +617,7 @@ class CLITestV10Base(testtools.TestCase): headers=test_utils.ContainsKeyValue('X-Auth-Token', TOKEN)) mock_get.assert_called_once_with() _str = self.fake_stdout.make_string() - msg = 'All %(resource)s(s) %(msg)s successfully\n' % { + msg = 'All specified %(resource)s(s) %(msg)s successfully\n' % { 'msg': deleted_msg.get(resource, 'deleted'), 'resource': resource} self.assertEqual(msg, _str)