Skip to content

feat(instance): add servers filter in ListServersRequest #317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 5, 2023
Merged

feat(instance): add servers filter in ListServersRequest #317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions scaleway-async/scaleway_async/instance/v1/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,7 @@ async def list_servers(
order: ListServersRequestOrder = ListServersRequestOrder.CREATION_DATE_DESC,
private_networks: Optional[List[str]] = None,
private_nic_mac_address: Optional[str] = None,
servers: Optional[List[str]] = None,
) -> ListServersResponse:
"""
List all Instances.
Expand All @@ -368,6 +369,7 @@ async def list_servers(
:param order: Define the order of the returned servers.
:param private_networks: List Instances from the given Private Networks (use commas to separate them).
:param private_nic_mac_address: List Instances associated with the given private NIC MAC address.
:param servers: List Instances from these server ids (use commas to separate them).
:return: :class:`ListServersResponse <ListServersResponse>`

Usage:
Expand Down Expand Up @@ -395,6 +397,7 @@ async def list_servers(
else None,
"private_nic_mac_address": private_nic_mac_address,
"project": project or self.client.default_project_id,
"servers": ",".join(servers) if servers and len(servers) > 0 else None,
"state": state,
"tags": ",".join(tags) if tags and len(tags) > 0 else None,
"without_ip": without_ip,
Expand Down Expand Up @@ -422,6 +425,7 @@ async def list_servers_all(
order: Optional[ListServersRequestOrder] = None,
private_networks: Optional[List[str]] = None,
private_nic_mac_address: Optional[str] = None,
servers: Optional[List[str]] = None,
) -> List[Server]:
"""
List all Instances.
Expand All @@ -441,6 +445,7 @@ async def list_servers_all(
:param order: Define the order of the returned servers.
:param private_networks: List Instances from the given Private Networks (use commas to separate them).
:param private_nic_mac_address: List Instances associated with the given private NIC MAC address.
:param servers: List Instances from these server ids (use commas to separate them).
:return: :class:`List[ListServersResponse] <List[ListServersResponse]>`

Usage:
Expand Down Expand Up @@ -469,6 +474,7 @@ async def list_servers_all(
"order": order,
"private_networks": private_networks,
"private_nic_mac_address": private_nic_mac_address,
"servers": servers,
},
)

Expand Down
5 changes: 5 additions & 0 deletions scaleway-async/scaleway_async/instance/v1/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2065,6 +2065,11 @@ class ListServersRequest:
List Instances associated with the given private NIC MAC address.
"""

servers: Optional[List[str]]
"""
List Instances from these server ids (use commas to separate them).
"""


@dataclass
class DeleteServerRequest:
Expand Down
6 changes: 6 additions & 0 deletions scaleway/scaleway/instance/v1/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,7 @@ def list_servers(
order: ListServersRequestOrder = ListServersRequestOrder.CREATION_DATE_DESC,
private_networks: Optional[List[str]] = None,
private_nic_mac_address: Optional[str] = None,
servers: Optional[List[str]] = None,
) -> ListServersResponse:
"""
List all Instances.
Expand All @@ -368,6 +369,7 @@ def list_servers(
:param order: Define the order of the returned servers.
:param private_networks: List Instances from the given Private Networks (use commas to separate them).
:param private_nic_mac_address: List Instances associated with the given private NIC MAC address.
:param servers: List Instances from these server ids (use commas to separate them).
:return: :class:`ListServersResponse <ListServersResponse>`

Usage:
Expand Down Expand Up @@ -395,6 +397,7 @@ def list_servers(
else None,
"private_nic_mac_address": private_nic_mac_address,
"project": project or self.client.default_project_id,
"servers": ",".join(servers) if servers and len(servers) > 0 else None,
"state": state,
"tags": ",".join(tags) if tags and len(tags) > 0 else None,
"without_ip": without_ip,
Expand Down Expand Up @@ -422,6 +425,7 @@ def list_servers_all(
order: Optional[ListServersRequestOrder] = None,
private_networks: Optional[List[str]] = None,
private_nic_mac_address: Optional[str] = None,
servers: Optional[List[str]] = None,
) -> List[Server]:
"""
List all Instances.
Expand All @@ -441,6 +445,7 @@ def list_servers_all(
:param order: Define the order of the returned servers.
:param private_networks: List Instances from the given Private Networks (use commas to separate them).
:param private_nic_mac_address: List Instances associated with the given private NIC MAC address.
:param servers: List Instances from these server ids (use commas to separate them).
:return: :class:`List[ListServersResponse] <List[ListServersResponse]>`

Usage:
Expand Down Expand Up @@ -469,6 +474,7 @@ def list_servers_all(
"order": order,
"private_networks": private_networks,
"private_nic_mac_address": private_nic_mac_address,
"servers": servers,
},
)

Expand Down
5 changes: 5 additions & 0 deletions scaleway/scaleway/instance/v1/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2065,6 +2065,11 @@ class ListServersRequest:
List Instances associated with the given private NIC MAC address.
"""

servers: Optional[List[str]]
"""
List Instances from these server ids (use commas to separate them).
"""


@dataclass
class DeleteServerRequest:
Expand Down