openstack/python-troveclient
Code Issues Proposed changes

Merge "Show project Id for backup"

Browse Source
This commit is contained in:
Zuul
2020-09-15 22:01:43 +00:00
committed by Gerrit Code Review
parent bbeb4009a4 4756e291b6
commit 0f5ffbe632
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
troveclient/osc/v1/database_backups.py
View File

@@ -33,7 +33,7 @@ class ListDatabaseBackups(command.Lister):
_description = _("List database backups") _description = _("List database backups")
columns = ['ID', 'Instance ID', 'Name', 'Status', 'Parent ID', columns = ['ID', 'Instance ID', 'Name', 'Status', 'Parent ID',
'Updated'] 'Updated', 'Project ID']
def get_parser(self, prog_name): def get_parser(self, prog_name):
parser = super(ListDatabaseBackups, self).get_parser(prog_name) parser = super(ListDatabaseBackups, self).get_parser(prog_name)

9
troveclient/tests/fakes.py
View File

@@ -680,7 +680,9 @@ class FakeHTTPClient(base_client.HTTPClient):
"instance_id": "1234", "instance_id": "1234",
"parent_id": None, "parent_id": None,
"locationRef": ("http://backup_srvr/database_backups/" "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", "status": "COMPLETED",
"updated": "2015-05-16T14:22:12", "updated": "2015-05-16T14:22:12",
@@ -694,7 +696,10 @@ class FakeHTTPClient(base_client.HTTPClient):
"instance_id": "5678", "instance_id": "5678",
"parent_id": None, "parent_id": None,
"locationRef": ("http://backup_srvr/database_backups/" "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): def get_backups_bk_1234(self, **kw):
r = {'backup': self.get_backups()[2]['backups'][0]} r = {'backup': self.get_backups()[2]['backups'][0]}

12
troveclient/tests/osc/v1/test_database_backups.py
View File

@@ -34,7 +34,7 @@ class TestBackupList(TestBackups):
columns = database_backups.ListDatabaseBackups.columns columns = database_backups.ListDatabaseBackups.columns
values = ('bk-1234', '1234', 'bkp_1', 'COMPLETED', None, 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): def setUp(self):
super(TestBackupList, self).setUp() 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', values = ('2015-05-16T14:22:28', 'mysql', '5.6', 'v-56', None, 'bk-1234',
'1234', '1234',
'http://backup_srvr/database_backups/bk-1234.xbstream.gz.enc', '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): def setUp(self):
super(TestBackupShow, self).setUp() super(TestBackupShow, self).setUp()
@@ -159,6 +161,7 @@ class TestBackupShow(TestBackups):
'locationRef', 'locationRef',
'name', 'name',
'parent_id', 'parent_id',
'project_id',
'size', 'size',
'status', 'status',
'updated', 'updated',
@@ -203,7 +206,9 @@ class TestBackupCreate(TestBackups):
values = ('2015-05-16T14:22:28', 'mysql', '5.6', 'v-56', None, 'bk-1234', values = ('2015-05-16T14:22:28', 'mysql', '5.6', 'v-56', None, 'bk-1234',
'1234', '1234',
'http://backup_srvr/database_backups/bk-1234.xbstream.gz.enc', '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): def setUp(self):
super(TestBackupCreate, self).setUp() super(TestBackupCreate, self).setUp()
@@ -221,6 +226,7 @@ class TestBackupCreate(TestBackups):
'locationRef', 'locationRef',
'name', 'name',
'parent_id', 'parent_id',
'project_id',
'size', 'size',
'status', 'status',
'updated', 'updated',