Skip to content

Commit 6a2a5d1

Browse files
scaleway-botscaleway-bot
authored
feat(instance): include SG in PrivateNics definition of Template (#1913)
1 parent dce9fef commit 6a2a5d1

8 files changed

Lines changed: 194 additions & 46 deletions

File tree

‎scaleway-async/scaleway_async/instance/v2alpha1/__init__.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
from .types import ServerTypeGpuInfo
3737
from .types import ServerTypeLimits
3838
from .types import ServerIP
39+
from .types import CreateTemplateRequestPrivateNetworkTemplate
3940
from .types import CreateTemplateRequestVolumeTemplate
4041
from .types import SecurityGroupRuleConfig
4142
from .types import SecurityGroup
@@ -53,6 +54,7 @@
5354
from .types import ServerRDPPassword
5455
from .types import ServerVolume
5556
from .types import UpdateServerRequestPublicNetworkInterface
57+
from .types import UpdateTemplateRequestUpdatePrivateNetworks
5658
from .types import UpdateTemplateRequestUpdateVolumes
5759
from .types import AddSecurityGroupRulesRequest
5860
from .types import AddSecurityGroupRulesResponse
@@ -165,6 +167,7 @@
165167
"ServerTypeGpuInfo",
166168
"ServerTypeLimits",
167169
"ServerIP",
170+
"CreateTemplateRequestPrivateNetworkTemplate",
168171
"CreateTemplateRequestVolumeTemplate",
169172
"SecurityGroupRuleConfig",
170173
"SecurityGroup",
@@ -182,6 +185,7 @@
182185
"ServerRDPPassword",
183186
"ServerVolume",
184187
"UpdateServerRequestPublicNetworkInterface",
188+
"UpdateTemplateRequestUpdatePrivateNetworks",
185189
"UpdateTemplateRequestUpdateVolumes",
186190
"AddSecurityGroupRulesRequest",
187191
"AddSecurityGroupRulesResponse",

‎scaleway-async/scaleway_async/instance/v2alpha1/api.py‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
CreateServerRequestPublicNetworkInterface,
4141
CreateServerRequestServerVolume,
4242
CreateTemplateRequest,
43+
CreateTemplateRequestPrivateNetworkTemplate,
4344
CreateTemplateRequestVolumeTemplate,
4445
DeleteSecurityGroupRulesRequest,
4546
DetachServerFileSystemRequest,
@@ -76,6 +77,7 @@
7677
UpdateServerRequest,
7778
UpdateServerRequestPublicNetworkInterface,
7879
UpdateTemplateRequest,
80+
UpdateTemplateRequestUpdatePrivateNetworks,
7981
UpdateTemplateRequestUpdateVolumes,
8082
UserData,
8183
)
@@ -2341,7 +2343,9 @@ async def create_template(
23412343
security_group_id: Optional[str] = None,
23422344
placement_group_id: Optional[str] = None,
23432345
volumes: Optional[list[CreateTemplateRequestVolumeTemplate]] = None,
2344-
private_network_ids: Optional[list[str]] = None,
2346+
private_networks: Optional[
2347+
list[CreateTemplateRequestPrivateNetworkTemplate]
2348+
] = None,
23452349
windows_rdp_ssh_key_id: Optional[str] = None,
23462350
filesystem_ids: Optional[list[str]] = None,
23472351
) -> Template:
@@ -2359,7 +2363,7 @@ async def create_template(
23592363
:param security_group_id:
23602364
:param placement_group_id:
23612365
:param volumes:
2362-
:param private_network_ids:
2366+
:param private_networks:
23632367
:param windows_rdp_ssh_key_id:
23642368
:param filesystem_ids:
23652369
:return: :class:`Template <Template>`
@@ -2393,7 +2397,7 @@ async def create_template(
23932397
security_group_id=security_group_id,
23942398
placement_group_id=placement_group_id,
23952399
volumes=volumes,
2396-
private_network_ids=private_network_ids,
2400+
private_networks=private_networks,
23972401
windows_rdp_ssh_key_id=windows_rdp_ssh_key_id,
23982402
filesystem_ids=filesystem_ids,
23992403
),
@@ -2448,7 +2452,9 @@ async def update_template(
24482452
security_group_id: Optional[str] = None,
24492453
placement_group_id: Optional[str] = None,
24502454
update_volumes: Optional[UpdateTemplateRequestUpdateVolumes] = None,
2451-
private_network_ids: Optional[list[str]] = None,
2455+
update_private_networks: Optional[
2456+
UpdateTemplateRequestUpdatePrivateNetworks
2457+
] = None,
24522458
public_ip_v4_count: Optional[int] = None,
24532459
public_ip_v6_count: Optional[int] = None,
24542460
windows_rdp_ssh_key_id: Optional[str] = None,
@@ -2466,7 +2472,7 @@ async def update_template(
24662472
:param security_group_id:
24672473
:param placement_group_id:
24682474
:param update_volumes:
2469-
:param private_network_ids:
2475+
:param update_private_networks:
24702476
:param public_ip_v4_count:
24712477
:param public_ip_v6_count:
24722478
:param windows_rdp_ssh_key_id:
@@ -2498,7 +2504,7 @@ async def update_template(
24982504
security_group_id=security_group_id,
24992505
placement_group_id=placement_group_id,
25002506
update_volumes=update_volumes,
2501-
private_network_ids=private_network_ids,
2507+
update_private_networks=update_private_networks,
25022508
public_ip_v4_count=public_ip_v4_count,
25032509
public_ip_v6_count=public_ip_v6_count,
25042510
windows_rdp_ssh_key_id=windows_rdp_ssh_key_id,

‎scaleway-async/scaleway_async/instance/v2alpha1/marshalling.py‎

Lines changed: 66 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
ServerRDPPassword,
3939
ServerVolume,
4040
Server,
41+
CreateTemplateRequestPrivateNetworkTemplate,
4142
CreateTemplateRequestVolumeTemplate,
4243
Template,
4344
UserData,
@@ -76,6 +77,7 @@
7677
UpdateSecurityGroupRuleRequest,
7778
UpdateServerRequestPublicNetworkInterface,
7879
UpdateServerRequest,
80+
UpdateTemplateRequestUpdatePrivateNetworks,
7981
UpdateTemplateRequestUpdateVolumes,
8082
UpdateTemplateRequest,
8183
)
@@ -1026,12 +1028,6 @@ def unmarshal_TemplateSummary(data: Any) -> TemplateSummary:
10261028
else:
10271029
args["public_ip_v6_count"] = None
10281030

1029-
field = data.get("private_network_ids", None)
1030-
if field is not None:
1031-
args["private_network_ids"] = field
1032-
else:
1033-
args["private_network_ids"] = None
1034-
10351031
field = data.get("filesystem_ids", None)
10361032
if field is not None:
10371033
args["filesystem_ids"] = field
@@ -1525,6 +1521,25 @@ def unmarshal_Server(data: Any) -> Server:
15251521
return Server(**args)
15261522

15271523

1524+
def unmarshal_CreateTemplateRequestPrivateNetworkTemplate(
1525+
data: Any,
1526+
) -> CreateTemplateRequestPrivateNetworkTemplate:
1527+
if not isinstance(data, dict):
1528+
raise TypeError(
1529+
"Unmarshalling the type 'CreateTemplateRequestPrivateNetworkTemplate' failed as data isn't a dictionary."
1530+
)
1531+
1532+
args: dict[str, Any] = {}
1533+
1534+
field = data.get("private_network_id", None)
1535+
if field is not None:
1536+
args["private_network_id"] = field
1537+
else:
1538+
args["private_network_id"] = None
1539+
1540+
return CreateTemplateRequestPrivateNetworkTemplate(**args)
1541+
1542+
15281543
def unmarshal_CreateTemplateRequestVolumeTemplate(
15291544
data: Any,
15301545
) -> CreateTemplateRequestVolumeTemplate:
@@ -1658,11 +1673,15 @@ def unmarshal_Template(data: Any) -> Template:
16581673
else:
16591674
args["volumes"] = None
16601675

1661-
field = data.get("private_network_ids", None)
1676+
field = data.get("private_networks", None)
16621677
if field is not None:
1663-
args["private_network_ids"] = field
1678+
args["private_networks"] = (
1679+
[unmarshal_CreateTemplateRequestPrivateNetworkTemplate(v) for v in field]
1680+
if field is not None
1681+
else None
1682+
)
16641683
else:
1665-
args["private_network_ids"] = None
1684+
args["private_networks"] = None
16661685

16671686
field = data.get("filesystem_ids", None)
16681687
if field is not None:
@@ -2110,6 +2129,18 @@ def marshal_CreateServerRequest(
21102129
return output
21112130

21122131

2132+
def marshal_CreateTemplateRequestPrivateNetworkTemplate(
2133+
request: CreateTemplateRequestPrivateNetworkTemplate,
2134+
defaults: ProfileDefaults,
2135+
) -> dict[str, Any]:
2136+
output: dict[str, Any] = {}
2137+
2138+
if request.private_network_id is not None:
2139+
output["private_network_id"] = request.private_network_id
2140+
2141+
return output
2142+
2143+
21132144
def marshal_CreateTemplateRequestVolumeTemplate(
21142145
request: CreateTemplateRequestVolumeTemplate,
21152146
defaults: ProfileDefaults,
@@ -2189,8 +2220,11 @@ def marshal_CreateTemplateRequest(
21892220
for item in request.volumes
21902221
]
21912222

2192-
if request.private_network_ids is not None:
2193-
output["private_network_ids"] = request.private_network_ids
2223+
if request.private_networks is not None:
2224+
output["private_networks"] = [
2225+
marshal_CreateTemplateRequestPrivateNetworkTemplate(item, defaults)
2226+
for item in request.private_networks
2227+
]
21942228

21952229
if request.windows_rdp_ssh_key_id is not None:
21962230
output["windows_rdp_ssh_key_id"] = request.windows_rdp_ssh_key_id
@@ -2551,6 +2585,21 @@ def marshal_UpdateServerRequest(
25512585
return output
25522586

25532587

2588+
def marshal_UpdateTemplateRequestUpdatePrivateNetworks(
2589+
request: UpdateTemplateRequestUpdatePrivateNetworks,
2590+
defaults: ProfileDefaults,
2591+
) -> dict[str, Any]:
2592+
output: dict[str, Any] = {}
2593+
2594+
if request.private_networks is not None:
2595+
output["private_networks"] = [
2596+
marshal_CreateTemplateRequestPrivateNetworkTemplate(item, defaults)
2597+
for item in request.private_networks
2598+
]
2599+
2600+
return output
2601+
2602+
25542603
def marshal_UpdateTemplateRequestUpdateVolumes(
25552604
request: UpdateTemplateRequestUpdateVolumes,
25562605
defaults: ProfileDefaults,
@@ -2595,8 +2644,12 @@ def marshal_UpdateTemplateRequest(
25952644
request.update_volumes, defaults
25962645
)
25972646

2598-
if request.private_network_ids is not None:
2599-
output["private_network_ids"] = request.private_network_ids
2647+
if request.update_private_networks is not None:
2648+
output["update_private_networks"] = (
2649+
marshal_UpdateTemplateRequestUpdatePrivateNetworks(
2650+
request.update_private_networks, defaults
2651+
)
2652+
)
26002653

26012654
if request.public_ip_v4_count is not None:
26022655
output["public_ip_v4_count"] = request.public_ip_v4_count

‎scaleway-async/scaleway_async/instance/v2alpha1/types.py‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,11 @@ class ServerIP:
309309
default: bool
310310

311311

312+
@dataclass
313+
class CreateTemplateRequestPrivateNetworkTemplate:
314+
private_network_id: str
315+
316+
312317
@dataclass
313318
class CreateTemplateRequestVolumeTemplate:
314319
volume_type: CreateServerRequestServerVolumeVolumeType
@@ -455,7 +460,6 @@ class TemplateSummary:
455460
server_type: str
456461
public_ip_v4_count: int
457462
public_ip_v6_count: int
458-
private_network_ids: list[str]
459463
filesystem_ids: list[str]
460464
zone: ScwZone
461465
"""
@@ -510,6 +514,11 @@ class UpdateServerRequestPublicNetworkInterface:
510514
security_group_id: Optional[str] = None
511515

512516

517+
@dataclass
518+
class UpdateTemplateRequestUpdatePrivateNetworks:
519+
private_networks: list[CreateTemplateRequestPrivateNetworkTemplate]
520+
521+
513522
@dataclass
514523
class UpdateTemplateRequestUpdateVolumes:
515524
volumes: list[CreateTemplateRequestVolumeTemplate]
@@ -682,7 +691,9 @@ class CreateTemplateRequest:
682691
volumes: Optional[list[CreateTemplateRequestVolumeTemplate]] = field(
683692
default_factory=list
684693
)
685-
private_network_ids: Optional[list[str]] = field(default_factory=list)
694+
private_networks: Optional[list[CreateTemplateRequestPrivateNetworkTemplate]] = (
695+
field(default_factory=list)
696+
)
686697
windows_rdp_ssh_key_id: Optional[str] = None
687698
filesystem_ids: Optional[list[str]] = field(default_factory=list)
688699

@@ -1264,7 +1275,7 @@ class Template:
12641275
public_ip_v4_count: int
12651276
public_ip_v6_count: int
12661277
volumes: list[CreateTemplateRequestVolumeTemplate]
1267-
private_network_ids: list[str]
1278+
private_networks: list[CreateTemplateRequestPrivateNetworkTemplate]
12681279
filesystem_ids: list[str]
12691280
zone: ScwZone
12701281
"""
@@ -1373,7 +1384,7 @@ class UpdateTemplateRequest:
13731384
security_group_id: Optional[str] = None
13741385
placement_group_id: Optional[str] = None
13751386
update_volumes: Optional[UpdateTemplateRequestUpdateVolumes] = None
1376-
private_network_ids: Optional[list[str]] = field(default_factory=list)
1387+
update_private_networks: Optional[UpdateTemplateRequestUpdatePrivateNetworks] = None
13771388
public_ip_v4_count: Optional[int] = None
13781389
public_ip_v6_count: Optional[int] = None
13791390
windows_rdp_ssh_key_id: Optional[str] = None

‎scaleway/scaleway/instance/v2alpha1/__init__.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
from .types import ServerTypeGpuInfo
3737
from .types import ServerTypeLimits
3838
from .types import ServerIP
39+
from .types import CreateTemplateRequestPrivateNetworkTemplate
3940
from .types import CreateTemplateRequestVolumeTemplate
4041
from .types import SecurityGroupRuleConfig
4142
from .types import SecurityGroup
@@ -53,6 +54,7 @@
5354
from .types import ServerRDPPassword
5455
from .types import ServerVolume
5556
from .types import UpdateServerRequestPublicNetworkInterface
57+
from .types import UpdateTemplateRequestUpdatePrivateNetworks
5658
from .types import UpdateTemplateRequestUpdateVolumes
5759
from .types import AddSecurityGroupRulesRequest
5860
from .types import AddSecurityGroupRulesResponse
@@ -165,6 +167,7 @@
165167
"ServerTypeGpuInfo",
166168
"ServerTypeLimits",
167169
"ServerIP",
170+
"CreateTemplateRequestPrivateNetworkTemplate",
168171
"CreateTemplateRequestVolumeTemplate",
169172
"SecurityGroupRuleConfig",
170173
"SecurityGroup",
@@ -182,6 +185,7 @@
182185
"ServerRDPPassword",
183186
"ServerVolume",
184187
"UpdateServerRequestPublicNetworkInterface",
188+
"UpdateTemplateRequestUpdatePrivateNetworks",
185189
"UpdateTemplateRequestUpdateVolumes",
186190
"AddSecurityGroupRulesRequest",
187191
"AddSecurityGroupRulesResponse",

0 commit comments

Comments
 (0)