Enhance BaseDevice validation and update Mikrotik model

- Introduced a new method `_validate_template_groups` in `BaseDevice` to ensure TTP templates declare all required and optional sections.
- Updated `_REQUIRED_SECTIONS` and added `_OPTIONAL_SECTIONS` to improve template validation.
- Modified the `vlans` method in `Mikrotik` to streamline raw data handling and added debug print statements for clarity.
- Revised the Mikrotik TTP template to include structured variable definitions and improved group handling for interfaces and VLANs.
This commit is contained in:
IluaAir
2026-02-19 00:16:37 +03:00
parent c434712309
commit 685ff19d2f
3 changed files with 56 additions and 17 deletions

View File

@@ -1,3 +1,4 @@
import re
from typing import TYPE_CHECKING
from oxi.interfaces import register_parser
from oxi.interfaces.base import BaseDevice
@@ -19,11 +20,13 @@ class Mikrotik(BaseDevice):
print("-" * 12)
def vlans(self) -> list["Vlans"]:
print(f"{self._raw["vlans"]=}")
print("-" * 12)
raw = self._raw.get("vlans", [])
print(raw)
if __name__ == "__main__":
mikr = Mikrotik()
mikr.run()
with open("../../test.txt") as file:
data = file.read()
mikr = Mikrotik(data)
mikr.parse()
print(mikr.load)

View File

@@ -1,31 +1,47 @@
<doc>
some templates
</doc>
<template>
<vars>
default_system = {
"model": "",
"serial_number": ""
}
default_vlans = {
"id": "",
"name": ""
default_interfaces = {
"disabled": "False"
}
default_vlans = {
"disabled": "False",
"mtu": None
}
</vars>
<group name="system" default="default_system">
# version: {{ version }} {{ ignore }}
# version: {{ version }}{{ ignore('.*') }}
# model = {{ model }}
# serial number = {{ serial_number }}
</group>
<group name="interfaces">
<group name="interfaces" default="default_interfaces">
/ip address
add address={{ address }} interface={{ interface }} network={{ network }}
## not disabled and no comment
add address={{ ip | _start_ }}/{{ mask }} interface={{ interface }} network={{ network }}
## not disabled and comment with/without quotes
add address={{ ip | _start_ }}/{{ mask }} comment={{ comment | ORPHRASE | exclude("disabled=") | strip('"')}} interface={{ interface }} network={{ network }}
## disabled no comment
add address={{ ip | _start_ }}/{{ mask }} disabled={{ disabled | replace("yes","True") | strip('"')}} interface={{ interface }} 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 }}
</group>
<group name="vlans" default="default_vlans">
/vlans add {{ id }} name= {{ name }}
<group name="vlans">
/interface vlan {{ _start_ }}
## not disabled and no comment
add interface={{ interface }} name={{ name | ORPHRASE }} 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 }}
## disabled with comment with/without quotes
add comment={{ comment | ORPHRASE | exclude("disabled=") | strip('"')}} disabled={{ disabled }} interface={{ interface }} name={{ name | ORPHRASE }} vlan-id={{ vlan_id }}
## disabled no comment
add interface={{ interface }} name={{ name | ORPHRASE }} vlan-id={{ vlan_id }} disabled={{ disabled }}
</group>
</template>