Skip to content

Commit d43137a

Browse files
authored
Merge branch 'main' into v1.5574.0
2 parents 0605506 + 8bf653e commit d43137a

File tree

2 files changed

+0
-60
lines changed

2 files changed

+0
-60
lines changed

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -894,12 +894,6 @@ def unmarshal_ServerInstall(data: Any) -> ServerInstall:
894894
if field is not None:
895895
args["service_url"] = field
896896

897-
field = data.get("partitioning_schema", None)
898-
if field is not None:
899-
args["partitioning_schema"] = unmarshal_Schema(field)
900-
else:
901-
args["partitioning_schema"] = None
902-
903897
return ServerInstall(**args)
904898

905899

@@ -1525,11 +1519,6 @@ def marshal_CreateServerRequestInstall(
15251519
if request.service_password is not None:
15261520
output["service_password"] = request.service_password
15271521

1528-
if request.partitioning_schema is not None:
1529-
output["partitioning_schema"] = marshal_Schema(
1530-
request.partitioning_schema, defaults
1531-
)
1532-
15331522
return output
15341523

15351524

@@ -1603,11 +1592,6 @@ def marshal_InstallServerRequest(
16031592
if request.service_password is not None:
16041593
output["service_password"] = request.service_password
16051594

1606-
if request.partitioning_schema is not None:
1607-
output["partitioning_schema"] = marshal_Schema(
1608-
request.partitioning_schema, defaults
1609-
)
1610-
16111595
return output
16121596

16131597

scaleway/scaleway/baremetal/v1/marshalling.py

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -894,12 +894,6 @@ def unmarshal_ServerInstall(data: Any) -> ServerInstall:
894894
if field is not None:
895895
args["service_url"] = field
896896

897-
field = data.get("partitioning_schema", None)
898-
if field is not None:
899-
args["partitioning_schema"] = unmarshal_Schema(field)
900-
else:
901-
args["partitioning_schema"] = None
902-
903897
return ServerInstall(**args)
904898

905899

@@ -1475,29 +1469,6 @@ def marshal_SchemaZFS(
14751469
return output
14761470

14771471

1478-
def marshal_Schema(
1479-
request: Schema,
1480-
defaults: ProfileDefaults,
1481-
) -> Dict[str, Any]:
1482-
output: Dict[str, Any] = {}
1483-
1484-
if request.disks is not None:
1485-
output["disks"] = [marshal_SchemaDisk(item, defaults) for item in request.disks]
1486-
1487-
if request.raids is not None:
1488-
output["raids"] = [marshal_SchemaRAID(item, defaults) for item in request.raids]
1489-
1490-
if request.filesystems is not None:
1491-
output["filesystems"] = [
1492-
marshal_SchemaFilesystem(item, defaults) for item in request.filesystems
1493-
]
1494-
1495-
if request.zfs is not None:
1496-
output["zfs"] = marshal_SchemaZFS(request.zfs, defaults)
1497-
1498-
return output
1499-
1500-
15011472
def marshal_CreateServerRequestInstall(
15021473
request: CreateServerRequestInstall,
15031474
defaults: ProfileDefaults,
@@ -1525,11 +1496,6 @@ def marshal_CreateServerRequestInstall(
15251496
if request.service_password is not None:
15261497
output["service_password"] = request.service_password
15271498

1528-
if request.partitioning_schema is not None:
1529-
output["partitioning_schema"] = marshal_Schema(
1530-
request.partitioning_schema, defaults
1531-
)
1532-
15331499
return output
15341500

15351501

@@ -1603,11 +1569,6 @@ def marshal_InstallServerRequest(
16031569
if request.service_password is not None:
16041570
output["service_password"] = request.service_password
16051571

1606-
if request.partitioning_schema is not None:
1607-
output["partitioning_schema"] = marshal_Schema(
1608-
request.partitioning_schema, defaults
1609-
)
1610-
16111572
return output
16121573

16131574

@@ -1725,9 +1686,4 @@ def marshal_ValidatePartitioningSchemaRequest(
17251686
if request.os_id is not None:
17261687
output["os_id"] = request.os_id
17271688

1728-
if request.partitioning_schema is not None:
1729-
output["partitioning_schema"] = marshal_Schema(
1730-
request.partitioning_schema, defaults
1731-
)
1732-
17331689
return output

0 commit comments

Comments
 (0)