From c4c727ceda9bdb8a77b0f1113006625430714e3e Mon Sep 17 00:00:00 2001 From: vapao Date: Sun, 27 Jun 2021 22:28:12 +0800 Subject: [PATCH] improve cloud import --- spug_api/apps/host/add.py | 3 ++- spug_api/apps/host/utils.py | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/spug_api/apps/host/add.py b/spug_api/apps/host/add.py index 0a80e22..1bbe521 100644 --- a/spug_api/apps/host/add.py +++ b/spug_api/apps/host/add.py @@ -45,12 +45,13 @@ def cloud_import(request): host_add_ids = [] for item in instances: instance_id = item['instance_id'] + host_name = item.pop('instance_name') item['public_ip_address'] = json.dumps(item['public_ip_address'] or []) item['private_ip_address'] = json.dumps(item['private_ip_address'] or []) if HostExtend.objects.filter(instance_id=instance_id).exists(): HostExtend.objects.filter(instance_id=instance_id).update(**item) else: - host = Host.objects.create(name=instance_id, created_by=request.user) + host = Host.objects.create(name=host_name, created_by=request.user) HostExtend.objects.create(host=host, **item) host_add_ids.append(host.id) if host_add_ids: diff --git a/spug_api/apps/host/utils.py b/spug_api/apps/host/utils.py index 5f0c672..99b81af 100644 --- a/spug_api/apps/host/utils.py +++ b/spug_api/apps/host/utils.py @@ -101,6 +101,7 @@ def fetch_ali_instances(ak, ac, region_id, page_number=1): network_interface = [] data[item['InstanceId']] = dict( instance_id=item['InstanceId'], + instance_name=item['InstanceName'], os_name=item['OSName'], os_type=check_os_type(item['OSName']), cpu=item['Cpu'], @@ -149,6 +150,7 @@ def fetch_tencent_instances(ak, ac, region_id, page_number=1): internet_charge_type = item['InternetAccessible']['InternetChargeType'] data.append(dict( instance_id=item['InstanceId'], + instance_name=item['InstanceName'], os_name=item['OsName'], os_type=check_os_type(item['OsName']), cpu=item['CPU'],