fix fields

Author: giancarloromeo

packages/models-library/src/models_library/aiodocker_api.py

@@ -11,12 +11,13 @@
 
 
 class AioDockerContainerSpec(ContainerSpec):
-    Env: dict[str, str | None] | None = Field(
+    env: dict[str, str | None] | None = Field(  # type: ignore[assignment]
         default=None,
-        description="aiodocker expects here a dictionary and re-convert it back internally`.\n",
+        alias="Env",
+        description="aiodocker expects here a dictionary and re-convert it back internally",
     )
 
-    @field_validator("Env", mode="before")
+    @field_validator("env", mode="before")
     @classmethod
     def convert_list_to_dict(cls, v):
         if v is not None and isinstance(v, list):
@@ -33,25 +34,22 @@ def convert_list_to_dict(cls, v):
 class AioDockerResources1(Resources1):
     # NOTE: The Docker REST API documentation is wrong!!!
     # Do not set that back to singular Reservation.
-    Reservation: ResourceObject | None = Field(
+    reservation: ResourceObject | None = Field(
         None, description="Define resources reservation.", alias="Reservations"
     )
 
     model_config = ConfigDict(populate_by_name=True)
 
 
 class AioDockerTaskSpec(TaskSpec):
-    ContainerSpec: AioDockerContainerSpec | None = Field(
-        None,
+    container_spec: AioDockerContainerSpec | None = Field(
+        default=None, alias="ContainerSpec"
     )
 
-    Resources: AioDockerResources1 | None = Field(
-        None,
-        description="Resource requirements which apply to each individual container created\nas part of the service.\n",
-    )
+    resources: AioDockerResources1 | None = Field(default=None, alias="Resources")
 
 
 class AioDockerServiceSpec(ServiceSpec):
-    TaskTemplate: AioDockerTaskSpec | None = None
+    task_template: AioDockerTaskSpec | None = Field(default=None, alias="TaskTemplate")
 
     model_config = ConfigDict(populate_by_name=True, alias_generator=camel_to_snake)

services/director-v2/tests/unit/with_dbs/test_api_route_clusters.py

@@ -745,7 +745,7 @@ async def test_ping_cluster(
     )
     response = await async_client.post(
         "/v2/clusters:ping",
-        json=model_dump_with_secrets(valid_cluster, show_secrets=True, alias=True),
+        json=model_dump_with_secrets(valid_cluster, show_secrets=True, by_alias=True),
     )
     response.raise_for_status()
     assert response.status_code == status.HTTP_204_NO_CONTENT

services/director-v2/tests/unit/with_dbs/test_modules_dynamic_sidecar_docker_service_specs.py

@@ -445,9 +445,9 @@ async def test_get_dynamic_proxy_spec(
     expected_dynamic_sidecar_spec_model = AioDockerServiceSpec.model_validate(
         expected_dynamic_sidecar_spec
     )
-    assert expected_dynamic_sidecar_spec_model.TaskTemplate
-    assert expected_dynamic_sidecar_spec_model.TaskTemplate.ContainerSpec
-    assert expected_dynamic_sidecar_spec_model.TaskTemplate.ContainerSpec.Env
+    assert expected_dynamic_sidecar_spec_model.task_template
+    assert expected_dynamic_sidecar_spec_model.task_template.container_spec
+    assert expected_dynamic_sidecar_spec_model.task_template.container_spec.env
 
     for count in range(1, 11):  # loop to check it does not repeat copies
         print(f"{count:*^50}")
@@ -478,33 +478,33 @@ async def test_get_dynamic_proxy_spec(
         # NOTE: some flakiness here
         # state_exclude is a set and does not preserve order
         # when dumping to json it gets converted to a list
-        assert dynamic_sidecar_spec.TaskTemplate
-        assert dynamic_sidecar_spec.TaskTemplate.ContainerSpec
-        assert dynamic_sidecar_spec.TaskTemplate.ContainerSpec.Env
-        assert dynamic_sidecar_spec.TaskTemplate.ContainerSpec.Env[
+        assert dynamic_sidecar_spec.task_template
+        assert dynamic_sidecar_spec.task_template.container_spec
+        assert dynamic_sidecar_spec.task_template.container_spec.env
+        assert dynamic_sidecar_spec.task_template.container_spec.env[
             "DY_SIDECAR_STATE_EXCLUDE"
         ]
 
-        dynamic_sidecar_spec.TaskTemplate.ContainerSpec.Env[
+        dynamic_sidecar_spec.task_template.container_spec.env[
             "DY_SIDECAR_STATE_EXCLUDE"
         ] = json.dumps(
             sorted(
                 json.loads(
-                    dynamic_sidecar_spec.TaskTemplate.ContainerSpec.Env[
+                    dynamic_sidecar_spec.task_template.container_spec.env[
                         "DY_SIDECAR_STATE_EXCLUDE"
                     ]
                 )
             )
         )
-        assert expected_dynamic_sidecar_spec_model.TaskTemplate.ContainerSpec.Env[
+        assert expected_dynamic_sidecar_spec_model.task_template.container_spec.env[
             "DY_SIDECAR_STATE_EXCLUDE"
         ]
-        expected_dynamic_sidecar_spec_model.TaskTemplate.ContainerSpec.Env[
+        expected_dynamic_sidecar_spec_model.task_template.container_spec.env[
             "DY_SIDECAR_STATE_EXCLUDE"
         ] = json.dumps(
             sorted(
                 json.loads(
-                    expected_dynamic_sidecar_spec_model.TaskTemplate.ContainerSpec.Env[
+                    expected_dynamic_sidecar_spec_model.task_template.container_spec.env[
                         "DY_SIDECAR_STATE_EXCLUDE"
                     ]
                 )