From 90971cd1026728d3061e13843d117e549c0be67c Mon Sep 17 00:00:00 2001 From: John Griffith Date: Fri, 15 Feb 2013 03:41:15 +0000 Subject: [PATCH] Fix ordering of function args Previous change swapped context and type-id params in function declaration. Put it back. Also, no reason for storing the qos dict in the parameters, if it's stored then we continuously have to update it, remove that for now and come up with a cleaner method later. Change-Id: I0820a48660bdfd0481be3681e33d7e2ff3246bb1 --- cinder/volume/drivers/solidfire.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/cinder/volume/drivers/solidfire.py b/cinder/volume/drivers/solidfire.py index a1f042507..800ac2413 100644 --- a/cinder/volume/drivers/solidfire.py +++ b/cinder/volume/drivers/solidfire.py @@ -282,9 +282,6 @@ class SolidFire(SanISCSIDriver): 'is_clone': 'True', 'src_uuid': 'src_uuid'} - if qos: - attributes['qos'] = qos - params = {'volumeID': int(sf_vol['volumeID']), 'name': 'UUID-%s' % v_ref['id'], 'attributes': attributes, @@ -331,7 +328,7 @@ class SolidFire(SanISCSIDriver): qos[i.key] = int(i.value) return qos - def _set_qos_by_volume_type(self, type_id, ctxt): + def _set_qos_by_volume_type(self, ctxt, type_id): qos = {} volume_type = volume_types.get_volume_type(ctxt, type_id) specs = volume_type.get('extra_specs') @@ -399,8 +396,6 @@ class SolidFire(SanISCSIDriver): attributes = {'uuid': volume['id'], 'is_clone': 'False'} - if qos: - attributes['qos'] = qos params = {'name': 'UUID-%s' % volume['id'], 'accountID': None, -- 2.45.2