Update Interfaces model and Mikrotik template for improved data handling

- Made the `description` field in the `Interfaces` model optional to enhance flexibility.
- Renamed `id` to `vlan_id` in the `Vlans` model for clarity.
- Refactored the `Mikrotik` class methods to streamline raw data access and removed unnecessary print statements.
- Updated the Mikrotik TTP template to reflect changes in variable names and improve overall structure for interface and VLAN configurations.

oxi/interfaces/contract.py

@@ -6,7 +6,7 @@ class Interfaces(BaseModel):
     name: str
     ip_address: IPv4Address | None = None
     mask: int | None = None
-    description: str
+    description: str | None = None
 
 
 class System(BaseModel):
@@ -16,7 +16,7 @@ class System(BaseModel):
 
 
 class Vlans(BaseModel):
-    id: int
+    vlan_id: int
     name: str | None = Field(default=None, alias="description")
 
 

oxi/interfaces/models/mikrotik.py

@@ -1,10 +1,6 @@
-import re
-from typing import TYPE_CHECKING
 from oxi.interfaces import register_parser
 from oxi.interfaces.base import BaseDevice
-
+from oxi.interfaces.contract import Interfaces, System, Vlans
-if TYPE_CHECKING:
-    from oxi.interfaces.contract import Interfaces, System, Vlans
 
 
 @register_parser(["routeros", "ros", "mikrotik"])
@@ -12,16 +8,16 @@ class Mikrotik(BaseDevice):
     template = "mikrotik.ttp"
 
     def system(self) -> "System":
-        print(self._raw["system"])
+        systems = self._raw.get("system")
-        print("-" * 12)
+        return System(**systems)
 
     def interfaces(self) -> "Interfaces":
-        print(f"{self._raw["interfaces"]=}")
+        print(self._raw.get("interfaces"))
-        print("-" * 12)
+        return [Interfaces(**item) for item in self._raw.get("interfaces")]
 
     def vlans(self) -> list["Vlans"]:
-        raw = self._raw.get("vlans", [])
+        print(self._raw.get("vlans"))
-        print(raw)
+        return [Vlans(**item) for item in self._raw.get("vlans")]
 
 
 if __name__ == "__main__":
@@ -29,4 +25,4 @@ if __name__ == "__main__":
         data = file.read()
     mikr = Mikrotik(data)
     mikr.parse()
-    print(mikr.load)
+    print(mikr)

oxi/interfaces/models/templates/mikrotik.ttp

@@ -24,24 +24,24 @@ default_vlans = {
 <group name="interfaces" default="default_interfaces">
 /ip address
 ## not disabled and no comment
-add address={{ ip | _start_ }}/{{ mask }} interface={{ interface }} network={{ network }}
+add address={{ ip_address | _start_ }}/{{ mask }} interface={{ name }} network={{ network }}
 ## not disabled and comment with/without quotes
-add address={{ ip | _start_ }}/{{ mask }} comment={{ comment | ORPHRASE | exclude("disabled=") | strip('"')}} interface={{ interface }} network={{ network }}
+add address={{ ip_address | _start_ }}/{{ mask }} comment={{ description | ORPHRASE | exclude("disabled=") | strip('"')}} interface={{ name }} network={{ network }}
 ## disabled no comment
-add address={{ ip | _start_ }}/{{ mask }} disabled={{ disabled | replace("yes","True") | strip('"')}} interface={{ interface }} network={{ network }}
+add address={{ ip_address | _start_ }}/{{ mask }} disabled={{ disabled | replace("yes","True") | strip('"')}} interface={{ name }} network={{ network }}
 ## disabled with comment with/without quotes
-add address={{ ip | _start_ }}/{{ mask }} comment={{ comment | ORPHRASE | exclude("disabled=") | strip('"') }} disabled={{ disabled }} interface={{ interface }} network={{ network }}
+add address={{ ip_address | _start_ }}/{{ mask }} comment={{ description | ORPHRASE | exclude("disabled=") | strip('"') }} disabled={{ disabled }} interface={{ name }} network={{ network }}
 </group>
 
 <group name="vlans">
-/interface vlan {{ _start_ }}
+/interface vlan
 ## not disabled and no comment
-add interface={{ interface }} name={{ name | ORPHRASE }} vlan-id={{ vlan_id }}
+add interface={{ interface | _start_ }} name={{ name | ORPHRASE | strip('"') }} vlan-id={{ vlan_id }}
 ## not disabled and comment with/without quotes
-add comment={{ comment | ORPHRASE | exclude("disabled=") | strip('"')}} interface={{ interface }} name={{ name | ORPHRASE }} vlan-id={{ vlan_id }}
+add comment={{ comment | _start_ | ORPHRASE | exclude("disabled=") | strip('"')}} interface={{ interface }} name={{ name | ORPHRASE | strip('"') }} vlan-id={{ vlan_id }}
 ## disabled with comment with/without quotes
-add comment={{ comment | ORPHRASE | exclude("disabled=") | strip('"')}} disabled={{ disabled }} interface={{ interface }} name={{ name | ORPHRASE }} vlan-id={{ vlan_id }}
+add comment={{ comment | _start_ | ORPHRASE | exclude("disabled=") | strip('"')}} disabled={{ disabled | replace("yes","True") | strip('"') }} interface={{ interface }} name={{ name | ORPHRASE | strip('"') }} vlan-id={{ vlan_id }}
 ## disabled no comment
-add interface={{ interface }} name={{ name | ORPHRASE }} vlan-id={{ vlan_id }} disabled={{ disabled }}
+add interface={{ interface | _start_ }} name={{ name | ORPHRASE | strip('"') }} vlan-id={{ vlan_id }} disabled={{ disabled | replace("yes","True") | strip('"') }}
 </group>