Skip to content

Commit f96ca88

Browse files
scaleway-botscaleway-bot
authored
fix(compute): define reason field in maintenance (#27)
1 parent 8b72a64 commit f96ca88

File tree

4 files changed

+70
-464
lines changed

4 files changed

+70
-464
lines changed

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

Lines changed: 34 additions & 231 deletions
Original file line numberDiff line numberDiff line change
@@ -531,6 +531,9 @@ def unmarshal_ServerMaintenance(data: Any) -> ServerMaintenance:
531531

532532
args: Dict[str, Any] = {}
533533

534+
field = data.get("reason")
535+
args["reason"] = field
536+
534537
return ServerMaintenance(**args)
535538

536539

@@ -2170,7 +2173,9 @@ def marshal_ServerMaintenance(
21702173
request: ServerMaintenance,
21712174
defaults: ProfileDefaults,
21722175
) -> Dict[str, Any]:
2173-
return {}
2176+
return {
2177+
"reason": request.reason,
2178+
}
21742179

21752180

21762181
def marshal_SetSecurityGroupRulesRequestRule(
@@ -2222,20 +2227,6 @@ def marshal_VolumeTemplate(
22222227
defaults: ProfileDefaults,
22232228
) -> Dict[str, Any]:
22242229
return {
2225-
"id": request.id,
2226-
"name": request.name,
2227-
**resolve_one_of(
2228-
[
2229-
OneOfPossibility(
2230-
"project", request.project, defaults.default_project_id
2231-
),
2232-
OneOfPossibility(
2233-
"organization",
2234-
request.organization,
2235-
defaults.default_organization_id,
2236-
),
2237-
]
2238-
),
22392230
**resolve_one_of(
22402231
[
22412232
OneOfPossibility(
@@ -2248,6 +2239,8 @@ def marshal_VolumeTemplate(
22482239
),
22492240
]
22502241
),
2242+
"id": request.id,
2243+
"name": request.name,
22512244
"size": request.size,
22522245
"volume_type": VolumeVolumeType(request.volume_type),
22532246
}
@@ -2258,27 +2251,6 @@ def marshal_CreateImageRequest(
22582251
defaults: ProfileDefaults,
22592252
) -> Dict[str, Any]:
22602253
return {
2261-
"arch": Arch(request.arch) if request.arch is not None else None,
2262-
"default_bootscript": request.default_bootscript,
2263-
"extra_volumes": {
2264-
k: marshal_VolumeTemplate(v, defaults)
2265-
for k, v in request.extra_volumes.items()
2266-
}
2267-
if request.extra_volumes is not None
2268-
else None,
2269-
"name": request.name,
2270-
**resolve_one_of(
2271-
[
2272-
OneOfPossibility(
2273-
"project", request.project, defaults.default_project_id
2274-
),
2275-
OneOfPossibility(
2276-
"organization",
2277-
request.organization,
2278-
defaults.default_organization_id,
2279-
),
2280-
]
2281-
),
22822254
**resolve_one_of(
22832255
[
22842256
OneOfPossibility(
@@ -2291,6 +2263,15 @@ def marshal_CreateImageRequest(
22912263
),
22922264
]
22932265
),
2266+
"arch": Arch(request.arch) if request.arch is not None else None,
2267+
"default_bootscript": request.default_bootscript,
2268+
"extra_volumes": {
2269+
k: marshal_VolumeTemplate(v, defaults)
2270+
for k, v in request.extra_volumes.items()
2271+
}
2272+
if request.extra_volumes is not None
2273+
else None,
2274+
"name": request.name,
22942275
"public": request.public,
22952276
"root_volume": request.root_volume,
22962277
"tags": request.tags,
@@ -2302,18 +2283,6 @@ def marshal_CreateIpRequest(
23022283
defaults: ProfileDefaults,
23032284
) -> Dict[str, Any]:
23042285
return {
2305-
**resolve_one_of(
2306-
[
2307-
OneOfPossibility(
2308-
"project", request.project, defaults.default_project_id
2309-
),
2310-
OneOfPossibility(
2311-
"organization",
2312-
request.organization,
2313-
defaults.default_organization_id,
2314-
),
2315-
]
2316-
),
23172286
**resolve_one_of(
23182287
[
23192288
OneOfPossibility(
@@ -2336,7 +2305,6 @@ def marshal_CreatePlacementGroupRequest(
23362305
defaults: ProfileDefaults,
23372306
) -> Dict[str, Any]:
23382307
return {
2339-
"name": request.name,
23402308
**resolve_one_of(
23412309
[
23422310
OneOfPossibility(
@@ -2349,20 +2317,9 @@ def marshal_CreatePlacementGroupRequest(
23492317
),
23502318
]
23512319
),
2320+
"name": request.name,
23522321
"policy_mode": PlacementGroupPolicyMode(request.policy_mode),
23532322
"policy_type": PlacementGroupPolicyType(request.policy_type),
2354-
**resolve_one_of(
2355-
[
2356-
OneOfPossibility(
2357-
"project", request.project, defaults.default_project_id
2358-
),
2359-
OneOfPossibility(
2360-
"organization",
2361-
request.organization,
2362-
defaults.default_organization_id,
2363-
),
2364-
]
2365-
),
23662323
"tags": request.tags,
23672324
}
23682325

@@ -2381,28 +2338,6 @@ def marshal_CreateSecurityGroupRequest(
23812338
defaults: ProfileDefaults,
23822339
) -> Dict[str, Any]:
23832340
return {
2384-
"description": request.description,
2385-
"enable_default_security": request.enable_default_security,
2386-
"inbound_default_policy": SecurityGroupPolicy(request.inbound_default_policy),
2387-
"name": request.name,
2388-
**resolve_one_of(
2389-
[
2390-
OneOfPossibility("organization_default", request.organization_default),
2391-
OneOfPossibility("project_default", request.project_default),
2392-
]
2393-
),
2394-
**resolve_one_of(
2395-
[
2396-
OneOfPossibility(
2397-
"project", request.project, defaults.default_project_id
2398-
),
2399-
OneOfPossibility(
2400-
"organization",
2401-
request.organization,
2402-
defaults.default_organization_id,
2403-
),
2404-
]
2405-
),
24062341
**resolve_one_of(
24072342
[
24082343
OneOfPossibility("organization_default", request.organization_default),
@@ -2421,43 +2356,11 @@ def marshal_CreateSecurityGroupRequest(
24212356
),
24222357
]
24232358
),
2359+
"description": request.description,
2360+
"enable_default_security": request.enable_default_security,
2361+
"inbound_default_policy": SecurityGroupPolicy(request.inbound_default_policy),
2362+
"name": request.name,
24242363
"outbound_default_policy": SecurityGroupPolicy(request.outbound_default_policy),
2425-
**resolve_one_of(
2426-
[
2427-
OneOfPossibility("organization_default", request.organization_default),
2428-
OneOfPossibility("project_default", request.project_default),
2429-
]
2430-
),
2431-
**resolve_one_of(
2432-
[
2433-
OneOfPossibility(
2434-
"project", request.project, defaults.default_project_id
2435-
),
2436-
OneOfPossibility(
2437-
"organization",
2438-
request.organization,
2439-
defaults.default_organization_id,
2440-
),
2441-
]
2442-
),
2443-
**resolve_one_of(
2444-
[
2445-
OneOfPossibility("organization_default", request.organization_default),
2446-
OneOfPossibility("project_default", request.project_default),
2447-
]
2448-
),
2449-
**resolve_one_of(
2450-
[
2451-
OneOfPossibility(
2452-
"project", request.project, defaults.default_project_id
2453-
),
2454-
OneOfPossibility(
2455-
"organization",
2456-
request.organization,
2457-
defaults.default_organization_id,
2458-
),
2459-
]
2460-
),
24612364
"stateful": request.stateful,
24622365
"tags": request.tags,
24632366
}
@@ -2490,21 +2393,6 @@ def marshal_CreateSnapshotRequest(
24902393
defaults: ProfileDefaults,
24912394
) -> Dict[str, Any]:
24922395
return {
2493-
"bucket": request.bucket,
2494-
"key": request.key,
2495-
"name": request.name,
2496-
**resolve_one_of(
2497-
[
2498-
OneOfPossibility(
2499-
"project", request.project, defaults.default_project_id
2500-
),
2501-
OneOfPossibility(
2502-
"organization",
2503-
request.organization,
2504-
defaults.default_organization_id,
2505-
),
2506-
]
2507-
),
25082396
**resolve_one_of(
25092397
[
25102398
OneOfPossibility(
@@ -2517,6 +2405,9 @@ def marshal_CreateSnapshotRequest(
25172405
),
25182406
]
25192407
),
2408+
"bucket": request.bucket,
2409+
"key": request.key,
2410+
"name": request.name,
25202411
"size": request.size,
25212412
"tags": request.tags,
25222413
"volume_id": request.volume_id,
@@ -2529,25 +2420,6 @@ def marshal_CreateVolumeRequest(
25292420
defaults: ProfileDefaults,
25302421
) -> Dict[str, Any]:
25312422
return {
2532-
**resolve_one_of(
2533-
[
2534-
OneOfPossibility(
2535-
"project", request.project, defaults.default_project_id
2536-
),
2537-
OneOfPossibility(
2538-
"organization",
2539-
request.organization,
2540-
defaults.default_organization_id,
2541-
),
2542-
]
2543-
),
2544-
**resolve_one_of(
2545-
[
2546-
OneOfPossibility("size", request.size),
2547-
OneOfPossibility("base_volume", request.base_volume),
2548-
OneOfPossibility("base_snapshot", request.base_snapshot),
2549-
]
2550-
),
25512423
**resolve_one_of(
25522424
[
25532425
OneOfPossibility(
@@ -2568,63 +2440,6 @@ def marshal_CreateVolumeRequest(
25682440
]
25692441
),
25702442
"name": request.name,
2571-
**resolve_one_of(
2572-
[
2573-
OneOfPossibility(
2574-
"project", request.project, defaults.default_project_id
2575-
),
2576-
OneOfPossibility(
2577-
"organization",
2578-
request.organization,
2579-
defaults.default_organization_id,
2580-
),
2581-
]
2582-
),
2583-
**resolve_one_of(
2584-
[
2585-
OneOfPossibility("size", request.size),
2586-
OneOfPossibility("base_volume", request.base_volume),
2587-
OneOfPossibility("base_snapshot", request.base_snapshot),
2588-
]
2589-
),
2590-
**resolve_one_of(
2591-
[
2592-
OneOfPossibility(
2593-
"project", request.project, defaults.default_project_id
2594-
),
2595-
OneOfPossibility(
2596-
"organization",
2597-
request.organization,
2598-
defaults.default_organization_id,
2599-
),
2600-
]
2601-
),
2602-
**resolve_one_of(
2603-
[
2604-
OneOfPossibility("size", request.size),
2605-
OneOfPossibility("base_volume", request.base_volume),
2606-
OneOfPossibility("base_snapshot", request.base_snapshot),
2607-
]
2608-
),
2609-
**resolve_one_of(
2610-
[
2611-
OneOfPossibility(
2612-
"project", request.project, defaults.default_project_id
2613-
),
2614-
OneOfPossibility(
2615-
"organization",
2616-
request.organization,
2617-
defaults.default_organization_id,
2618-
),
2619-
]
2620-
),
2621-
**resolve_one_of(
2622-
[
2623-
OneOfPossibility("size", request.size),
2624-
OneOfPossibility("base_volume", request.base_volume),
2625-
OneOfPossibility("base_snapshot", request.base_snapshot),
2626-
]
2627-
),
26282443
"tags": request.tags,
26292444
"volume_type": VolumeVolumeType(request.volume_type),
26302445
}
@@ -2744,15 +2559,6 @@ def marshal__CreateServerRequest(
27442559
defaults: ProfileDefaults,
27452560
) -> Dict[str, Any]:
27462561
return {
2747-
"boot_type": BootType(request.boot_type)
2748-
if request.boot_type is not None
2749-
else None,
2750-
"bootscript": request.bootscript,
2751-
"commercial_type": request.commercial_type,
2752-
"dynamic_ip_required": request.dynamic_ip_required,
2753-
"enable_ipv6": request.enable_ipv6,
2754-
"image": request.image,
2755-
"name": request.name,
27562562
**resolve_one_of(
27572563
[
27582564
OneOfPossibility(
@@ -2765,19 +2571,16 @@ def marshal__CreateServerRequest(
27652571
),
27662572
]
27672573
),
2574+
"boot_type": BootType(request.boot_type)
2575+
if request.boot_type is not None
2576+
else None,
2577+
"bootscript": request.bootscript,
2578+
"commercial_type": request.commercial_type,
2579+
"dynamic_ip_required": request.dynamic_ip_required,
2580+
"enable_ipv6": request.enable_ipv6,
2581+
"image": request.image,
2582+
"name": request.name,
27682583
"placement_group": request.placement_group,
2769-
**resolve_one_of(
2770-
[
2771-
OneOfPossibility(
2772-
"project", request.project, defaults.default_project_id
2773-
),
2774-
OneOfPossibility(
2775-
"organization",
2776-
request.organization,
2777-
defaults.default_organization_id,
2778-
),
2779-
]
2780-
),
27812584
"public_ip": request.public_ip,
27822585
"security_group": request.security_group,
27832586
"tags": request.tags,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1154,7 +1154,7 @@ class ServerLocation:
11541154

11551155
@dataclass
11561156
class ServerMaintenance:
1157-
pass
1157+
reason: str
11581158

11591159

11601160
@dataclass

0 commit comments

Comments
 (0)