github
/
ConsulManager
mirror of https://github.com/starsliao/ConsulManager
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update sync_jms.py

pull/46/head
StarsL.cn 2022-11-15 06:16:12 +08:00 committed by GitHub
parent da1be6d019
commit ed5030ab1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
flask-consul/units/jms/sync_jms.py
View File

@ -61,14 +61,18 @@ def update_jms_ecs(jms_url,headers,new_node_dict,node_id,cloud,account,ecs_info,
"nodes": [nodes], "nodes": [nodes],
"comment": comment "comment": comment
} }
if ip in jms_ecs_dict.keys(): try:
jms_group = '无' if jms_ecs_dict[ip]['node'].split('/')[-1] == '未分组' else jms_ecs_dict[ip]['node'].split('/')[-1] if ip in jms_ecs_dict.keys():
if jms_ecs_dict[ip]['name'] != iname or jms_group != v['ent']: jms_group = '无' if jms_ecs_dict[ip]['node'].split('/')[-1] == '未分组' else jms_ecs_dict[ip]['node'].split('/')[-1]
response = requests.request("PUT", f"{ecs_url}{jms_ecs_dict[ip]['id']}/", headers=headers, data = json.dumps(payload)) if jms_ecs_dict[ip]['name'] != iname or jms_group != v['ent']:
print(' 【JMS】update：主机名:',response.json()['hostname'],response.status_code,flush=True) response = requests.request("PUT", f"{ecs_url}{jms_ecs_dict[ip]['id']}/", headers=headers, data = json.dumps(payload))
else: print(' 【JMS】update：主机名:',response.json()['hostname'],response.status_code,flush=True)
response = requests.request("POST", ecs_url, headers=headers, data = json.dumps(payload)) else:
print(' 【JMS】add：主机名:',iname,ip,f"【{response.json()['hostname']}，{response.status_code}】",flush=True) response = requests.request("POST", ecs_url, headers=headers, data = json.dumps(payload))
print(' 【JMS】add：主机名:',iname,ip,f"【{response.json()['hostname']}，{response.status_code}】",flush=True)
except Exception as e:
print('【update_jms ERROR】',e,flush=True)
print(response.json(),flush=True)
return ecs_ip_dict return ecs_ip_dict
#从JMS中删除IP重复的主机 #从JMS中删除IP重复的主机
@ -96,7 +100,10 @@ def del_node(jms_url,headers,now,node_id,cloud,account):
jms_node_list = requests.request("GET", node_tree_url, headers=headers).json() jms_node_list = requests.request("GET", node_tree_url, headers=headers).json()
for i in jms_node_list: for i in jms_node_list:
if i['name'].endswith(' (0)'): if i['name'].endswith(' (0)'):
del_node_url = f"{jms_url}/api/v1/assets/nodes/{i['meta']['node']['id']}/" if 'node' in i['meta']:
del_node_url = f"{jms_url}/api/v1/assets/nodes/{i['meta']['node']['id']}/"
else:
del_node_url = f"{jms_url}/api/v1/assets/nodes/{i['meta']['data']['id']}/"
response = requests.request("DELETE", del_node_url, headers=headers) response = requests.request("DELETE", del_node_url, headers=headers)
print(' 【JMS】删除空组===>',i['name'],response.status_code,flush=True) print(' 【JMS】删除空组===>',i['name'],response.status_code,flush=True)
ecs_count_url = f"{jms_url}/api/v1/assets/assets/?node={node_id}&limit=1&offset=1" ecs_count_url = f"{jms_url}/api/v1/assets/assets/?node={node_id}&limit=1&offset=1"