Skip to content

Commit 052cb88

Browse files
authored
feat(rdb): prepare ipam integration (#76)
1 parent a5407a1 commit 052cb88

File tree

8 files changed

+1400
-1284
lines changed

8 files changed

+1400
-1284
lines changed

scaleway-async/scaleway_async/rdb/v1/__init__.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
from .types import EndpointSpec
3939
from .types import EndpointSpecLoadBalancer
4040
from .types import EndpointSpecPrivateNetwork
41+
from .types import EndpointSpecPrivateNetworkIpamConfig
4142
from .types import EngineSetting
4243
from .types import EngineVersion
4344
from .types import Instance
@@ -67,6 +68,7 @@
6768
from .types import ReadReplicaEndpointSpec
6869
from .types import ReadReplicaEndpointSpecDirectAccess
6970
from .types import ReadReplicaEndpointSpecPrivateNetwork
71+
from .types import ReadReplicaEndpointSpecPrivateNetworkIpamConfig
7072
from .types import SetInstanceACLRulesResponse
7173
from .types import SetInstanceSettingsResponse
7274
from .types import Snapshot
@@ -120,6 +122,7 @@
120122
"EndpointSpec",
121123
"EndpointSpecLoadBalancer",
122124
"EndpointSpecPrivateNetwork",
125+
"EndpointSpecPrivateNetworkIpamConfig",
123126
"EngineSetting",
124127
"EngineVersion",
125128
"Instance",
@@ -149,6 +152,7 @@
149152
"ReadReplicaEndpointSpec",
150153
"ReadReplicaEndpointSpecDirectAccess",
151154
"ReadReplicaEndpointSpecPrivateNetwork",
155+
"ReadReplicaEndpointSpecPrivateNetworkIpamConfig",
152156
"SetInstanceACLRulesResponse",
153157
"SetInstanceSettingsResponse",
154158
"Snapshot",

scaleway-async/scaleway_async/rdb/v1/api.py

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

scaleway-async/scaleway_async/rdb/v1/marshalling.py

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
EndpointSpec,
3333
EndpointSpecLoadBalancer,
3434
EndpointSpecPrivateNetwork,
35+
EndpointSpecPrivateNetworkIpamConfig,
3536
EngineSetting,
3637
EngineVersion,
3738
Instance,
@@ -61,6 +62,7 @@
6162
ReadReplicaEndpointSpec,
6263
ReadReplicaEndpointSpecDirectAccess,
6364
ReadReplicaEndpointSpecPrivateNetwork,
65+
ReadReplicaEndpointSpecPrivateNetworkIpamConfig,
6466
SetInstanceACLRulesResponse,
6567
SetInstanceSettingsResponse,
6668
Snapshot,
@@ -1148,6 +1150,20 @@ def unmarshal_SetInstanceSettingsResponse(data: Any) -> SetInstanceSettingsRespo
11481150
return SetInstanceSettingsResponse(**args)
11491151

11501152

1153+
def marshal_EndpointSpecPrivateNetworkIpamConfig(
1154+
request: EndpointSpecPrivateNetworkIpamConfig,
1155+
defaults: ProfileDefaults,
1156+
) -> Dict[str, Any]:
1157+
return {}
1158+
1159+
1160+
def marshal_ReadReplicaEndpointSpecPrivateNetworkIpamConfig(
1161+
request: ReadReplicaEndpointSpecPrivateNetworkIpamConfig,
1162+
defaults: ProfileDefaults,
1163+
) -> Dict[str, Any]:
1164+
return {}
1165+
1166+
11511167
def marshal_EndpointSpecLoadBalancer(
11521168
request: EndpointSpecLoadBalancer,
11531169
defaults: ProfileDefaults,
@@ -1160,8 +1176,13 @@ def marshal_EndpointSpecPrivateNetwork(
11601176
defaults: ProfileDefaults,
11611177
) -> Dict[str, Any]:
11621178
return {
1179+
**resolve_one_of(
1180+
[
1181+
OneOfPossibility("service_ip", request.service_ip),
1182+
OneOfPossibility("ipam_config", request.ipam_config),
1183+
]
1184+
),
11631185
"private_network_id": request.private_network_id,
1164-
"service_ip": request.service_ip,
11651186
}
11661187

11671188

@@ -1177,8 +1198,13 @@ def marshal_ReadReplicaEndpointSpecPrivateNetwork(
11771198
defaults: ProfileDefaults,
11781199
) -> Dict[str, Any]:
11791200
return {
1201+
**resolve_one_of(
1202+
[
1203+
OneOfPossibility("service_ip", request.service_ip),
1204+
OneOfPossibility("ipam_config", request.ipam_config),
1205+
]
1206+
),
11801207
"private_network_id": request.private_network_id,
1181-
"service_ip": request.service_ip,
11821208
}
11831209

11841210

0 commit comments

Comments
 (0)