openstack/deb-cinder
Code Issues Proposed changes

Merge "Return a tuple from SolidFire update_provider_info"

Browse Source
This commit is contained in:
Jenkins 2015-09-09 02:20:32 +00:00 committed by Gerrit Code Review
commit de64f5ad71
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cinder/tests/unit/test_solidfire.py
View File

@ -1046,6 +1046,6 @@ class SolidFireVolumeTestCase(test.TestCase):
with mock.patch.object( with mock.patch.object(
sfv, '_issue_api_request', side_effect=_fake_issue_api_req): sfv, '_issue_api_request', side_effect=_fake_issue_api_req):
updates = sfv._init_volume_mappings(vrefs) volume_updates, snapshot_updates = sfv.update_provider_info(vrefs)
self.assertEqual(99, updates[0]['provider_id']) self.assertEqual(99, volume_updates[0]['provider_id'])
self.assertEqual(1, len(updates)) self.assertEqual(1, len(volume_updates))

4
cinder/volume/drivers/solidfire.py
View File

@ -205,7 +205,9 @@ class SolidFireDriver(san.SanISCSIDriver):
return updates return updates
def update_provider_info(self, vrefs): def update_provider_info(self, vrefs):
return self._init_volume_mappings(vrefs) volume_updates = self._init_volume_mappings(vrefs)
snapshot_updates = None
return (volume_updates, snapshot_updates)
def _create_template_account(self, account_name): def _create_template_account(self, account_name):
# We raise an API exception if the account doesn't exist # We raise an API exception if the account doesn't exist