Skip to content

fix(lb): attach private network path #935

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 2 commits into from
Mar 31, 2025
Merged

fix(lb): attach private network path #935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70e97cb
feat: update generated APIs
scaleway-bot Mar 31, 2025
d3db4e3
Merge branch 'main' into v1.6329.0
Laure-di Mar 31, 2025
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
21 changes: 12 additions & 9 deletions scaleway-async/scaleway_async/lb/v1/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@
ZonedApiCreateLbRequest,
ZonedApiCreateRouteRequest,
ZonedApiCreateSubscriberRequest,
ZonedApiDetachPrivateNetworkRequest,
ZonedApiMigrateLbRequest,
ZonedApiRemoveBackendServersRequest,
ZonedApiSetAclsRequest,
Expand Down Expand Up @@ -183,6 +184,7 @@
marshal_ZonedApiCreateLbRequest,
marshal_ZonedApiCreateRouteRequest,
marshal_ZonedApiCreateSubscriberRequest,
marshal_ZonedApiDetachPrivateNetworkRequest,
marshal_ZonedApiMigrateLbRequest,
marshal_ZonedApiRemoveBackendServersRequest,
marshal_ZonedApiSetAclsRequest,
Expand Down Expand Up @@ -3162,13 +3164,10 @@ async def attach_private_network(

param_zone = validate_path_param("zone", zone or self.client.default_zone)
param_lb_id = validate_path_param("lb_id", lb_id)
param_private_network_id = validate_path_param(
"private_network_id", private_network_id
)

res = self._request(
"POST",
f"/lb/v1/zones/{param_zone}/lbs/{param_lb_id}/private-networks/{param_private_network_id}/attach",
f"/lb/v1/zones/{param_zone}/lbs/{param_lb_id}/attach-private-network",
body=marshal_ZonedApiAttachPrivateNetworkRequest(
ZonedApiAttachPrivateNetworkRequest(
lb_id=lb_id,
Expand Down Expand Up @@ -3211,14 +3210,18 @@ async def detach_private_network(

param_zone = validate_path_param("zone", zone or self.client.default_zone)
param_lb_id = validate_path_param("lb_id", lb_id)
param_private_network_id = validate_path_param(
"private_network_id", private_network_id
)

res = self._request(
"POST",
f"/lb/v1/zones/{param_zone}/lbs/{param_lb_id}/private-networks/{param_private_network_id}/detach",
body={},
f"/lb/v1/zones/{param_zone}/lbs/{param_lb_id}/detach-private-network",
body=marshal_ZonedApiDetachPrivateNetworkRequest(
ZonedApiDetachPrivateNetworkRequest(
lb_id=lb_id,
private_network_id=private_network_id,
zone=zone,
),
self.client,
),
)

self._throw_on_error(res)
Expand Down
16 changes: 16 additions & 0 deletions scaleway-async/scaleway_async/lb/v1/marshalling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
ZonedApiCreateLbRequest,
ZonedApiCreateRouteRequest,
ZonedApiCreateSubscriberRequest,
ZonedApiDetachPrivateNetworkRequest,
ZonedApiMigrateLbRequest,
ZonedApiRemoveBackendServersRequest,
AclSpec,
Expand Down Expand Up @@ -2446,6 +2447,9 @@ def marshal_ZonedApiAttachPrivateNetworkRequest(
),
)

if request.private_network_id is not None:
output["private_network_id"] = request.private_network_id

if request.ipam_ids is not None:
output["ipam_ids"] = request.ipam_ids

Expand Down Expand Up @@ -2735,6 +2739,18 @@ def marshal_ZonedApiCreateSubscriberRequest(
return output


def marshal_ZonedApiDetachPrivateNetworkRequest(
request: ZonedApiDetachPrivateNetworkRequest,
defaults: ProfileDefaults,
) -> Dict[str, Any]:
output: Dict[str, Any] = {}

if request.private_network_id is not None:
output["private_network_id"] = request.private_network_id

return output


def marshal_ZonedApiMigrateLbRequest(
request: ZonedApiMigrateLbRequest,
defaults: ProfileDefaults,
Expand Down
21 changes: 12 additions & 9 deletions scaleway/scaleway/lb/v1/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@
ZonedApiCreateLbRequest,
ZonedApiCreateRouteRequest,
ZonedApiCreateSubscriberRequest,
ZonedApiDetachPrivateNetworkRequest,
ZonedApiMigrateLbRequest,
ZonedApiRemoveBackendServersRequest,
ZonedApiSetAclsRequest,
Expand Down Expand Up @@ -183,6 +184,7 @@
marshal_ZonedApiCreateLbRequest,
marshal_ZonedApiCreateRouteRequest,
marshal_ZonedApiCreateSubscriberRequest,
marshal_ZonedApiDetachPrivateNetworkRequest,
marshal_ZonedApiMigrateLbRequest,
marshal_ZonedApiRemoveBackendServersRequest,
marshal_ZonedApiSetAclsRequest,
Expand Down Expand Up @@ -3160,13 +3162,10 @@ def attach_private_network(

param_zone = validate_path_param("zone", zone or self.client.default_zone)
param_lb_id = validate_path_param("lb_id", lb_id)
param_private_network_id = validate_path_param(
"private_network_id", private_network_id
)

res = self._request(
"POST",
f"/lb/v1/zones/{param_zone}/lbs/{param_lb_id}/private-networks/{param_private_network_id}/attach",
f"/lb/v1/zones/{param_zone}/lbs/{param_lb_id}/attach-private-network",
body=marshal_ZonedApiAttachPrivateNetworkRequest(
ZonedApiAttachPrivateNetworkRequest(
lb_id=lb_id,
Expand Down Expand Up @@ -3209,14 +3208,18 @@ def detach_private_network(

param_zone = validate_path_param("zone", zone or self.client.default_zone)
param_lb_id = validate_path_param("lb_id", lb_id)
param_private_network_id = validate_path_param(
"private_network_id", private_network_id
)

res = self._request(
"POST",
f"/lb/v1/zones/{param_zone}/lbs/{param_lb_id}/private-networks/{param_private_network_id}/detach",
body={},
f"/lb/v1/zones/{param_zone}/lbs/{param_lb_id}/detach-private-network",
body=marshal_ZonedApiDetachPrivateNetworkRequest(
ZonedApiDetachPrivateNetworkRequest(
lb_id=lb_id,
private_network_id=private_network_id,
zone=zone,
),
self.client,
),
)

self._throw_on_error(res)
Expand Down
16 changes: 16 additions & 0 deletions scaleway/scaleway/lb/v1/marshalling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
ZonedApiCreateLbRequest,
ZonedApiCreateRouteRequest,
ZonedApiCreateSubscriberRequest,
ZonedApiDetachPrivateNetworkRequest,
ZonedApiMigrateLbRequest,
ZonedApiRemoveBackendServersRequest,
AclSpec,
Expand Down Expand Up @@ -2446,6 +2447,9 @@ def marshal_ZonedApiAttachPrivateNetworkRequest(
),
)

if request.private_network_id is not None:
output["private_network_id"] = request.private_network_id

if request.ipam_ids is not None:
output["ipam_ids"] = request.ipam_ids

Expand Down Expand Up @@ -2735,6 +2739,18 @@ def marshal_ZonedApiCreateSubscriberRequest(
return output


def marshal_ZonedApiDetachPrivateNetworkRequest(
request: ZonedApiDetachPrivateNetworkRequest,
defaults: ProfileDefaults,
) -> Dict[str, Any]:
output: Dict[str, Any] = {}

if request.private_network_id is not None:
output["private_network_id"] = request.private_network_id

return output


def marshal_ZonedApiMigrateLbRequest(
request: ZonedApiMigrateLbRequest,
defaults: ProfileDefaults,
Expand Down