BCE-JC-33026 net-console-sdk-review-2

Change-Id: I549d26d03e2fea0570ecdee89784c49c42aa9f33

Author: chongkuitai

Changelog

@@ -1,5 +1,25 @@
 发行说明：记录每次SDK更新的说明，最新版本的SDK包含以前所有版本的更新内容。
 ---------------------------------------------------------------------
+【版本：v0.9.63】
+涉及产品:VPC
+删除路由规则接口入参的params中删除action参数和数值;主备切换接口新增switchRouteHA查询参数；HTTP Method由DELETE修改为PUT;
+企业安全组规则添加remoteIpSet、remoteIpGroup、createdTime、updatedTime字段；删除普通安全组规则、授权普通安全组增加sgVersion字段；
+更新企业安全组规则增加remoteIpSet、remoteIpGroup参数；删除企业安全组、删除企业安全组规则、更新企业安全组规则增加clientToken 参数；
+查询普通安全组列表增加 securityGroupId 参数;update_eni校验name和description二者不能同时为空;list_eni去除max_keys默认值设为1000逻辑，
+由服务端实现;list_eni去除client_token参数;get_eni_details去除client_token参数;attach_eni_instance请求添加instanceType字段;
+update_eni_enterprise_security_group必填security_group_ids修改为security_group_ids;get_eni_status去除client_token参数;
+bind_eni_public_ip中privat_ip_address修改为private_ip_address;unbind_eni_public_ip去除private_ip_address必填;
+
+涉及产品: BLB
+查询普通型blb实例支持exactlyMatch和type字段;补齐创建普通型blb实例参数;更新普通型blb实例接口支持allowDelete、
+allocateIpv6字段;CreateTCPListener 新增tcpSessionTimeout,healthCheckType入参;CreateUDPListener 新增udpSessionTimeout入参，
+healthCheckString修改为非必须参数;CreateHTTPListener 新增 xForwardedProto,additionalAttributes,healthCheckHost入参;
+CraeteHTTPSListener新增xForwardedProto,additionalAttributes,healthCheckHost,appliedCiphers入参;CreateSSLListener新增
+healthCheckType,serverTimeout,appliedCiphers入参;UpdateTCPListener新增healthCheckType,tcpSessionTimeout入参;
+UpdateUDPListener新增udpSessionTimeout参数，backend_port修改为非必须;UpdateHTTPListener新增xForwardedProto,
+additionalAttributes,healthCheckHost入参;UpdateHTTPSListener新增xForwardedProto,additionalAttributes,healthCHeckHost入参;
+UpdateSSLListener新增healthCheckType,appliedCiphers入参;完善应用型lb的创建时支持的参数;增加list和detail的响应参数;
+
 【版本：v0.9.62】
 涉及产品：BCC
 增加自助诊断接口

baidubce/__init__.py

@@ -18,7 +18,7 @@
 from . import protocol
 
 
-SDK_VERSION = b'0.9.61'
+SDK_VERSION = b'0.9.63'
 DEFAULT_SERVICE_DOMAIN = b'bcebos.com'
 URL_PREFIX = b'/v1'
 DEFAULT_ENCODING = 'UTF-8'

baidubce/services/bcc/bcc_client.py

@@ -3259,8 +3259,8 @@ def create_security_group(self,
         return self._send_request(http_methods.POST, path, json.dumps(body),
                                   params=params, config=config)
 
-    def list_security_groups(self, instance_id=None, vpc_id=None, security_group_ids=None, marker=None, max_keys=None,
-                             config=None):
+    def list_security_groups(self, instance_id=None, vpc_id=None, security_group_id=None, security_group_ids=None,
+                             marker=None, max_keys=None, config=None):
         """
         Listing SecurityGroup owned by the authenticated user.
 
@@ -3273,6 +3273,10 @@ def list_security_groups(self, instance_id=None, vpc_id=None, security_group_ids
             filter by vpcId, optional parameter
         :type vpc_id: string
 
+        :param security_group_id:
+            filter by securityGroupId, optional parameter
+        :type security_group_id: string
+
         :param security_group_ids:
             filter by securityGroupIds, optional parameter
         :type security_group_ids: string
@@ -3304,6 +3308,8 @@ def list_security_groups(self, instance_id=None, vpc_id=None, security_group_ids
             params['marker'] = marker
         if max_keys is not None:
             params['maxKeys'] = max_keys
+        if security_group_id is not None:
+            params['securityGroupId'] = security_group_id
 
         return self._send_request(http_methods.GET, path,
                                   params=params, config=config)
@@ -3327,7 +3333,7 @@ def delete_security_group(self, security_group_id, config=None):
     @required(security_group_id=(bytes, str),  # ***Unicode***
               rule=bcc_model.SecurityGroupRuleModel)
     def authorize_security_group_rule(self, security_group_id, rule, client_token=None,
-                                      config=None):
+                                      sg_version=None, config=None):
         """
         authorize a security group rule to the specified security group
 
@@ -3349,6 +3355,10 @@ def authorize_security_group_rule(self, security_group_id, rule, client_token=No
             https://bce.baidu.com/doc/BCC/API.html#.E5.B9.82.E7.AD.89.E6.80.A7
         :type client_token: string
 
+        :param sg_version:
+            Security group version number for optimistic locking.
+        :type sg_version: int
+
         :return:
         :rtype baidubce.bce_response.BceResponse
         """
@@ -3359,6 +3369,8 @@ def authorize_security_group_rule(self, security_group_id, rule, client_token=No
             params['clientToken'] = generate_client_token()
         else:
             params['clientToken'] = client_token
+        if sg_version is not None:
+            params['sgVersion'] = sg_version
         body = {
             'rule': rule.__dict__
         }
@@ -3368,7 +3380,7 @@ def authorize_security_group_rule(self, security_group_id, rule, client_token=No
 
     @required(security_group_id=(bytes, str),  # ***Unicode***
               rule=bcc_model.SecurityGroupRuleModel)
-    def revoke_security_group_rule(self, security_group_id, rule, client_token=None, config=None):
+    def revoke_security_group_rule(self, security_group_id, rule, client_token=None, sg_version=None, config=None):
         """
         revoke a security group rule from the specified security group
         :param security_group_id:
@@ -3386,6 +3398,9 @@ def revoke_security_group_rule(self, security_group_id, rule, client_token=None,
             See more detail at
             https://bce.baidu.com/doc/BCC/API.html#.E5.B9.82.E7.AD.89.E6.80.A7
         :type client_token: string
+        :param sg_version:
+            Security group version number for optimistic locking.
+        :type sg_version: int
         :return:
         :rtype baidubce.bce_response.BceResponse
         """
@@ -3396,6 +3411,8 @@ def revoke_security_group_rule(self, security_group_id, rule, client_token=None,
             params['clientToken'] = generate_client_token()
         else:
             params['clientToken'] = client_token
+        if sg_version is not None:
+            params['sgVersion'] = sg_version
         body = {
             'rule': rule.__dict__
         }
@@ -3405,16 +3422,17 @@ def revoke_security_group_rule(self, security_group_id, rule, client_token=None,
 
     def update_security_group_rule(self, security_group_rule_id,
                                    remark=None,
-                                   direction=None,
                                    protocol=None,
                                    portrange=None,
                                    source_ip=None,
                                    sourcegroup_id=None,
                                    dest_ip=None,
                                    destgroup_id=None,
-                                   config=None):
+                                   sg_version=None,
+                                   client_token=None,
+                                   config=None,):
         """
-            uodate a security group rule from the specified security group
+            update a security group rule from the specified security group
             :param security_group_rule_id:
                 security group rule id.
             :param: remark:
@@ -3437,43 +3455,75 @@ def update_security_group_rule(self, security_group_rule_id,
                 Only works for  direction = "egress".
             :param: destgroup_id:
                 The destination security group id. Cannot coexist with destIP.
-            :param: priority:
-                The parameter specify the priority of the rule(range 1-1000).
+            :param sg_version:
+                Security group version number for optimistic locking.
+            :type sg_version: int
+            :param client_token:
+                An ASCII string whose length is less than 64.
+                The request will be idempotent if client token is provided.
+            :type client_token: string
             :param config:
                 :type config: baidubce.BceClientConfiguration
             :return:
             :rtype baidubce.bce_response.BceResponse
         """
         path = b'/securityGroup/rule/update'
-        body = {
-            'securityGroupRuleId': security_group_rule_id,
-            'remark': remark,
-            'direction': direction,
-            'protocol': protocol,
-            'portRange': portrange,
-            'sourceIp': source_ip,
-            'sourceGroupId': sourcegroup_id,
-            'destIp': dest_ip,
-            'destGroupId': destgroup_id
-        }
+        params = {}
+        if sg_version is not None:
+            params['sgVersion'] = sg_version
+        if client_token is None:
+            params['clientToken'] = generate_client_token()
+        else:
+            params['clientToken'] = client_token
+
+        body = {'securityGroupRuleId': security_group_rule_id}
+        if remark is not None:
+            body['remark'] = remark
+        if protocol is not None:
+            body['protocol'] = protocol
+        if portrange is not None:
+            body['portRange'] = portrange
+        if source_ip is not None:
+            body['sourceIp'] = source_ip
+        if sourcegroup_id is not None:
+            body['sourceGroupId'] = sourcegroup_id
+        if dest_ip is not None:
+            body['destIp'] = dest_ip
+        if destgroup_id is not None:
+            body['destGroupId'] = destgroup_id
+
         return self._send_request(http_methods.PUT, path, json.dumps(body),
-                                  params=None, config=config)
+                                  params=params if params else None, config=config)
 
     @required(security_group_rule_id=(bytes, str))  # ***Unicode***
-    def delete_security_group_rule(self, security_group_rule_id, config=None):
+    def delete_security_group_rule(self, security_group_rule_id, sg_version=None, client_token=None, config=None):
         """
             delete a security group rule from the specified security group
             :param security_group_rule_id:
                 The id of SecurityGroupRule that will be deleted.
-            :type security_group_id: string
+            :type security_group_rule_id: string
+            :param sg_version:
+                Security group version number for optimistic locking.
+            :type sg_version: int
+            :param client_token:
+                An ASCII string whose length is less than 64.
+                The request will be idempotent if client token is provided.
+            :type client_token: string
             :param config:
             :type config: baidubce.BceClientConfiguration
             :return:
             :rtype baidubce.bce_response.BceResponse
         """
         security_group_rule_id = compat.convert_to_bytes(security_group_rule_id)
         path = b'/securityGroup/rule/%s' % security_group_rule_id
-        return self._send_request(http_methods.DELETE, path, params=None, config=config)
+        params = {}
+        if sg_version is not None:
+            params['sgVersion'] = sg_version
+        if client_token is None:
+            params['clientToken'] = generate_client_token()
+        else:
+            params['clientToken'] = client_token
+        return self._send_request(http_methods.DELETE, path, params=params if params else None, config=config)
 
     @required(security_group_id=(bytes, str))  # ***Unicode***
     def get_security_group_detail(self, security_group_id, config=None):