openstack/cinder
Code Issues Proposed changes

Return a tuple from SolidFire update_provider_info

Browse Source 
The SolidFire update_provider_info is only returning
a list of updated volumes, but the manager call (and
the method def in the reference) calls for a tuple of
volumes and snapshots.

This patch fixes the return to be a tuple, a follow on
will be needed to add snapshot updates.

Change-Id: Ifa617bfd7b0652adf7bf1b19d48e88bfcfcec8df
Partial-Bug: #1493563
This commit is contained in:
John Griffith
2015-09-08 15:29:05 -06:00
parent bcc7ce05cb
commit 81de3ea731
2 changed files with 6 additions and 4 deletions
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