tencentcloud-sdk-python-emr 3.0.1417__tar.gz → 3.0.1422__tar.gz

{tencentcloud-sdk-python-emr-3.0.1417 → tencentcloud-sdk-python-emr-3.0.1422}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: tencentcloud-sdk-python-emr
-Version: 3.0.1417
+Version: 3.0.1422
 Summary: Tencent Cloud Emr SDK for Python
 Home-page: https://github.com/TencentCloud/tencentcloud-sdk-python
 Author: Tencent Cloud

{tencentcloud-sdk-python-emr-3.0.1417 → tencentcloud-sdk-python-emr-3.0.1422}/setup.py

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

{tencentcloud-sdk-python-emr-3.0.1417 → tencentcloud-sdk-python-emr-3.0.1422}/tencentcloud/__init__.py

@@ -14,4 +14,4 @@
 # limitations under the License.
 
 
-__version__ = '3.0.1417'
+__version__ = '3.0.1422'

{tencentcloud-sdk-python-emr-3.0.1417 → tencentcloud-sdk-python-emr-3.0.1422}/tencentcloud/emr/v20190103/models.py

@@ -6186,9 +6186,9 @@ class CreateSLInstanceRequest(AbstractModel):
         r"""
         :param _InstanceName: 实例名称。
         :type InstanceName: str
-        :param _PayMode: 实例计费模式，0表示后付费，即按量计费。
+        :param _PayMode: 实例计费模式，0表示后付费，即按量计费，1表示预付费，即包年包月。
         :type PayMode: int
-        :param _DiskType: 实例存储类型，填写CLOUD_HSSD，表示性能云存储。
+        :param _DiskType: 实例存储类型，CLOUD_HSSD表示性能云存储， CLOUD_BSSD表示标准云存储。
         :type DiskType: str
         :param _DiskSize: 实例单节点磁盘容量，单位GB，单节点磁盘容量需大于等于100，小于等于250*CPU核心数，容量调整步长为100。
         :type DiskSize: int
@@ -6202,6 +6202,8 @@ class CreateSLInstanceRequest(AbstractModel):
         :type PrePaySetting: :class:`tencentcloud.emr.v20190103.models.PrePaySetting`
         :param _ClientToken: 唯一随机标识，时效性为5分钟，需要调用者指定 防止客户端重复创建资源，例如 a9a90aa6-****-****-****-fae360632808	
         :type ClientToken: str
+        :param _DeploymentMode: 部署模式
+        :type DeploymentMode: str
         """
         self._InstanceName = None
         self._PayMode = None
@@ -6212,6 +6214,7 @@ class CreateSLInstanceRequest(AbstractModel):
         self._Tags = None
         self._PrePaySetting = None
         self._ClientToken = None
+        self._DeploymentMode = None
 
     @property
     def InstanceName(self):
@@ -6226,7 +6229,7 @@ class CreateSLInstanceRequest(AbstractModel):
 
     @property
     def PayMode(self):
-        """实例计费模式，0表示后付费，即按量计费。
+        """实例计费模式，0表示后付费，即按量计费，1表示预付费，即包年包月。
         :rtype: int
         """
         return self._PayMode
@@ -6237,7 +6240,7 @@ class CreateSLInstanceRequest(AbstractModel):
 
     @property
     def DiskType(self):
-        """实例存储类型，填写CLOUD_HSSD，表示性能云存储。
+        """实例存储类型，CLOUD_HSSD表示性能云存储， CLOUD_BSSD表示标准云存储。
         :rtype: str
         """
         return self._DiskType
@@ -6312,6 +6315,17 @@ class CreateSLInstanceRequest(AbstractModel):
     def ClientToken(self, ClientToken):
         self._ClientToken = ClientToken
 
+    @property
+    def DeploymentMode(self):
+        """部署模式
+        :rtype: str
+        """
+        return self._DeploymentMode
+
+    @DeploymentMode.setter
+    def DeploymentMode(self, DeploymentMode):
+        self._DeploymentMode = DeploymentMode
+
 
     def _deserialize(self, params):
         self._InstanceName = params.get("InstanceName")
@@ -6335,6 +6349,7 @@ class CreateSLInstanceRequest(AbstractModel):
             self._PrePaySetting = PrePaySetting()
             self._PrePaySetting._deserialize(params.get("PrePaySetting"))
         self._ClientToken = params.get("ClientToken")
+        self._DeploymentMode = params.get("DeploymentMode")
         memeber_set = set(params.keys())
         for name, value in vars(self).items():
             property_name = name[1:]
@@ -12629,6 +12644,8 @@ class DescribeSLInstanceResponse(AbstractModel):
         :type AutoRenewFlag: int
         :param _NodeNum: 实例节点总数。
         :type NodeNum: int
+        :param _SLInstance: Serverless Instance infomation
+        :type SLInstance: list of SLInstance
         :param _RequestId: 唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。
         :type RequestId: str
         """
@@ -12649,6 +12666,7 @@ class DescribeSLInstanceResponse(AbstractModel):
         self._Status = None
         self._AutoRenewFlag = None
         self._NodeNum = None
+        self._SLInstance = None
         self._RequestId = None
 
     @property
@@ -12839,6 +12857,17 @@ class DescribeSLInstanceResponse(AbstractModel):
     def NodeNum(self, NodeNum):
         self._NodeNum = NodeNum
 
+    @property
+    def SLInstance(self):
+        """Serverless Instance infomation
+        :rtype: list of SLInstance
+        """
+        return self._SLInstance
+
+    @SLInstance.setter
+    def SLInstance(self, SLInstance):
+        self._SLInstance = SLInstance
+
     @property
     def RequestId(self):
         """唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。
@@ -12879,6 +12908,12 @@ class DescribeSLInstanceResponse(AbstractModel):
         self._Status = params.get("Status")
         self._AutoRenewFlag = params.get("AutoRenewFlag")
         self._NodeNum = params.get("NodeNum")
+        if params.get("SLInstance") is not None:
+            self._SLInstance = []
+            for item in params.get("SLInstance"):
+                obj = SLInstance()
+                obj._deserialize(item)
+                self._SLInstance.append(obj)
         self._RequestId = params.get("RequestId")
 
 
@@ -30632,19 +30667,44 @@ class Resource(AbstractModel):
         r"""
         :param _Spec: 节点规格描述，如CVM.SA2。
         :type Spec: str
-        :param _StorageType: 存储类型
-取值范围：
-<li>4：表示云SSD。</li>
-<li>5：表示高效云盘。</li>
-<li>6：表示增强型SSD云硬盘。</li>
-<li>11：表示吞吐型云硬盘。</li>
-<li>12：表示极速型SSD云硬盘。</li>：创建时该类型无效，会根据数据盘类型和节点类型自动判断
+        :param _StorageType: 取值范围:
+"LOCAL_SSD"   3     //本地SSD 
+"CLOUD_SSD"   4     //云SSD 
+"CLOUD_PREMIUM"  5  //高效云盘
+"CLOUD_HSSD"   6    //增强型SSD云硬盘 
+"CLOUD_THROUGHPUT" 11//吞吐型云硬盘 
+"CLOUD_TSSD"  12     //极速型SSD云硬盘 
+"CLOUD_BSSD"    13   //通用型SSD云硬盘 
+"CLOUD_BIGDATA" 14   //大数据型云硬盘
+"CLOUD_HIGHIO"  15   //高IO型云硬盘 
+
+该类型字段为无效字段，实际系统盘类型会根据数据盘类型和节点类型判断，如果节点支持所选的数据盘类型，系统盘类型会跟数据盘保持一致，建议使用CreateCluster接口
         :type StorageType: int
-        :param _DiskType: 磁盘类型
-取值范围：
-<li>CLOUD_SSD：表示云SSD。</li>
-<li>CLOUD_PREMIUM：表示高效云盘。</li>
-<li>CLOUD_BASIC：表示云硬盘。</li>
+        :param _DiskType: 数据盘类型 取值范围：
+
+CLOUD_SSD：表示云SSD。
+
+CLOUD_PREMIUM：表示高效云盘。
+
+CLOUD_BASIC：表示云硬盘。
+
+LOCAL_BASIC：表示本地盘。
+
+LOCAL_SSD：表示本地SSD。
+
+CLOUD_HSSD：表示增强型SSD云硬盘。
+
+CLOUD_THROUGHPUT：表示吞吐型云硬盘。
+
+CLOUD_TSSD：表示极速型SSD云硬盘。
+
+CLOUD_BIGDATA：表示大数据型云硬盘。
+
+CLOUD_HIGHIO：表示高IO型云硬盘。
+
+CLOUD_BSSD：表示通用型SSD云硬盘。
+
+REMOTE_SSD：表示远端SSD盘。
         :type DiskType: str
         :param _MemSize: 内存容量,单位为M
         :type MemSize: int
@@ -30696,13 +30756,18 @@ class Resource(AbstractModel):
 
     @property
     def StorageType(self):
-        """存储类型
-取值范围：
-<li>4：表示云SSD。</li>
-<li>5：表示高效云盘。</li>
-<li>6：表示增强型SSD云硬盘。</li>
-<li>11：表示吞吐型云硬盘。</li>
-<li>12：表示极速型SSD云硬盘。</li>：创建时该类型无效，会根据数据盘类型和节点类型自动判断
+        """取值范围:
+"LOCAL_SSD"   3     //本地SSD 
+"CLOUD_SSD"   4     //云SSD 
+"CLOUD_PREMIUM"  5  //高效云盘
+"CLOUD_HSSD"   6    //增强型SSD云硬盘 
+"CLOUD_THROUGHPUT" 11//吞吐型云硬盘 
+"CLOUD_TSSD"  12     //极速型SSD云硬盘 
+"CLOUD_BSSD"    13   //通用型SSD云硬盘 
+"CLOUD_BIGDATA" 14   //大数据型云硬盘
+"CLOUD_HIGHIO"  15   //高IO型云硬盘 
+
+该类型字段为无效字段，实际系统盘类型会根据数据盘类型和节点类型判断，如果节点支持所选的数据盘类型，系统盘类型会跟数据盘保持一致，建议使用CreateCluster接口
         :rtype: int
         """
         return self._StorageType
@@ -30713,11 +30778,31 @@ class Resource(AbstractModel):
 
     @property
     def DiskType(self):
-        """磁盘类型
-取值范围：
-<li>CLOUD_SSD：表示云SSD。</li>
-<li>CLOUD_PREMIUM：表示高效云盘。</li>
-<li>CLOUD_BASIC：表示云硬盘。</li>
+        """数据盘类型 取值范围：
+
+CLOUD_SSD：表示云SSD。
+
+CLOUD_PREMIUM：表示高效云盘。
+
+CLOUD_BASIC：表示云硬盘。
+
+LOCAL_BASIC：表示本地盘。
+
+LOCAL_SSD：表示本地SSD。
+
+CLOUD_HSSD：表示增强型SSD云硬盘。
+
+CLOUD_THROUGHPUT：表示吞吐型云硬盘。
+
+CLOUD_TSSD：表示极速型SSD云硬盘。
+
+CLOUD_BIGDATA：表示大数据型云硬盘。
+
+CLOUD_HIGHIO：表示高IO型云硬盘。
+
+CLOUD_BSSD：表示通用型SSD云硬盘。
+
+REMOTE_SSD：表示远端SSD盘。
         :rtype: str
         """
         return self._DiskType
@@ -31494,6 +31579,307 @@ class RunJobFlowResponse(AbstractModel):
         self._RequestId = params.get("RequestId")
 
 
+class SLInstance(AbstractModel):
+    """Serverless Instance
+
+    """
+
+    def __init__(self):
+        r"""
+        :param _InstanceId: EMR Instance Id
+        :type InstanceId: str
+        :param _ClusterId: EMR Numeric Instance Id
+        :type ClusterId: int
+        :param _InstanceName: Instance Name
+        :type InstanceName: str
+        :param _RegionId: Region id
+        :type RegionId: int
+        :param _Zone: Zone Name
+        :type Zone: str
+        :param _PayMode: Pay Mode
+        :type PayMode: int
+        :param _DiskType: Disk Type
+        :type DiskType: str
+        :param _DiskSize: Disk Size
+        :type DiskSize: int
+        :param _NodeType: Node Type
+        :type NodeType: str
+        :param _NodeNum: Node Number
+        :type NodeNum: int
+        :param _ExpireTime: Expire Time
+        :type ExpireTime: str
+        :param _IsolateTime: Isolate Time
+        :type IsolateTime: str
+        :param _CreateTime: Create Time
+        :type CreateTime: str
+        :param _AutoRenewFlag: Auto Renew Flag
+        :type AutoRenewFlag: int
+        :param _Status: EMR Numeric Instance Status
+        :type Status: int
+        :param _ZoneSettings: Zone Setting
+        :type ZoneSettings: list of ZoneSetting
+        :param _Tags: Bound Tags
+        :type Tags: list of Tag
+        :param _DeployRole: Deploy Role
+        :type DeployRole: str
+        """
+        self._InstanceId = None
+        self._ClusterId = None
+        self._InstanceName = None
+        self._RegionId = None
+        self._Zone = None
+        self._PayMode = None
+        self._DiskType = None
+        self._DiskSize = None
+        self._NodeType = None
+        self._NodeNum = None
+        self._ExpireTime = None
+        self._IsolateTime = None
+        self._CreateTime = None
+        self._AutoRenewFlag = None
+        self._Status = None
+        self._ZoneSettings = None
+        self._Tags = None
+        self._DeployRole = None
+
+    @property
+    def InstanceId(self):
+        """EMR Instance Id
+        :rtype: str
+        """
+        return self._InstanceId
+
+    @InstanceId.setter
+    def InstanceId(self, InstanceId):
+        self._InstanceId = InstanceId
+
+    @property
+    def ClusterId(self):
+        """EMR Numeric Instance Id
+        :rtype: int
+        """
+        return self._ClusterId
+
+    @ClusterId.setter
+    def ClusterId(self, ClusterId):
+        self._ClusterId = ClusterId
+
+    @property
+    def InstanceName(self):
+        """Instance Name
+        :rtype: str
+        """
+        return self._InstanceName
+
+    @InstanceName.setter
+    def InstanceName(self, InstanceName):
+        self._InstanceName = InstanceName
+
+    @property
+    def RegionId(self):
+        """Region id
+        :rtype: int
+        """
+        return self._RegionId
+
+    @RegionId.setter
+    def RegionId(self, RegionId):
+        self._RegionId = RegionId
+
+    @property
+    def Zone(self):
+        """Zone Name
+        :rtype: str
+        """
+        return self._Zone
+
+    @Zone.setter
+    def Zone(self, Zone):
+        self._Zone = Zone
+
+    @property
+    def PayMode(self):
+        """Pay Mode
+        :rtype: int
+        """
+        return self._PayMode
+
+    @PayMode.setter
+    def PayMode(self, PayMode):
+        self._PayMode = PayMode
+
+    @property
+    def DiskType(self):
+        """Disk Type
+        :rtype: str
+        """
+        return self._DiskType
+
+    @DiskType.setter
+    def DiskType(self, DiskType):
+        self._DiskType = DiskType
+
+    @property
+    def DiskSize(self):
+        """Disk Size
+        :rtype: int
+        """
+        return self._DiskSize
+
+    @DiskSize.setter
+    def DiskSize(self, DiskSize):
+        self._DiskSize = DiskSize
+
+    @property
+    def NodeType(self):
+        """Node Type
+        :rtype: str
+        """
+        return self._NodeType
+
+    @NodeType.setter
+    def NodeType(self, NodeType):
+        self._NodeType = NodeType
+
+    @property
+    def NodeNum(self):
+        """Node Number
+        :rtype: int
+        """
+        return self._NodeNum
+
+    @NodeNum.setter
+    def NodeNum(self, NodeNum):
+        self._NodeNum = NodeNum
+
+    @property
+    def ExpireTime(self):
+        """Expire Time
+        :rtype: str
+        """
+        return self._ExpireTime
+
+    @ExpireTime.setter
+    def ExpireTime(self, ExpireTime):
+        self._ExpireTime = ExpireTime
+
+    @property
+    def IsolateTime(self):
+        """Isolate Time
+        :rtype: str
+        """
+        return self._IsolateTime
+
+    @IsolateTime.setter
+    def IsolateTime(self, IsolateTime):
+        self._IsolateTime = IsolateTime
+
+    @property
+    def CreateTime(self):
+        """Create Time
+        :rtype: str
+        """
+        return self._CreateTime
+
+    @CreateTime.setter
+    def CreateTime(self, CreateTime):
+        self._CreateTime = CreateTime
+
+    @property
+    def AutoRenewFlag(self):
+        """Auto Renew Flag
+        :rtype: int
+        """
+        return self._AutoRenewFlag
+
+    @AutoRenewFlag.setter
+    def AutoRenewFlag(self, AutoRenewFlag):
+        self._AutoRenewFlag = AutoRenewFlag
+
+    @property
+    def Status(self):
+        """EMR Numeric Instance Status
+        :rtype: int
+        """
+        return self._Status
+
+    @Status.setter
+    def Status(self, Status):
+        self._Status = Status
+
+    @property
+    def ZoneSettings(self):
+        """Zone Setting
+        :rtype: list of ZoneSetting
+        """
+        return self._ZoneSettings
+
+    @ZoneSettings.setter
+    def ZoneSettings(self, ZoneSettings):
+        self._ZoneSettings = ZoneSettings
+
+    @property
+    def Tags(self):
+        """Bound Tags
+        :rtype: list of Tag
+        """
+        return self._Tags
+
+    @Tags.setter
+    def Tags(self, Tags):
+        self._Tags = Tags
+
+    @property
+    def DeployRole(self):
+        """Deploy Role
+        :rtype: str
+        """
+        return self._DeployRole
+
+    @DeployRole.setter
+    def DeployRole(self, DeployRole):
+        self._DeployRole = DeployRole
+
+
+    def _deserialize(self, params):
+        self._InstanceId = params.get("InstanceId")
+        self._ClusterId = params.get("ClusterId")
+        self._InstanceName = params.get("InstanceName")
+        self._RegionId = params.get("RegionId")
+        self._Zone = params.get("Zone")
+        self._PayMode = params.get("PayMode")
+        self._DiskType = params.get("DiskType")
+        self._DiskSize = params.get("DiskSize")
+        self._NodeType = params.get("NodeType")
+        self._NodeNum = params.get("NodeNum")
+        self._ExpireTime = params.get("ExpireTime")
+        self._IsolateTime = params.get("IsolateTime")
+        self._CreateTime = params.get("CreateTime")
+        self._AutoRenewFlag = params.get("AutoRenewFlag")
+        self._Status = params.get("Status")
+        if params.get("ZoneSettings") is not None:
+            self._ZoneSettings = []
+            for item in params.get("ZoneSettings"):
+                obj = ZoneSetting()
+                obj._deserialize(item)
+                self._ZoneSettings.append(obj)
+        if params.get("Tags") is not None:
+            self._Tags = []
+            for item in params.get("Tags"):
+                obj = Tag()
+                obj._deserialize(item)
+                self._Tags.append(obj)
+        self._DeployRole = params.get("DeployRole")
+        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 SLInstanceInfo(AbstractModel):
     """Serverless HBase实例信息
 
@@ -31541,6 +31927,8 @@ class SLInstanceInfo(AbstractModel):
         :type IsolateTime: str
         :param _ExpireTime: 过期时间，后付费返回0000-00-00 00:00:00
         :type ExpireTime: str
+        :param _DeployRole: 主备部署角色
+        :type DeployRole: str
         """
         self._ClusterId = None
         self._Id = None
@@ -31561,6 +31949,7 @@ class SLInstanceInfo(AbstractModel):
         self._AutoRenewFlag = None
         self._IsolateTime = None
         self._ExpireTime = None
+        self._DeployRole = None
 
     @property
     def ClusterId(self):
@@ -31773,6 +32162,17 @@ class SLInstanceInfo(AbstractModel):
     def ExpireTime(self, ExpireTime):
         self._ExpireTime = ExpireTime
 
+    @property
+    def DeployRole(self):
+        """主备部署角色
+        :rtype: str
+        """
+        return self._DeployRole
+
+    @DeployRole.setter
+    def DeployRole(self, DeployRole):
+        self._DeployRole = DeployRole
+
 
     def _deserialize(self, params):
         self._ClusterId = params.get("ClusterId")
@@ -31804,6 +32204,7 @@ class SLInstanceInfo(AbstractModel):
         self._AutoRenewFlag = params.get("AutoRenewFlag")
         self._IsolateTime = params.get("IsolateTime")
         self._ExpireTime = params.get("ExpireTime")
+        self._DeployRole = params.get("DeployRole")
         memeber_set = set(params.keys())
         for name, value in vars(self).items():
             property_name = name[1:]

{tencentcloud-sdk-python-emr-3.0.1417 → tencentcloud-sdk-python-emr-3.0.1422}/tencentcloud_sdk_python_emr.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: tencentcloud-sdk-python-emr
-Version: 3.0.1417
+Version: 3.0.1422
 Summary: Tencent Cloud Emr SDK for Python
 Home-page: https://github.com/TencentCloud/tencentcloud-sdk-python
 Author: Tencent Cloud

tencentcloud-sdk-python-emr-3.0.1422/tencentcloud_sdk_python_emr.egg-info/requires.txt

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

tencentcloud-sdk-python-emr-3.0.1417/tencentcloud_sdk_python_emr.egg-info/requires.txt

@@ -1 +0,0 @@
-tencentcloud-sdk-python-common==3.0.1417