Merge branch 'main' into v1.7168.0

Author: Mia-Cross

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

@@ -210,6 +210,12 @@ def unmarshal_PrivateNIC(data: Any) -> PrivateNIC:
     else:
         args["tags"] = []
 
+    field = data.get("zone", None)
+    if field is not None:
+        args["zone"] = field
+    else:
+        args["zone"] = None
+
     field = data.get("creation_date", None)
     if field is not None:
         args["creation_date"] = (
@@ -4726,6 +4732,11 @@ def marshal_PrivateNIC(
     if request.tags is not None:
         output["tags"] = request.tags
 
+    if request.zone is not None:
+        output["zone"] = request.zone
+    else:
+        output["zone"] = defaults.default_zone
+
     if request.creation_date is not None:
         output["creation_date"] = request.creation_date.isoformat()
 

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

@@ -541,6 +541,11 @@ class PrivateNIC:
     Private NIC tags.
     """
 
+    zone: ScwZone
+    """
+    The zone in which the Private NIC is located.
+    """
+
     creation_date: Optional[datetime] = None
     """
     Private NIC creation date.

scaleway-async/scaleway_async/qaas/v1alpha1/marshalling.py

@@ -179,6 +179,12 @@ def unmarshal_Booking(data: Any) -> Booking:
     else:
         args["finished_at"] = None
 
+    field = data.get("time_zone", None)
+    if field is not None:
+        args["time_zone"] = field
+    else:
+        args["time_zone"] = None
+
     return Booking(**args)
 
 
@@ -1205,6 +1211,9 @@ def marshal_CreateSessionRequestBookingDemand(
     if request.description is not None:
         output["description"] = request.description
 
+    if request.time_zone is not None:
+        output["time_zone"] = request.time_zone
+
     return output
 
 

scaleway-async/scaleway_async/qaas/v1alpha1/types.py

@@ -323,6 +323,7 @@ class CreateSessionRequestBookingDemand:
     started_at: Optional[datetime] = None
     finished_at: Optional[datetime] = None
     description: Optional[str] = None
+    time_zone: Optional[str] = None
 
 
 @dataclass
@@ -395,6 +396,11 @@ class Booking:
     Time at which the booking finishes.
     """
 
+    time_zone: Optional[str] = None
+    """
+    Time zone for the booking schedule, in tz database format (e.g. 'Europe/Paris').
+    """
+
 
 @dataclass
 class JobResult:

scaleway/scaleway/instance/v1/marshalling.py

@@ -210,6 +210,12 @@ def unmarshal_PrivateNIC(data: Any) -> PrivateNIC:
     else:
         args["tags"] = []
 
+    field = data.get("zone", None)
+    if field is not None:
+        args["zone"] = field
+    else:
+        args["zone"] = None
+
     field = data.get("creation_date", None)
     if field is not None:
         args["creation_date"] = (
@@ -4726,6 +4732,11 @@ def marshal_PrivateNIC(
     if request.tags is not None:
         output["tags"] = request.tags
 
+    if request.zone is not None:
+        output["zone"] = request.zone
+    else:
+        output["zone"] = defaults.default_zone
+
     if request.creation_date is not None:
         output["creation_date"] = request.creation_date.isoformat()
 

scaleway/scaleway/instance/v1/types.py

@@ -541,6 +541,11 @@ class PrivateNIC:
     Private NIC tags.
     """
 
+    zone: ScwZone
+    """
+    The zone in which the Private NIC is located.
+    """
+
     creation_date: Optional[datetime] = None
     """
     Private NIC creation date.

scaleway/scaleway/qaas/v1alpha1/marshalling.py

@@ -179,6 +179,12 @@ def unmarshal_Booking(data: Any) -> Booking:
     else:
         args["finished_at"] = None
 
+    field = data.get("time_zone", None)
+    if field is not None:
+        args["time_zone"] = field
+    else:
+        args["time_zone"] = None
+
     return Booking(**args)
 
 
@@ -1205,6 +1211,9 @@ def marshal_CreateSessionRequestBookingDemand(
     if request.description is not None:
         output["description"] = request.description
 
+    if request.time_zone is not None:
+        output["time_zone"] = request.time_zone
+
     return output
 
 

scaleway/scaleway/qaas/v1alpha1/types.py

@@ -323,6 +323,7 @@ class CreateSessionRequestBookingDemand:
     started_at: Optional[datetime] = None
     finished_at: Optional[datetime] = None
     description: Optional[str] = None
+    time_zone: Optional[str] = None
 
 
 @dataclass
@@ -395,6 +396,11 @@ class Booking:
     Time at which the booking finishes.
     """
 
+    time_zone: Optional[str] = None
+    """
+    Time zone for the booking schedule, in tz database format (e.g. 'Europe/Paris').
+    """
+
 
 @dataclass
 class JobResult: