tccli 3.0.1215.1__py2.py3-none-any.whl → 3.0.1216.1__py2.py3-none-any.whl

tccli/services/vpc/vpc_client.py

@@ -3917,7 +3917,7 @@ def doModifyVpnGatewayAttribute(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doUnlockCcns(args, parsed_globals):
+def doDeleteVpc(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -3946,11 +3946,11 @@ def doUnlockCcns(args, parsed_globals):
     client = mod.VpcClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.UnlockCcnsRequest()
+    model = models.DeleteVpcRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.UnlockCcns(model)
+        rsp = client.DeleteVpc(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -11925,7 +11925,7 @@ def doModifyCcnRouteTables(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doModifyHighPriorityRouteECMPAlgorithm(args, parsed_globals):
+def doModifyCcnRegionBandwidthLimitsType(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -11954,11 +11954,11 @@ def doModifyHighPriorityRouteECMPAlgorithm(args, parsed_globals):
     client = mod.VpcClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.ModifyHighPriorityRouteECMPAlgorithmRequest()
+    model = models.ModifyCcnRegionBandwidthLimitsTypeRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.ModifyHighPriorityRouteECMPAlgorithm(model)
+        rsp = client.ModifyCcnRegionBandwidthLimitsType(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -11977,7 +11977,7 @@ def doModifyHighPriorityRouteECMPAlgorithm(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDeleteNatGatewaySourceIpTranslationNatRule(args, parsed_globals):
+def doModifyHighPriorityRouteECMPAlgorithm(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -12006,11 +12006,11 @@ def doDeleteNatGatewaySourceIpTranslationNatRule(args, parsed_globals):
     client = mod.VpcClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DeleteNatGatewaySourceIpTranslationNatRuleRequest()
+    model = models.ModifyHighPriorityRouteECMPAlgorithmRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.DeleteNatGatewaySourceIpTranslationNatRule(model)
+        rsp = client.ModifyHighPriorityRouteECMPAlgorithm(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -12029,7 +12029,7 @@ def doDeleteNatGatewaySourceIpTranslationNatRule(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doModifyNatGatewaySourceIpTranslationNatRule(args, parsed_globals):
+def doDeleteNatGatewaySourceIpTranslationNatRule(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -12058,11 +12058,11 @@ def doModifyNatGatewaySourceIpTranslationNatRule(args, parsed_globals):
     client = mod.VpcClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.ModifyNatGatewaySourceIpTranslationNatRuleRequest()
+    model = models.DeleteNatGatewaySourceIpTranslationNatRuleRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.ModifyNatGatewaySourceIpTranslationNatRule(model)
+        rsp = client.DeleteNatGatewaySourceIpTranslationNatRule(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -12081,7 +12081,7 @@ def doModifyNatGatewaySourceIpTranslationNatRule(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doUnassignIpv6SubnetCidrBlock(args, parsed_globals):
+def doModifyNatGatewaySourceIpTranslationNatRule(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -12110,11 +12110,11 @@ def doUnassignIpv6SubnetCidrBlock(args, parsed_globals):
     client = mod.VpcClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.UnassignIpv6SubnetCidrBlockRequest()
+    model = models.ModifyNatGatewaySourceIpTranslationNatRuleRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.UnassignIpv6SubnetCidrBlock(model)
+        rsp = client.ModifyNatGatewaySourceIpTranslationNatRule(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -12133,7 +12133,7 @@ def doUnassignIpv6SubnetCidrBlock(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDisableRoutes(args, parsed_globals):
+def doUnassignIpv6SubnetCidrBlock(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -12162,11 +12162,11 @@ def doDisableRoutes(args, parsed_globals):
     client = mod.VpcClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DisableRoutesRequest()
+    model = models.UnassignIpv6SubnetCidrBlockRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.DisableRoutes(model)
+        rsp = client.UnassignIpv6SubnetCidrBlock(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -12185,7 +12185,7 @@ def doDisableRoutes(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doEnableVpnGatewaySslClientCert(args, parsed_globals):
+def doDisableRoutes(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -12214,11 +12214,11 @@ def doEnableVpnGatewaySslClientCert(args, parsed_globals):
     client = mod.VpcClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.EnableVpnGatewaySslClientCertRequest()
+    model = models.DisableRoutesRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.EnableVpnGatewaySslClientCert(model)
+        rsp = client.DisableRoutes(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -12237,7 +12237,7 @@ def doEnableVpnGatewaySslClientCert(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doCreateAssistantCidr(args, parsed_globals):
+def doEnableVpnGatewaySslClientCert(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -12266,11 +12266,11 @@ def doCreateAssistantCidr(args, parsed_globals):
     client = mod.VpcClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.CreateAssistantCidrRequest()
+    model = models.EnableVpnGatewaySslClientCertRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.CreateAssistantCidr(model)
+        rsp = client.EnableVpnGatewaySslClientCert(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -12289,7 +12289,7 @@ def doCreateAssistantCidr(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDescribeVpnGatewaySslClients(args, parsed_globals):
+def doCreateAssistantCidr(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -12318,11 +12318,11 @@ def doDescribeVpnGatewaySslClients(args, parsed_globals):
     client = mod.VpcClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DescribeVpnGatewaySslClientsRequest()
+    model = models.CreateAssistantCidrRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.DescribeVpnGatewaySslClients(model)
+        rsp = client.CreateAssistantCidr(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -12341,7 +12341,7 @@ def doDescribeVpnGatewaySslClients(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doCreateNatGateway(args, parsed_globals):
+def doDescribeVpnGatewaySslClients(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -12370,11 +12370,11 @@ def doCreateNatGateway(args, parsed_globals):
     client = mod.VpcClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.CreateNatGatewayRequest()
+    model = models.DescribeVpnGatewaySslClientsRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.CreateNatGateway(model)
+        rsp = client.DescribeVpnGatewaySslClients(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -12393,7 +12393,7 @@ def doCreateNatGateway(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDeleteNetDetect(args, parsed_globals):
+def doCreateNatGateway(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -12422,11 +12422,11 @@ def doDeleteNetDetect(args, parsed_globals):
     client = mod.VpcClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DeleteNetDetectRequest()
+    model = models.CreateNatGatewayRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.DeleteNetDetect(model)
+        rsp = client.CreateNatGateway(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -12445,7 +12445,7 @@ def doDeleteNetDetect(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doNotifyRoutes(args, parsed_globals):
+def doDeleteNetDetect(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -12474,11 +12474,11 @@ def doNotifyRoutes(args, parsed_globals):
     client = mod.VpcClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.NotifyRoutesRequest()
+    model = models.DeleteNetDetectRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.NotifyRoutes(model)
+        rsp = client.DeleteNetDetect(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -12497,7 +12497,7 @@ def doNotifyRoutes(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDeleteVpcEndPoint(args, parsed_globals):
+def doNotifyRoutes(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -12526,11 +12526,11 @@ def doDeleteVpcEndPoint(args, parsed_globals):
     client = mod.VpcClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DeleteVpcEndPointRequest()
+    model = models.NotifyRoutesRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.DeleteVpcEndPoint(model)
+        rsp = client.NotifyRoutes(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -12549,7 +12549,7 @@ def doDeleteVpcEndPoint(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDeleteHighPriorityRoutes(args, parsed_globals):
+def doDeleteVpcEndPoint(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -12578,11 +12578,11 @@ def doDeleteHighPriorityRoutes(args, parsed_globals):
     client = mod.VpcClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DeleteHighPriorityRoutesRequest()
+    model = models.DeleteVpcEndPointRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.DeleteHighPriorityRoutes(model)
+        rsp = client.DeleteVpcEndPoint(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -12601,7 +12601,7 @@ def doDeleteHighPriorityRoutes(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doCreateServiceTemplate(args, parsed_globals):
+def doDeleteHighPriorityRoutes(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -12630,11 +12630,11 @@ def doCreateServiceTemplate(args, parsed_globals):
     client = mod.VpcClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.CreateServiceTemplateRequest()
+    model = models.DeleteHighPriorityRoutesRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.CreateServiceTemplate(model)
+        rsp = client.DeleteHighPriorityRoutes(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -12653,7 +12653,7 @@ def doCreateServiceTemplate(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDeleteVpc(args, parsed_globals):
+def doCreateServiceTemplate(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -12682,11 +12682,11 @@ def doDeleteVpc(args, parsed_globals):
     client = mod.VpcClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DeleteVpcRequest()
+    model = models.CreateServiceTemplateRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.DeleteVpc(model)
+        rsp = client.CreateServiceTemplate(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -14733,7 +14733,7 @@ def doDescribeNetDetects(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doModifyCcnRegionBandwidthLimitsType(args, parsed_globals):
+def doModifyAddressesRenewFlag(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -14762,11 +14762,11 @@ def doModifyCcnRegionBandwidthLimitsType(args, parsed_globals):
     client = mod.VpcClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.ModifyCcnRegionBandwidthLimitsTypeRequest()
+    model = models.ModifyAddressesRenewFlagRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.ModifyCcnRegionBandwidthLimitsType(model)
+        rsp = client.ModifyAddressesRenewFlag(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -17801,6 +17801,58 @@ def doDescribeNatGatewayDirectConnectGatewayRoute(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doUnlockCcns(args, parsed_globals):
+    g_param = parse_global_arg(parsed_globals)
+
+    if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
+        cred = credential.CVMRoleCredential()
+    elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
+        cred = credential.STSAssumeRoleCredential(
+            g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
+            g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
+        )
+    elif os.getenv(OptionsDefine.ENV_TKE_REGION)             and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID)             and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE)             and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
+        cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
+    else:
+        cred = credential.Credential(
+            g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
+        )
+    http_profile = HttpProfile(
+        reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
+        reqMethod="POST",
+        endpoint=g_param[OptionsDefine.Endpoint],
+        proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
+    )
+    profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
+    if g_param[OptionsDefine.Language]:
+        profile.language = g_param[OptionsDefine.Language]
+    mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
+    client = mod.VpcClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.UnlockCcnsRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.UnlockCcns(model)
+        result = rsp.to_json_string()
+        try:
+            json_obj = json.loads(result)
+        except TypeError as e:
+            json_obj = json.loads(result.decode('utf-8'))  # python3.3
+        if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
+            break
+        cur_time = time.time()
+        if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
+            raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
+            (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
+            search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
+        else:
+            print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
+        time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
+    FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
+
+
 def doHaVipAssociateAddressIp(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -19343,7 +19395,7 @@ ACTION_MAP = {
     "ModifyBandwidthPackageAttribute": doModifyBandwidthPackageAttribute,
     "CreateVpnGatewaySslServer": doCreateVpnGatewaySslServer,
     "ModifyVpnGatewayAttribute": doModifyVpnGatewayAttribute,
-    "UnlockCcns": doUnlockCcns,
+    "DeleteVpc": doDeleteVpc,
     "DescribeSubnets": doDescribeSubnets,
     "ModifyPrivateNatGatewayTranslationAclRule": doModifyPrivateNatGatewayTranslationAclRule,
     "ModifyPrivateIpAddressesAttribute": doModifyPrivateIpAddressesAttribute,
@@ -19497,6 +19549,7 @@ ACTION_MAP = {
     "DeleteNetworkAclEntries": doDeleteNetworkAclEntries,
     "DescribeBandwidthPackageBillUsage": doDescribeBandwidthPackageBillUsage,
     "ModifyCcnRouteTables": doModifyCcnRouteTables,
+    "ModifyCcnRegionBandwidthLimitsType": doModifyCcnRegionBandwidthLimitsType,
     "ModifyHighPriorityRouteECMPAlgorithm": doModifyHighPriorityRouteECMPAlgorithm,
     "DeleteNatGatewaySourceIpTranslationNatRule": doDeleteNatGatewaySourceIpTranslationNatRule,
     "ModifyNatGatewaySourceIpTranslationNatRule": doModifyNatGatewaySourceIpTranslationNatRule,
@@ -19511,7 +19564,6 @@ ACTION_MAP = {
     "DeleteVpcEndPoint": doDeleteVpcEndPoint,
     "DeleteHighPriorityRoutes": doDeleteHighPriorityRoutes,
     "CreateServiceTemplate": doCreateServiceTemplate,
-    "DeleteVpc": doDeleteVpc,
     "ModifyDirectConnectGatewayAttribute": doModifyDirectConnectGatewayAttribute,
     "ModifySubnetAttribute": doModifySubnetAttribute,
     "DescribeSgSnapshotFileContent": doDescribeSgSnapshotFileContent,
@@ -19551,7 +19603,7 @@ ACTION_MAP = {
     "DisassociateNetworkInterfaceSecurityGroups": doDisassociateNetworkInterfaceSecurityGroups,
     "ResetRoutes": doResetRoutes,
     "DescribeNetDetects": doDescribeNetDetects,
-    "ModifyCcnRegionBandwidthLimitsType": doModifyCcnRegionBandwidthLimitsType,
+    "ModifyAddressesRenewFlag": doModifyAddressesRenewFlag,
     "DescribeCcnRouteTableInputPolicys": doDescribeCcnRouteTableInputPolicys,
     "CloneSecurityGroup": doCloneSecurityGroup,
     "DeleteSnapshotPolicies": doDeleteSnapshotPolicies,
@@ -19610,6 +19662,7 @@ ACTION_MAP = {
     "DescribeServiceTemplates": doDescribeServiceTemplates,
     "HaVipDisassociateAddressIp": doHaVipDisassociateAddressIp,
     "DescribeNatGatewayDirectConnectGatewayRoute": doDescribeNatGatewayDirectConnectGatewayRoute,
+    "UnlockCcns": doUnlockCcns,
     "HaVipAssociateAddressIp": doHaVipAssociateAddressIp,
     "CheckDefaultSubnet": doCheckDefaultSubnet,
     "AssociateNetworkInterfaceSecurityGroups": doAssociateNetworkInterfaceSecurityGroups,

tccli/services/waf/v20180125/api.json

@@ -917,6 +917,13 @@
       "output": "ModifyUserSignatureRuleResponse",
       "status": "online"
     },
+    "ModifyUserSignatureRuleV2": {
+      "document": "修改用户防护规则，开启关闭具体的某条规则",
+      "input": "ModifyUserSignatureRuleV2Request",
+      "name": "修改用户防护规则V2",
+      "output": "ModifyUserSignatureRuleV2Response",
+      "status": "online"
+    },
     "ModifyWafAutoDenyRules": {
       "document": "修改ip惩罚规则",
       "input": "ModifyWafAutoDenyRulesRequest",
@@ -18004,6 +18011,60 @@
       ],
       "type": "object"
     },
+    "ModifyUserSignatureRuleV2Request": {
+      "document": "ModifyUserSignatureRuleV2请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "域名",
+          "example": "xx.qcloudwaf.com",
+          "member": "string",
+          "name": "Domain",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "主类id",
+          "example": "010000000",
+          "member": "string",
+          "name": "MainClassID",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "主类开关0=关闭，1=开启，2=只告警",
+          "example": "1",
+          "member": "int64",
+          "name": "Status",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "下发修改的规则列表",
+          "example": "无",
+          "member": "ReqUserRule",
+          "name": "RuleID",
+          "required": false,
+          "type": "list"
+        }
+      ],
+      "type": "object"
+    },
+    "ModifyUserSignatureRuleV2Response": {
+      "document": "ModifyUserSignatureRuleV2返回参数结构体",
+      "members": [
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "ModifyWafAutoDenyRulesRequest": {
       "document": "ModifyWafAutoDenyRules请求参数结构体",
       "members": [

tccli/services/waf/v20180125/examples.json

@@ -1160,6 +1160,14 @@
         "title": "查询示例"
       }
     ],
+    "ModifyUserSignatureRuleV2": [
+      {
+        "document": "",
+        "input": "POST / HTTP/1.1\nHost: waf.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: ModifyUserSignatureRuleV2\n<公共请求参数>\n\n{\n    \"Domain\": \"abc.test.com\",\n    \"RuleID\": [\n        {\n            \"Id\": \"10000266\",\n            \"Status\": 0\n        }\n    ]\n}",
+        "output": "{\n    \"Response\": {\n        \"RequestId\": \"40bbd265-74de-4e3b-b4f8-6219222ab961\"\n    }\n}",
+        "title": "修改用户防护规则，关闭具体的某条规则"
+      }
+    ],
     "ModifyWafAutoDenyRules": [
       {
         "document": "修改ip惩罚配置",

tccli/services/waf/waf_client.py

@@ -5529,6 +5529,58 @@ def doDescribeHost(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doModifyUserSignatureRuleV2(args, parsed_globals):
+    g_param = parse_global_arg(parsed_globals)
+
+    if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
+        cred = credential.CVMRoleCredential()
+    elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
+        cred = credential.STSAssumeRoleCredential(
+            g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
+            g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
+        )
+    elif os.getenv(OptionsDefine.ENV_TKE_REGION)             and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID)             and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE)             and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
+        cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
+    else:
+        cred = credential.Credential(
+            g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
+        )
+    http_profile = HttpProfile(
+        reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
+        reqMethod="POST",
+        endpoint=g_param[OptionsDefine.Endpoint],
+        proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
+    )
+    profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
+    if g_param[OptionsDefine.Language]:
+        profile.language = g_param[OptionsDefine.Language]
+    mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
+    client = mod.WafClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.ModifyUserSignatureRuleV2Request()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.ModifyUserSignatureRuleV2(model)
+        result = rsp.to_json_string()
+        try:
+            json_obj = json.loads(result)
+        except TypeError as e:
+            json_obj = json.loads(result.decode('utf-8'))  # python3.3
+        if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
+            break
+        cur_time = time.time()
+        if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
+            raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
+            (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
+            search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
+        else:
+            print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
+        time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
+    FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
+
+
 def doDescribeAccessExports(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -7622,6 +7674,7 @@ ACTION_MAP = {
     "PostAttackDownloadTask": doPostAttackDownloadTask,
     "DescribeCustomWhiteRule": doDescribeCustomWhiteRule,
     "DescribeHost": doDescribeHost,
+    "ModifyUserSignatureRuleV2": doModifyUserSignatureRuleV2,
     "DescribeAccessExports": doDescribeAccessExports,
     "ModifyGenerateDeals": doModifyGenerateDeals,
     "DescribeHostLimit": doDescribeHostLimit,