update clb_gateway_scaling_j_count

gateway/clb_gateway_scaling_j_count.py

@@ -89,13 +89,13 @@ async def ess_instance(ecs_client, clb_client, ess_count, max_workers):
     if len(health_instances) > 0:
         # 所有机器探活成功
         time.sleep(20)
-        clb_utils.add_backend_servers_with_slbs(client=clb_client,
-                                            slb_id_list=gateway_config.clb_id_list,
+        clb_utils.add_backend_servers_with_clbs(client=clb_client,
+                                            clb_id_list=gateway_config.clb_id_list,
                                             instances=health_instances)
         add_weight_list = [(10, 5), (20, 5), (40, 5), (60, 5), (80, 5), (100, 5)]
         health_instance_ids = [instance_id for instance_id, _ in health_instances]
-        clb_utils.set_instance_weight_process_with_slbs(client=clb_client,
-                                                    slb_id_list=gateway_config.clb_id_list,
+        clb_utils.set_instance_weight_process_with_clbs(client=clb_client,
+                                                    clb_id_list=gateway_config.clb_id_list,
                                                     instance_id_list=health_instance_ids,
                                                     weight_list=add_weight_list)
         logging.info(f"ess count: {ess_count}, "

gateway/clb_utils.py

@@ -440,7 +440,7 @@ def remove_backend_servers(client, slb_id, instances):
         sys.exit()
 
 
-def set_instance_weight_process_with_slbs(client, clb_id_list, instance_id_list, weight_list):
+def set_instance_weight_process_with_clbs(client, clb_id_list, instance_id_list, weight_list):
     """
     修改服务器的权重值
     :param client: slb客户端连接
@@ -464,11 +464,11 @@ def set_instance_weight_process_with_slbs(client, clb_id_list, instance_id_list,
         time.sleep(sleep_time)
 
 
-def add_backend_servers_with_slbs(client, slb_id_list, instances):
+def add_backend_servers_with_clbs(client, clb_id_list, instances):
     """
     服务器挂载到负载均衡(必须是状态为运行中的后端服务器才可以加入负载均衡实例，每次调用最多可添加20个后端服务器)
     :param client:
-    :param slb_id_list:
+    :param clb_id_list:
     :param instances: 实例列表 [(instance_id, ip), ...]
     :return:
     """
@@ -477,16 +477,16 @@ def add_backend_servers_with_slbs(client, slb_id_list, instances):
             instances_list = instances[i*20:(i+1)*20]
             if len(instances_list) == 0:
                 return
-            for slb_id in slb_id_list:
+            for clb_id in clb_id_list:
                 request = AddBackendServersRequest()
                 request.set_accept_format('json')
-                request.set_LoadBalancerId(slb_id)
+                request.set_LoadBalancerId(clb_id)
                 backend_servers = [
                     {"ServerId": instance_id, "Weight": "0", "Type": "ecs", "ServerIp": ip_address}
                     for instance_id, ip_address in instances_list]
                 request.set_BackendServers(backend_servers)
                 response = client.do_action_with_exception(request)
-                logging.info(f"slb: {slb_id} add backend servers finished!")
+                logging.info(f"slb: {clb_id} add backend servers finished!")
             logging.info(f"i: {i}, count: {len(instances_list)}, instances: {instances_list} "
                          f"add backend servers finished!")
     except Exception as e: