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

Co-authored-by: Jonathan R. <jremy@scaleway.com>

Author: scaleway-bot

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

@@ -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)
 
 
@@ -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"] = (
@@ -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:

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

@@ -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.
@@ -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).

scaleway-async/scaleway_async/product_catalog/v2alpha1/types.py

@@ -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)

scaleway/scaleway/baremetal/v1/marshalling.py

@@ -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)
 
 
@@ -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"] = (
@@ -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:

scaleway/scaleway/baremetal/v1/types.py

@@ -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.
@@ -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).

scaleway/scaleway/product_catalog/v2alpha1/types.py

@@ -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)