tencentcloud-sdk-python-emr 3.1.130__tar.gz → 3.1.165__tar.gz

{tencentcloud_sdk_python_emr-3.1.130 → tencentcloud_sdk_python_emr-3.1.165}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tencentcloud-sdk-python-emr
-Version: 3.1.130
+Version: 3.1.165
 Summary: Tencent Cloud Emr SDK for Python
 Home-page: https://github.com/TencentCloud/tencentcloud-sdk-python
 Author: Tencent Cloud
@@ -15,7 +15,7 @@ Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: 3.7
-Requires-Dist: tencentcloud-sdk-python-common<4.0.0,>=3.1.130
+Requires-Dist: tencentcloud-sdk-python-common<4.0.0,>=3.1.165
 
 ============================
 Tencent Cloud SDK for Python

{tencentcloud_sdk_python_emr-3.1.130 → tencentcloud_sdk_python_emr-3.1.165}/setup.py

@@ -8,7 +8,7 @@ ROOT = os.path.dirname(__file__)
 
 setup(
     name='tencentcloud-sdk-python-emr',
-    install_requires=["tencentcloud-sdk-python-common>=3.1.130,<4.0.0"],
+    install_requires=["tencentcloud-sdk-python-common>=3.1.165,<4.0.0"],
     
     version=tencentcloud.__version__,
     description='Tencent Cloud Emr SDK for Python',

{tencentcloud_sdk_python_emr-3.1.130 → tencentcloud_sdk_python_emr-3.1.165}/tencentcloud/__init__.py

@@ -14,4 +14,4 @@
 # limitations under the License.
 
 
-__version__ = '3.1.130'
+__version__ = '3.1.165'

{tencentcloud_sdk_python_emr-3.1.130 → tencentcloud_sdk_python_emr-3.1.165}/tencentcloud/emr/v20190103/models.py

@@ -1349,43 +1349,45 @@ class AutoScaleResourceConf(AbstractModel):
 
     def __init__(self):
         r"""
-        :param _Id: 配置ID。
+        :param _Id: <p>配置ID。</p>
         :type Id: int
-        :param _ClusterId: 集群实例ID。
+        :param _ClusterId: <p>集群实例ID。</p>
         :type ClusterId: int
-        :param _ScaleLowerBound: 自动扩缩容保留最小实例数。
+        :param _ScaleLowerBound: <p>自动扩缩容保留最小实例数。</p>
         :type ScaleLowerBound: int
-        :param _ScaleUpperBound: 自动扩缩容最大实例数。
+        :param _ScaleUpperBound: <p>自动扩缩容最大实例数。</p>
         :type ScaleUpperBound: int
-        :param _StrategyType: 扩容规则类型，1为按负载指标扩容规则，2为按时间扩容规则
+        :param _StrategyType: <p>扩容规则类型，1为按负载指标扩容规则，2为按时间扩容规则</p>
         :type StrategyType: int
-        :param _NextTimeCanScale: 下次可扩容时间。
+        :param _NextTimeCanScale: <p>下次可扩容时间。</p>
         :type NextTimeCanScale: int
-        :param _GraceDownFlag: 优雅缩容开关
+        :param _GraceDownFlag: <p>优雅缩容开关</p>
         :type GraceDownFlag: bool
-        :param _HardwareType: "CVM"表示规格全部使用CVM相关类型，"POD"表示规格使用容器相关类型,默认为"CVM"。
+        :param _HardwareType: <p>&quot;CVM&quot;表示规格全部使用CVM相关类型，&quot;POD&quot;表示规格使用容器相关类型,默认为&quot;CVM&quot;。</p>
         :type HardwareType: str
-        :param _PayMode: "POSTPAY"表示只使用按量计费，"SPOT_FIRST"表示竞价实例优先，只有HardwareType为"HOST"时支持竞价实例优先，"POD"只支持纯按量计费。
+        :param _PayMode: <p>&quot;POSTPAY&quot;表示只使用按量计费，&quot;SPOT_FIRST&quot;表示竞价实例优先，只有HardwareType为&quot;HOST&quot;时支持竞价实例优先，&quot;POD&quot;只支持纯按量计费。</p>
         :type PayMode: str
-        :param _PostPayPercentMin: 竞价实例优先的场景下，按量计费资源数量的最低百分比，整数
+        :param _PostPayPercentMin: <p>竞价实例优先的场景下，按量计费资源数量的最低百分比，整数</p>
         :type PostPayPercentMin: int
-        :param _ChangeToPod: 预设资源类型为HOST时，支持勾选“资源不足时切换POD”；支持取消勾选；0表示默认不勾选（0），1表示勾选
+        :param _ChangeToPod: <p>预设资源类型为HOST时，支持勾选“资源不足时切换POD”；支持取消勾选；0表示默认不勾选（0），1表示勾选</p>
         :type ChangeToPod: int
-        :param _GroupName: 伸缩组名
+        :param _GroupName: <p>伸缩组名</p>
         :type GroupName: str
-        :param _YarnNodeLabel: 标签
+        :param _YarnNodeLabel: <p>标签</p>
         :type YarnNodeLabel: str
-        :param _WarehouseName: 对应的计算组
+        :param _WarehouseName: <p>对应的计算组</p>
         :type WarehouseName: str
-        :param _GroupStatus: 伸缩组状态
+        :param _GroupStatus: <p>伸缩组状态</p>
         :type GroupStatus: int
-        :param _Parallel: 并行伸缩 0关闭；1开启
+        :param _Parallel: <p>并行伸缩 0关闭；1开启</p>
         :type Parallel: int
-        :param _EnableMNode: 是否支持MNode
+        :param _EnableMNode: <p>是否支持MNode</p>
         :type EnableMNode: int
-        :param _ExtraAdvanceAttrs: 伸缩组更多设置
+        :param _ExtraAdvanceAttrs: <p>伸缩组更多设置</p>
 注意：此字段可能返回 null，表示取不到有效值。
         :type ExtraAdvanceAttrs: :class:`tencentcloud.emr.v20190103.models.AutoScaleGroupAdvanceAttrs`
+        :param _CustomNodeName: <p>自定义主机名</p>
+        :type CustomNodeName: str
         """
         self._Id = None
         self._ClusterId = None
@@ -1405,10 +1407,11 @@ class AutoScaleResourceConf(AbstractModel):
         self._Parallel = None
         self._EnableMNode = None
         self._ExtraAdvanceAttrs = None
+        self._CustomNodeName = None
 
     @property
     def Id(self):
-        r"""配置ID。
+        r"""<p>配置ID。</p>
         :rtype: int
         """
         return self._Id
@@ -1419,7 +1422,7 @@ class AutoScaleResourceConf(AbstractModel):
 
     @property
     def ClusterId(self):
-        r"""集群实例ID。
+        r"""<p>集群实例ID。</p>
         :rtype: int
         """
         return self._ClusterId
@@ -1430,7 +1433,7 @@ class AutoScaleResourceConf(AbstractModel):
 
     @property
     def ScaleLowerBound(self):
-        r"""自动扩缩容保留最小实例数。
+        r"""<p>自动扩缩容保留最小实例数。</p>
         :rtype: int
         """
         return self._ScaleLowerBound
@@ -1441,7 +1444,7 @@ class AutoScaleResourceConf(AbstractModel):
 
     @property
     def ScaleUpperBound(self):
-        r"""自动扩缩容最大实例数。
+        r"""<p>自动扩缩容最大实例数。</p>
         :rtype: int
         """
         return self._ScaleUpperBound
@@ -1452,7 +1455,7 @@ class AutoScaleResourceConf(AbstractModel):
 
     @property
     def StrategyType(self):
-        r"""扩容规则类型，1为按负载指标扩容规则，2为按时间扩容规则
+        r"""<p>扩容规则类型，1为按负载指标扩容规则，2为按时间扩容规则</p>
         :rtype: int
         """
         return self._StrategyType
@@ -1463,7 +1466,7 @@ class AutoScaleResourceConf(AbstractModel):
 
     @property
     def NextTimeCanScale(self):
-        r"""下次可扩容时间。
+        r"""<p>下次可扩容时间。</p>
         :rtype: int
         """
         return self._NextTimeCanScale
@@ -1474,7 +1477,7 @@ class AutoScaleResourceConf(AbstractModel):
 
     @property
     def GraceDownFlag(self):
-        r"""优雅缩容开关
+        r"""<p>优雅缩容开关</p>
         :rtype: bool
         """
         return self._GraceDownFlag
@@ -1485,7 +1488,7 @@ class AutoScaleResourceConf(AbstractModel):
 
     @property
     def HardwareType(self):
-        r""""CVM"表示规格全部使用CVM相关类型，"POD"表示规格使用容器相关类型,默认为"CVM"。
+        r"""<p>&quot;CVM&quot;表示规格全部使用CVM相关类型，&quot;POD&quot;表示规格使用容器相关类型,默认为&quot;CVM&quot;。</p>
         :rtype: str
         """
         return self._HardwareType
@@ -1496,7 +1499,7 @@ class AutoScaleResourceConf(AbstractModel):
 
     @property
     def PayMode(self):
-        r""""POSTPAY"表示只使用按量计费，"SPOT_FIRST"表示竞价实例优先，只有HardwareType为"HOST"时支持竞价实例优先，"POD"只支持纯按量计费。
+        r"""<p>&quot;POSTPAY&quot;表示只使用按量计费，&quot;SPOT_FIRST&quot;表示竞价实例优先，只有HardwareType为&quot;HOST&quot;时支持竞价实例优先，&quot;POD&quot;只支持纯按量计费。</p>
         :rtype: str
         """
         return self._PayMode
@@ -1507,7 +1510,7 @@ class AutoScaleResourceConf(AbstractModel):
 
     @property
     def PostPayPercentMin(self):
-        r"""竞价实例优先的场景下，按量计费资源数量的最低百分比，整数
+        r"""<p>竞价实例优先的场景下，按量计费资源数量的最低百分比，整数</p>
         :rtype: int
         """
         return self._PostPayPercentMin
@@ -1518,7 +1521,7 @@ class AutoScaleResourceConf(AbstractModel):
 
     @property
     def ChangeToPod(self):
-        r"""预设资源类型为HOST时，支持勾选“资源不足时切换POD”；支持取消勾选；0表示默认不勾选（0），1表示勾选
+        r"""<p>预设资源类型为HOST时，支持勾选“资源不足时切换POD”；支持取消勾选；0表示默认不勾选（0），1表示勾选</p>
         :rtype: int
         """
         return self._ChangeToPod
@@ -1529,7 +1532,7 @@ class AutoScaleResourceConf(AbstractModel):
 
     @property
     def GroupName(self):
-        r"""伸缩组名
+        r"""<p>伸缩组名</p>
         :rtype: str
         """
         return self._GroupName
@@ -1540,7 +1543,7 @@ class AutoScaleResourceConf(AbstractModel):
 
     @property
     def YarnNodeLabel(self):
-        r"""标签
+        r"""<p>标签</p>
         :rtype: str
         """
         return self._YarnNodeLabel
@@ -1551,7 +1554,7 @@ class AutoScaleResourceConf(AbstractModel):
 
     @property
     def WarehouseName(self):
-        r"""对应的计算组
+        r"""<p>对应的计算组</p>
         :rtype: str
         """
         return self._WarehouseName
@@ -1562,7 +1565,7 @@ class AutoScaleResourceConf(AbstractModel):
 
     @property
     def GroupStatus(self):
-        r"""伸缩组状态
+        r"""<p>伸缩组状态</p>
         :rtype: int
         """
         return self._GroupStatus
@@ -1573,7 +1576,7 @@ class AutoScaleResourceConf(AbstractModel):
 
     @property
     def Parallel(self):
-        r"""并行伸缩 0关闭；1开启
+        r"""<p>并行伸缩 0关闭；1开启</p>
         :rtype: int
         """
         return self._Parallel
@@ -1584,7 +1587,7 @@ class AutoScaleResourceConf(AbstractModel):
 
     @property
     def EnableMNode(self):
-        r"""是否支持MNode
+        r"""<p>是否支持MNode</p>
         :rtype: int
         """
         return self._EnableMNode
@@ -1595,7 +1598,7 @@ class AutoScaleResourceConf(AbstractModel):
 
     @property
     def ExtraAdvanceAttrs(self):
-        r"""伸缩组更多设置
+        r"""<p>伸缩组更多设置</p>
 注意：此字段可能返回 null，表示取不到有效值。
         :rtype: :class:`tencentcloud.emr.v20190103.models.AutoScaleGroupAdvanceAttrs`
         """
@@ -1605,6 +1608,17 @@ class AutoScaleResourceConf(AbstractModel):
     def ExtraAdvanceAttrs(self, ExtraAdvanceAttrs):
         self._ExtraAdvanceAttrs = ExtraAdvanceAttrs
 
+    @property
+    def CustomNodeName(self):
+        r"""<p>自定义主机名</p>
+        :rtype: str
+        """
+        return self._CustomNodeName
+
+    @CustomNodeName.setter
+    def CustomNodeName(self, CustomNodeName):
+        self._CustomNodeName = CustomNodeName
+
 
     def _deserialize(self, params):
         self._Id = params.get("Id")
@@ -1627,6 +1641,7 @@ class AutoScaleResourceConf(AbstractModel):
         if params.get("ExtraAdvanceAttrs") is not None:
             self._ExtraAdvanceAttrs = AutoScaleGroupAdvanceAttrs()
             self._ExtraAdvanceAttrs._deserialize(params.get("ExtraAdvanceAttrs"))
+        self._CustomNodeName = params.get("CustomNodeName")
         memeber_set = set(params.keys())
         for name, value in vars(self).items():
             property_name = name[1:]
@@ -5291,6 +5306,10 @@ class CreateCloudInstanceRequest(AbstractModel):
         :type ContainerExtraConf: :class:`tencentcloud.emr.v20190103.models.ContainerExtraConf`
         :param _EnableSparkAppMonitorInfo: <p>spark监控</p>
         :type EnableSparkAppMonitorInfo: :class:`tencentcloud.emr.v20190103.models.EnableSparkAppMonitorInfo`
+        :param _ComputeResourceGroupIds: <p>已有EMR资源节点组Id列表</p>
+        :type ComputeResourceGroupIds: list of str
+        :param _TerminateProtection: <p>是否开启实例保护</p>
+        :type TerminateProtection: bool
         """
         self._InstanceName = None
         self._ClusterClass = None
@@ -5313,6 +5332,8 @@ class CreateCloudInstanceRequest(AbstractModel):
         self._SgIP = None
         self._ContainerExtraConf = None
         self._EnableSparkAppMonitorInfo = None
+        self._ComputeResourceGroupIds = None
+        self._TerminateProtection = None
 
     @property
     def InstanceName(self):
@@ -5545,6 +5566,28 @@ class CreateCloudInstanceRequest(AbstractModel):
     def EnableSparkAppMonitorInfo(self, EnableSparkAppMonitorInfo):
         self._EnableSparkAppMonitorInfo = EnableSparkAppMonitorInfo
 
+    @property
+    def ComputeResourceGroupIds(self):
+        r"""<p>已有EMR资源节点组Id列表</p>
+        :rtype: list of str
+        """
+        return self._ComputeResourceGroupIds
+
+    @ComputeResourceGroupIds.setter
+    def ComputeResourceGroupIds(self, ComputeResourceGroupIds):
+        self._ComputeResourceGroupIds = ComputeResourceGroupIds
+
+    @property
+    def TerminateProtection(self):
+        r"""<p>是否开启实例保护</p>
+        :rtype: bool
+        """
+        return self._TerminateProtection
+
+    @TerminateProtection.setter
+    def TerminateProtection(self, TerminateProtection):
+        self._TerminateProtection = TerminateProtection
+
 
     def _deserialize(self, params):
         self._InstanceName = params.get("InstanceName")
@@ -5593,6 +5636,8 @@ class CreateCloudInstanceRequest(AbstractModel):
         if params.get("EnableSparkAppMonitorInfo") is not None:
             self._EnableSparkAppMonitorInfo = EnableSparkAppMonitorInfo()
             self._EnableSparkAppMonitorInfo._deserialize(params.get("EnableSparkAppMonitorInfo"))
+        self._ComputeResourceGroupIds = params.get("ComputeResourceGroupIds")
+        self._TerminateProtection = params.get("TerminateProtection")
         memeber_set = set(params.keys())
         for name, value in vars(self).items():
             property_name = name[1:]
@@ -18397,6 +18442,8 @@ class DynamicInstanceForm(AbstractModel):
         :type ImageInfoV2: :class:`tencentcloud.emr.v20190103.models.ImageInfoV2`
         :param _GooseFSVolumes: <p>GooseFS盘</p>
         :type GooseFSVolumes: list of GooseFSVolume
+        :param _EnableHistoryServer: <p>开启HistoryServer</p>
+        :type EnableHistoryServer: bool
         """
         self._DynamicInstanceName = None
         self._Namespace = None
@@ -18416,6 +18463,7 @@ class DynamicInstanceForm(AbstractModel):
         self._CFSTurboVolumes = None
         self._ImageInfoV2 = None
         self._GooseFSVolumes = None
+        self._EnableHistoryServer = None
 
     @property
     def DynamicInstanceName(self):
@@ -18632,6 +18680,17 @@ class DynamicInstanceForm(AbstractModel):
     def GooseFSVolumes(self, GooseFSVolumes):
         self._GooseFSVolumes = GooseFSVolumes
 
+    @property
+    def EnableHistoryServer(self):
+        r"""<p>开启HistoryServer</p>
+        :rtype: bool
+        """
+        return self._EnableHistoryServer
+
+    @EnableHistoryServer.setter
+    def EnableHistoryServer(self, EnableHistoryServer):
+        self._EnableHistoryServer = EnableHistoryServer
+
 
     def _deserialize(self, params):
         self._DynamicInstanceName = params.get("DynamicInstanceName")
@@ -18711,6 +18770,7 @@ class DynamicInstanceForm(AbstractModel):
                 obj = GooseFSVolume()
                 obj._deserialize(item)
                 self._GooseFSVolumes.append(obj)
+        self._EnableHistoryServer = params.get("EnableHistoryServer")
         memeber_set = set(params.keys())
         for name, value in vars(self).items():
             property_name = name[1:]
@@ -21699,6 +21759,132 @@ class GooseFSVolume(AbstractModel):
         
 
 
+class GpuImageDriverSpec(AbstractModel):
+    r"""GPU机型镜像与驱动配置
+
+    """
+
+    def __init__(self):
+        r"""
+        :param _ImageId: <p>镜像ID</p>
+        :type ImageId: str
+        :param _DriverName: <p>驱动名称</p>
+        :type DriverName: str
+        :param _DriverVersion: <p>驱动版本</p>
+        :type DriverVersion: str
+        :param _CUDAName: <p>CUDA名称</p>
+        :type CUDAName: str
+        :param _CUDAVersion: <p>CUDA版本</p>
+        :type CUDAVersion: str
+        :param _CUDNNName: <p>CUDNN名称</p>
+        :type CUDNNName: str
+        :param _CUDNNVersion: <p>CUDNN版本</p>
+        :type CUDNNVersion: str
+        """
+        self._ImageId = None
+        self._DriverName = None
+        self._DriverVersion = None
+        self._CUDAName = None
+        self._CUDAVersion = None
+        self._CUDNNName = None
+        self._CUDNNVersion = None
+
+    @property
+    def ImageId(self):
+        r"""<p>镜像ID</p>
+        :rtype: str
+        """
+        return self._ImageId
+
+    @ImageId.setter
+    def ImageId(self, ImageId):
+        self._ImageId = ImageId
+
+    @property
+    def DriverName(self):
+        r"""<p>驱动名称</p>
+        :rtype: str
+        """
+        return self._DriverName
+
+    @DriverName.setter
+    def DriverName(self, DriverName):
+        self._DriverName = DriverName
+
+    @property
+    def DriverVersion(self):
+        r"""<p>驱动版本</p>
+        :rtype: str
+        """
+        return self._DriverVersion
+
+    @DriverVersion.setter
+    def DriverVersion(self, DriverVersion):
+        self._DriverVersion = DriverVersion
+
+    @property
+    def CUDAName(self):
+        r"""<p>CUDA名称</p>
+        :rtype: str
+        """
+        return self._CUDAName
+
+    @CUDAName.setter
+    def CUDAName(self, CUDAName):
+        self._CUDAName = CUDAName
+
+    @property
+    def CUDAVersion(self):
+        r"""<p>CUDA版本</p>
+        :rtype: str
+        """
+        return self._CUDAVersion
+
+    @CUDAVersion.setter
+    def CUDAVersion(self, CUDAVersion):
+        self._CUDAVersion = CUDAVersion
+
+    @property
+    def CUDNNName(self):
+        r"""<p>CUDNN名称</p>
+        :rtype: str
+        """
+        return self._CUDNNName
+
+    @CUDNNName.setter
+    def CUDNNName(self, CUDNNName):
+        self._CUDNNName = CUDNNName
+
+    @property
+    def CUDNNVersion(self):
+        r"""<p>CUDNN版本</p>
+        :rtype: str
+        """
+        return self._CUDNNVersion
+
+    @CUDNNVersion.setter
+    def CUDNNVersion(self, CUDNNVersion):
+        self._CUDNNVersion = CUDNNVersion
+
+
+    def _deserialize(self, params):
+        self._ImageId = params.get("ImageId")
+        self._DriverName = params.get("DriverName")
+        self._DriverVersion = params.get("DriverVersion")
+        self._CUDAName = params.get("CUDAName")
+        self._CUDAVersion = params.get("CUDAVersion")
+        self._CUDNNName = params.get("CUDNNName")
+        self._CUDNNVersion = params.get("CUDNNVersion")
+        memeber_set = set(params.keys())
+        for name, value in vars(self).items():
+            property_name = name[1:]
+            if property_name in memeber_set:
+                memeber_set.remove(property_name)
+        if len(memeber_set) > 0:
+            warnings.warn("%s fileds are useless." % ",".join(memeber_set))
+        
+
+
 class GroupGlobalConfs(AbstractModel):
     r"""集群所有伸缩组全局参数信息
 
@@ -32206,6 +32392,8 @@ class NodeResourceSpec(AbstractModel):
         :type LocalDataDisk: list of DiskSpecInfo
         :param _SoftwareConfig: <p>节点配置信息，目前仅提供给terraform平台校验参数使用</p>
         :type SoftwareConfig: list of ServiceDeploy
+        :param _CustomNodeName: <p>自定义主机名</p>
+        :type CustomNodeName: str
         """
         self._InstanceType = None
         self._SystemDisk = None
@@ -32213,6 +32401,7 @@ class NodeResourceSpec(AbstractModel):
         self._DataDisk = None
         self._LocalDataDisk = None
         self._SoftwareConfig = None
+        self._CustomNodeName = None
 
     @property
     def InstanceType(self):
@@ -32284,6 +32473,17 @@ class NodeResourceSpec(AbstractModel):
     def SoftwareConfig(self, SoftwareConfig):
         self._SoftwareConfig = SoftwareConfig
 
+    @property
+    def CustomNodeName(self):
+        r"""<p>自定义主机名</p>
+        :rtype: str
+        """
+        return self._CustomNodeName
+
+    @CustomNodeName.setter
+    def CustomNodeName(self, CustomNodeName):
+        self._CustomNodeName = CustomNodeName
+
 
     def _deserialize(self, params):
         self._InstanceType = params.get("InstanceType")
@@ -32317,6 +32517,7 @@ class NodeResourceSpec(AbstractModel):
                 obj = ServiceDeploy()
                 obj._deserialize(item)
                 self._SoftwareConfig.append(obj)
+        self._CustomNodeName = params.get("CustomNodeName")
         memeber_set = set(params.keys())
         for name, value in vars(self).items():
             property_name = name[1:]
@@ -33339,24 +33540,26 @@ class OperationLog(AbstractModel):
 
     def __init__(self):
         r"""
-        :param _InstanceId: EMR实例ID
+        :param _InstanceId: <p>EMR实例ID</p>
         :type InstanceId: int
-        :param _Operation: 操作名称
+        :param _Operation: <p>操作名称</p>
         :type Operation: str
-        :param _OperationType: 操作类型
+        :param _OperationType: <p>操作类型</p>
         :type OperationType: int
-        :param _UserType: 用户类型
+        :param _UserType: <p>用户类型</p>
         :type UserType: int
-        :param _Operator: 操作者
+        :param _Operator: <p>操作者</p>
         :type Operator: str
-        :param _CreateTime: 操作时间
+        :param _CreateTime: <p>操作时间</p>
         :type CreateTime: str
-        :param _Operand: 操作对象
+        :param _Operand: <p>操作对象</p>
         :type Operand: str
-        :param _OperationDesc: 操作详情
+        :param _OperationDesc: <p>操作详情</p>
         :type OperationDesc: str
-        :param _SecurityLevel: 安全级别
+        :param _SecurityLevel: <p>安全级别</p>
         :type SecurityLevel: str
+        :param _OperatorName: <p>操作者名称</p>
+        :type OperatorName: str
         """
         self._InstanceId = None
         self._Operation = None
@@ -33367,10 +33570,11 @@ class OperationLog(AbstractModel):
         self._Operand = None
         self._OperationDesc = None
         self._SecurityLevel = None
+        self._OperatorName = None
 
     @property
     def InstanceId(self):
-        r"""EMR实例ID
+        r"""<p>EMR实例ID</p>
         :rtype: int
         """
         return self._InstanceId
@@ -33381,7 +33585,7 @@ class OperationLog(AbstractModel):
 
     @property
     def Operation(self):
-        r"""操作名称
+        r"""<p>操作名称</p>
         :rtype: str
         """
         return self._Operation
@@ -33392,7 +33596,7 @@ class OperationLog(AbstractModel):
 
     @property
     def OperationType(self):
-        r"""操作类型
+        r"""<p>操作类型</p>
         :rtype: int
         """
         return self._OperationType
@@ -33403,7 +33607,7 @@ class OperationLog(AbstractModel):
 
     @property
     def UserType(self):
-        r"""用户类型
+        r"""<p>用户类型</p>
         :rtype: int
         """
         return self._UserType
@@ -33414,7 +33618,7 @@ class OperationLog(AbstractModel):
 
     @property
     def Operator(self):
-        r"""操作者
+        r"""<p>操作者</p>
         :rtype: str
         """
         return self._Operator
@@ -33425,7 +33629,7 @@ class OperationLog(AbstractModel):
 
     @property
     def CreateTime(self):
-        r"""操作时间
+        r"""<p>操作时间</p>
         :rtype: str
         """
         return self._CreateTime
@@ -33436,7 +33640,7 @@ class OperationLog(AbstractModel):
 
     @property
     def Operand(self):
-        r"""操作对象
+        r"""<p>操作对象</p>
         :rtype: str
         """
         return self._Operand
@@ -33447,7 +33651,7 @@ class OperationLog(AbstractModel):
 
     @property
     def OperationDesc(self):
-        r"""操作详情
+        r"""<p>操作详情</p>
         :rtype: str
         """
         return self._OperationDesc
@@ -33458,7 +33662,7 @@ class OperationLog(AbstractModel):
 
     @property
     def SecurityLevel(self):
-        r"""安全级别
+        r"""<p>安全级别</p>
         :rtype: str
         """
         return self._SecurityLevel
@@ -33467,6 +33671,17 @@ class OperationLog(AbstractModel):
     def SecurityLevel(self, SecurityLevel):
         self._SecurityLevel = SecurityLevel
 
+    @property
+    def OperatorName(self):
+        r"""<p>操作者名称</p>
+        :rtype: str
+        """
+        return self._OperatorName
+
+    @OperatorName.setter
+    def OperatorName(self, OperatorName):
+        self._OperatorName = OperatorName
+
 
     def _deserialize(self, params):
         self._InstanceId = params.get("InstanceId")
@@ -33478,6 +33693,7 @@ class OperationLog(AbstractModel):
         self._Operand = params.get("Operand")
         self._OperationDesc = params.get("OperationDesc")
         self._SecurityLevel = params.get("SecurityLevel")
+        self._OperatorName = params.get("OperatorName")
         memeber_set = set(params.keys())
         for name, value in vars(self).items():
             property_name = name[1:]
@@ -37888,6 +38104,10 @@ class Resource(AbstractModel):
         :type PartitionNumber: int
         :param _HCCHpcClusterId: <p>高性能集群ID</p>
         :type HCCHpcClusterId: str
+        :param _CustomNodeName: <p>自定义主机名</p>
+        :type CustomNodeName: str
+        :param _GpuImageDriver: <p>GPU镜像驱动配置</p>
+        :type GpuImageDriver: :class:`tencentcloud.emr.v20190103.models.GpuImageDriverSpec`
         """
         self._Spec = None
         self._StorageType = None
@@ -37904,6 +38124,8 @@ class Resource(AbstractModel):
         self._GpuDesc = None
         self._PartitionNumber = None
         self._HCCHpcClusterId = None
+        self._CustomNodeName = None
+        self._GpuImageDriver = None
 
     @property
     def Spec(self):
@@ -38072,6 +38294,28 @@ class Resource(AbstractModel):
     def HCCHpcClusterId(self, HCCHpcClusterId):
         self._HCCHpcClusterId = HCCHpcClusterId
 
+    @property
+    def CustomNodeName(self):
+        r"""<p>自定义主机名</p>
+        :rtype: str
+        """
+        return self._CustomNodeName
+
+    @CustomNodeName.setter
+    def CustomNodeName(self, CustomNodeName):
+        self._CustomNodeName = CustomNodeName
+
+    @property
+    def GpuImageDriver(self):
+        r"""<p>GPU镜像驱动配置</p>
+        :rtype: :class:`tencentcloud.emr.v20190103.models.GpuImageDriverSpec`
+        """
+        return self._GpuImageDriver
+
+    @GpuImageDriver.setter
+    def GpuImageDriver(self, GpuImageDriver):
+        self._GpuImageDriver = GpuImageDriver
+
 
     def _deserialize(self, params):
         self._Spec = params.get("Spec")
@@ -38099,6 +38343,10 @@ class Resource(AbstractModel):
         self._GpuDesc = params.get("GpuDesc")
         self._PartitionNumber = params.get("PartitionNumber")
         self._HCCHpcClusterId = params.get("HCCHpcClusterId")
+        self._CustomNodeName = params.get("CustomNodeName")
+        if params.get("GpuImageDriver") is not None:
+            self._GpuImageDriver = GpuImageDriverSpec()
+            self._GpuImageDriver._deserialize(params.get("GpuImageDriver"))
         memeber_set = set(params.keys())
         for name, value in vars(self).items():
             property_name = name[1:]
@@ -46073,18 +46321,32 @@ class UserManagerUserBriefInfo(AbstractModel):
 
     def __init__(self):
         r"""
-        :param _UserName: 用户名
+        :param _UserName: <p>用户名</p>
         :type UserName: str
-        :param _UserGroup: 用户所属的组
+        :param _UserGroup: <p>用户所属的组</p>
         :type UserGroup: str
-        :param _UserType: Manager表示管理员、NormalUser表示普通用户
+        :param _UserType: <p>Manager表示管理员、NormalUser表示普通用户</p>
         :type UserType: str
-        :param _CreateTime: 用户创建时间
+        :param _CreateTime: <p>用户创建时间</p>
         :type CreateTime: str
-        :param _SupportDownLoadKeyTab: 是否可以下载用户对应的keytab文件，对开启kerberos的集群才有意义
+        :param _SupportDownLoadKeyTab: <p>是否可以下载用户对应的keytab文件，对开启kerberos的集群才有意义</p>
         :type SupportDownLoadKeyTab: bool
-        :param _DownLoadKeyTabUrl: keytab文件的下载地址
+        :param _DownLoadKeyTabUrl: <p>keytab文件的下载地址</p>
         :type DownLoadKeyTabUrl: str
+        :param _Groups: <p>用户组</p>
+        :type Groups: list of str
+        :param _Uin: <p>客户UIN</p>
+        :type Uin: str
+        :param _State: <p>用户状态</p>
+        :type State: int
+        :param _DisplayPasswdUpdateTime: <p>是否展示密码更新时间</p>
+        :type DisplayPasswdUpdateTime: bool
+        :param _PasswdUpdateTime: <p>密码最近更新时间</p>
+        :type PasswdUpdateTime: str
+        :param _PasswdUsedDay: <p>已经使用的天数</p><p>单位：天</p>
+        :type PasswdUsedDay: int
+        :param _PasswdUsedHour: <p>已经使用的小时数</p><p>单位：时</p>
+        :type PasswdUsedHour: int
         """
         self._UserName = None
         self._UserGroup = None
@@ -46092,10 +46354,17 @@ class UserManagerUserBriefInfo(AbstractModel):
         self._CreateTime = None
         self._SupportDownLoadKeyTab = None
         self._DownLoadKeyTabUrl = None
+        self._Groups = None
+        self._Uin = None
+        self._State = None
+        self._DisplayPasswdUpdateTime = None
+        self._PasswdUpdateTime = None
+        self._PasswdUsedDay = None
+        self._PasswdUsedHour = None
 
     @property
     def UserName(self):
-        r"""用户名
+        r"""<p>用户名</p>
         :rtype: str
         """
         return self._UserName
@@ -46106,7 +46375,7 @@ class UserManagerUserBriefInfo(AbstractModel):
 
     @property
     def UserGroup(self):
-        r"""用户所属的组
+        r"""<p>用户所属的组</p>
         :rtype: str
         """
         return self._UserGroup
@@ -46117,7 +46386,7 @@ class UserManagerUserBriefInfo(AbstractModel):
 
     @property
     def UserType(self):
-        r"""Manager表示管理员、NormalUser表示普通用户
+        r"""<p>Manager表示管理员、NormalUser表示普通用户</p>
         :rtype: str
         """
         return self._UserType
@@ -46128,7 +46397,7 @@ class UserManagerUserBriefInfo(AbstractModel):
 
     @property
     def CreateTime(self):
-        r"""用户创建时间
+        r"""<p>用户创建时间</p>
         :rtype: str
         """
         return self._CreateTime
@@ -46139,7 +46408,7 @@ class UserManagerUserBriefInfo(AbstractModel):
 
     @property
     def SupportDownLoadKeyTab(self):
-        r"""是否可以下载用户对应的keytab文件，对开启kerberos的集群才有意义
+        r"""<p>是否可以下载用户对应的keytab文件，对开启kerberos的集群才有意义</p>
         :rtype: bool
         """
         return self._SupportDownLoadKeyTab
@@ -46150,7 +46419,7 @@ class UserManagerUserBriefInfo(AbstractModel):
 
     @property
     def DownLoadKeyTabUrl(self):
-        r"""keytab文件的下载地址
+        r"""<p>keytab文件的下载地址</p>
         :rtype: str
         """
         return self._DownLoadKeyTabUrl
@@ -46159,6 +46428,83 @@ class UserManagerUserBriefInfo(AbstractModel):
     def DownLoadKeyTabUrl(self, DownLoadKeyTabUrl):
         self._DownLoadKeyTabUrl = DownLoadKeyTabUrl
 
+    @property
+    def Groups(self):
+        r"""<p>用户组</p>
+        :rtype: list of str
+        """
+        return self._Groups
+
+    @Groups.setter
+    def Groups(self, Groups):
+        self._Groups = Groups
+
+    @property
+    def Uin(self):
+        r"""<p>客户UIN</p>
+        :rtype: str
+        """
+        return self._Uin
+
+    @Uin.setter
+    def Uin(self, Uin):
+        self._Uin = Uin
+
+    @property
+    def State(self):
+        r"""<p>用户状态</p>
+        :rtype: int
+        """
+        return self._State
+
+    @State.setter
+    def State(self, State):
+        self._State = State
+
+    @property
+    def DisplayPasswdUpdateTime(self):
+        r"""<p>是否展示密码更新时间</p>
+        :rtype: bool
+        """
+        return self._DisplayPasswdUpdateTime
+
+    @DisplayPasswdUpdateTime.setter
+    def DisplayPasswdUpdateTime(self, DisplayPasswdUpdateTime):
+        self._DisplayPasswdUpdateTime = DisplayPasswdUpdateTime
+
+    @property
+    def PasswdUpdateTime(self):
+        r"""<p>密码最近更新时间</p>
+        :rtype: str
+        """
+        return self._PasswdUpdateTime
+
+    @PasswdUpdateTime.setter
+    def PasswdUpdateTime(self, PasswdUpdateTime):
+        self._PasswdUpdateTime = PasswdUpdateTime
+
+    @property
+    def PasswdUsedDay(self):
+        r"""<p>已经使用的天数</p><p>单位：天</p>
+        :rtype: int
+        """
+        return self._PasswdUsedDay
+
+    @PasswdUsedDay.setter
+    def PasswdUsedDay(self, PasswdUsedDay):
+        self._PasswdUsedDay = PasswdUsedDay
+
+    @property
+    def PasswdUsedHour(self):
+        r"""<p>已经使用的小时数</p><p>单位：时</p>
+        :rtype: int
+        """
+        return self._PasswdUsedHour
+
+    @PasswdUsedHour.setter
+    def PasswdUsedHour(self, PasswdUsedHour):
+        self._PasswdUsedHour = PasswdUsedHour
+
 
     def _deserialize(self, params):
         self._UserName = params.get("UserName")
@@ -46167,6 +46513,13 @@ class UserManagerUserBriefInfo(AbstractModel):
         self._CreateTime = params.get("CreateTime")
         self._SupportDownLoadKeyTab = params.get("SupportDownLoadKeyTab")
         self._DownLoadKeyTabUrl = params.get("DownLoadKeyTabUrl")
+        self._Groups = params.get("Groups")
+        self._Uin = params.get("Uin")
+        self._State = params.get("State")
+        self._DisplayPasswdUpdateTime = params.get("DisplayPasswdUpdateTime")
+        self._PasswdUpdateTime = params.get("PasswdUpdateTime")
+        self._PasswdUsedDay = params.get("PasswdUsedDay")
+        self._PasswdUsedHour = params.get("PasswdUsedHour")
         memeber_set = set(params.keys())
         for name, value in vars(self).items():
             property_name = name[1:]

{tencentcloud_sdk_python_emr-3.1.130 → tencentcloud_sdk_python_emr-3.1.165}/tencentcloud_sdk_python_emr.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tencentcloud-sdk-python-emr
-Version: 3.1.130
+Version: 3.1.165
 Summary: Tencent Cloud Emr SDK for Python
 Home-page: https://github.com/TencentCloud/tencentcloud-sdk-python
 Author: Tencent Cloud
@@ -15,7 +15,7 @@ Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: 3.7
-Requires-Dist: tencentcloud-sdk-python-common<4.0.0,>=3.1.130
+Requires-Dist: tencentcloud-sdk-python-common<4.0.0,>=3.1.165
 
 ============================
 Tencent Cloud SDK for Python

tencentcloud_sdk_python_emr-3.1.165/tencentcloud_sdk_python_emr.egg-info/requires.txt

@@ -0,0 +1 @@
+tencentcloud-sdk-python-common<4.0.0,>=3.1.165

tencentcloud_sdk_python_emr-3.1.130/tencentcloud_sdk_python_emr.egg-info/requires.txt

@@ -1 +0,0 @@
-tencentcloud-sdk-python-common<4.0.0,>=3.1.130