Skip to content

Commit d51d089

Browse files
committed
Generated python 2021-03-20 for Emr.
1 parent 2c9bc42 commit d51d089

File tree

4 files changed

+24
-1
lines changed

4 files changed

+24
-1
lines changed

emr-20210320/ChangeLog.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
2025-02-27 Version: 2.3.1
2+
- Generated python 2021-03-20 for Emr.
3+
14
2025-02-21 Version: 2.3.0
25
- Support API CreateUsers.
36
- Support API DeleteUsers.
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
__version__ = '2.3.0'
1+
<<<<<<< Updated upstream
2+
__version__ = '2.3.0'
3+
=======
4+
__version__ = '2.3.1'
5+
>>>>>>> Stashed changes

emr-20210320/alibabacloud_emr20210320/models.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4707,6 +4707,7 @@ class NodeGroup(TeaModel):
47074707
def __init__(
47084708
self,
47094709
additional_security_group_ids: List[str] = None,
4710+
compensate_with_on_demand: bool = None,
47104711
cost_optimized_config: CostOptimizedConfig = None,
47114712
data_disks: List[DataDisk] = None,
47124713
deployment_set_strategy: str = None,
@@ -4732,6 +4733,7 @@ def __init__(
47324733
):
47334734
# 安全组ID。
47344735
self.additional_security_group_ids = additional_security_group_ids
4736+
self.compensate_with_on_demand = compensate_with_on_demand
47354737
# 成本优化模式配置。
47364738
self.cost_optimized_config = cost_optimized_config
47374739
# 数据盘列表。
@@ -4819,6 +4821,8 @@ def to_map(self):
48194821
result = dict()
48204822
if self.additional_security_group_ids is not None:
48214823
result['AdditionalSecurityGroupIds'] = self.additional_security_group_ids
4824+
if self.compensate_with_on_demand is not None:
4825+
result['CompensateWithOnDemand'] = self.compensate_with_on_demand
48224826
if self.cost_optimized_config is not None:
48234827
result['CostOptimizedConfig'] = self.cost_optimized_config.to_map()
48244828
result['DataDisks'] = []
@@ -4873,6 +4877,8 @@ def from_map(self, m: dict = None):
48734877
m = m or dict()
48744878
if m.get('AdditionalSecurityGroupIds') is not None:
48754879
self.additional_security_group_ids = m.get('AdditionalSecurityGroupIds')
4880+
if m.get('CompensateWithOnDemand') is not None:
4881+
self.compensate_with_on_demand = m.get('CompensateWithOnDemand')
48764882
if m.get('CostOptimizedConfig') is not None:
48774883
temp_model = CostOptimizedConfig()
48784884
self.cost_optimized_config = temp_model.from_map(m['CostOptimizedConfig'])
@@ -4935,6 +4941,7 @@ def __init__(
49354941
self,
49364942
additional_security_group_ids: List[str] = None,
49374943
auto_scaling_policy: AutoScalingPolicy = None,
4944+
compensate_with_on_demand: bool = None,
49384945
component_tags: List[str] = None,
49394946
cost_optimized_config: CostOptimizedConfig = None,
49404947
data_disks: List[DataDisk] = None,
@@ -4958,6 +4965,7 @@ def __init__(
49584965
# 附加安全组。除集群设置的安全组外,为节点组单独设置的附加安全组。数组元数个数N的取值范围:0~2。
49594966
self.additional_security_group_ids = additional_security_group_ids
49604967
self.auto_scaling_policy = auto_scaling_policy
4968+
self.compensate_with_on_demand = compensate_with_on_demand
49614969
self.component_tags = component_tags
49624970
# 成本优化模式配置。
49634971
self.cost_optimized_config = cost_optimized_config
@@ -5060,6 +5068,8 @@ def to_map(self):
50605068
result['AdditionalSecurityGroupIds'] = self.additional_security_group_ids
50615069
if self.auto_scaling_policy is not None:
50625070
result['AutoScalingPolicy'] = self.auto_scaling_policy.to_map()
5071+
if self.compensate_with_on_demand is not None:
5072+
result['CompensateWithOnDemand'] = self.compensate_with_on_demand
50635073
if self.component_tags is not None:
50645074
result['ComponentTags'] = self.component_tags
50655075
if self.cost_optimized_config is not None:
@@ -5111,6 +5121,8 @@ def from_map(self, m: dict = None):
51115121
if m.get('AutoScalingPolicy') is not None:
51125122
temp_model = AutoScalingPolicy()
51135123
self.auto_scaling_policy = temp_model.from_map(m['AutoScalingPolicy'])
5124+
if m.get('CompensateWithOnDemand') is not None:
5125+
self.compensate_with_on_demand = m.get('CompensateWithOnDemand')
51145126
if m.get('ComponentTags') is not None:
51155127
self.component_tags = m.get('ComponentTags')
51165128
if m.get('CostOptimizedConfig') is not None:

emr-20210320/setup.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@
2424
"""
2525
setup module for alibabacloud_emr20210320.
2626
27+
<<<<<<< Updated upstream
2728
Created on 21/02/2025
29+
=======
30+
Created on 27/02/2025
31+
>>>>>>> Stashed changes
2832
2933
@author: Alibaba Cloud SDK
3034
"""

0 commit comments

Comments
 (0)