Skip to content

Commit a4c6ef9

Browse files
author
fengyikai
committed
费用账单(bill-union):添加计费项账单查询、产品类型查询等； 星曜裸金属服务器(epc):tag标签类型修改;
1 parent 94e7bf4 commit a4c6ef9

10 files changed

Lines changed: 2144 additions & 81 deletions

File tree

‎ksyun/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
# limitations under the License.
1515

1616

17-
__version__ = '1.5.8.10'
17+
__version__ = '1.5.8.11'

‎ksyun/client/bill_union/v20200101/client.py‎

Lines changed: 54 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ class Bill_unionClient(AbstractClient):
88
_apiVersion = '2020-01-01'
99
_endpoint = 'bill-union.api.ksyun.com'
1010
_service = 'bill-union'
11-
1211
def DescribeBillSummaryByPayMode(self, request):
1312
"""获取计费类别汇总账单
1413
:param request: Request instance for DescribeBillSummaryByPayMode.
@@ -31,6 +30,7 @@ def DescribeBillSummaryByPayMode(self, request):
3130
else:
3231
raise KsyunSDKException(e.message, e.message)
3332

33+
3434
def DescribeBillSummaryByProduct(self, request):
3535
"""按产品线获取账单汇总金额
3636
:param request: Request instance for DescribeBillSummaryByProduct.
@@ -53,6 +53,7 @@ def DescribeBillSummaryByProduct(self, request):
5353
else:
5454
raise KsyunSDKException(e.message, e.message)
5555

56+
5657
def DescribeBillSummaryByProject(self, request):
5758
"""按项目制获取账单汇总金额
5859
:param request: Request instance for DescribeBillSummaryByProject.
@@ -75,6 +76,7 @@ def DescribeBillSummaryByProject(self, request):
7576
else:
7677
raise KsyunSDKException(e.message, e.message)
7778

79+
7880
def DescribeInstanceSummaryBills(self, request):
7981
"""按实例ID获取账单汇总金额
8082
:param request: Request instance for DescribeInstanceSummaryBills.
@@ -97,6 +99,7 @@ def DescribeInstanceSummaryBills(self, request):
9799
else:
98100
raise KsyunSDKException(e.message, e.message)
99101

102+
100103
def DescribeProductCode(self, request):
101104
"""获取产品线列表
102105
:param request: Request instance for DescribeProductCode.
@@ -119,6 +122,7 @@ def DescribeProductCode(self, request):
119122
else:
120123
raise KsyunSDKException(e.message, e.message)
121124

125+
122126
def DescribeSplitItemBillDetails(self, request):
123127
"""分页查询分拆项账单明细
124128
:param request: Request instance for DescribeSplitItemBillDetails.
@@ -141,6 +145,30 @@ def DescribeSplitItemBillDetails(self, request):
141145
else:
142146
raise KsyunSDKException(e.message, e.message)
143147

148+
149+
def DescribeMiItemBills(self, request):
150+
"""小米计费项账单
151+
:param request: Request instance for DescribeMiItemBills.
152+
:type request: :class:`ksyun.client.bill_union.v20200101.models.DescribeMiItemBillsRequest`
153+
"""
154+
try:
155+
params = request._serialize()
156+
body = self.call_judge("DescribeMiItemBills", params, "application/json")
157+
response = json.loads(body)
158+
if "Error" not in response:
159+
return body
160+
else:
161+
code = response["Error"]["Code"]
162+
message = response["Error"]["Message"]
163+
req_id = response["RequestId"]
164+
raise KsyunSDKException(code, message, req_id)
165+
except Exception as e:
166+
if isinstance(e, KsyunSDKException):
167+
raise
168+
else:
169+
raise KsyunSDKException(e.message, e.message)
170+
171+
144172
def DescribeSplitItemDayBillDetails(self, request):
145173
"""分页查询分拆项账单明细
146174
:param request: Request instance for DescribeSplitItemDayBillDetails.
@@ -162,3 +190,28 @@ def DescribeSplitItemDayBillDetails(self, request):
162190
raise
163191
else:
164192
raise KsyunSDKException(e.message, e.message)
193+
194+
195+
def ListProductGroups(self, request):
196+
"""获取产品线详情列表
197+
:param request: Request instance for ListProductGroups.
198+
:type request: :class:`ksyun.client.bill_union.v20200101.models.ListProductGroupsRequest`
199+
"""
200+
try:
201+
params = request._serialize()
202+
body = self.call_judge("ListProductGroups", params, "application/json")
203+
response = json.loads(body)
204+
if "Error" not in response:
205+
return body
206+
else:
207+
code = response["Error"]["Code"]
208+
message = response["Error"]["Message"]
209+
req_id = response["RequestId"]
210+
raise KsyunSDKException(code, message, req_id)
211+
except Exception as e:
212+
if isinstance(e, KsyunSDKException):
213+
raise
214+
else:
215+
raise KsyunSDKException(e.message, e.message)
216+
217+

‎ksyun/client/bill_union/v20200101/models.py‎

Lines changed: 53 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
from ksyun.common.abstract_model import AbstractModel
22

3-
43
class DescribeBillSummaryByPayModeRequest(AbstractModel):
54
"""DescribeBillSummaryByPayMode请求参数结构体
65
"""
@@ -11,15 +10,20 @@ def __init__(self):
1110
:type PathPrefix: String
1211
:param BillEndMonth: 账单结束时间
1312
:type PathPrefix: String
13+
:param SubAccount: 成员账账号Id，非必填
14+
:type PathPrefix: Int
1415
"""
1516
self.BillBeginMonth = None
1617
self.BillEndMonth = None
18+
self.SubAccount = None
1719

1820
def _deserialize(self, params):
1921
if params.get("BillBeginMonth"):
2022
self.BillBeginMonth = params.get("BillBeginMonth")
2123
if params.get("BillEndMonth"):
2224
self.BillEndMonth = params.get("BillEndMonth")
25+
if params.get("SubAccount"):
26+
self.SubAccount = params.get("SubAccount")
2327

2428

2529
class DescribeBillSummaryByProductRequest(AbstractModel):
@@ -32,15 +36,28 @@ def __init__(self):
3236
:type PathPrefix: String
3337
:param BillEndMonth: 账单结束时间
3438
:type PathPrefix: String
39+
:param SubAccount: 成员账号Id
40+
:type PathPrefix: Int
41+
:param FetchAllFinanceRelationData: 非必传，默认值为 False。
42+
是否吐出全部财务关系数据。
43+
值为true时，同时吐出财务管理和财务托管账号数据。
44+
值为false时或不传该参数，仅吐出财务托管账号数据。
45+
:type PathPrefix: Boolean
3546
"""
3647
self.BillBeginMonth = None
3748
self.BillEndMonth = None
49+
self.SubAccount = None
50+
self.FetchAllFinanceRelationData = None
3851

3952
def _deserialize(self, params):
4053
if params.get("BillBeginMonth"):
4154
self.BillBeginMonth = params.get("BillBeginMonth")
4255
if params.get("BillEndMonth"):
4356
self.BillEndMonth = params.get("BillEndMonth")
57+
if params.get("SubAccount"):
58+
self.SubAccount = params.get("SubAccount")
59+
if params.get("FetchAllFinanceRelationData"):
60+
self.FetchAllFinanceRelationData = params.get("FetchAllFinanceRelationData")
4461

4562

4663
class DescribeBillSummaryByProjectRequest(AbstractModel):
@@ -53,15 +70,20 @@ def __init__(self):
5370
:type PathPrefix: String
5471
:param BillEndMonth: 账单结束月份
5572
:type PathPrefix: String
73+
:param SubAccount: 成员账号Id
74+
:type PathPrefix: Int
5675
"""
5776
self.BillBeginMonth = None
5877
self.BillEndMonth = None
78+
self.SubAccount = None
5979

6080
def _deserialize(self, params):
6181
if params.get("BillBeginMonth"):
6282
self.BillBeginMonth = params.get("BillBeginMonth")
6383
if params.get("BillEndMonth"):
6484
self.BillEndMonth = params.get("BillEndMonth")
85+
if params.get("SubAccount"):
86+
self.SubAccount = params.get("SubAccount")
6587

6688

6789
class DescribeInstanceSummaryBillsRequest(AbstractModel):
@@ -153,6 +175,22 @@ def _deserialize(self, params):
153175
self.Size = params.get("Size")
154176

155177

178+
class DescribeMiItemBillsRequest(AbstractModel):
179+
"""DescribeMiItemBills请求参数结构体
180+
"""
181+
182+
def __init__(self):
183+
r"""小米计费项账单
184+
:param BillMonth:
185+
:type PathPrefix: String
186+
"""
187+
self.BillMonth = None
188+
189+
def _deserialize(self, params):
190+
if params.get("BillMonth"):
191+
self.BillMonth = params.get("BillMonth")
192+
193+
156194
class DescribeSplitItemDayBillDetailsRequest(AbstractModel):
157195
"""DescribeSplitItemDayBillDetails请求参数结构体
158196
"""
@@ -200,3 +238,17 @@ def _deserialize(self, params):
200238
self.Page = params.get("Page")
201239
if params.get("Size"):
202240
self.Size = params.get("Size")
241+
242+
243+
class ListProductGroupsRequest(AbstractModel):
244+
"""ListProductGroups请求参数结构体
245+
"""
246+
247+
def __init__(self):
248+
r"""获取产品线详情列表
249+
"""
250+
251+
def _deserialize(self, params):
252+
return
253+
254+

‎ksyun/client/bill_union/v20221222/client.py‎

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ class Bill_unionClient(AbstractClient):
88
_apiVersion = '2022-12-22'
99
_endpoint = 'bill-union.api.ksyun.com'
1010
_service = 'bill-union'
11-
1211
def QueryInstanceConsume(self, request):
1312
"""查询实例按日汇总账单
1413
:param request: Request instance for QueryInstanceConsume.
@@ -31,6 +30,7 @@ def QueryInstanceConsume(self, request):
3130
else:
3231
raise KsyunSDKException(e.message, e.message)
3332

33+
3434
def QueryProjectConsume(self, request):
3535
"""项目制按日汇总账单
3636
:param request: Request instance for QueryProjectConsume.
@@ -53,6 +53,7 @@ def QueryProjectConsume(self, request):
5353
else:
5454
raise KsyunSDKException(e.message, e.message)
5555

56+
5657
def QueryProductConsume(self, request):
5758
"""产品线按日汇总账单
5859
:param request: Request instance for QueryProductConsume.
@@ -75,6 +76,7 @@ def QueryProductConsume(self, request):
7576
else:
7677
raise KsyunSDKException(e.message, e.message)
7778

79+
7880
def QueryFinanceUnitConsume(self, request):
7981
"""财务单元按日汇总账单
8082
:param request: Request instance for QueryFinanceUnitConsume.
@@ -97,6 +99,7 @@ def QueryFinanceUnitConsume(self, request):
9799
else:
98100
raise KsyunSDKException(e.message, e.message)
99101

102+
100103
def QueryFinanceUnitConsumeOfMonth(self, request):
101104
"""财务单元按月汇总账单
102105
:param request: Request instance for QueryFinanceUnitConsumeOfMonth.
@@ -119,6 +122,7 @@ def QueryFinanceUnitConsumeOfMonth(self, request):
119122
else:
120123
raise KsyunSDKException(e.message, e.message)
121124

125+
122126
def QueryUserConsume(self, request):
123127
"""计费类别按日汇总账单
124128
:param request: Request instance for QueryUserConsume.
@@ -141,24 +145,4 @@ def QueryUserConsume(self, request):
141145
else:
142146
raise KsyunSDKException(e.message, e.message)
143147

144-
def DescribeInstanceSummaryBills(self, request):
145-
"""实例账单
146-
:param request: Request instance for DescribeInstanceSummaryBills.
147-
:type request: :class:`ksyun.client.bill_union.v20221222.models.DescribeInstanceSummaryBillsRequest`
148-
"""
149-
try:
150-
params = request._serialize()
151-
body = self.call_judge("DescribeInstanceSummaryBills", params, "application/json")
152-
response = json.loads(body)
153-
if "Error" not in response:
154-
return body
155-
else:
156-
code = response["Error"]["Code"]
157-
message = response["Error"]["Message"]
158-
req_id = response["RequestId"]
159-
raise KsyunSDKException(code, message, req_id)
160-
except Exception as e:
161-
if isinstance(e, KsyunSDKException):
162-
raise
163-
else:
164-
raise KsyunSDKException(e.message, e.message)
148+

‎ksyun/client/bill_union/v20221222/models.py‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
from ksyun.common.abstract_model import AbstractModel
22

3-
43
class QueryInstanceConsumeRequest(AbstractModel):
54
"""QueryInstanceConsume请求参数结构体
65
"""
@@ -192,32 +191,3 @@ def _deserialize(self, params):
192191
self.Size = params.get("Size")
193192

194193

195-
class DescribeInstanceSummaryBillsRequest(AbstractModel):
196-
"""DescribeInstanceSummaryBills请求参数结构体
197-
"""
198-
199-
def __init__(self):
200-
r"""实例账单
201-
:param BillMonth: 客户账单月份，YYYY-MM。不支持跨月查询
202-
:type PathPrefix: String
203-
:param ProductCode: 产品线对应的Code
204-
:type PathPrefix: String
205-
:param Page: 第几页,默认值为1
206-
:type PathPrefix: Int
207-
:param Size: 每页条数,默认值20
208-
:type PathPrefix: Int
209-
"""
210-
self.BillMonth = None
211-
self.ProductCode = None
212-
self.Page = None
213-
self.Size = None
214-
215-
def _deserialize(self, params):
216-
if params.get("BillMonth"):
217-
self.BillMonth = params.get("BillMonth")
218-
if params.get("ProductCode"):
219-
self.ProductCode = params.get("ProductCode")
220-
if params.get("Page"):
221-
self.Page = params.get("Page")
222-
if params.get("Size"):
223-
self.Size = params.get("Size")

‎ksyun/client/bill_union/v20250801/__init__.py‎

Whitespace-only changes.

0 commit comments

Comments
 (0)