Skip to content

Commit d33bc33

Browse files
authored
Merge pull request #88 from Onemind-Services-LLC/feat/ruk
Update the Ruk's parameter
2 parents f73f5dd + 832dab1 commit d33bc33

26 files changed

+2193
-2372
lines changed

jelastic/api/administration/__init__.py

Lines changed: 594 additions & 904 deletions
Large diffs are not rendered by default.

jelastic/api/automation/__init__.py

Lines changed: 71 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,12 @@ class _Utils(Automation):
4141
_endpoint2 = "utils"
4242

4343
def ClearBillingHistory(
44-
self, uid: int, start_date: date, end_date: date, env_name: str = None
44+
self,
45+
uid: int,
46+
start_date: date,
47+
end_date: date,
48+
env_name: str = None,
49+
ruk: str = None,
4550
):
4651
return self._get(
4752
"ClearBillingHistory",
@@ -50,28 +55,40 @@ def ClearBillingHistory(
5055
"startDate": start_date,
5156
"endDate": end_date,
5257
"envName": env_name,
58+
"ruk": ruk,
5359
},
5460
datetime_format="%Y-%m-%d",
5561
)
5662

57-
def ClearMonthTraffic(self, uid: int, month_start: str):
63+
def ClearMonthTraffic(
64+
self,
65+
uid: int,
66+
month_start: str,
67+
ruk: str = None,
68+
):
5869
return self._get(
5970
"ClearMonthTraffic",
6071
params={
6172
"uid": uid,
6273
"monthStart": month_start,
74+
"ruk": ruk,
6375
},
6476
)
6577

6678
def ClearResourceStatistics(
67-
self, uid: int, start_date_from: date, start_date_to: date
79+
self,
80+
uid: int,
81+
start_date_from: date,
82+
start_date_to: date,
83+
ruk: str = None,
6884
):
6985
return self._get(
7086
"ClearResourceStatistics",
7187
params={
7288
"uid": uid,
7389
"startDateFrom": start_date_from,
7490
"startDateTo": start_date_to,
91+
"ruk": ruk,
7592
},
7693
datetime_format="%Y-%m-%d",
7794
)
@@ -83,6 +100,7 @@ def GenerateBillableItemStatistics(
83100
node_id: int,
84101
item_id: int,
85102
env_name: str = None,
103+
ruk: str = None,
86104
):
87105
return self._get(
88106
"GenerateBillableItemStatistics",
@@ -92,12 +110,18 @@ def GenerateBillableItemStatistics(
92110
"nodeId": node_id,
93111
"itemId": item_id,
94112
"envName": env_name,
113+
"ruk": ruk,
95114
},
96115
datetime_format="%Y-%m-%d",
97116
)
98117

99118
def GenerateStatistics(
100-
self, start_date: date, duration_hour: int, node_id: int, stat_json: dict
119+
self,
120+
start_date: date,
121+
duration_hour: int,
122+
node_id: int,
123+
stat_json: dict,
124+
ruk: str = None,
101125
):
102126
stat_json = json.dumps(stat_json)
103127
return self._get(
@@ -107,34 +131,60 @@ def GenerateStatistics(
107131
"durationHour": duration_hour,
108132
"nodeId": node_id,
109133
"statJson": stat_json,
134+
"ruk": ruk,
110135
},
111136
datetime_format="%Y-%m-%d",
112137
)
113138

114-
def GetUidUsageByPeriod(self, uid: int, start_date: date, end_date: date):
139+
def GetUidUsageByPeriod(
140+
self,
141+
uid: int,
142+
start_date: date,
143+
end_date: date,
144+
ruk: str = None,
145+
):
115146
return self._get(
116147
"GetUidUsageByPeriod",
117148
params={
118149
"uid": uid,
119150
"startDate": start_date,
120151
"endDate": end_date,
152+
"ruk": ruk,
121153
},
122154
datetime_format="%Y-%m-%d",
123155
)
124156

125-
def SetAccountDate(self, uid: int, date_type: str, date_value: str):
157+
def SetAccountDate(
158+
self,
159+
uid: int,
160+
date_type: str,
161+
date_value: str,
162+
ruk: str = None,
163+
):
126164
return self._get(
127165
"SetAccountDate",
128-
params={"uid": uid, "dateType": date_type, "dateValue": date_value},
166+
params={
167+
"uid": uid,
168+
"dateType": date_type,
169+
"dateValue": date_value,
170+
"ruk": ruk,
171+
},
129172
)
130173

131-
def SetAppNodeDate(self, env_name: str, date_type: str, date_value: str):
174+
def SetAppNodeDate(
175+
self,
176+
env_name: str,
177+
date_type: str,
178+
date_value: str,
179+
ruk: str = None,
180+
):
132181
return self._get(
133182
"SetAppNodeDate",
134183
params={
135184
"envName": env_name,
136185
"dateType": date_type,
137186
"dateValue": date_value,
187+
"ruk": ruk,
138188
},
139189
)
140190

@@ -146,6 +196,7 @@ def SetBillingHistoryDate(
146196
start_date_to: date,
147197
date_type: str,
148198
date_value: str,
199+
ruk: str = None,
149200
):
150201
return self._get(
151202
"SetBillingHistoryDate",
@@ -156,22 +207,31 @@ def SetBillingHistoryDate(
156207
"startDateTo": start_date_to,
157208
"dateType": date_type,
158209
"dateValue": date_value,
210+
"ruk": ruk,
159211
},
160212
datetime_format="%Y-%m-%d",
161213
)
162214

163-
def SetMonthTraffic(self, uid: int, month_start: str, external_traffic: float):
215+
def SetMonthTraffic(
216+
self, uid: int, month_start: str, external_traffic: float, ruk: str = None
217+
):
164218
return self._get(
165219
"SetMonthTraffic",
166220
params={
167221
"uid": uid,
168222
"monthStart": month_start,
169223
"externalTraffic": external_traffic,
224+
"ruk": ruk,
170225
},
171226
)
172227

173228
def ShiftResourceCreatedOnDateToStartDate(
174-
self, uid: int, env_name: str, start_date_from: date, start_date_to: date
229+
self,
230+
uid: int,
231+
env_name: str,
232+
start_date_from: date,
233+
start_date_to: date,
234+
ruk: str = None,
175235
):
176236
return self._get(
177237
"ShiftResourceCreatedOnDateToStartDate",
@@ -180,6 +240,7 @@ def ShiftResourceCreatedOnDateToStartDate(
180240
"envName": env_name,
181241
"startDateFrom": start_date_from,
182242
"startDateTo": start_date_to,
243+
"ruk": ruk,
183244
},
184245
datetime_format="%Y-%m-%d",
185246
)

0 commit comments

Comments
 (0)