Skip to content

feat(baremetal): expose zone for offers and os #1308

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 2 commits into from
Oct 15, 2025
Merged

feat(baremetal): expose zone for offers and os #1308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27f61ff
feat: update generated APIs
scaleway-bot Oct 14, 2025
83083cb
Merge branch 'main' into v1.7145.0
jremy42 Oct 15, 2025
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
18 changes: 15 additions & 3 deletions scaleway-async/scaleway_async/baremetal/v1/marshalling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,6 +824,12 @@ def unmarshal_OS(data: Any) -> OS:
else:
args["custom_partitioning_supported"] = False

field = data.get("zone", None)
if field is not None:
args["zone"] = field
else:
args["zone"] = None

return OS(**args)


Expand Down Expand Up @@ -1214,6 +1220,12 @@ def unmarshal_Offer(data: Any) -> Offer:
else:
args["operation_path"] = None

field = data.get("fee", None)
if field is not None:
args["fee"] = unmarshal_Money(field)
else:
args["fee"] = None

field = data.get("options", None)
if field is not None:
args["options"] = (
Expand Down Expand Up @@ -1248,11 +1260,11 @@ def unmarshal_Offer(data: Any) -> Offer:
else:
args["gpus"] = []

field = data.get("fee", None)
field = data.get("zone", None)
if field is not None:
args["fee"] = unmarshal_Money(field)
args["zone"] = field
else:
args["fee"] = None
args["zone"] = None

field = data.get("monthly_offer_id", None)
if field is not None:
Expand Down
10 changes: 10 additions & 0 deletions scaleway-async/scaleway_async/baremetal/v1/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,6 +811,11 @@ class OS:
Defines if custom partitioning is supported by this OS.
"""

zone: ScwZone
"""
Zone in which is the OS is available.
"""

ssh: Optional[OSOSField] = None
"""
Object defining the SSH requirements to install the OS.
Expand Down Expand Up @@ -944,6 +949,11 @@ class Offer:
GPU specifications of the offer.
"""

zone: ScwZone
"""
Zone in which is the offer is available.
"""

price_per_hour: Optional[Money] = None
"""
Price of the offer for the next 60 minutes (a server order at 11h32 will be paid until 12h32).
Expand Down
1 change: 1 addition & 0 deletions scaleway-async/scaleway_async/product_catalog/v2alpha1/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ class PublicCatalogProductUnitOfMeasureCountableUnit(str, Enum, metaclass=StrEnu
SECOND = "second"
SAMPLE_DAY = "sample_day"
GIGABYTE_DAY = "gigabyte_day"
MVCPU = "mvcpu"

def __str__(self) -> str:
return str(self.value)
Expand Down
18 changes: 15 additions & 3 deletions scaleway/scaleway/baremetal/v1/marshalling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,6 +824,12 @@ def unmarshal_OS(data: Any) -> OS:
else:
args["custom_partitioning_supported"] = False

field = data.get("zone", None)
if field is not None:
args["zone"] = field
else:
args["zone"] = None

return OS(**args)


Expand Down Expand Up @@ -1214,6 +1220,12 @@ def unmarshal_Offer(data: Any) -> Offer:
else:
args["operation_path"] = None

field = data.get("fee", None)
if field is not None:
args["fee"] = unmarshal_Money(field)
else:
args["fee"] = None

field = data.get("options", None)
if field is not None:
args["options"] = (
Expand Down Expand Up @@ -1248,11 +1260,11 @@ def unmarshal_Offer(data: Any) -> Offer:
else:
args["gpus"] = []

field = data.get("fee", None)
field = data.get("zone", None)
if field is not None:
args["fee"] = unmarshal_Money(field)
args["zone"] = field
else:
args["fee"] = None
args["zone"] = None

field = data.get("monthly_offer_id", None)
if field is not None:
Expand Down
10 changes: 10 additions & 0 deletions scaleway/scaleway/baremetal/v1/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,6 +811,11 @@ class OS:
Defines if custom partitioning is supported by this OS.
"""

zone: ScwZone
"""
Zone in which is the OS is available.
"""

ssh: Optional[OSOSField] = None
"""
Object defining the SSH requirements to install the OS.
Expand Down Expand Up @@ -944,6 +949,11 @@ class Offer:
GPU specifications of the offer.
"""

zone: ScwZone
"""
Zone in which is the offer is available.
"""

price_per_hour: Optional[Money] = None
"""
Price of the offer for the next 60 minutes (a server order at 11h32 will be paid until 12h32).
Expand Down
1 change: 1 addition & 0 deletions scaleway/scaleway/product_catalog/v2alpha1/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ class PublicCatalogProductUnitOfMeasureCountableUnit(str, Enum, metaclass=StrEnu
SECOND = "second"
SAMPLE_DAY = "sample_day"
GIGABYTE_DAY = "gigabyte_day"
MVCPU = "mvcpu"

def __str__(self) -> str:
return str(self.value)
Expand Down