Merge pull request #128 from Tanc009/master

publish jdcloud-sdk-python 1.6.97

Author: Tanc009

jdcloud_sdk/services/jdccs/ChangeLog.md

@@ -1,8 +1,10 @@
 # 更新历史 #
-API版本：1.1.0
+API版本：1.1.2
 
 |发布时间|版本号|更新|说明|
 |---|---|---|---|
+|2021-03-15|1.1.2|新增接口|金山云需求:开放设备数据信息接口|
+|2020-11-03|1.1.1|新增接口|新增机房巡检列表接口<br>新增设备巡检接口<br>新增机房巡检详情接口|
 |2020-08-04|1.1.0|新增接口|新增机房概览接口<br>新增提交通用服务工单接口<br>新增创建、启用、禁用和删除报警规则|
 |2020-06-22|1.0.10|接口变更|带宽（上、下行流量）监控项数据2小时范围查询支持5m粒度|
 |2020-03-20|1.0.9|接口变更|公网IP列表新增IP地址数量、IP类型、线路类型<br>带宽（出口）列表、详情新增计费方式|

jdcloud_sdk/services/jdccs/apis/CreateAlarmRequest.py

@@ -51,6 +51,7 @@ def __init__(self, ):
         self.noticeMethod = None
         self.noticeObj = None
         self.userId = None
+        self.groupId = None
 
     def setIdc(self, idc):
         """
@@ -142,3 +143,9 @@ def setUserId(self, userId):
         """
         self.userId = userId
 
+    def setGroupId(self, groupId):
+        """
+        :param groupId: (Optional) 通知对象组ID
+        """
+        self.groupId = groupId
+

jdcloud_sdk/services/jdccs/apis/DescribeAlarmHistoryRequest.py

@@ -39,6 +39,7 @@ def __init__(self, ):
         self.pageNumber = None
         self.pageSize = None
         self.alarmId = None
+        self.idc = None
         self.startTime = None
         self.endTime = None
 
@@ -60,6 +61,12 @@ def setAlarmId(self, alarmId):
         """
         self.alarmId = alarmId
 
+    def setIdc(self, idc):
+        """
+        :param idc: (Optional) 机房英文标识
+        """
+        self.idc = idc
+
     def setStartTime(self, startTime):
         """
         :param startTime: (Optional) 查询时间范围的开始时间， UNIX时间戳

jdcloud_sdk/services/jdccs/apis/DescribeAlarmsRequest.py

@@ -38,9 +38,12 @@ def __init__(self, ):
 
         self.pageNumber = None
         self.pageSize = None
+        self.all = None
         self.resourceType = None
         self.resourceId = None
+        self.idc = None
         self.status = None
+        self.filters = None
 
     def setPageNumber(self, pageNumber):
         """
@@ -54,6 +57,12 @@ def setPageSize(self, pageSize):
         """
         self.pageSize = pageSize
 
+    def setAll(self, all):
+        """
+        :param all: (Optional) 是否查询全部，默认分页
+        """
+        self.all = all
+
     def setResourceType(self, resourceType):
         """
         :param resourceType: (Optional) 资源类型 bandwidth:带宽
@@ -66,9 +75,22 @@ def setResourceId(self, resourceId):
         """
         self.resourceId = resourceId
 
+    def setIdc(self, idc):
+        """
+        :param idc: (Optional) 机房英文标识
+        """
+        self.idc = idc
+
     def setStatus(self, status):
         """
         :param status: (Optional) 规则状态 disabled:禁用 enabled:启用
         """
         self.status = status
 
+    def setFilters(self, filters):
+        """
+        :param filters: (Optional) alarmId - 规则实施ID，精确匹配，支持多个
+
+        """
+        self.filters = filters
+

jdcloud_sdk/services/jdccs/apis/DescribeBandwidthTrafficsRequest.py

@@ -40,6 +40,8 @@ def __init__(self, idc, ):
         self.idc = idc
         self.pageNumber = None
         self.pageSize = None
+        self.all = None
+        self.bandwidthName = None
 
     def setPageNumber(self, pageNumber):
         """
@@ -53,3 +55,15 @@ def setPageSize(self, pageSize):
         """
         self.pageSize = pageSize
 
+    def setAll(self, all):
+        """
+        :param all: (Optional) 是否查询全部，默认分页
+        """
+        self.all = all
+
+    def setBandwidthName(self, bandwidthName):
+        """
+        :param bandwidthName: (Optional) 带宽（出口）名称
+        """
+        self.bandwidthName = bandwidthName
+

jdcloud_sdk/services/jdccs/apis/DescribeBandwidthsRequest.py

@@ -40,8 +40,13 @@ def __init__(self, idc, ):
         self.idc = idc
         self.pageNumber = None
         self.pageSize = None
-        self.filters = None
+        self.all = None
         self.lineType = None
+        self.chargeType = None
+        self.bandwidthName = None
+        self.relatedIp = None
+        self.filters = None
+        self.sorts = None
 
     def setPageNumber(self, pageNumber):
         """
@@ -55,16 +60,46 @@ def setPageSize(self, pageSize):
         """
         self.pageSize = pageSize
 
-    def setFilters(self, filters):
+    def setAll(self, all):
         """
-        :param filters: (Optional) bandwidthId - 带宽实例IID，精确匹配，支持多个
-
+        :param all: (Optional) 是否查询全部，默认分页
         """
-        self.filters = filters
+        self.all = all
 
     def setLineType(self, lineType):
         """
         :param lineType: (Optional) 线路类型 dynamicBGP:动态BGP thirdLineBGP:三线BGP telecom:电信单线 unicom:联通单线 mobile:移动单线
         """
         self.lineType = lineType
 
+    def setChargeType(self, chargeType):
+        """
+        :param chargeType: (Optional) 计费方式 fixedBandwidth:固定带宽 95thPercentile:95峰值 merge95thPercentile:合并95峰值
+        """
+        self.chargeType = chargeType
+
+    def setBandwidthName(self, bandwidthName):
+        """
+        :param bandwidthName: (Optional) 带宽（出口）名称
+        """
+        self.bandwidthName = bandwidthName
+
+    def setRelatedIp(self, relatedIp):
+        """
+        :param relatedIp: (Optional) 关联的公网IP
+        """
+        self.relatedIp = relatedIp
+
+    def setFilters(self, filters):
+        """
+        :param filters: (Optional) bandwidthId - 带宽实例ID，精确匹配，支持多个
+
+        """
+        self.filters = filters
+
+    def setSorts(self, sorts):
+        """
+        :param sorts: (Optional) null
+        """
+        self.sorts = sorts
+

jdcloud_sdk/services/jdccs/apis/DescribeCabinetsRequest.py

@@ -40,8 +40,13 @@ def __init__(self, idc, ):
         self.idc = idc
         self.pageNumber = None
         self.pageSize = None
-        self.filters = None
+        self.all = None
+        self.cabinetType = None
         self.cabinetOpenStatus = None
+        self.cabinetNo = None
+        self.deviceMustBeEmpty = None
+        self.filters = None
+        self.sorts = None
 
     def setPageNumber(self, pageNumber):
         """
@@ -55,17 +60,49 @@ def setPageSize(self, pageSize):
         """
         self.pageSize = pageSize
 
+    def setAll(self, all):
+        """
+        :param all: (Optional) 是否查询全部，默认分页
+        """
+        self.all = all
+
+    def setCabinetType(self, cabinetType):
+        """
+        :param cabinetType: (Optional) 机柜类型 formal:正式机柜 reserved:预留机柜
+        """
+        self.cabinetType = cabinetType
+
+    def setCabinetOpenStatus(self, cabinetOpenStatus):
+        """
+        :param cabinetOpenStatus: (Optional) 机柜开通状态 disabled:未开通 enabling:开通中 enabled:已开通 disabling:关电中
+        """
+        self.cabinetOpenStatus = cabinetOpenStatus
+
+    def setCabinetNo(self, cabinetNo):
+        """
+        :param cabinetNo: (Optional) 机柜编码
+        """
+        self.cabinetNo = cabinetNo
+
+    def setDeviceMustBeEmpty(self, deviceMustBeEmpty):
+        """
+        :param deviceMustBeEmpty: (Optional) 机柜关电工单使用 yes
+        """
+        self.deviceMustBeEmpty = deviceMustBeEmpty
+
     def setFilters(self, filters):
         """
         :param filters: (Optional) roomNo - 房间号，精确匹配，支持多个
 cabinetId - 机柜ID，精确匹配，支持多个
+cabinetNo - 机柜编码，精确匹配，支持多个
+cabinetOpenStatus - 机柜开通状态，精确匹配，支持多个
 
         """
         self.filters = filters
 
-    def setCabinetOpenStatus(self, cabinetOpenStatus):
+    def setSorts(self, sorts):
         """
-        :param cabinetOpenStatus: (Optional) 机柜开通状态 disabled:未开通 enabling:开通中 enabled:已开通 disabling:关电中
+        :param sorts: (Optional) cabinetNo - 机柜编码 roomNo - 房间号
         """
-        self.cabinetOpenStatus = cabinetOpenStatus
+        self.sorts = sorts
 

jdcloud_sdk/services/jdccs/apis/DescribeDevicesRequest.py

@@ -40,9 +40,17 @@ def __init__(self, idc, ):
         self.idc = idc
         self.pageNumber = None
         self.pageSize = None
+        self.all = None
         self.cabinetId = None
-        self.filters = None
         self.deviceType = None
+        self.assetStatus = None
+        self.assetBelong = None
+        self.deviceNo = None
+        self.snNo = None
+        self.cabinetNo = None
+        self.ticketTemplateCode = None
+        self.filters = None
+        self.sorts = None
 
     def setPageNumber(self, pageNumber):
         """
@@ -56,23 +64,73 @@ def setPageSize(self, pageSize):
         """
         self.pageSize = pageSize
 
+    def setAll(self, all):
+        """
+        :param all: (Optional) 是否查询全部，默认分页
+        """
+        self.all = all
+
     def setCabinetId(self, cabinetId):
         """
         :param cabinetId: (Optional) 机柜ID
         """
         self.cabinetId = cabinetId
 
+    def setDeviceType(self, deviceType):
+        """
+        :param deviceType: (Optional) 设备类型 server:服务器 network:网络设备 storage:存储设备 other:其他设备
+        """
+        self.deviceType = deviceType
+
+    def setAssetStatus(self, assetStatus):
+        """
+        :param assetStatus: (Optional) 资产状态 launched:已上架 opened:已开通 canceling:退订中 operating:操作中 modifing:变更中
+        """
+        self.assetStatus = assetStatus
+
+    def setAssetBelong(self, assetBelong):
+        """
+        :param assetBelong: (Optional) 资产归属 own:自备 lease:租赁
+        """
+        self.assetBelong = assetBelong
+
+    def setDeviceNo(self, deviceNo):
+        """
+        :param deviceNo: (Optional) 设备编码
+        """
+        self.deviceNo = deviceNo
+
+    def setSnNo(self, snNo):
+        """
+        :param snNo: (Optional) 设备SN号
+        """
+        self.snNo = snNo
+
+    def setCabinetNo(self, cabinetNo):
+        """
+        :param cabinetNo: (Optional) 机柜编码
+        """
+        self.cabinetNo = cabinetNo
+
+    def setTicketTemplateCode(self, ticketTemplateCode):
+        """
+        :param ticketTemplateCode: (Optional) 工单模板CODE
+        """
+        self.ticketTemplateCode = ticketTemplateCode
+
     def setFilters(self, filters):
         """
         :param filters: (Optional) deviceId - 设备实例ID，精确匹配，支持多个
 snNo - 设备SN号，精确匹配，支持多个
+deviceNo - 设备编码，精确匹配，支持多个
+cabinetNo - 机柜编码，精确匹配，支持多个
 
         """
         self.filters = filters
 
-    def setDeviceType(self, deviceType):
+    def setSorts(self, sorts):
         """
-        :param deviceType: (Optional) 设备类型 server:服务器 network:网络设备 storage:存储设备 other:其他设备
+        :param sorts: (Optional) deviceNo - 设备编码 cabinetNo - 机柜编码
         """
-        self.deviceType = deviceType
+        self.sorts = sorts
 

jdcloud_sdk/services/jdccs/apis/DescribeIdcsRequest.py

@@ -38,6 +38,7 @@ def __init__(self, ):
 
         self.pageNumber = None
         self.pageSize = None
+        self.all = None
         self.includeExternalIdc = None
 
     def setPageNumber(self, pageNumber):
@@ -52,6 +53,12 @@ def setPageSize(self, pageSize):
         """
         self.pageSize = pageSize
 
+    def setAll(self, all):
+        """
+        :param all: (Optional) 是否查询全部，默认分页
+        """
+        self.all = all
+
     def setIncludeExternalIdc(self, includeExternalIdc):
         """
         :param includeExternalIdc: (Optional) 是否强制包含外部机房 yes/no