Use pydantic alias for planned maintenance fields

To have them match the field names in Zino1

changelog.d/287.fixed.md

@@ -0,0 +1 @@
+Use Zino1 field names for serialization of planned maintenance

src/zino/state.py

@@ -40,7 +40,7 @@ def dump_state_to_file(self, filename: str):
         """Dumps the full state to a file in JSON format"""
         _log.debug("dumping state to %s", filename)
         with open(filename, "w") as statefile:
-            statefile.write(self.model_dump_json(exclude_none=True, indent=2))
+            statefile.write(self.model_dump_json(exclude_none=True, indent=2, by_alias=True))
 
     @classmethod
     @log_time_spent()

src/zino/statemodels.py

@@ -21,7 +21,7 @@
     Union,
 )
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, ConfigDict, Field
 
 from zino.compat import StrEnum
 from zino.time import now
@@ -413,13 +413,16 @@ class PmType(StrEnum):
 
 
 class PlannedMaintenance(BaseModel):
+    # Allow populating fields by name or alias
+    model_config = ConfigDict(populate_by_name=True)
+
     id: Optional[int] = None
-    start_time: datetime.datetime
-    end_time: datetime.datetime
+    start_time: datetime.datetime = Field(alias="starttime")
+    end_time: datetime.datetime = Field(alias="endtime")
     type: PmType
     match_type: MatchType
-    match_device: Optional[str] = None
-    match_expression: str
+    match_device: Optional[str] = Field(default=None, alias="match_dev")
+    match_expression: str = Field(alias="match_expr")
     log: List[LogEntry] = []
     event_ids: List[int] = []
 

tests/planned_maintenance_test.py

@@ -159,6 +159,14 @@ def test_pms_should_be_parsed_as_correct_subclass_when_read_from_file(tmp_path,
     assert isinstance(read_portstate_pm, PortStateMaintenance)
 
 
+def test_model_dump_of_pm_should_use_aliases(state, active_portstate_pm, active_pm):
+    state_dump = state.model_dump_json(exclude_none=True, indent=2, by_alias=True)
+    assert "starttime" in state_dump
+    assert "endtime" in state_dump
+    assert "match_dev" in state_dump
+    assert "match_expr" in state_dump
+
+
 @pytest.fixture
 def pms():
     return PlannedMaintenances()