From: John Griffith Date: Tue, 8 Sep 2015 21:29:05 +0000 (-0600) Subject: Return a tuple from SolidFire update_provider_info X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=81de3ea731066feb40c2db9ca95ec0c67d65de1a;p=openstack-build%2Fcinder-build.git Return a tuple from SolidFire update_provider_info 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 --- diff --git a/cinder/tests/unit/test_solidfire.py b/cinder/tests/unit/test_solidfire.py index a3a4b2d7a..5210e0846 100644 --- a/cinder/tests/unit/test_solidfire.py +++ b/cinder/tests/unit/test_solidfire.py @@ -1046,6 +1046,6 @@ class SolidFireVolumeTestCase(test.TestCase): with mock.patch.object( sfv, '_issue_api_request', side_effect=_fake_issue_api_req): - updates = sfv._init_volume_mappings(vrefs) - self.assertEqual(99, updates[0]['provider_id']) - self.assertEqual(1, len(updates)) + volume_updates, snapshot_updates = sfv.update_provider_info(vrefs) + self.assertEqual(99, volume_updates[0]['provider_id']) + self.assertEqual(1, len(volume_updates)) diff --git a/cinder/volume/drivers/solidfire.py b/cinder/volume/drivers/solidfire.py index 48cdfb89d..f662c3826 100644 --- a/cinder/volume/drivers/solidfire.py +++ b/cinder/volume/drivers/solidfire.py @@ -205,7 +205,9 @@ class SolidFireDriver(san.SanISCSIDriver): return updates 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): # We raise an API exception if the account doesn't exist