Merge 'integration_2024-11-14_582231061506' into 'master'

merge branch integration_2024-11-14_582231061506 into master

See merge request: !427

Author: liuweiwei-xyz

meta.json

@@ -1,4 +1,4 @@
 {
-	"lasted": "1.0.108",
-	"meta_commit": "8039d218891edbb271041a50e524ba8d2f662b13"
+	"lasted": "1.0.109",
+	"meta_commit": "4a25d5602d9a2cbd91f81aaf048011b7013e73ed"
 }

setup.py

@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "volcengine-python-sdk"
-VERSION = "1.0.108"
+VERSION = "1.0.109"
 # To install the library, run the following
 #
 # python setup.py install

volcenginesdkbilling/models/list_for_list_bill_detail_output.py

@@ -64,6 +64,7 @@ class ListForListBillDetailOutput(object):
         'expense_end_time': 'str',
         'factor': 'str',
         'factor_code': 'str',
+        'formula': 'str',
         'instance_name': 'str',
         'instance_no': 'str',
         'market_price': 'str',
@@ -138,6 +139,7 @@ class ListForListBillDetailOutput(object):
         'expense_end_time': 'ExpenseEndTime',
         'factor': 'Factor',
         'factor_code': 'FactorCode',
+        'formula': 'Formula',
         'instance_name': 'InstanceName',
         'instance_no': 'InstanceNo',
         'market_price': 'MarketPrice',
@@ -180,7 +182,7 @@ class ListForListBillDetailOutput(object):
         'zone_code': 'ZoneCode'
     }
 
-    def __init__(self, bill_category=None, bill_detail_id=None, bill_id=None, bill_period=None, billing_function=None, billing_method_code=None, billing_mode=None, busi_period=None, business_mode=None, config_name=None, configuration_code=None, count=None, coupon_amount=None, credit_carried_amount=None, currency=None, deduction_count=None, deduction_use_duration=None, discount_bill_amount=None, discount_biz_billing_function=None, discount_biz_measure_interval=None, discount_biz_unit_price=None, discount_biz_unit_price_interval=None, effective_factor=None, element=None, element_code=None, expand_field=None, expense_begin_time=None, expense_date=None, expense_end_time=None, factor=None, factor_code=None, instance_name=None, instance_no=None, market_price=None, measure_interval=None, original_bill_amount=None, owner_customer_name=None, owner_id=None, owner_user_name=None, paid_amount=None, payable_amount=None, payer_customer_name=None, payer_id=None, payer_user_name=None, preferential_bill_amount=None, price=None, price_interval=None, price_unit=None, product=None, product_zh=None, project=None, project_display_name=None, region=None, region_code=None, reservation_instance=None, round_amount=None, seller_customer_name=None, seller_id=None, seller_user_name=None, selling_mode=None, settlement_type=None, solution_zh=None, subject_name=None, tag=None, trade_time=None, unit=None, unpaid_amount=None, use_duration=None, use_duration_unit=None, zone=None, zone_code=None, _configuration=None):  # noqa: E501
+    def __init__(self, bill_category=None, bill_detail_id=None, bill_id=None, bill_period=None, billing_function=None, billing_method_code=None, billing_mode=None, busi_period=None, business_mode=None, config_name=None, configuration_code=None, count=None, coupon_amount=None, credit_carried_amount=None, currency=None, deduction_count=None, deduction_use_duration=None, discount_bill_amount=None, discount_biz_billing_function=None, discount_biz_measure_interval=None, discount_biz_unit_price=None, discount_biz_unit_price_interval=None, effective_factor=None, element=None, element_code=None, expand_field=None, expense_begin_time=None, expense_date=None, expense_end_time=None, factor=None, factor_code=None, formula=None, instance_name=None, instance_no=None, market_price=None, measure_interval=None, original_bill_amount=None, owner_customer_name=None, owner_id=None, owner_user_name=None, paid_amount=None, payable_amount=None, payer_customer_name=None, payer_id=None, payer_user_name=None, preferential_bill_amount=None, price=None, price_interval=None, price_unit=None, product=None, product_zh=None, project=None, project_display_name=None, region=None, region_code=None, reservation_instance=None, round_amount=None, seller_customer_name=None, seller_id=None, seller_user_name=None, selling_mode=None, settlement_type=None, solution_zh=None, subject_name=None, tag=None, trade_time=None, unit=None, unpaid_amount=None, use_duration=None, use_duration_unit=None, zone=None, zone_code=None, _configuration=None):  # noqa: E501
         """ListForListBillDetailOutput - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -217,6 +219,7 @@ def __init__(self, bill_category=None, bill_detail_id=None, bill_id=None, bill_p
         self._expense_end_time = None
         self._factor = None
         self._factor_code = None
+        self._formula = None
         self._instance_name = None
         self._instance_no = None
         self._market_price = None
@@ -321,6 +324,8 @@ def __init__(self, bill_category=None, bill_detail_id=None, bill_id=None, bill_p
             self.factor = factor
         if factor_code is not None:
             self.factor_code = factor_code
+        if formula is not None:
+            self.formula = formula
         if instance_name is not None:
             self.instance_name = instance_name
         if instance_no is not None:
@@ -1053,6 +1058,27 @@ def factor_code(self, factor_code):
 
         self._factor_code = factor_code
 
+    @property
+    def formula(self):
+        """Gets the formula of this ListForListBillDetailOutput.  # noqa: E501
+
+
+        :return: The formula of this ListForListBillDetailOutput.  # noqa: E501
+        :rtype: str
+        """
+        return self._formula
+
+    @formula.setter
+    def formula(self, formula):
+        """Sets the formula of this ListForListBillDetailOutput.
+
+
+        :param formula: The formula of this ListForListBillDetailOutput.  # noqa: E501
+        :type: str
+        """
+
+        self._formula = formula
+
     @property
     def instance_name(self):
         """Gets the instance_name of this ListForListBillDetailOutput.  # noqa: E501

volcenginesdkcore/api_client.py

@@ -67,7 +67,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'volcstack-python-sdk/1.0.108'
+        self.user_agent = 'volcstack-python-sdk/1.0.109'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):

volcenginesdkcore/configuration.py

@@ -221,5 +221,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: 0.1.0\n"\
-               "SDK Package Version: 1.0.108".\
+               "SDK Package Version: 1.0.109".\
                format(env=sys.platform, pyversion=sys.version)

volcenginesdkfwcenter/__init__.py

@@ -25,15 +25,20 @@
 from volcenginesdkfwcenter.models.add_control_policy_response import AddControlPolicyResponse
 from volcenginesdkfwcenter.models.add_dns_control_policy_request import AddDnsControlPolicyRequest
 from volcenginesdkfwcenter.models.add_dns_control_policy_response import AddDnsControlPolicyResponse
+from volcenginesdkfwcenter.models.add_nat_firewall_control_policy_request import AddNatFirewallControlPolicyRequest
+from volcenginesdkfwcenter.models.add_nat_firewall_control_policy_response import AddNatFirewallControlPolicyResponse
 from volcenginesdkfwcenter.models.add_vpc_firewall_acl_rule_request import AddVpcFirewallAclRuleRequest
 from volcenginesdkfwcenter.models.add_vpc_firewall_acl_rule_response import AddVpcFirewallAclRuleResponse
+from volcenginesdkfwcenter.models.asset_list_for_update_asset_switch_input import AssetListForUpdateAssetSwitchInput
 from volcenginesdkfwcenter.models.asset_list_request import AssetListRequest
 from volcenginesdkfwcenter.models.asset_list_response import AssetListResponse
 from volcenginesdkfwcenter.models.data_for_asset_list_output import DataForAssetListOutput
 from volcenginesdkfwcenter.models.data_for_describe_address_book_output import DataForDescribeAddressBookOutput
 from volcenginesdkfwcenter.models.data_for_describe_control_policy_by_rule_id_output import DataForDescribeControlPolicyByRuleIdOutput
 from volcenginesdkfwcenter.models.data_for_describe_control_policy_output import DataForDescribeControlPolicyOutput
 from volcenginesdkfwcenter.models.data_for_describe_dns_control_policy_output import DataForDescribeDnsControlPolicyOutput
+from volcenginesdkfwcenter.models.data_for_describe_nat_firewall_control_policy_output import DataForDescribeNatFirewallControlPolicyOutput
+from volcenginesdkfwcenter.models.data_for_describe_nat_firewall_list_output import DataForDescribeNatFirewallListOutput
 from volcenginesdkfwcenter.models.data_for_describe_vpc_firewall_acl_rule_list_output import DataForDescribeVpcFirewallAclRuleListOutput
 from volcenginesdkfwcenter.models.data_for_describe_vpc_firewall_list_output import DataForDescribeVpcFirewallListOutput
 from volcenginesdkfwcenter.models.data_for_describe_vpcs_output import DataForDescribeVpcsOutput
@@ -43,6 +48,8 @@
 from volcenginesdkfwcenter.models.delete_control_policy_response import DeleteControlPolicyResponse
 from volcenginesdkfwcenter.models.delete_dns_control_policy_request import DeleteDnsControlPolicyRequest
 from volcenginesdkfwcenter.models.delete_dns_control_policy_response import DeleteDnsControlPolicyResponse
+from volcenginesdkfwcenter.models.delete_nat_firewall_control_policy_request import DeleteNatFirewallControlPolicyRequest
+from volcenginesdkfwcenter.models.delete_nat_firewall_control_policy_response import DeleteNatFirewallControlPolicyResponse
 from volcenginesdkfwcenter.models.delete_vpc_firewall_acl_rule_request import DeleteVpcFirewallAclRuleRequest
 from volcenginesdkfwcenter.models.delete_vpc_firewall_acl_rule_response import DeleteVpcFirewallAclRuleResponse
 from volcenginesdkfwcenter.models.describe_address_book_request import DescribeAddressBookRequest
@@ -55,6 +62,12 @@
 from volcenginesdkfwcenter.models.describe_control_policy_response import DescribeControlPolicyResponse
 from volcenginesdkfwcenter.models.describe_dns_control_policy_request import DescribeDnsControlPolicyRequest
 from volcenginesdkfwcenter.models.describe_dns_control_policy_response import DescribeDnsControlPolicyResponse
+from volcenginesdkfwcenter.models.describe_nat_firewall_control_policy_priority_used_request import DescribeNatFirewallControlPolicyPriorityUsedRequest
+from volcenginesdkfwcenter.models.describe_nat_firewall_control_policy_priority_used_response import DescribeNatFirewallControlPolicyPriorityUsedResponse
+from volcenginesdkfwcenter.models.describe_nat_firewall_control_policy_request import DescribeNatFirewallControlPolicyRequest
+from volcenginesdkfwcenter.models.describe_nat_firewall_control_policy_response import DescribeNatFirewallControlPolicyResponse
+from volcenginesdkfwcenter.models.describe_nat_firewall_list_request import DescribeNatFirewallListRequest
+from volcenginesdkfwcenter.models.describe_nat_firewall_list_response import DescribeNatFirewallListResponse
 from volcenginesdkfwcenter.models.describe_vpc_firewall_acl_rule_list_request import DescribeVpcFirewallAclRuleListRequest
 from volcenginesdkfwcenter.models.describe_vpc_firewall_acl_rule_list_response import DescribeVpcFirewallAclRuleListResponse
 from volcenginesdkfwcenter.models.describe_vpc_firewall_acl_rule_prior_used_request import DescribeVpcFirewallAclRulePriorUsedRequest
@@ -71,18 +84,26 @@
 from volcenginesdkfwcenter.models.modify_control_policy_response import ModifyControlPolicyResponse
 from volcenginesdkfwcenter.models.modify_dns_control_policy_request import ModifyDnsControlPolicyRequest
 from volcenginesdkfwcenter.models.modify_dns_control_policy_response import ModifyDnsControlPolicyResponse
+from volcenginesdkfwcenter.models.modify_nat_firewall_control_policy_position_request import ModifyNatFirewallControlPolicyPositionRequest
+from volcenginesdkfwcenter.models.modify_nat_firewall_control_policy_position_response import ModifyNatFirewallControlPolicyPositionResponse
+from volcenginesdkfwcenter.models.modify_nat_firewall_control_policy_request import ModifyNatFirewallControlPolicyRequest
+from volcenginesdkfwcenter.models.modify_nat_firewall_control_policy_response import ModifyNatFirewallControlPolicyResponse
 from volcenginesdkfwcenter.models.modify_vpc_firewall_acl_rule_position_request import ModifyVpcFirewallAclRulePositionRequest
 from volcenginesdkfwcenter.models.modify_vpc_firewall_acl_rule_position_response import ModifyVpcFirewallAclRulePositionResponse
 from volcenginesdkfwcenter.models.modify_vpc_firewall_acl_rule_request import ModifyVpcFirewallAclRuleRequest
 from volcenginesdkfwcenter.models.modify_vpc_firewall_acl_rule_response import ModifyVpcFirewallAclRuleResponse
 from volcenginesdkfwcenter.models.source_for_add_dns_control_policy_input import SourceForAddDnsControlPolicyInput
 from volcenginesdkfwcenter.models.source_for_describe_dns_control_policy_output import SourceForDescribeDnsControlPolicyOutput
 from volcenginesdkfwcenter.models.source_for_modify_dns_control_policy_input import SourceForModifyDnsControlPolicyInput
+from volcenginesdkfwcenter.models.update_asset_switch_request import UpdateAssetSwitchRequest
+from volcenginesdkfwcenter.models.update_asset_switch_response import UpdateAssetSwitchResponse
 from volcenginesdkfwcenter.models.update_assets_request import UpdateAssetsRequest
 from volcenginesdkfwcenter.models.update_assets_response import UpdateAssetsResponse
 from volcenginesdkfwcenter.models.update_control_policy_switch_request import UpdateControlPolicySwitchRequest
 from volcenginesdkfwcenter.models.update_control_policy_switch_response import UpdateControlPolicySwitchResponse
 from volcenginesdkfwcenter.models.update_dns_control_policy_switch_request import UpdateDnsControlPolicySwitchRequest
 from volcenginesdkfwcenter.models.update_dns_control_policy_switch_response import UpdateDnsControlPolicySwitchResponse
+from volcenginesdkfwcenter.models.update_nat_firewall_control_policy_switch_request import UpdateNatFirewallControlPolicySwitchRequest
+from volcenginesdkfwcenter.models.update_nat_firewall_control_policy_switch_response import UpdateNatFirewallControlPolicySwitchResponse
 from volcenginesdkfwcenter.models.update_vpc_firewall_acl_rule_switch_request import UpdateVpcFirewallAclRuleSwitchRequest
 from volcenginesdkfwcenter.models.update_vpc_firewall_acl_rule_switch_response import UpdateVpcFirewallAclRuleSwitchResponse