Merge branch 'main' into instance-doc

Author: Laure-di

scaleway-async/poetry.lock

@@ -25,15 +25,15 @@ classifiers = [
 [tool.poetry.dependencies]
 python = ">=3.10"
 scaleway-core = "*"
-pytest-cov = ">=6.3,<8.0"
 
 [tool.poetry.group.dev.dependencies]
 scaleway-core = { path = "../scaleway-core", develop = true }
 ruff = ">=0.5.0,<0.13.3"
 mypy = "^1.5.1"
 ty = "^0.0.1a15"
-pyrefly = ">=0.24.2,<0.32.0"
 pytest = "^8.4.1"
+pyrefly = "^0.36.1"
+pytest-cov = "^6.3.0"
 
 [build-system]
 requires = ["poetry-core"]

scaleway-async/pyproject.toml

@@ -66,6 +66,12 @@ def unmarshal_BgpSession(data: Any) -> BgpSession:
     else:
         args["private_ip"] = None
 
+    field = data.get("peer_private_ip", None)
+    if field is not None:
+        args["peer_private_ip"] = field
+    else:
+        args["peer_private_ip"] = None
+
     return BgpSession(**args)
 
 
@@ -783,6 +789,12 @@ def marshal_CreateConnectionRequestBgpConfig(
     if request.routing_policy_id is not None:
         output["routing_policy_id"] = request.routing_policy_id
 
+    if request.private_ip is not None:
+        output["private_ip"] = request.private_ip
+
+    if request.peer_private_ip is not None:
+        output["peer_private_ip"] = request.peer_private_ip
+
     return output
 
 

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

@@ -167,6 +167,7 @@ def __str__(self) -> str:
 class BgpSession:
     routing_policy_id: str
     private_ip: str
+    peer_private_ip: str
 
 
 @dataclass
@@ -190,6 +191,8 @@ class VpnGatewayPublicConfig:
 @dataclass
 class CreateConnectionRequestBgpConfig:
     routing_policy_id: str
+    private_ip: Optional[str] = None
+    peer_private_ip: Optional[str] = None
 
 
 @dataclass