diff options
author | Zuul <zuul@review.openstack.org> | 2018-07-18 05:52:02 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2018-07-18 05:52:02 +0000 |
commit | 048dd502fa8273e138cf76b752e39a912b16d534 (patch) | |
tree | ef035e759e76cbed8af361053bab08377b3c45b0 | |
parent | cb1d3672ab4ba38b869b39da2b0a670813e8f726 (diff) | |
parent | 83eb65cc84c3de0df477486e2adf622e0ddfa2e9 (diff) | |
download | python-troveclient-048dd502fa8273e138cf76b752e39a912b16d534.tar.gz |
Merge "Add execution-delete to OSC"
-rw-r--r-- | releasenotes/notes/add-execution-delete-to-osc-013b4bf00a1cb8ff.yaml | 5 | ||||
-rw-r--r-- | setup.cfg | 1 | ||||
-rw-r--r-- | troveclient/osc/v1/database_backups.py | 19 | ||||
-rw-r--r-- | troveclient/tests/osc/v1/test_database_backups.py | 15 |
4 files changed, 40 insertions, 0 deletions
diff --git a/releasenotes/notes/add-execution-delete-to-osc-013b4bf00a1cb8ff.yaml b/releasenotes/notes/add-execution-delete-to-osc-013b4bf00a1cb8ff.yaml new file mode 100644 index 0000000..96ff826 --- /dev/null +++ b/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`` @@ -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 diff --git a/troveclient/osc/v1/database_backups.py b/troveclient/osc/v1/database_backups.py index 8b3e973..8f2b160 100644 --- a/troveclient/osc/v1/database_backups.py +++ b/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) diff --git a/troveclient/tests/osc/v1/test_database_backups.py b/troveclient/tests/osc/v1/test_database_backups.py index 4b1d10a..bbcaefe 100644 --- a/troveclient/tests/osc/v1/test_database_backups.py +++ b/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) |