update slb > clb

commonapi/clb_utils.py

@@ -244,7 +244,7 @@ def run_command(client, instance_ids, command):
 
 def get_instance_ids(client, clb_id):
     """
-    获取slb下所有服务器instanceId
+    获取clb下所有服务器instanceId
     :param client: 客户端连接
     :param clb_id: 负载均衡id type-string
     :return: instance_ids type-list
@@ -274,7 +274,7 @@ def get_ip_address(client, instance_id):
 
 def set_weight_for_instances(client, clb_id, instance_id_list, weight):
     """
-    同时设置多台服务器的slb权重，权重一样
+    同时设置多台服务器的clb权重，权重一样
     :param client: 客户端连接
     :param clb_id: clb_id
     :param instance_id_list: 服务器id list
@@ -386,11 +386,11 @@ def set_instance_weight_process(client, clb_id, instance_id_list, weight_list):
                 continue
 
 
-def add_backend_servers(client, slb_id, instances):
+def add_backend_servers(client, clb_id, instances):
     """
     服务器挂载到负载均衡(必须是状态为运行中的后端服务器才可以加入负载均衡实例，每次调用最多可添加20个后端服务器)
     :param client:
-    :param slb_id:
+    :param clb_id:
     :param instances: 实例列表 [(instance_id, ip), ...]
     :return:
     """
@@ -401,7 +401,7 @@ def add_backend_servers(client, slb_id, instances):
                 return
             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]
@@ -413,11 +413,11 @@ def add_backend_servers(client, slb_id, instances):
         sys.exit()
 
 
-def remove_backend_servers(client, slb_id, instances):
+def remove_backend_servers(client, clb_id, instances):
     """
     服务器从负载均衡移除(一次调用最多可以移除20个后端服务器)
     :param client:
-    :param slb_id:
+    :param clb_id:
     :param instances: 实例列表 [instance_id, ...]
     :return:
     """
@@ -428,7 +428,7 @@ def remove_backend_servers(client, slb_id, instances):
                 return
             request = RemoveBackendServersRequest()
             request.set_accept_format('json')
-            request.set_LoadBalancerId(slb_id)
+            request.set_LoadBalancerId(clb_id)
             backend_servers = [
                 {"ServerId": instance_id, "Weight": "0", "Type": "ecs"}
                 for instance_id in instances_list]
@@ -456,7 +456,7 @@ def set_instance_weight_process_with_clbs(client, clb_id_list, instance_id_list,
             while flag:
                 try:
                     set_weight_for_instances(client=client, clb_id=clb_id, instance_id_list=instance_id_list, weight=weight)
-                    logging.info(f"slb: {clb_id} finished！")
+                    logging.info(f"clb: {clb_id} finished！")
                     flag = False
                 except Exception as e:
                     time.sleep(10)
@@ -486,7 +486,7 @@ def add_backend_servers_with_clbs(client, clb_id_list, instances):
                     for instance_id, ip_address in instances_list]
                 request.set_BackendServers(backend_servers)
                 response = client.do_action_with_exception(request)
-                logging.info(f"slb: {clb_id} add backend servers finished!")
+                logging.info(f"clb: {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:
@@ -507,16 +507,16 @@ def remove_backend_servers_with_clbs(client, clb_id_list, instances):
             instances_list = instances[i*20:(i+1)*20]
             if len(instances_list) == 0:
                 return
-            for slb_id in clb_id_list:
+            for clb_id in clb_id_list:
                 request = RemoveBackendServersRequest()
                 request.set_accept_format('json')
-                request.set_LoadBalancerId(slb_id)
+                request.set_LoadBalancerId(clb_id)
                 backend_servers = [
                     {"ServerId": instance_id, "Weight": "0", "Type": "ecs"}
                     for instance_id in instances_list]
                 request.set_BackendServers(backend_servers)
                 response = client.do_action_with_exception(request)
-                logging.info(f"slb: {slb_id} remove backend servers finished!")
+                logging.info(f"clb: {clb_id} remove backend servers finished!")
             logging.info(f"i: {i}, count: {len(instances_list)}, instances: {instances_list} "
                          f"remove backend servers finished!")
     except Exception as e:

gateway/clb_gateway_reduce_with_count.py

@@ -24,7 +24,7 @@ def remove_instances(ecs_client, clb_client, instance_ids):
                                                 weight_list=[(0, 20)])
     logging.info(f"set weight = 0 finished, instances: {instance_ids}")
     time.sleep(10)
-    # 2.移除slb
+    # 2.移除clb
     clb_utils.remove_backend_servers_with_clbs(client=clb_client,
                                            clb_id_list=gateway_config.clb_id_list,
                                            instances=instance_ids)

gateway/clb_gateway_update_list.py

@@ -158,7 +158,7 @@ async def update_instance(ecs_client, clb_client, instance_ids, max_workers, ver
     """
     线上机器更新
     :param ecs_client:
-    :param clb_client: slb客户端连接
+    :param clb_client: clb客户端连接
     :param instance_ids: instanceId type-list
     :param max_workers:
     :param version: 版本标记
@@ -246,7 +246,7 @@ def remove_instances(ecs_client, clb_client, instance_ids):
                                                 weight_list=[(0, 20)])
     logging.info(f"set weight = 0 finished, instances: {instance_ids}")
     time.sleep(10)
-    # 2.移除slb
+    # 2.移除clb
     clb_utils.remove_backend_servers_with_clbs(client=clb_client,
                                            clb_id_list=gateway_config.clb_id_list,
                                            instances=instance_ids)

gateway/clb_utils.py

@@ -244,7 +244,7 @@ def run_command(client, instance_ids, command):
 
 def get_instance_ids(client, clb_id):
     """
-    获取slb下所有服务器instanceId
+    获取clb下所有服务器instanceId
     :param client: 客户端连接
     :param clb_id: 负载均衡id type-string
     :return: instance_ids type-list
@@ -274,7 +274,7 @@ def get_ip_address(client, instance_id):
 
 def set_weight_for_instances(client, clb_id, instance_id_list, weight):
     """
-    同时设置多台服务器的slb权重，权重一样
+    同时设置多台服务器的clb权重，权重一样
     :param client: 客户端连接
     :param clb_id: clb_id
     :param instance_id_list: 服务器id list
@@ -386,11 +386,11 @@ def set_instance_weight_process(client, clb_id, instance_id_list, weight_list):
                 continue
 
 
-def add_backend_servers(client, slb_id, instances):
+def add_backend_servers(client, clb_id, instances):
     """
     服务器挂载到负载均衡(必须是状态为运行中的后端服务器才可以加入负载均衡实例，每次调用最多可添加20个后端服务器)
     :param client:
-    :param slb_id:
+    :param clb_id:
     :param instances: 实例列表 [(instance_id, ip), ...]
     :return:
     """
@@ -401,7 +401,7 @@ def add_backend_servers(client, slb_id, instances):
                 return
             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]
@@ -413,11 +413,11 @@ def add_backend_servers(client, slb_id, instances):
         sys.exit()
 
 
-def remove_backend_servers(client, slb_id, instances):
+def remove_backend_servers(client, clb_id, instances):
     """
     服务器从负载均衡移除(一次调用最多可以移除20个后端服务器)
     :param client:
-    :param slb_id:
+    :param clb_id:
     :param instances: 实例列表 [instance_id, ...]
     :return:
     """
@@ -428,7 +428,7 @@ def remove_backend_servers(client, slb_id, instances):
                 return
             request = RemoveBackendServersRequest()
             request.set_accept_format('json')
-            request.set_LoadBalancerId(slb_id)
+            request.set_LoadBalancerId(clb_id)
             backend_servers = [
                 {"ServerId": instance_id, "Weight": "0", "Type": "ecs"}
                 for instance_id in instances_list]
@@ -456,7 +456,7 @@ def set_instance_weight_process_with_clbs(client, clb_id_list, instance_id_list,
             while flag:
                 try:
                     set_weight_for_instances(client=client, clb_id=clb_id, instance_id_list=instance_id_list, weight=weight)
-                    logging.info(f"slb: {clb_id} finished！")
+                    logging.info(f"clb: {clb_id} finished！")
                     flag = False
                 except Exception as e:
                     time.sleep(10)
@@ -486,7 +486,7 @@ def add_backend_servers_with_clbs(client, clb_id_list, instances):
                     for instance_id, ip_address in instances_list]
                 request.set_BackendServers(backend_servers)
                 response = client.do_action_with_exception(request)
-                logging.info(f"slb: {clb_id} add backend servers finished!")
+                logging.info(f"clb: {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:
@@ -507,16 +507,16 @@ def remove_backend_servers_with_clbs(client, clb_id_list, instances):
             instances_list = instances[i*20:(i+1)*20]
             if len(instances_list) == 0:
                 return
-            for slb_id in clb_id_list:
+            for clb_id in clb_id_list:
                 request = RemoveBackendServersRequest()
                 request.set_accept_format('json')
-                request.set_LoadBalancerId(slb_id)
+                request.set_LoadBalancerId(clb_id)
                 backend_servers = [
                     {"ServerId": instance_id, "Weight": "0", "Type": "ecs"}
                     for instance_id in instances_list]
                 request.set_BackendServers(backend_servers)
                 response = client.do_action_with_exception(request)
-                logging.info(f"slb: {slb_id} remove backend servers finished!")
+                logging.info(f"clb: {clb_id} remove backend servers finished!")
             logging.info(f"i: {i}, count: {len(instances_list)}, instances: {instances_list} "
                          f"remove backend servers finished!")
     except Exception as e: