From 48389857d15c5cda860fa8f9914d62b148bfd17a Mon Sep 17 00:00:00 2001 From: John Griffith Date: Wed, 19 Jun 2013 17:33:59 -0600 Subject: [PATCH] Modify check for volume-type-id to a get w/default While implementing Fix for a previous bug to enable setting volume type on a cloned volume and reading it's info we added a vref['volume_type_id'], problem is that the _do_clone method is shared for both clone and create from snapshot. In the create from snapshot case however that key doesn't exist in the vref (which is a snapshot object). This change turns this into a key.get with a default return. Fixes bug: 1192745 Change-Id: I1a6d38de614f54fcaa31ea7cc4250aacc85b0796 --- cinder/volume/drivers/solidfire.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cinder/volume/drivers/solidfire.py b/cinder/volume/drivers/solidfire.py index 8c990606f..63c8c9899 100644 --- a/cinder/volume/drivers/solidfire.py +++ b/cinder/volume/drivers/solidfire.py @@ -332,7 +332,7 @@ class SolidFire(SanISCSIDriver): qos = self._set_qos_presets(v_ref) ctxt = context.get_admin_context() - type_id = v_ref['volume_type_id'] + type_id = v_ref.get('volume_type_id', None) if type_id is not None: qos = self._set_qos_by_volume_type(ctxt, type_id) -- 2.45.2