Refactor BaseDevice methods for improved data handling and validation

- Updated the `BaseDevice` class to replace `_raw` with `raw` for consistency in data access.
- Enhanced the `vlans`, `interfaces`, and `system` methods to utilize the new `raw` attribute.
- Introduced a `_validate_contract` method to streamline the validation of parsed data into structured models.
- Adjusted the `Keenetic` and `Mikrotik` models to align with the updated data handling approach, ensuring proper parsing and decoding of interface and VLAN data.

oxi/interfaces/models/keenetic.py

@@ -1,17 +1,13 @@
 from ipaddress import ip_interface
-from pprint import pprint
 from oxi.interfaces import register_parser
 from oxi.interfaces.base import BaseDevice
-from oxi.interfaces.contract import Interfaces, System, Vlans
+from oxi.interfaces.contract import Interfaces, Vlans
 
 
 @register_parser(["NDMS", "keenetic", "KeeneticOS"])
 class Keenetic(BaseDevice):
     template = "keenetic.ttp"
 
-    def system(self):
-        return System(**self._raw["system"])
-
     def _decode_utf(self, text: str):
         if "\\x" in text:
             desc = text.strip('"')
@@ -25,7 +21,7 @@ class Keenetic(BaseDevice):
         return text
 
     def interfaces(self):
-        interfaces: list[dict] = self._raw["interfaces"]
+        interfaces: list[dict] = self.raw["interfaces"]
         for item in interfaces:
             if item.get("ip_address") and item.get("netmask"):
                 ipaddress = ip_interface(
@@ -36,15 +32,15 @@ class Keenetic(BaseDevice):
             if item.get("description"):
                 decoded = self._decode_utf(item.get("description", ""))
                 item["description"] = decoded
-        return [Interfaces(**item) for item in interfaces]
+        return interfaces
 
     def vlans(self):
-        vlans = self._raw["vlans"]
+        vlans = self.raw["vlans"]
         for item in vlans:
             if item.get("description"):
                 decoded = self._decode_utf(item.get("description", ""))
                 item["description"] = decoded
-        return [Vlans(**item) for item in vlans]
+        return vlans
 
 
 if __name__ == "__main__":

oxi/interfaces/models/mikrotik.py

@@ -1,22 +1,21 @@
 import os
 from oxi.interfaces import register_parser
 from oxi.interfaces.base import BaseDevice
-from oxi.interfaces.contract import Interfaces, System, Vlans
 
 
 @register_parser(["routeros", "ros", "mikrotik"])
 class Mikrotik(BaseDevice):
     template = "mikrotik.ttp"
 
-    def system(self) -> "System":
-        systems = self._raw.get("system")
-        return System(**systems)
+    # def system(self) -> "System":
+    #     systems = self._raw.get("system")
+    #     return System(**systems)
 
-    def interfaces(self) -> "Interfaces":
-        return [Interfaces(**item) for item in self._raw.get("interfaces")]
+    # def interfaces(self) -> "Interfaces":
+    #     return [Interfaces(**item) for item in self._raw.get("interfaces")]
 
-    def vlans(self) -> list["Vlans"]:
-        return [Vlans(**item) for item in self._raw.get("vlans")]
+    # def vlans(self) -> list["Vlans"]:
+    #     return [Vlans(**item) for item in self._raw.get("vlans")]
 
 
 if __name__ == "__main__":