Skip to content

fix(compute): define reason field in maintenance #27

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
Jan 20, 2023
Merged

fix(compute): define reason field in maintenance #27

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
265 changes: 34 additions & 231 deletions scaleway-async/scaleway_async/instance/v1/marshalling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,9 @@ def unmarshal_ServerMaintenance(data: Any) -> ServerMaintenance:

args: Dict[str, Any] = {}

field = data.get("reason")
args["reason"] = field

return ServerMaintenance(**args)


Expand Down Expand Up @@ -2170,7 +2173,9 @@ def marshal_ServerMaintenance(
request: ServerMaintenance,
defaults: ProfileDefaults,
) -> Dict[str, Any]:
return {}
return {
"reason": request.reason,
}


def marshal_SetSecurityGroupRulesRequestRule(
Expand Down Expand Up @@ -2222,20 +2227,6 @@ def marshal_VolumeTemplate(
defaults: ProfileDefaults,
) -> Dict[str, Any]:
return {
"id": request.id,
"name": request.name,
**resolve_one_of(
[
OneOfPossibility(
"project", request.project, defaults.default_project_id
),
OneOfPossibility(
"organization",
request.organization,
defaults.default_organization_id,
),
]
),
**resolve_one_of(
[
OneOfPossibility(
Expand All @@ -2248,6 +2239,8 @@ def marshal_VolumeTemplate(
),
]
),
"id": request.id,
"name": request.name,
"size": request.size,
"volume_type": VolumeVolumeType(request.volume_type),
}
Expand All @@ -2258,27 +2251,6 @@ def marshal_CreateImageRequest(
defaults: ProfileDefaults,
) -> Dict[str, Any]:
return {
"arch": Arch(request.arch) if request.arch is not None else None,
"default_bootscript": request.default_bootscript,
"extra_volumes": {
k: marshal_VolumeTemplate(v, defaults)
for k, v in request.extra_volumes.items()
}
if request.extra_volumes is not None
else None,
"name": request.name,
**resolve_one_of(
[
OneOfPossibility(
"project", request.project, defaults.default_project_id
),
OneOfPossibility(
"organization",
request.organization,
defaults.default_organization_id,
),
]
),
**resolve_one_of(
[
OneOfPossibility(
Expand All @@ -2291,6 +2263,15 @@ def marshal_CreateImageRequest(
),
]
),
"arch": Arch(request.arch) if request.arch is not None else None,
"default_bootscript": request.default_bootscript,
"extra_volumes": {
k: marshal_VolumeTemplate(v, defaults)
for k, v in request.extra_volumes.items()
}
if request.extra_volumes is not None
else None,
"name": request.name,
"public": request.public,
"root_volume": request.root_volume,
"tags": request.tags,
Expand All @@ -2302,18 +2283,6 @@ def marshal_CreateIpRequest(
defaults: ProfileDefaults,
) -> Dict[str, Any]:
return {
**resolve_one_of(
[
OneOfPossibility(
"project", request.project, defaults.default_project_id
),
OneOfPossibility(
"organization",
request.organization,
defaults.default_organization_id,
),
]
),
**resolve_one_of(
[
OneOfPossibility(
Expand All @@ -2336,7 +2305,6 @@ def marshal_CreatePlacementGroupRequest(
defaults: ProfileDefaults,
) -> Dict[str, Any]:
return {
"name": request.name,
**resolve_one_of(
[
OneOfPossibility(
Expand All @@ -2349,20 +2317,9 @@ def marshal_CreatePlacementGroupRequest(
),
]
),
"name": request.name,
"policy_mode": PlacementGroupPolicyMode(request.policy_mode),
"policy_type": PlacementGroupPolicyType(request.policy_type),
**resolve_one_of(
[
OneOfPossibility(
"project", request.project, defaults.default_project_id
),
OneOfPossibility(
"organization",
request.organization,
defaults.default_organization_id,
),
]
),
"tags": request.tags,
}

Expand All @@ -2381,28 +2338,6 @@ def marshal_CreateSecurityGroupRequest(
defaults: ProfileDefaults,
) -> Dict[str, Any]:
return {
"description": request.description,
"enable_default_security": request.enable_default_security,
"inbound_default_policy": SecurityGroupPolicy(request.inbound_default_policy),
"name": request.name,
**resolve_one_of(
[
OneOfPossibility("organization_default", request.organization_default),
OneOfPossibility("project_default", request.project_default),
]
),
**resolve_one_of(
[
OneOfPossibility(
"project", request.project, defaults.default_project_id
),
OneOfPossibility(
"organization",
request.organization,
defaults.default_organization_id,
),
]
),
**resolve_one_of(
[
OneOfPossibility("organization_default", request.organization_default),
Expand All @@ -2421,43 +2356,11 @@ def marshal_CreateSecurityGroupRequest(
),
]
),
"description": request.description,
"enable_default_security": request.enable_default_security,
"inbound_default_policy": SecurityGroupPolicy(request.inbound_default_policy),
"name": request.name,
"outbound_default_policy": SecurityGroupPolicy(request.outbound_default_policy),
**resolve_one_of(
[
OneOfPossibility("organization_default", request.organization_default),
OneOfPossibility("project_default", request.project_default),
]
),
**resolve_one_of(
[
OneOfPossibility(
"project", request.project, defaults.default_project_id
),
OneOfPossibility(
"organization",
request.organization,
defaults.default_organization_id,
),
]
),
**resolve_one_of(
[
OneOfPossibility("organization_default", request.organization_default),
OneOfPossibility("project_default", request.project_default),
]
),
**resolve_one_of(
[
OneOfPossibility(
"project", request.project, defaults.default_project_id
),
OneOfPossibility(
"organization",
request.organization,
defaults.default_organization_id,
),
]
),
"stateful": request.stateful,
"tags": request.tags,
}
Expand Down Expand Up @@ -2490,21 +2393,6 @@ def marshal_CreateSnapshotRequest(
defaults: ProfileDefaults,
) -> Dict[str, Any]:
return {
"bucket": request.bucket,
"key": request.key,
"name": request.name,
**resolve_one_of(
[
OneOfPossibility(
"project", request.project, defaults.default_project_id
),
OneOfPossibility(
"organization",
request.organization,
defaults.default_organization_id,
),
]
),
**resolve_one_of(
[
OneOfPossibility(
Expand All @@ -2517,6 +2405,9 @@ def marshal_CreateSnapshotRequest(
),
]
),
"bucket": request.bucket,
"key": request.key,
"name": request.name,
"size": request.size,
"tags": request.tags,
"volume_id": request.volume_id,
Expand All @@ -2529,25 +2420,6 @@ def marshal_CreateVolumeRequest(
defaults: ProfileDefaults,
) -> Dict[str, Any]:
return {
**resolve_one_of(
[
OneOfPossibility(
"project", request.project, defaults.default_project_id
),
OneOfPossibility(
"organization",
request.organization,
defaults.default_organization_id,
),
]
),
**resolve_one_of(
[
OneOfPossibility("size", request.size),
OneOfPossibility("base_volume", request.base_volume),
OneOfPossibility("base_snapshot", request.base_snapshot),
]
),
**resolve_one_of(
[
OneOfPossibility(
Expand All @@ -2568,63 +2440,6 @@ def marshal_CreateVolumeRequest(
]
),
"name": request.name,
**resolve_one_of(
[
OneOfPossibility(
"project", request.project, defaults.default_project_id
),
OneOfPossibility(
"organization",
request.organization,
defaults.default_organization_id,
),
]
),
**resolve_one_of(
[
OneOfPossibility("size", request.size),
OneOfPossibility("base_volume", request.base_volume),
OneOfPossibility("base_snapshot", request.base_snapshot),
]
),
**resolve_one_of(
[
OneOfPossibility(
"project", request.project, defaults.default_project_id
),
OneOfPossibility(
"organization",
request.organization,
defaults.default_organization_id,
),
]
),
**resolve_one_of(
[
OneOfPossibility("size", request.size),
OneOfPossibility("base_volume", request.base_volume),
OneOfPossibility("base_snapshot", request.base_snapshot),
]
),
**resolve_one_of(
[
OneOfPossibility(
"project", request.project, defaults.default_project_id
),
OneOfPossibility(
"organization",
request.organization,
defaults.default_organization_id,
),
]
),
**resolve_one_of(
[
OneOfPossibility("size", request.size),
OneOfPossibility("base_volume", request.base_volume),
OneOfPossibility("base_snapshot", request.base_snapshot),
]
),
"tags": request.tags,
"volume_type": VolumeVolumeType(request.volume_type),
}
Expand Down Expand Up @@ -2744,15 +2559,6 @@ def marshal__CreateServerRequest(
defaults: ProfileDefaults,
) -> Dict[str, Any]:
return {
"boot_type": BootType(request.boot_type)
if request.boot_type is not None
else None,
"bootscript": request.bootscript,
"commercial_type": request.commercial_type,
"dynamic_ip_required": request.dynamic_ip_required,
"enable_ipv6": request.enable_ipv6,
"image": request.image,
"name": request.name,
**resolve_one_of(
[
OneOfPossibility(
Expand All @@ -2765,19 +2571,16 @@ def marshal__CreateServerRequest(
),
]
),
"boot_type": BootType(request.boot_type)
if request.boot_type is not None
else None,
"bootscript": request.bootscript,
"commercial_type": request.commercial_type,
"dynamic_ip_required": request.dynamic_ip_required,
"enable_ipv6": request.enable_ipv6,
"image": request.image,
"name": request.name,
"placement_group": request.placement_group,
**resolve_one_of(
[
OneOfPossibility(
"project", request.project, defaults.default_project_id
),
OneOfPossibility(
"organization",
request.organization,
defaults.default_organization_id,
),
]
),
"public_ip": request.public_ip,
"security_group": request.security_group,
"tags": request.tags,
Expand Down
2 changes: 1 addition & 1 deletion scaleway-async/scaleway_async/instance/v1/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1154,7 +1154,7 @@ class ServerLocation:

@dataclass
class ServerMaintenance:
pass
reason: str


@dataclass
Expand Down
Loading