Merge branch 'main' into feature/v3.7.x/jetson_uefi_rebased

tier4 · Jun 26, 2024 · e04c7c5 · e04c7c5
2 parents 173bdbf + 0f9856d
commit e04c7c5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/otaclient_common/typing.py b/src/otaclient_common/typing.py
@@ -19,7 +19,7 @@
 from pathlib import Path
 from typing import Any, Callable, TypeVar, Union
 
-from pydantic import Field
+from pydantic import BeforeValidator, Field
 from typing_extensions import Annotated, Concatenate, ParamSpec
 
 P = ParamSpec("P")
@@ -31,7 +31,11 @@
 
 # pydantic helpers
 
-NetworkPort = Annotated[int, Field(ge=1, le=65535)]
+NetworkPort = Annotated[
+    int,
+    BeforeValidator(lambda x: int(x)),
+    Field(ge=1, le=65535),
+]
 
 
 def gen_strenum_validator(

diff --git a/tests/test_otaclient/test_configs/test_proxy_info.py b/tests/test_otaclient/test_configs/test_proxy_info.py
@@ -95,6 +95,11 @@
             "enable_ota_proxy: true\ngateway: false\n",
             DEFAULT_PROXY_INFO,
         ),
+        # ------ case 7(20240626): NetworkPort allow str value ------ #
+        (
+            'local_ota_proxy_listen_port: "8082"',
+            ProxyInfo(local_ota_proxy_listen_port=8082),
+        ),
     ),
 )
 def test_proxy_info(tmp_path: Path, _input_yaml: str, _expected: ProxyInfo):