openstack
/
horizon
Code Issues Proposed changes

Merge "fix volume status bug when restoring a Volume"

This commit is contained in:
Zuul 2018-09-06 13:26:47 +00:00 committed by Gerrit Code Review
parent a0e90eee83 19635237b3
commit 78090176ea
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openstack_dashboard/dashboards/project/backups/forms.py
View File

@ -76,7 +76,8 @@ class RestoreBackupForm(forms.SelfHandlingForm):
super(RestoreBackupForm, self).__init__(request, *args, **kwargs)
try:
volumes = api.cinder.volume_list(request)
search_opts = {'status': 'available'}
volumes = api.cinder.volume_list(request, search_opts)
except Exception:
msg = _('Unable to lookup volume or backup information.')
redirect = reverse('horizon:project:backups:index')

25
openstack_dashboard/dashboards/project/backups/tests.py
View File

@ -261,26 +261,29 @@ class VolumeBackupsViewTests(test.TestCase):
@test.create_mocks({api.cinder: ('volume_list',
'volume_backup_restore')})
def test_restore_backup(self):
backup = self.cinder_volume_backups.first()
mock_backup = self.cinder_volume_backups.first()
volumes = self.cinder_volumes.list()
expected_volumes = [vol for vol in volumes
if vol.status == 'available']
self.mock_volume_list.return_value = volumes
self.mock_volume_backup_restore.return_value = backup
self.mock_volume_list.return_value = expected_volumes
self.mock_volume_backup_restore.return_value = mock_backup
formData = {'method': 'RestoreBackupForm',
'backup_id': backup.id,
'backup_name': backup.name,
'volume_id': backup.volume_id}
'backup_id': mock_backup.id,
'backup_name': mock_backup.name,
'volume_id': mock_backup.volume_id}
url = reverse('horizon:project:backups:restore',
args=[backup.id])
url += '?%s' % urlencode({'backup_name': backup.name,
'volume_id': backup.volume_id})
args=[mock_backup.id])
url += '?%s' % urlencode({'backup_name': mock_backup.name,
'volume_id': mock_backup.volume_id})
res = self.client.post(url, formData)
self.assertNoFormErrors(res)
self.assertMessageCount(info=1)
self.assertRedirectsNoFollow(res,
reverse('horizon:project:volumes:index'))
self.mock_volume_list.assert_called_once_with(test.IsHttpRequest())
self.mock_volume_list.assert_called_once_with(test.IsHttpRequest(),
{'status': 'available'})
self.mock_volume_backup_restore.assert_called_once_with(
test.IsHttpRequest(), backup.id, backup.volume_id)
test.IsHttpRequest(), mock_backup.id, mock_backup.volume_id)