Skip to content

feat(rdb): prepare ipam integration #76

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
Mar 7, 2023
Merged

feat(rdb): prepare ipam integration #76

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
4 changes: 4 additions & 0 deletions scaleway-async/scaleway_async/rdb/v1/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
from .types import EndpointSpec
from .types import EndpointSpecLoadBalancer
from .types import EndpointSpecPrivateNetwork
from .types import EndpointSpecPrivateNetworkIpamConfig
from .types import EngineSetting
from .types import EngineVersion
from .types import Instance
Expand Down Expand Up @@ -67,6 +68,7 @@
from .types import ReadReplicaEndpointSpec
from .types import ReadReplicaEndpointSpecDirectAccess
from .types import ReadReplicaEndpointSpecPrivateNetwork
from .types import ReadReplicaEndpointSpecPrivateNetworkIpamConfig
from .types import SetInstanceACLRulesResponse
from .types import SetInstanceSettingsResponse
from .types import Snapshot
Expand Down Expand Up @@ -120,6 +122,7 @@
"EndpointSpec",
"EndpointSpecLoadBalancer",
"EndpointSpecPrivateNetwork",
"EndpointSpecPrivateNetworkIpamConfig",
"EngineSetting",
"EngineVersion",
"Instance",
Expand Down Expand Up @@ -149,6 +152,7 @@
"ReadReplicaEndpointSpec",
"ReadReplicaEndpointSpecDirectAccess",
"ReadReplicaEndpointSpecPrivateNetwork",
"ReadReplicaEndpointSpecPrivateNetworkIpamConfig",
"SetInstanceACLRulesResponse",
"SetInstanceSettingsResponse",
"Snapshot",
Expand Down
494 changes: 247 additions & 247 deletions scaleway-async/scaleway_async/rdb/v1/api.py
View file
Open in desktop

Large diffs are not rendered by default.

30 changes: 28 additions & 2 deletions scaleway-async/scaleway_async/rdb/v1/marshalling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
EndpointSpec,
EndpointSpecLoadBalancer,
EndpointSpecPrivateNetwork,
EndpointSpecPrivateNetworkIpamConfig,
EngineSetting,
EngineVersion,
Instance,
Expand Down Expand Up @@ -61,6 +62,7 @@
ReadReplicaEndpointSpec,
ReadReplicaEndpointSpecDirectAccess,
ReadReplicaEndpointSpecPrivateNetwork,
ReadReplicaEndpointSpecPrivateNetworkIpamConfig,
SetInstanceACLRulesResponse,
SetInstanceSettingsResponse,
Snapshot,
Expand Down Expand Up @@ -1148,6 +1150,20 @@ def unmarshal_SetInstanceSettingsResponse(data: Any) -> SetInstanceSettingsRespo
return SetInstanceSettingsResponse(**args)


def marshal_EndpointSpecPrivateNetworkIpamConfig(
request: EndpointSpecPrivateNetworkIpamConfig,
defaults: ProfileDefaults,
) -> Dict[str, Any]:
return {}


def marshal_ReadReplicaEndpointSpecPrivateNetworkIpamConfig(
request: ReadReplicaEndpointSpecPrivateNetworkIpamConfig,
defaults: ProfileDefaults,
) -> Dict[str, Any]:
return {}


def marshal_EndpointSpecLoadBalancer(
request: EndpointSpecLoadBalancer,
defaults: ProfileDefaults,
Expand All @@ -1160,8 +1176,13 @@ def marshal_EndpointSpecPrivateNetwork(
defaults: ProfileDefaults,
) -> Dict[str, Any]:
return {
**resolve_one_of(
[
OneOfPossibility("service_ip", request.service_ip),
OneOfPossibility("ipam_config", request.ipam_config),
]
),
"private_network_id": request.private_network_id,
"service_ip": request.service_ip,
}


Expand All @@ -1177,8 +1198,13 @@ def marshal_ReadReplicaEndpointSpecPrivateNetwork(
defaults: ProfileDefaults,
) -> Dict[str, Any]:
return {
**resolve_one_of(
[
OneOfPossibility("service_ip", request.service_ip),
OneOfPossibility("ipam_config", request.ipam_config),
]
),
"private_network_id": request.private_network_id,
"service_ip": request.service_ip,
}


Expand Down
Loading