From 8a6dcd31e1a042a0b793587b293a0ff477e7c3c4 Mon Sep 17 00:00:00 2001 From: Laure-di Date: Thu, 10 Oct 2024 16:31:41 +0200 Subject: [PATCH 1/3] feat(baremetal): add GetDefaultPartitioningRequest --- .../baremetal/v1/marshalling.py | 146 ++++++++++++++++-- scaleway/scaleway/baremetal/v1/marshalling.py | 146 ++++++++++++++++-- 2 files changed, 260 insertions(+), 32 deletions(-) diff --git a/scaleway-async/scaleway_async/baremetal/v1/marshalling.py b/scaleway-async/scaleway_async/baremetal/v1/marshalling.py index eaa3227f0..aaf966083 100644 --- a/scaleway-async/scaleway_async/baremetal/v1/marshalling.py +++ b/scaleway-async/scaleway_async/baremetal/v1/marshalling.py @@ -894,12 +894,6 @@ def unmarshal_ServerInstall(data: Any) -> ServerInstall: if field is not None: args["service_url"] = field - field = data.get("partitioning_schema", None) - if field is not None: - args["partitioning_schema"] = unmarshal_Schema(field) - else: - args["partitioning_schema"] = None - return ServerInstall(**args) @@ -1525,11 +1519,6 @@ def marshal_CreateServerRequestInstall( if request.service_password is not None: output["service_password"] = request.service_password - if request.partitioning_schema is not None: - output["partitioning_schema"] = marshal_Schema( - request.partitioning_schema, defaults - ) - return output @@ -1603,11 +1592,6 @@ def marshal_InstallServerRequest( if request.service_password is not None: output["service_password"] = request.service_password - if request.partitioning_schema is not None: - output["partitioning_schema"] = marshal_Schema( - request.partitioning_schema, defaults - ) - return output @@ -1713,6 +1697,136 @@ def marshal_UpdateSettingRequest( return output +def marshal_SchemaPartition( + request: SchemaPartition, + defaults: ProfileDefaults, +) -> Dict[str, Any]: + output: Dict[str, Any] = {} + + if request.label is not None: + output["label"] = str(request.label) + + if request.number is not None: + output["number"] = request.number + + if request.size is not None: + output["size"] = request.size + + return output + + +def marshal_SchemaPool( + request: SchemaPool, + defaults: ProfileDefaults, +) -> Dict[str, Any]: + output: Dict[str, Any] = {} + + if request.name is not None: + output["name"] = request.name + + if request.type_ is not None: + output["type"] = str(request.type_) + + if request.devices is not None: + output["devices"] = request.devices + + if request.options is not None: + output["options"] = request.options + + if request.filesystem_options is not None: + output["filesystem_options"] = request.filesystem_options + + return output + + +def marshal_SchemaDisk( + request: SchemaDisk, + defaults: ProfileDefaults, +) -> Dict[str, Any]: + output: Dict[str, Any] = {} + + if request.device is not None: + output["device"] = request.device + + if request.partitions is not None: + output["partitions"] = [ + marshal_SchemaPartition(item, defaults) for item in request.partitions + ] + + return output + + +def marshal_SchemaFilesystem( + request: SchemaFilesystem, + defaults: ProfileDefaults, +) -> Dict[str, Any]: + output: Dict[str, Any] = {} + + if request.device is not None: + output["device"] = request.device + + if request.format is not None: + output["format"] = str(request.format) + + if request.mountpoint is not None: + output["mountpoint"] = request.mountpoint + + return output + + +def marshal_SchemaRAID( + request: SchemaRAID, + defaults: ProfileDefaults, +) -> Dict[str, Any]: + output: Dict[str, Any] = {} + + if request.name is not None: + output["name"] = request.name + + if request.level is not None: + output["level"] = str(request.level) + + if request.devices is not None: + output["devices"] = request.devices + + return output + + +def marshal_SchemaZFS( + request: SchemaZFS, + defaults: ProfileDefaults, +) -> Dict[str, Any]: + output: Dict[str, Any] = {} + + if request.pools is not None: + output["pools"] = [marshal_SchemaPool(item, defaults) for item in request.pools] + + return output + + +def marshal_Schema( + request: Schema, + defaults: ProfileDefaults, +) -> Dict[str, Any]: + output: Dict[str, Any] = {} + + if request.disks is not None: + output["disks"] = [marshal_SchemaDisk(item, defaults) for item in request.disks] + + if request.raids is not None: + output["raids"] = [marshal_SchemaRAID(item, defaults) for item in request.raids] + + if request.filesystems is not None: + output["filesystems"] = [ + marshal_SchemaFilesystem(item, defaults) for item in request.filesystems + ] + + if request.zfs is not None: + output["zfs"] = marshal_SchemaZFS(request.zfs, defaults) + + return output + + def marshal_ValidatePartitioningSchemaRequest( request: ValidatePartitioningSchemaRequest, defaults: ProfileDefaults, diff --git a/scaleway/scaleway/baremetal/v1/marshalling.py b/scaleway/scaleway/baremetal/v1/marshalling.py index eaa3227f0..aaf966083 100644 --- a/scaleway/scaleway/baremetal/v1/marshalling.py +++ b/scaleway/scaleway/baremetal/v1/marshalling.py @@ -894,12 +894,6 @@ def unmarshal_ServerInstall(data: Any) -> ServerInstall: if field is not None: args["service_url"] = field - field = data.get("partitioning_schema", None) - if field is not None: - args["partitioning_schema"] = unmarshal_Schema(field) - else: - args["partitioning_schema"] = None - return ServerInstall(**args) @@ -1525,11 +1519,6 @@ def marshal_CreateServerRequestInstall( if request.service_password is not None: output["service_password"] = request.service_password - if request.partitioning_schema is not None: - output["partitioning_schema"] = marshal_Schema( - request.partitioning_schema, defaults - ) - return output @@ -1603,11 +1592,6 @@ def marshal_InstallServerRequest( if request.service_password is not None: output["service_password"] = request.service_password - if request.partitioning_schema is not None: - output["partitioning_schema"] = marshal_Schema( - request.partitioning_schema, defaults - ) - return output @@ -1713,6 +1697,136 @@ def marshal_UpdateSettingRequest( return output +def marshal_SchemaPartition( + request: SchemaPartition, + defaults: ProfileDefaults, +) -> Dict[str, Any]: + output: Dict[str, Any] = {} + + if request.label is not None: + output["label"] = str(request.label) + + if request.number is not None: + output["number"] = request.number + + if request.size is not None: + output["size"] = request.size + + return output + + +def marshal_SchemaPool( + request: SchemaPool, + defaults: ProfileDefaults, +) -> Dict[str, Any]: + output: Dict[str, Any] = {} + + if request.name is not None: + output["name"] = request.name + + if request.type_ is not None: + output["type"] = str(request.type_) + + if request.devices is not None: + output["devices"] = request.devices + + if request.options is not None: + output["options"] = request.options + + if request.filesystem_options is not None: + output["filesystem_options"] = request.filesystem_options + + return output + + +def marshal_SchemaDisk( + request: SchemaDisk, + defaults: ProfileDefaults, +) -> Dict[str, Any]: + output: Dict[str, Any] = {} + + if request.device is not None: + output["device"] = request.device + + if request.partitions is not None: + output["partitions"] = [ + marshal_SchemaPartition(item, defaults) for item in request.partitions + ] + + return output + + +def marshal_SchemaFilesystem( + request: SchemaFilesystem, + defaults: ProfileDefaults, +) -> Dict[str, Any]: + output: Dict[str, Any] = {} + + if request.device is not None: + output["device"] = request.device + + if request.format is not None: + output["format"] = str(request.format) + + if request.mountpoint is not None: + output["mountpoint"] = request.mountpoint + + return output + + +def marshal_SchemaRAID( + request: SchemaRAID, + defaults: ProfileDefaults, +) -> Dict[str, Any]: + output: Dict[str, Any] = {} + + if request.name is not None: + output["name"] = request.name + + if request.level is not None: + output["level"] = str(request.level) + + if request.devices is not None: + output["devices"] = request.devices + + return output + + +def marshal_SchemaZFS( + request: SchemaZFS, + defaults: ProfileDefaults, +) -> Dict[str, Any]: + output: Dict[str, Any] = {} + + if request.pools is not None: + output["pools"] = [marshal_SchemaPool(item, defaults) for item in request.pools] + + return output + + +def marshal_Schema( + request: Schema, + defaults: ProfileDefaults, +) -> Dict[str, Any]: + output: Dict[str, Any] = {} + + if request.disks is not None: + output["disks"] = [marshal_SchemaDisk(item, defaults) for item in request.disks] + + if request.raids is not None: + output["raids"] = [marshal_SchemaRAID(item, defaults) for item in request.raids] + + if request.filesystems is not None: + output["filesystems"] = [ + marshal_SchemaFilesystem(item, defaults) for item in request.filesystems + ] + + if request.zfs is not None: + output["zfs"] = marshal_SchemaZFS(request.zfs, defaults) + + return output + + def marshal_ValidatePartitioningSchemaRequest( request: ValidatePartitioningSchemaRequest, defaults: ProfileDefaults, From 250301a5f53478b2b78cf77f86a3f39531f6383e Mon Sep 17 00:00:00 2001 From: Laure-di Date: Thu, 10 Oct 2024 17:18:50 +0200 Subject: [PATCH 2/3] fix ruff --- .../baremetal/v1/marshalling.py | 131 --------------- scaleway/scaleway/baremetal/v1/marshalling.py | 159 ------------------ 2 files changed, 290 deletions(-) diff --git a/scaleway-async/scaleway_async/baremetal/v1/marshalling.py b/scaleway-async/scaleway_async/baremetal/v1/marshalling.py index aaf966083..538d56083 100644 --- a/scaleway-async/scaleway_async/baremetal/v1/marshalling.py +++ b/scaleway-async/scaleway_async/baremetal/v1/marshalling.py @@ -1696,137 +1696,6 @@ def marshal_UpdateSettingRequest( return output - -def marshal_SchemaPartition( - request: SchemaPartition, - defaults: ProfileDefaults, -) -> Dict[str, Any]: - output: Dict[str, Any] = {} - - if request.label is not None: - output["label"] = str(request.label) - - if request.number is not None: - output["number"] = request.number - - if request.size is not None: - output["size"] = request.size - - return output - - -def marshal_SchemaPool( - request: SchemaPool, - defaults: ProfileDefaults, -) -> Dict[str, Any]: - output: Dict[str, Any] = {} - - if request.name is not None: - output["name"] = request.name - - if request.type_ is not None: - output["type"] = str(request.type_) - - if request.devices is not None: - output["devices"] = request.devices - - if request.options is not None: - output["options"] = request.options - - if request.filesystem_options is not None: - output["filesystem_options"] = request.filesystem_options - - return output - - -def marshal_SchemaDisk( - request: SchemaDisk, - defaults: ProfileDefaults, -) -> Dict[str, Any]: - output: Dict[str, Any] = {} - - if request.device is not None: - output["device"] = request.device - - if request.partitions is not None: - output["partitions"] = [ - marshal_SchemaPartition(item, defaults) for item in request.partitions - ] - - return output - - -def marshal_SchemaFilesystem( - request: SchemaFilesystem, - defaults: ProfileDefaults, -) -> Dict[str, Any]: - output: Dict[str, Any] = {} - - if request.device is not None: - output["device"] = request.device - - if request.format is not None: - output["format"] = str(request.format) - - if request.mountpoint is not None: - output["mountpoint"] = request.mountpoint - - return output - - -def marshal_SchemaRAID( - request: SchemaRAID, - defaults: ProfileDefaults, -) -> Dict[str, Any]: - output: Dict[str, Any] = {} - - if request.name is not None: - output["name"] = request.name - - if request.level is not None: - output["level"] = str(request.level) - - if request.devices is not None: - output["devices"] = request.devices - - return output - - -def marshal_SchemaZFS( - request: SchemaZFS, - defaults: ProfileDefaults, -) -> Dict[str, Any]: - output: Dict[str, Any] = {} - - if request.pools is not None: - output["pools"] = [marshal_SchemaPool(item, defaults) for item in request.pools] - - return output - - -def marshal_Schema( - request: Schema, - defaults: ProfileDefaults, -) -> Dict[str, Any]: - output: Dict[str, Any] = {} - - if request.disks is not None: - output["disks"] = [marshal_SchemaDisk(item, defaults) for item in request.disks] - - if request.raids is not None: - output["raids"] = [marshal_SchemaRAID(item, defaults) for item in request.raids] - - if request.filesystems is not None: - output["filesystems"] = [ - marshal_SchemaFilesystem(item, defaults) for item in request.filesystems - ] - - if request.zfs is not None: - output["zfs"] = marshal_SchemaZFS(request.zfs, defaults) - - return output - - def marshal_ValidatePartitioningSchemaRequest( request: ValidatePartitioningSchemaRequest, defaults: ProfileDefaults, diff --git a/scaleway/scaleway/baremetal/v1/marshalling.py b/scaleway/scaleway/baremetal/v1/marshalling.py index aaf966083..f5ad354c5 100644 --- a/scaleway/scaleway/baremetal/v1/marshalling.py +++ b/scaleway/scaleway/baremetal/v1/marshalling.py @@ -1468,30 +1468,6 @@ def marshal_SchemaZFS( return output - -def marshal_Schema( - request: Schema, - defaults: ProfileDefaults, -) -> Dict[str, Any]: - output: Dict[str, Any] = {} - - if request.disks is not None: - output["disks"] = [marshal_SchemaDisk(item, defaults) for item in request.disks] - - if request.raids is not None: - output["raids"] = [marshal_SchemaRAID(item, defaults) for item in request.raids] - - if request.filesystems is not None: - output["filesystems"] = [ - marshal_SchemaFilesystem(item, defaults) for item in request.filesystems - ] - - if request.zfs is not None: - output["zfs"] = marshal_SchemaZFS(request.zfs, defaults) - - return output - - def marshal_CreateServerRequestInstall( request: CreateServerRequestInstall, defaults: ProfileDefaults, @@ -1697,136 +1673,6 @@ def marshal_UpdateSettingRequest( return output -def marshal_SchemaPartition( - request: SchemaPartition, - defaults: ProfileDefaults, -) -> Dict[str, Any]: - output: Dict[str, Any] = {} - - if request.label is not None: - output["label"] = str(request.label) - - if request.number is not None: - output["number"] = request.number - - if request.size is not None: - output["size"] = request.size - - return output - - -def marshal_SchemaPool( - request: SchemaPool, - defaults: ProfileDefaults, -) -> Dict[str, Any]: - output: Dict[str, Any] = {} - - if request.name is not None: - output["name"] = request.name - - if request.type_ is not None: - output["type"] = str(request.type_) - - if request.devices is not None: - output["devices"] = request.devices - - if request.options is not None: - output["options"] = request.options - - if request.filesystem_options is not None: - output["filesystem_options"] = request.filesystem_options - - return output - - -def marshal_SchemaDisk( - request: SchemaDisk, - defaults: ProfileDefaults, -) -> Dict[str, Any]: - output: Dict[str, Any] = {} - - if request.device is not None: - output["device"] = request.device - - if request.partitions is not None: - output["partitions"] = [ - marshal_SchemaPartition(item, defaults) for item in request.partitions - ] - - return output - - -def marshal_SchemaFilesystem( - request: SchemaFilesystem, - defaults: ProfileDefaults, -) -> Dict[str, Any]: - output: Dict[str, Any] = {} - - if request.device is not None: - output["device"] = request.device - - if request.format is not None: - output["format"] = str(request.format) - - if request.mountpoint is not None: - output["mountpoint"] = request.mountpoint - - return output - - -def marshal_SchemaRAID( - request: SchemaRAID, - defaults: ProfileDefaults, -) -> Dict[str, Any]: - output: Dict[str, Any] = {} - - if request.name is not None: - output["name"] = request.name - - if request.level is not None: - output["level"] = str(request.level) - - if request.devices is not None: - output["devices"] = request.devices - - return output - - -def marshal_SchemaZFS( - request: SchemaZFS, - defaults: ProfileDefaults, -) -> Dict[str, Any]: - output: Dict[str, Any] = {} - - if request.pools is not None: - output["pools"] = [marshal_SchemaPool(item, defaults) for item in request.pools] - - return output - - -def marshal_Schema( - request: Schema, - defaults: ProfileDefaults, -) -> Dict[str, Any]: - output: Dict[str, Any] = {} - - if request.disks is not None: - output["disks"] = [marshal_SchemaDisk(item, defaults) for item in request.disks] - - if request.raids is not None: - output["raids"] = [marshal_SchemaRAID(item, defaults) for item in request.raids] - - if request.filesystems is not None: - output["filesystems"] = [ - marshal_SchemaFilesystem(item, defaults) for item in request.filesystems - ] - - if request.zfs is not None: - output["zfs"] = marshal_SchemaZFS(request.zfs, defaults) - - return output - - def marshal_ValidatePartitioningSchemaRequest( request: ValidatePartitioningSchemaRequest, defaults: ProfileDefaults, @@ -1839,9 +1685,4 @@ def marshal_ValidatePartitioningSchemaRequest( if request.os_id is not None: output["os_id"] = request.os_id - if request.partitioning_schema is not None: - output["partitioning_schema"] = marshal_Schema( - request.partitioning_schema, defaults - ) - return output From eaac3811ecfbafa12d70cea0801ba845a3bc32e3 Mon Sep 17 00:00:00 2001 From: Laure-di Date: Mon, 14 Oct 2024 12:15:38 +0200 Subject: [PATCH 3/3] fix ruff format --- scaleway-async/scaleway_async/baremetal/v1/marshalling.py | 1 + scaleway/scaleway/baremetal/v1/marshalling.py | 1 + 2 files changed, 2 insertions(+) diff --git a/scaleway-async/scaleway_async/baremetal/v1/marshalling.py b/scaleway-async/scaleway_async/baremetal/v1/marshalling.py index 538d56083..2cc97bf3b 100644 --- a/scaleway-async/scaleway_async/baremetal/v1/marshalling.py +++ b/scaleway-async/scaleway_async/baremetal/v1/marshalling.py @@ -1696,6 +1696,7 @@ def marshal_UpdateSettingRequest( return output + def marshal_ValidatePartitioningSchemaRequest( request: ValidatePartitioningSchemaRequest, defaults: ProfileDefaults, diff --git a/scaleway/scaleway/baremetal/v1/marshalling.py b/scaleway/scaleway/baremetal/v1/marshalling.py index f5ad354c5..7ab7eb963 100644 --- a/scaleway/scaleway/baremetal/v1/marshalling.py +++ b/scaleway/scaleway/baremetal/v1/marshalling.py @@ -1468,6 +1468,7 @@ def marshal_SchemaZFS( return output + def marshal_CreateServerRequestInstall( request: CreateServerRequestInstall, defaults: ProfileDefaults,