Skip to content

Commit 82177c3

Browse files
committed
Mod rebases new endpoints
1 parent 98fbf4b commit 82177c3

10 files changed

+18
-154
lines changed

core_client/base/api/v3_cluster_fs_get_list.py

Lines changed: 0 additions & 53 deletions
This file was deleted.

core_client/base/api/v3_cluster_fs_patch_file.py

Lines changed: 0 additions & 70 deletions
This file was deleted.

core_client/base/api/v3_cluster_fs_delete_file.py renamed to core_client/base/api/v3_cluster_node_fs_delete_file.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
@validate_call()
99
def _build_request(
1010
client: Client,
11-
core_id: str,
11+
id: str,
1212
storage: str,
1313
path: str,
1414
retries: int = None,
@@ -20,12 +20,11 @@ def _build_request(
2020
timeout = client.timeout
2121
return {
2222
"method": "delete",
23-
"url": f"{client.base_url}/api/v3/cluster/fs/{storage}/{path}",
23+
"url": f"{client.base_url}/api/v3/cluster/node/{id}/fs/{storage}/{path}",
2424
"headers": client.headers,
2525
"timeout": timeout,
2626
"data": None,
2727
"json": None,
28-
"params": {"core_id": core_id},
2928
}, retries
3029

3130

core_client/base/api/v3_cluster_fs_get_file.py renamed to core_client/base/api/v3_cluster_node_fs_get_file.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
@validate_call()
99
def _build_request(
1010
client: Client,
11+
id: str,
1112
storage: str,
1213
path: str,
13-
core_id: str = None,
1414
retries: int = None,
1515
timeout: float = None,
1616
):
@@ -20,12 +20,11 @@ def _build_request(
2020
timeout = client.timeout
2121
return {
2222
"method": "get",
23-
"url": f"{client.base_url}/api/v3/cluster/fs/{storage}/{path}",
23+
"url": f"{client.base_url}/api/v3/cluster/node/{id}/fs/{storage}/{path}",
2424
"headers": client.headers,
2525
"timeout": timeout,
2626
"data": None,
2727
"json": None,
28-
"params": {"core_id": core_id},
2928
}, retries
3029

3130

core_client/base/api/v3_cluster_fs_get_file_list.py renamed to core_client/base/api/v3_cluster_node_fs_get_file_list.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,11 @@
99
@validate_call()
1010
def _build_request(
1111
client: Client,
12+
id: str,
1213
storage: str,
1314
glob: str = "",
14-
size_min: str = "",
15-
size_max: str = "",
16-
lastmod_start: str = "",
17-
lastmod_end: str = "",
1815
sort: str = "",
1916
order: str = "",
20-
core_id: str = None,
2117
retries: int = None,
2218
timeout: float = None,
2319
):
@@ -33,15 +29,13 @@ def _build_request(
3329
timeout = client.timeout
3430
return {
3531
"method": "get",
36-
"url": f"{client.base_url}/api/v3/cluster/fs/{storage}"
37-
+ f"?glob={glob}&size_min={size_min}&size_max={size_max}"
38-
+ f"&lastmod_start={lastmod_start}&lastmod_end={lastmod_end}"
32+
"url": f"{client.base_url}/api/v3/cluster/node/{id}/fs/{storage}"
33+
+ f"?glob={glob}"
3934
+ f"&sort={sort}&order={order}",
4035
"headers": client.headers,
4136
"timeout": timeout,
4237
"data": None,
4338
"json": None,
44-
"params": {"core_id": core_id},
4539
}, retries
4640

4741

core_client/base/api/v3_cluster_fs_get_file_exists.py renamed to core_client/base/api/v3_cluster_node_fs_head_file.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
@validate_call()
99
def _build_request(
1010
client: Client,
11+
id: str,
1112
storage: str,
1213
path: str,
13-
core_id: str = None,
1414
retries: int = None,
1515
timeout: float = None,
1616
):
@@ -20,12 +20,11 @@ def _build_request(
2020
timeout = client.timeout
2121
return {
2222
"method": "head",
23-
"url": f"{client.base_url}/api/v3/cluster/fs/{storage}/{path}",
23+
"url": f"{client.base_url}/api/v3/cluster/node/{id}/fs/{storage}/{path}",
2424
"headers": client.headers,
2525
"timeout": timeout,
2626
"data": None,
2727
"json": None,
28-
"params": {"core_id": core_id},
2928
}, retries
3029

3130

core_client/base/api/v3_cluster_fs_put_file.py renamed to core_client/base/api/v3_cluster_node_fs_put_file.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
@validate_call()
99
def _build_request(
1010
client: Client,
11+
id: str,
1112
storage: str,
1213
path: str,
1314
data: bytes,
14-
core_id: str = None,
1515
retries: int = None,
1616
timeout: float = None,
1717
):
@@ -21,12 +21,11 @@ def _build_request(
2121
timeout = client.timeout
2222
return {
2323
"method": "put",
24-
"url": f"{client.base_url}/api/v3/cluster/fs/{storage}/{path}",
24+
"url": f"{client.base_url}/api/v3/cluster/node/{id}/fs/{storage}/{path}",
2525
"headers": client.headers,
2626
"timeout": timeout,
2727
"content": data,
2828
"json": None,
29-
"params": {"core_id": core_id},
3029
}, retries
3130

3231

core_client/base/api/v3_cluster_node_get_files.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@
88

99
@validate_call()
1010
def _build_request(
11-
client: Client, id: str, retries: int = None, timeout: float = None
11+
client: Client,
12+
id: str,
13+
retries: int = None,
14+
timeout: float = None,
1215
):
1316
if not retries:
1417
retries = client.retries

core_client/base/api/v3_cluster_process_get_probe.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
def _build_request(
1111
client: Client,
1212
id: str,
13-
domain: str = None,
13+
domain: str = "",
1414
retries: int = None,
1515
timeout: float = None,
1616
):
@@ -20,15 +20,11 @@ def _build_request(
2020
timeout = client.timeout
2121
return {
2222
"method": "post",
23-
"url": f"{client.base_url}/api/v3/cluster/process/probe",
23+
"url": f"{client.base_url}/api/v3/cluster/process/{id}/probe?domain={domain}",
2424
"headers": client.headers,
2525
"timeout": timeout,
2626
"data": None,
27-
"json": config,
28-
"params": {
29-
"id": id,
30-
"domain": domain,
31-
}
27+
"json": None,
3228
}, retries
3329

3430

core_client/base/api/v3_cluster_process_post_probe.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
def _build_request(
1111
client: Client,
1212
config: ProcessConfig,
13-
core_id: str = None,
1413
retries: int = None,
1514
timeout: float = None,
1615
):
@@ -27,7 +26,6 @@ def _build_request(
2726
"timeout": timeout,
2827
"data": None,
2928
"json": config,
30-
"params": {"core_id": core_id} if core_id else None,
3129
}, retries
3230

3331

0 commit comments

Comments
 (0)