From: John Griffith <john.griffith8@gmail.com>
Date: Mon, 1 Jun 2015 15:33:14 +0000 (+0000)
Subject: Return provider_id in SolidFire model update
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=16817f8bef04189a0709482b1a394aaf14addd7a;p=openstack-build%2Fcinder-build.git

Return provider_id in SolidFire model update

The provider_id field was added in
commit: 9f34d34d0ab92400223e3cc87285d0d4fbdf21f9

This patch adds provider_id to the returned model
update and uses it to provide the internal SolidFire
volume ID mapping.

Next step will be to rewrite the awkward list search
of volume names to find the corresponding volume on
the SolidFire backend.

Change-Id: Ia44d46362bb1b688c4ac266afecca9ce66dcef25
---

diff --git a/cinder/volume/drivers/solidfire.py b/cinder/volume/drivers/solidfire.py
index dde7d5c76..43864665d 100644
--- a/cinder/volume/drivers/solidfire.py
+++ b/cinder/volume/drivers/solidfire.py
@@ -341,6 +341,7 @@ class SolidFireDriver(san.SanISCSIDriver):
                                             chap_secret))
         if not self.configuration.sf_emulate_512:
             model_update['provider_geometry'] = ('%s %s' % (4096, 4096))
+        model_update['provider_id'] = ('%s' % sf_volume_id)
 
         return model_update