Merge pull request #155 from jdcloud-apigateway/master

2022-02-24

Author: jdcloud-apigateway

jdcloud_sdk/services/lb/ChangeLog.md

@@ -1,8 +1,11 @@
 # 更新历史 #
-API版本：0.5.3
+API版本：0.5.6
 
 |发布时间|版本号|更新|说明|
 |---|---|---|---|
+|2022-01-12|0.5.6|*1、增加Lb导出接口，指定filter和columns 2、增加Lb导出查询接口，查询用户导出的任务列表*||
+|2021-05-26|0.5.5|支持默认证书使用不同加密算法的双证书，支持X-Forwarded-Client-Port的Header||
+|2020-08-14|0.5.4|lb优化接口调整|*1.涉及LB创建时增加指定VIP和域名开关，对应更新和查询也修改 2.LB创建监听器增加HSTS相关参数，对应更新和查询接口也修改 3.更新Backend和健康检查相关描述*|
 |2020-08-13|0.5.3|支持多证书接口对外发布||
 |2020-03-20|0.5.2|lb接入tag||
 |2020-03-20|0.5.0|增加新接口，修改旧接口|* 新增扩展证书的增、删、改接口<br>* 修改查询listener列表和详情接口，增加扩展证书内容<br>* 配额的查询、修改接口支持扩展证书<br>* 修改addRules，updateRules，describeUrlmap(s)接口，增加重定向动作<br>* 注册/修改ALB target时，支持权重为0<br>* ALB开放计费功能：支持欠费停服、续费启服、欠费到期删除操作，欠费停服后不允许手动启服，启服后恢复为原运行状态|

jdcloud_sdk/services/lb/apis/AddListenerCertificatesRequest.py

@@ -32,7 +32,7 @@ def __init__(self, parameters, header=None, version="v1"):
 
 class AddListenerCertificatesParameters(object):
 
-    def __init__(self, regionId, listenerId, certificates):
+    def __init__(self, regionId,listenerId,certificates):
         """
         :param regionId: Region ID
         :param listenerId: 监听器ID

jdcloud_sdk/services/lb/apis/AddRulesRequest.py

@@ -32,7 +32,7 @@ def __init__(self, parameters, header=None, version="v1"):
 
 class AddRulesParameters(object):
 
-    def __init__(self, regionId, urlMapId, ruleSpecs):
+    def __init__(self, regionId,urlMapId,ruleSpecs):
         """
         :param regionId: Region ID
         :param urlMapId: 转发规则组Id

jdcloud_sdk/services/lb/apis/AssociateElasticIpRequest.py

@@ -32,7 +32,7 @@ def __init__(self, parameters, header=None, version="v1"):
 
 class AssociateElasticIpParameters(object):
 
-    def __init__(self, regionId, loadBalancerId, elasticIpId):
+    def __init__(self, regionId,loadBalancerId,elasticIpId):
         """
         :param regionId: Region ID
         :param loadBalancerId: LB ID

jdcloud_sdk/services/lb/apis/AssociateSecurityGroupRequest.py

@@ -32,7 +32,7 @@ def __init__(self, parameters, header=None, version="v1"):
 
 class AssociateSecurityGroupParameters(object):
 
-    def __init__(self, regionId, loadBalancerId, securityGroupIds):
+    def __init__(self, regionId,loadBalancerId,securityGroupIds):
         """
         :param regionId: Region ID
         :param loadBalancerId: LB ID

jdcloud_sdk/services/lb/apis/CreateBackendRequest.py

@@ -32,12 +32,12 @@ def __init__(self, parameters, header=None, version="v1"):
 
 class CreateBackendParameters(object):
 
-    def __init__(self, regionId, backendName, loadBalancerId, protocol, port, healthCheckSpec, ):
+    def __init__(self, regionId,backendName, loadBalancerId, protocol, port, healthCheckSpec, ):
         """
         :param regionId: Region ID
         :param backendName: 后端服务名字,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符
         :param loadBalancerId: 后端服务所属负载均衡的Id
-        :param protocol: 后端服务的协议 <br>【alb】取值范围：Http、Tcp <br>【nlb】取值范围：Tcp <br>【dnlb】取值范围：Tcp
+        :param protocol: 后端服务的协议 <br>【alb】取值范围：Http、Tcp、Udp <br>【nlb】取值范围：Tcp、Udp <br>【dnlb】取值范围：Tcp、Udp
         :param port: 后端服务的端口，取值范围为[1, 65535]，如指定了TargetSpec中的port，实际按照target指定的port进行转发
         :param healthCheckSpec: 健康检查信息
         """
@@ -61,6 +61,7 @@ def __init__(self, regionId, backendName, loadBalancerId, protocol, port, health
         self.httpForwardedPort = None
         self.httpForwardedHost = None
         self.httpForwardedVip = None
+        self.httpForwardedClientPort = None
 
     def setAlgorithm(self, algorithm):
         """
@@ -82,7 +83,7 @@ def setAgIds(self, agIds):
 
     def setProxyProtocol(self, proxyProtocol):
         """
-        :param proxyProtocol: (Optional) 【alb Tcp协议】获取真实ip, 取值为False(不获取)或者True(获取,支持Proxy Protocol v1版本)，默认为False
+        :param proxyProtocol: (Optional) 【alb Tcp、Udp协议】获取真实ip, 取值为False(不获取)或者True(获取,支持Proxy Protocol v1版本)，默认为False
         """
         self.proxyProtocol = proxyProtocol
 
@@ -140,3 +141,9 @@ def setHttpForwardedVip(self, httpForwardedVip):
         """
         self.httpForwardedVip = httpForwardedVip
 
+    def setHttpForwardedClientPort(self, httpForwardedClientPort):
+        """
+        :param httpForwardedClientPort: (Optional) 【alb Http协议】获取请求端使用的端口, 取值为False(不获取)或True(获取), 默认为False
+        """
+        self.httpForwardedClientPort = httpForwardedClientPort
+

jdcloud_sdk/services/lb/apis/CreateListenerRequest.py

@@ -32,11 +32,11 @@ def __init__(self, parameters, header=None, version="v1"):
 
 class CreateListenerParameters(object):
 
-    def __init__(self, regionId, listenerName, protocol, port, backendId, loadBalancerId, ):
+    def __init__(self, regionId,listenerName, protocol, port, backendId, loadBalancerId, ):
         """
         :param regionId: Region ID
         :param listenerName: Listener的名字,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符
-        :param protocol: 监听协议, 取值为Tcp, Tls, Http, Https <br>【alb】支持Http, Https，Tcp和Tls <br>【nlb】支持Tcp  <br>【dnlb】支持Tcp
+        :param protocol: 监听协议, 取值为Tcp, Tls, Http, Https, Udp <br>【alb】支持Http, Https，Tcp、Tls和Udp <br>【nlb】支持Tcp, Udp  <br>【dnlb】支持Tcp, Udp
         :param port: 监听端口，取值范围为[1, 65535]
         :param backendId: 默认的后端服务Id
         :param loadBalancerId: Listener所属loadBalancer的Id
@@ -45,6 +45,8 @@ def __init__(self, regionId, listenerName, protocol, port, backendId, loadBalanc
         self.regionId = regionId
         self.listenerName = listenerName
         self.protocol = protocol
+        self.hstsEnable = None
+        self.hstsMaxAge = None
         self.port = port
         self.backendId = backendId
         self.loadBalancerId = loadBalancerId
@@ -54,6 +56,18 @@ def __init__(self, regionId, listenerName, protocol, port, backendId, loadBalanc
         self.connectionIdleTimeSeconds = None
         self.description = None
 
+    def setHstsEnable(self, hstsEnable):
+        """
+        :param hstsEnable: (Optional) 【alb使用https时支持】是否开启HSTS，True(开启)， False(关闭)，缺省为False
+        """
+        self.hstsEnable = hstsEnable
+
+    def setHstsMaxAge(self, hstsMaxAge):
+        """
+        :param hstsMaxAge: (Optional) 【alb使用https时支持】HSTS过期时间(秒)，取值范围为[1, 94608000(3年)]，缺省为31536000(1年)
+        """
+        self.hstsMaxAge = hstsMaxAge
+
     def setUrlMapId(self, urlMapId):
         """
         :param urlMapId: (Optional) 【alb Https和Http协议】转发规则组Id
@@ -68,13 +82,13 @@ def setAction(self, action):
 
     def setCertificateSpecs(self, certificateSpecs):
         """
-        :param certificateSpecs: (Optional) 【alb Https和Tls协议】Listener绑定的默认证书，只支持一个证书
+        :param certificateSpecs: (Optional) 【alb Https和Tls协议】Listener绑定的默认证书，最多支持两个，两个证书的加密算法需要不同
         """
         self.certificateSpecs = certificateSpecs
 
     def setConnectionIdleTimeSeconds(self, connectionIdleTimeSeconds):
         """
-        :param connectionIdleTimeSeconds: (Optional) 【alb、nlb】空闲连接超时时间, 范围为[1,86400]。 <br>（Tcp和Tls协议）默认为：1800s <br>（Http和Https协议）默认为：60s <br>【dnlb】不支持
+        :param connectionIdleTimeSeconds: (Optional) 【alb、nlb】空闲连接超时时间, 范围为[1,86400]。 <br>（Tcp和Tls协议）默认为：1800s <br>（Udp协议）默认为：300s <br>（Http和Https协议）默认为：60s <br>【dnlb】不支持
         """
         self.connectionIdleTimeSeconds = connectionIdleTimeSeconds
 

jdcloud_sdk/services/lb/apis/CreateLoadBalancerRequest.py

@@ -32,23 +32,24 @@ def __init__(self, parameters, header=None, version="v1"):
 
 class CreateLoadBalancerParameters(object):
 
-    def __init__(self, regionId, loadBalancerName, subnetId, azs, ):
+    def __init__(self, regionId,loadBalancerName, subnetId, ):
         """
         :param regionId: Region ID
         :param loadBalancerName: LoadBalancer的名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符
         :param subnetId: LoadBalancer所属子网的Id
-        :param azs: 【alb，nlb】LoadBalancer所属availability Zone列表,对于alb,nlb是必选参数 <br>【dnlb】全可用区可用，不必传该参数
         """
 
         self.regionId = regionId
         self.loadBalancerName = loadBalancerName
         self.subnetId = subnetId
         self.type = None
-        self.azs = azs
+        self.azs = None
         self.chargeSpec = None
         self.elasticIp = None
+        self.privateIpAddress = None
         self.securityGroupIds = None
         self.description = None
+        self.domainEnable = None
         self.deleteProtection = None
         self.userTags = None
 
@@ -58,6 +59,12 @@ def setType(self, type):
         """
         self.type = type
 
+    def setAzs(self, azs):
+        """
+        :param azs: (Optional) 【alb，nlb】LoadBalancer所属availability Zone列表,对于alb,nlb是必选参数，可用区个数不能超过2个 <br>【dnlb】全可用区可用，不必传该参数
+        """
+        self.azs = azs
+
     def setChargeSpec(self, chargeSpec):
         """
         :param chargeSpec: (Optional) 【alb】支持按用量计费，默认为按用量。【nlb】支持按用量计费。【dnlb】支持按配置计费
@@ -70,6 +77,12 @@ def setElasticIp(self, elasticIp):
         """
         self.elasticIp = elasticIp
 
+    def setPrivateIpAddress(self, privateIpAddress):
+        """
+        :param privateIpAddress: (Optional) 指定LoadBalancer的VIP(内网IPv4地址)，需要属于指定的子网并且未被占用
+        """
+        self.privateIpAddress = privateIpAddress
+
     def setSecurityGroupIds(self, securityGroupIds):
         """
         :param securityGroupIds: (Optional) 【alb】 安全组 ID列表
@@ -82,6 +95,12 @@ def setDescription(self, description):
         """
         self.description = description
 
+    def setDomainEnable(self, domainEnable):
+        """
+        :param domainEnable: (Optional) 是否绑定域名，包括外网和内网，缺省为False(关闭)
+        """
+        self.domainEnable = domainEnable
+
     def setDeleteProtection(self, deleteProtection):
         """
         :param deleteProtection: (Optional) 删除保护，取值为True(开启)或False(关闭)，默认为False

jdcloud_sdk/services/lb/apis/CreateTargetGroupRequest.py

@@ -32,7 +32,7 @@ def __init__(self, parameters, header=None, version="v1"):
 
 class CreateTargetGroupParameters(object):
 
-    def __init__(self, regionId, targetGroupName, loadBalancerId, ):
+    def __init__(self, regionId,targetGroupName, loadBalancerId, ):
         """
         :param regionId: Region ID
         :param targetGroupName: 虚拟服务器组名称,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符

jdcloud_sdk/services/lb/apis/CreateUrlMapRequest.py

@@ -32,7 +32,7 @@ def __init__(self, parameters, header=None, version="v1"):
 
 class CreateUrlMapParameters(object):
 
-    def __init__(self, regionId, urlMapName, loadBalancerId, ):
+    def __init__(self, regionId,urlMapName, loadBalancerId, ):
         """
         :param regionId: Region ID
         :param urlMapName: 转发规则组名称，同一个负载均衡下，名称不能重复,只允许输入中文、数字、大小写字母、英文下划线“_”及中划线“-”，不允许为空且不超过32字符