github
/
spug
mirror of https://github.com/openspug/spug
1
0
Fork 0
Code Issues Releases Wiki Activity

fix issue

pull/342/head
vapao 2021-06-23 16:49:32 +08:00
parent 4ac3b2f166
commit e6cda83c4d
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spug_api/apps/host/utils.py
View File

@ -76,7 +76,7 @@ def fetch_ali_disks(ak, ac, region_id, page_number=1):
data[item['InstanceId']].append(item['Size']) data[item['InstanceId']].append(item['Size'])
if len(res['Disks']['Disk']) == page_size: if len(res['Disks']['Disk']) == page_size:
page_number += 1 page_number += 1
new_data = fetch_ali_disks(ak, ac, 'http://ecs.aliyuncs.com', page_number) new_data = fetch_ali_disks(ak, ac, region_id, page_number)
data.update(new_data) data.update(new_data)
return data return data
else: else:
@ -114,8 +114,7 @@ def fetch_ali_instances(ak, ac, region_id, page_number=1):
zone_id=item['ZoneId'] zone_id=item['ZoneId']
) )
if len(res['Instances']['Instance']) == page_size: if len(res['Instances']['Instance']) == page_size:
page_number += 1 new_data = fetch_ali_instances(ak, ac, region_id, page_number + 1)
new_data = fetch_ali_instances(ak, ac, region_id, page_number)
data.update(new_data) data.update(new_data)
if page_number != 1: if page_number != 1:
return data return data