diff --git a/oxi/conf.py b/oxi/conf.py index 6b7e832..cd89be4 100644 --- a/oxi/conf.py +++ b/oxi/conf.py @@ -73,10 +73,11 @@ class NodeConfig: return self._response.text def dump_json(self): - return self._parsed_data.model_dump_json() + return self._parsed_data.model_dump_json(by_alias=True) def dump(self): - return self._parsed_data.model_dump() + return self._parsed_data.model_dump(by_alias=True) + def __str__(self): return self.text diff --git a/oxi/interfaces/contract.py b/oxi/interfaces/contract.py index 834c7a4..091e663 100644 --- a/oxi/interfaces/contract.py +++ b/oxi/interfaces/contract.py @@ -32,7 +32,7 @@ class Vlans(Base): Optional """ - vlan_id: int = Field(alias="id") + vlan_id: int name: str | None = Field(default=None, alias="description") diff --git a/oxi/interfaces/models/templates/qtech.ttp b/oxi/interfaces/models/templates/qtech.ttp index b2a3789..aa14025 100644 --- a/oxi/interfaces/models/templates/qtech.ttp +++ b/oxi/interfaces/models/templates/qtech.ttp @@ -22,6 +22,6 @@ interface {{ interface | ORPHRASE }} vlan {{ vlan_ids | contains(",", "-") | unrange("-", ",") }} ,{{ vlan_tail | unrange("-", ",") }} -vlan {{ vlan_id }} +vlan {{ vlan_id | _start_ }} name {{ name | ORPHRASE }}