@@ -1048,25 +1048,20 @@ def upgrade(self, instance_id, cpus=None, memory=None, nic_speed=None, public=Tr
10481048 vsi_disk = self .get_instance (instance_id )
10491049 for item in vsi_disk .get ('billingItem' ).get ('children' ):
10501050 if 'guest_disk' in item .get ('categoryCode' ):
1051- if disk_number < int ("" .join (filter (str .isdigit , item .get ('categoryCode' )))):
1052- disk_number = int ("" .join (filter (str .isdigit , item .get ('categoryCode' ))))
1051+ disk_number = max (disk_number , int ("" .join (filter (str .isdigit , item .get ('categoryCode' )))))
10531052 for disk_guest in disk :
10541053 if disk_guest .get ('number' ) > 0 :
1055- price_id = self ._get_price_id_for_upgrade_option (upgrade_prices , 'disk' ,
1056- disk_guest .get ('capacity' ),
1057- public )
10581054 disk_number = disk_guest .get ('number' )
1059-
10601055 else :
1061- price_id = self ._get_price_id_for_upgrade_option (upgrade_prices , 'disk' ,
1062- disk_guest .get ('capacity' ),
1063- public )
10641056 disk_number = disk_number + 1
1057+ price_id = self ._get_price_id_for_upgrade_option (upgrade_prices ,
1058+ 'disk' ,
1059+ disk_guest .get ('capacity' ),
1060+ public )
10651061
10661062 if price_id is None :
1067- raise exceptions .SoftLayerAPIError (500 ,
1068- 'Unable to find %s option with value %s' % (
1069- ('disk' , disk_guest .get ('capacity' ))))
1063+ error = f"Unable to find disk option with value { disk_guest .get ('capacity' )} "
1064+ raise exceptions .SoftLayerAPIError (500 , error )
10701065
10711066 category_id = self .get_disk_category_id_by_disk_number (disk_guest .get ('capacity' ), disk_number )
10721067 if category_id is None :
@@ -1083,10 +1078,7 @@ def upgrade(self, instance_id, cpus=None, memory=None, nic_speed=None, public=Tr
10831078 for option , value in data .items ():
10841079 if not value :
10851080 continue
1086- price_id = self ._get_price_id_for_upgrade_option (upgrade_prices ,
1087- option ,
1088- value ,
1089- public )
1081+ price_id = self ._get_price_id_for_upgrade_option (upgrade_prices , option , value , public )
10901082 if not price_id :
10911083 # Every option provided is expected to have a price
10921084 raise exceptions .SoftLayerError (
0 commit comments