Merge "Add execution-delete to OSC"

releasenotes/notes/add-execution-delete-to-osc-013b4bf00a1cb8ff.yaml

@@ -0,0 +1,5 @@
+---
+features:
+    - The command ``trove execution-delete`` is now available to use in
+      the python-openstackclient CLI as ``openstack database backup
+      execution delete``

setup.cfg

@@ -32,6 +32,7 @@ openstack.cli.extension =
 openstack.database.v1 =
     database_backup_create= troveclient.osc.v1.database_backups:CreateDatabaseBackup
     database_backup_delete = troveclient.osc.v1.database_backups:DeleteDatabaseBackup
+    database_backup_execution_delete = troveclient.osc.v1.database_backups:DeleteDatabaseBackupExecution
     database_backup_list = troveclient.osc.v1.database_backups:ListDatabaseBackups
     database_backup_list_instance = troveclient.osc.v1.database_backups:ListDatabaseInstanceBackups
     database_backup_show = troveclient.osc.v1.database_backups:ShowDatabaseBackup

troveclient/osc/v1/database_backups.py

@@ -220,3 +220,22 @@ class CreateDatabaseBackup(command.ShowOne):
                                          incremental=parsed_args.incremental)
         backup = set_attributes_for_print_detail(backup)
         return zip(*sorted(six.iteritems(backup)))
+
+
+class DeleteDatabaseBackupExecution(command.Command):
+
+    _description = _("Deletes an execution.")
+
+    def get_parser(self, prog_name):
+        parser = super(DeleteDatabaseBackupExecution, self).get_parser(
+            prog_name)
+        parser.add_argument(
+            'execution',
+            metavar='<execution>',
+            help=_('ID of the execution to delete.')
+        )
+        return parser
+
+    def take_action(self, parsed_args):
+        database_backups = self.app.client_manager.database.backups
+        database_backups.execution_delete(parsed_args.execution)

troveclient/tests/osc/v1/test_database_backups.py

@@ -206,3 +206,18 @@ class TestBackupCreate(TestBackups):
                                                      description='backup 1234',
                                                      parent_id='1234-1',
                                                      incremental=True)
+
+
+class TestDatabaseBackupExecutionDelete(TestBackups):
+
+    def setUp(self):
+        super(TestDatabaseBackupExecutionDelete, self).setUp()
+        self.cmd = database_backups.DeleteDatabaseBackupExecution(
+            self.app, None)
+
+    def test_execution_delete(self):
+        args = ['execution']
+        parsed_args = self.check_parser(self.cmd, args, [])
+        result = self.cmd.take_action(parsed_args)
+        self.backup_client.execution_delete.assert_called_with('execution')
+        self.assertIsNone(result)