From b0eea766553afde74c297af6693a40991759a68b Mon Sep 17 00:00:00 2001 From: "StarsL.cn" Date: Thu, 21 Apr 2022 15:33:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=85=BE=E8=AE=AF=E4=BA=91?= =?UTF-8?q?=E6=8C=89=E9=87=8FECS=E9=87=87=E9=9B=86=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flask-consul/units/cloud/tencent_cloud.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/flask-consul/units/cloud/tencent_cloud.py b/flask-consul/units/cloud/tencent_cloud.py index 4dc0f8b..3deca41 100644 --- a/flask-consul/units/cloud/tencent_cloud.py +++ b/flask-consul/units/cloud/tencent_cloud.py @@ -71,7 +71,8 @@ def ecs(account,region): ecs_dict_temp = {i.InstanceId:{'name':i.InstanceName,'group':group_dict.get(str(i.Placement.ProjectId),'无'), 'ostype': 'windows' if 'win' in i.OsName.lower() else 'linux', 'status': i.InstanceState, 'region': region, 'ip':i.PrivateIpAddresses[0], - 'cpu': f'{i.CPU}核','mem': f'{i.Memory}GB','exp': i.ExpiredTime.split('T')[0] + 'cpu': f'{i.CPU}核','mem': f'{i.Memory}GB', + 'exp': '按量' if i.ExpiredTime is None else i.ExpiredTime.split('T')[0] } for i in ecs_list} offset = offset + 100 ecs_dict.update(ecs_dict_temp)