diff --git a/releasenotes/notes/add-user-delete-to-osc-35cb82b041ee2b48.yaml b/releasenotes/notes/add-user-delete-to-osc-35cb82b041ee2b48.yaml new file mode 100644 index 00000000..95531df0 --- /dev/null +++ b/releasenotes/notes/add-user-delete-to-osc-35cb82b041ee2b48.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + The command ``trove user-delete`` is now available to use in + the python-openstackclient CLI as ``openstack database user delete`` diff --git a/setup.cfg b/setup.cfg index 032800a8..74f0e396 100644 --- a/setup.cfg +++ b/setup.cfg @@ -42,6 +42,7 @@ openstack.database.v1 = database_instance_show = troveclient.osc.v1.database_instances:ShowDatabaseInstance database_limit_list = troveclient.osc.v1.database_limits:ListDatabaseLimits database_list = troveclient.osc.v1.databases:ListDatabases + database_user_delete = troveclient.osc.v1.database_users:DeleteDatabaseUser database_user_list = troveclient.osc.v1.database_users:ListDatabaseUsers database_user_show = troveclient.osc.v1.database_users:ShowDatabaseUser datastore_list = troveclient.osc.v1.datastores:ListDatastores diff --git a/troveclient/osc/v1/database_users.py b/troveclient/osc/v1/database_users.py index 5a22133d..9a2ca8d4 100644 --- a/troveclient/osc/v1/database_users.py +++ b/troveclient/osc/v1/database_users.py @@ -13,6 +13,7 @@ """Database v1 Users action implementations""" from osc_lib.command import command +from osc_lib import exceptions from osc_lib import utils import six @@ -75,3 +76,39 @@ class ShowDatabaseUser(command.ShowOne): user = db_users.get(parsed_args.instance, parsed_args.name, hostname=parsed_args.host) return zip(*sorted(six.iteritems(user._info))) + + +class DeleteDatabaseUser(command.Command): + + _description = _("Deletes a user from an instance.") + + def get_parser(self, prog_name): + parser = super(DeleteDatabaseUser, self).get_parser(prog_name) + parser.add_argument( + 'instance', + metavar='', + help=_('ID or name of the instance.') + ) + parser.add_argument( + 'name', + metavar='', + help=_('Name of user.') + ) + parser.add_argument( + '--host', + metavar='', + help=_('Optional host of user.') + ) + return parser + + def take_action(self, parsed_args): + manager = self.app.client_manager.database + users = manager.users + try: + instance = utils.find_resource(manager.instances, + parsed_args.instance) + users.delete(instance, parsed_args.name, parsed_args.host) + except Exception as e: + msg = (_("Failed to delete user %(user)s: %(e)s") + % {'user': parsed_args.name, 'e': e}) + raise exceptions.CommandError(msg) diff --git a/troveclient/tests/osc/v1/test_database_users.py b/troveclient/tests/osc/v1/test_database_users.py index fe5a19c7..5f798fe6 100644 --- a/troveclient/tests/osc/v1/test_database_users.py +++ b/troveclient/tests/osc/v1/test_database_users.py @@ -9,6 +9,10 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. +import mock + +from osc_lib import exceptions +from osc_lib import utils from troveclient import common from troveclient.osc.v1 import database_users @@ -62,3 +66,42 @@ class TestUserShow(TestUsers): columns, data = self.cmd.take_action(parsed_args) self.assertEqual(self.columns, columns) self.assertEqual(self.values, data) + + +class TestDatabaseUserDelete(TestUsers): + + def setUp(self): + super(TestDatabaseUserDelete, self).setUp() + self.cmd = database_users.DeleteDatabaseUser(self.app, None) + + @mock.patch.object(utils, 'find_resource') + def test_user_delete(self, mock_find): + args = ['userinstance', 'user1', '--host', '1.1.1.1'] + mock_find.return_value = args[0] + parsed_args = self.check_parser(self.cmd, args, []) + result = self.cmd.take_action(parsed_args) + self.user_client.delete.assert_called_with('userinstance', + 'user1', + '1.1.1.1') + self.assertIsNone(result) + + @mock.patch.object(utils, 'find_resource') + def test_user_delete_without_host(self, mock_find): + args = ['userinstance2', 'user1'] + mock_find.return_value = args[0] + parsed_args = self.check_parser(self.cmd, args, []) + result = self.cmd.take_action(parsed_args) + self.user_client.delete.assert_called_with('userinstance2', + 'user1', + None) + self.assertIsNone(result) + + @mock.patch.object(utils, 'find_resource') + def test_user_delete_with_exception(self, mock_find): + args = ['userfakeinstance', 'db1', '--host', '1.1.1.1'] + parsed_args = self.check_parser(self.cmd, args, []) + + mock_find.side_effect = exceptions.CommandError + self.assertRaises(exceptions.CommandError, + self.cmd.take_action, + parsed_args)