Skip to content

Commit 8a6dcd3

Browse files
Laure-diLaure-di
committed
feat(baremetal): add GetDefaultPartitioningRequest
1 parent 8512ee7 commit 8a6dcd3

File tree

2 files changed

+260
-32
lines changed

2 files changed

+260
-32
lines changed

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

Lines changed: 130 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

@@ -1713,6 +1697,136 @@ def marshal_UpdateSettingRequest(
17131697
return output
17141698

17151699

1700+
def marshal_SchemaPartition(
1701+
request: SchemaPartition,
1702+
defaults: ProfileDefaults,
1703+
) -> Dict[str, Any]:
1704+
output: Dict[str, Any] = {}
1705+
1706+
if request.label is not None:
1707+
output["label"] = str(request.label)
1708+
1709+
if request.number is not None:
1710+
output["number"] = request.number
1711+
1712+
if request.size is not None:
1713+
output["size"] = request.size
1714+
1715+
return output
1716+
1717+
1718+
def marshal_SchemaPool(
1719+
request: SchemaPool,
1720+
defaults: ProfileDefaults,
1721+
) -> Dict[str, Any]:
1722+
output: Dict[str, Any] = {}
1723+
1724+
if request.name is not None:
1725+
output["name"] = request.name
1726+
1727+
if request.type_ is not None:
1728+
output["type"] = str(request.type_)
1729+
1730+
if request.devices is not None:
1731+
output["devices"] = request.devices
1732+
1733+
if request.options is not None:
1734+
output["options"] = request.options
1735+
1736+
if request.filesystem_options is not None:
1737+
output["filesystem_options"] = request.filesystem_options
1738+
1739+
return output
1740+
1741+
1742+
def marshal_SchemaDisk(
1743+
request: SchemaDisk,
1744+
defaults: ProfileDefaults,
1745+
) -> Dict[str, Any]:
1746+
output: Dict[str, Any] = {}
1747+
1748+
if request.device is not None:
1749+
output["device"] = request.device
1750+
1751+
if request.partitions is not None:
1752+
output["partitions"] = [
1753+
marshal_SchemaPartition(item, defaults) for item in request.partitions
1754+
]
1755+
1756+
return output
1757+
1758+
1759+
def marshal_SchemaFilesystem(
1760+
request: SchemaFilesystem,
1761+
defaults: ProfileDefaults,
1762+
) -> Dict[str, Any]:
1763+
output: Dict[str, Any] = {}
1764+
1765+
if request.device is not None:
1766+
output["device"] = request.device
1767+
1768+
if request.format is not None:
1769+
output["format"] = str(request.format)
1770+
1771+
if request.mountpoint is not None:
1772+
output["mountpoint"] = request.mountpoint
1773+
1774+
return output
1775+
1776+
1777+
def marshal_SchemaRAID(
1778+
request: SchemaRAID,
1779+
defaults: ProfileDefaults,
1780+
) -> Dict[str, Any]:
1781+
output: Dict[str, Any] = {}
1782+
1783+
if request.name is not None:
1784+
output["name"] = request.name
1785+
1786+
if request.level is not None:
1787+
output["level"] = str(request.level)
1788+
1789+
if request.devices is not None:
1790+
output["devices"] = request.devices
1791+
1792+
return output
1793+
1794+
1795+
def marshal_SchemaZFS(
1796+
request: SchemaZFS,
1797+
defaults: ProfileDefaults,
1798+
) -> Dict[str, Any]:
1799+
output: Dict[str, Any] = {}
1800+
1801+
if request.pools is not None:
1802+
output["pools"] = [marshal_SchemaPool(item, defaults) for item in request.pools]
1803+
1804+
return output
1805+
1806+
1807+
def marshal_Schema(
1808+
request: Schema,
1809+
defaults: ProfileDefaults,
1810+
) -> Dict[str, Any]:
1811+
output: Dict[str, Any] = {}
1812+
1813+
if request.disks is not None:
1814+
output["disks"] = [marshal_SchemaDisk(item, defaults) for item in request.disks]
1815+
1816+
if request.raids is not None:
1817+
output["raids"] = [marshal_SchemaRAID(item, defaults) for item in request.raids]
1818+
1819+
if request.filesystems is not None:
1820+
output["filesystems"] = [
1821+
marshal_SchemaFilesystem(item, defaults) for item in request.filesystems
1822+
]
1823+
1824+
if request.zfs is not None:
1825+
output["zfs"] = marshal_SchemaZFS(request.zfs, defaults)
1826+
1827+
return output
1828+
1829+
17161830
def marshal_ValidatePartitioningSchemaRequest(
17171831
request: ValidatePartitioningSchemaRequest,
17181832
defaults: ProfileDefaults,

‎scaleway/scaleway/baremetal/v1/marshalling.py

Lines changed: 130 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

@@ -1713,6 +1697,136 @@ def marshal_UpdateSettingRequest(
17131697
return output
17141698

17151699

1700+
def marshal_SchemaPartition(
1701+
request: SchemaPartition,
1702+
defaults: ProfileDefaults,
1703+
) -> Dict[str, Any]:
1704+
output: Dict[str, Any] = {}
1705+
1706+
if request.label is not None:
1707+
output["label"] = str(request.label)
1708+
1709+
if request.number is not None:
1710+
output["number"] = request.number
1711+
1712+
if request.size is not None:
1713+
output["size"] = request.size
1714+
1715+
return output
1716+
1717+
1718+
def marshal_SchemaPool(
1719+
request: SchemaPool,
1720+
defaults: ProfileDefaults,
1721+
) -> Dict[str, Any]:
1722+
output: Dict[str, Any] = {}
1723+
1724+
if request.name is not None:
1725+
output["name"] = request.name
1726+
1727+
if request.type_ is not None:
1728+
output["type"] = str(request.type_)
1729+
1730+
if request.devices is not None:
1731+
output["devices"] = request.devices
1732+
1733+
if request.options is not None:
1734+
output["options"] = request.options
1735+
1736+
if request.filesystem_options is not None:
1737+
output["filesystem_options"] = request.filesystem_options
1738+
1739+
return output
1740+
1741+
1742+
def marshal_SchemaDisk(
1743+
request: SchemaDisk,
1744+
defaults: ProfileDefaults,
1745+
) -> Dict[str, Any]:
1746+
output: Dict[str, Any] = {}
1747+
1748+
if request.device is not None:
1749+
output["device"] = request.device
1750+
1751+
if request.partitions is not None:
1752+
output["partitions"] = [
1753+
marshal_SchemaPartition(item, defaults) for item in request.partitions
1754+
]
1755+
1756+
return output
1757+
1758+
1759+
def marshal_SchemaFilesystem(
1760+
request: SchemaFilesystem,
1761+
defaults: ProfileDefaults,
1762+
) -> Dict[str, Any]:
1763+
output: Dict[str, Any] = {}
1764+
1765+
if request.device is not None:
1766+
output["device"] = request.device
1767+
1768+
if request.format is not None:
1769+
output["format"] = str(request.format)
1770+
1771+
if request.mountpoint is not None:
1772+
output["mountpoint"] = request.mountpoint
1773+
1774+
return output
1775+
1776+
1777+
def marshal_SchemaRAID(
1778+
request: SchemaRAID,
1779+
defaults: ProfileDefaults,
1780+
) -> Dict[str, Any]:
1781+
output: Dict[str, Any] = {}
1782+
1783+
if request.name is not None:
1784+
output["name"] = request.name
1785+
1786+
if request.level is not None:
1787+
output["level"] = str(request.level)
1788+
1789+
if request.devices is not None:
1790+
output["devices"] = request.devices
1791+
1792+
return output
1793+
1794+
1795+
def marshal_SchemaZFS(
1796+
request: SchemaZFS,
1797+
defaults: ProfileDefaults,
1798+
) -> Dict[str, Any]:
1799+
output: Dict[str, Any] = {}
1800+
1801+
if request.pools is not None:
1802+
output["pools"] = [marshal_SchemaPool(item, defaults) for item in request.pools]
1803+
1804+
return output
1805+
1806+
1807+
def marshal_Schema(
1808+
request: Schema,
1809+
defaults: ProfileDefaults,
1810+
) -> Dict[str, Any]:
1811+
output: Dict[str, Any] = {}
1812+
1813+
if request.disks is not None:
1814+
output["disks"] = [marshal_SchemaDisk(item, defaults) for item in request.disks]
1815+
1816+
if request.raids is not None:
1817+
output["raids"] = [marshal_SchemaRAID(item, defaults) for item in request.raids]
1818+
1819+
if request.filesystems is not None:
1820+
output["filesystems"] = [
1821+
marshal_SchemaFilesystem(item, defaults) for item in request.filesystems
1822+
]
1823+
1824+
if request.zfs is not None:
1825+
output["zfs"] = marshal_SchemaZFS(request.zfs, defaults)
1826+
1827+
return output
1828+
1829+
17161830
def marshal_ValidatePartitioningSchemaRequest(
17171831
request: ValidatePartitioningSchemaRequest,
17181832
defaults: ProfileDefaults,

0 commit comments

Comments
 (0)