Browse Source

add clb_id_list test

xuekailun 4 tháng trước cách đây
mục cha
commit
9468a50d4d
2 tập tin đã thay đổi với 21 bổ sung6 xóa
  1. 12 1
      gateway/alb_gateway_unittest.py
  2. 9 5
      gateway/gateway_config.py

+ 12 - 1
gateway/alb_gateway_unittest.py

@@ -4,7 +4,7 @@ import unittest
 from os import write
 from aliyunsdkecs.request.v20140526.RunInstancesRequest import RunInstancesRequest
 
-from gateway import gateway_config, alb_utils, alb_gateway_scaling_j_count
+from gateway import gateway_config, alb_utils, alb_gateway_scaling_j_count, alb_gateway_update_cluster
 from longvideoapi.longvideoapi_config import server_group_id_list
 
 
@@ -90,5 +90,16 @@ class MyTestCase(unittest.TestCase):
         logging.info(ess_instance_ids)
 
 
+    def test_remove_container_image(self):
+        ecs_client = alb_utils.connect_client(access_key_id=gateway_config.ecs_client_params['access_key_id'],
+                                          access_key_secret=gateway_config.ecs_client_params['access_key_secret'],
+                                          region_id=gateway_config.ecs_client_params['region_id'])
+        instance_id = 'i-bp1933o7phjzrwg1x3kd'
+        container_name_list = ['piaoquan-gateway', 'gateway']
+        alb_gateway_update_cluster.remove_container_image(ecs_client, instance_id, container_name_list)
+
+
+
+
 if __name__ == '__main__':
     unittest.main()

+ 9 - 5
gateway/gateway_config.py

@@ -5,14 +5,19 @@ logging.basicConfig(level=logging.INFO,
                     format='%(asctime)s %(filename)s[line:%(lineno)d] %(levelname)s %(message)s',
                     datefmt='%a, %d %b %Y %H:%M:%S')
 
-# gateway-alb-ecs组-生产环境
-# server_group_id_list = ["sgp-l2k0p33e470vfmj538"]
 
 # alb后端服务器_调试使用组
 server_group_id_list = ["sgp-ec4gopoclruofsfmxu"]
 
+# clb 测试环境_临时调试使用
+clb_id_list = ["lb-bp1i49h7ncw2c9nl3kp6u"]
+
+
+# gateway-alb-ecs组-生产环境
+# server_group_id_list = ["sgp-l2k0p33e470vfmj538"]
+
 # gateway clb 生产环境
-clb_id_list = ["lb-bp1mfk1gmd47twfh6bgwv", "lb-bp1jtzhp9krunyv3mim2q"]
+# clb_id_list = ["lb-bp1mfk1gmd47twfh6bgwv", "lb-bp1jtzhp9krunyv3mim2q"]
 
 apps = 'piaoquan-gateway'
 repository = 'registry-vpc.cn-hangzhou.aliyuncs.com/stuuudy/{}'
@@ -48,10 +53,9 @@ docker_config = {
 }
 
 
-# 机器配置_hangzhou_k
+# 机器配置_hangzhou_j
 instance_config_j = {
     # 使用的镜像信息
-    # 'image_id': 'm-bp1etti4xsich7c8y5e8',
     'image_id': 'm-bp1e7t7odil9c8kqsm10',
     # 设置实例规格
     'instance_type': 'ecs.c6.xlarge',