diff options
| author | Zuul <zuul@review.opendev.org> | 2020-09-15 22:01:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-09-15 22:01:43 +0000 |
| commit | 0f5ffbe63207f16d78a8aaa8fa41717b27dbbb3f (patch) | |
| tree | 300801cac86507b878bd0b1a435cae314f165e9b | |
| parent | bbeb4009a4f2e317aaf108cfd7c6694e0a43d25d (diff) | |
| parent | 4756e291b6b29835c8a8cdfb09d716fe39ee9733 (diff) | |
| download | python-troveclient-0f5ffbe63207f16d78a8aaa8fa41717b27dbbb3f.tar.gz | |
Merge "Show project Id for backup"
| -rw-r--r-- | troveclient/osc/v1/database_backups.py | 2 | ||||
| -rw-r--r-- | troveclient/tests/fakes.py | 9 | ||||
| -rw-r--r-- | troveclient/tests/osc/v1/test_database_backups.py | 12 |
3 files changed, 17 insertions, 6 deletions
diff --git a/troveclient/osc/v1/database_backups.py b/troveclient/osc/v1/database_backups.py index 779b942..9525ed0 100644 --- a/troveclient/osc/v1/database_backups.py +++ b/troveclient/osc/v1/database_backups.py @@ -33,7 +33,7 @@ class ListDatabaseBackups(command.Lister): _description = _("List database backups") columns = ['ID', 'Instance ID', 'Name', 'Status', 'Parent ID', - 'Updated'] + 'Updated', 'Project ID'] def get_parser(self, prog_name): parser = super(ListDatabaseBackups, self).get_parser(prog_name) diff --git a/troveclient/tests/fakes.py b/troveclient/tests/fakes.py index 53ea5c5..be074c2 100644 --- a/troveclient/tests/fakes.py +++ b/troveclient/tests/fakes.py @@ -680,7 +680,9 @@ class FakeHTTPClient(base_client.HTTPClient): "instance_id": "1234", "parent_id": None, "locationRef": ("http://backup_srvr/database_backups/" - "bk-1234.xbstream.gz.enc")}, + "bk-1234.xbstream.gz.enc"), + "project_id": "262db161-d3e4-4218-8bde-5bd879fc3e61" + }, { "status": "COMPLETED", "updated": "2015-05-16T14:22:12", @@ -694,7 +696,10 @@ class FakeHTTPClient(base_client.HTTPClient): "instance_id": "5678", "parent_id": None, "locationRef": ("http://backup_srvr/database_backups/" - "bk-5678.xbstream.gz.enc")}]}) + "bk-5678.xbstream.gz.enc"), + "project_id": "262db161-d3e4-4218-8bde-5bd879fc3e61" + } + ]}) def get_backups_bk_1234(self, **kw): r = {'backup': self.get_backups()[2]['backups'][0]} diff --git a/troveclient/tests/osc/v1/test_database_backups.py b/troveclient/tests/osc/v1/test_database_backups.py index 7a4ae13..a552d25 100644 --- a/troveclient/tests/osc/v1/test_database_backups.py +++ b/troveclient/tests/osc/v1/test_database_backups.py @@ -34,7 +34,7 @@ class TestBackupList(TestBackups): columns = database_backups.ListDatabaseBackups.columns values = ('bk-1234', '1234', 'bkp_1', 'COMPLETED', None, - '2015-05-16T14:23:08') + '2015-05-16T14:23:08', '262db161-d3e4-4218-8bde-5bd879fc3e61') def setUp(self): super(TestBackupList, self).setUp() @@ -141,7 +141,9 @@ class TestBackupShow(TestBackups): values = ('2015-05-16T14:22:28', 'mysql', '5.6', 'v-56', None, 'bk-1234', '1234', 'http://backup_srvr/database_backups/bk-1234.xbstream.gz.enc', - 'bkp_1', None, 0.11, 'COMPLETED', '2015-05-16T14:23:08') + 'bkp_1', None, + '262db161-d3e4-4218-8bde-5bd879fc3e61', + 0.11, 'COMPLETED', '2015-05-16T14:23:08') def setUp(self): super(TestBackupShow, self).setUp() @@ -159,6 +161,7 @@ class TestBackupShow(TestBackups): 'locationRef', 'name', 'parent_id', + 'project_id', 'size', 'status', 'updated', @@ -203,7 +206,9 @@ class TestBackupCreate(TestBackups): values = ('2015-05-16T14:22:28', 'mysql', '5.6', 'v-56', None, 'bk-1234', '1234', 'http://backup_srvr/database_backups/bk-1234.xbstream.gz.enc', - 'bkp_1', None, 0.11, 'COMPLETED', '2015-05-16T14:23:08') + 'bkp_1', None, + '262db161-d3e4-4218-8bde-5bd879fc3e61', + 0.11, 'COMPLETED', '2015-05-16T14:23:08') def setUp(self): super(TestBackupCreate, self).setUp() @@ -221,6 +226,7 @@ class TestBackupCreate(TestBackups): 'locationRef', 'name', 'parent_id', + 'project_id', 'size', 'status', 'updated', |