annet 0.16.33__tar.gz → 0.16.34__tar.gz

{annet-0.16.33/annet.egg-info → annet-0.16.34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: annet
-Version: 0.16.33
+Version: 0.16.34
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT
@@ -23,7 +23,7 @@ Requires-Dist: yarl>=1.8.2
 Requires-Dist: adaptix==3.0.0b7
 Requires-Dist: dataclass-rest==0.4
 Provides-Extra: netbox
-Requires-Dist: annetbox[sync]>=0.1.10; extra == "netbox"
+Requires-Dist: annetbox[sync]>=0.1.12; extra == "netbox"
 Dynamic: home-page
 Dynamic: license
 Dynamic: provides-extra

{annet-0.16.33 → annet-0.16.34}/annet/adapters/netbox/v37/storage.py

@@ -165,17 +165,28 @@ class NetboxStorageV37(Storage):
     def _load_devices(self, query: NetboxQuery) -> List[api_models.Device]:
         if not query.globs:
             return []
+        devices = []
+        device_ids = set()
+        query_groups = parse_glob(query.globs)
         if self.exact_host_filter:
-            devices = self.netbox.dcim_all_devices(name__ie=query.globs).results
-        else:
-            query = _hostname_dot_hack(query)
-            devices = [
-                device
-                for device in self.netbox.dcim_all_devices(
-                    name__ic=query.globs,
-                ).results
-                if _match_query(query, device)
-            ]
+            name_ies = [_hostname_dot_hack(query) for query in query_groups.pop("name__ic", [])]
+            query_groups["name__ie"].extend(name_ies)
+        for grp, params in query_groups.items():
+            if not params:
+                continue
+            try:
+                new_devices = self.netbox.dcim_all_devices(**{grp: params}).results
+            except Exception as e:
+                # tag and site lookup returns 400 in case of unknown tag or site
+                if "is not one of the available choices" in str(e):
+                    continue
+                raise
+            if grp == "name__ic":
+                new_devices = [device for device in new_devices if _match_query(query, device)]
+            for device in new_devices:
+                if device.id not in device_ids:
+                    device_ids.add(device.id)
+                    devices.extend(new_devices)
         return devices
 
     def _extend_interfaces(self, interfaces: List[models.Interface]) -> List[models.Interface]:
@@ -268,7 +279,7 @@ def _match_query(query: NetboxQuery, device_data: api_models.Device) -> bool:
     return False
 
 
-def _hostname_dot_hack(netbox_query: NetboxQuery) -> NetboxQuery:
+def _hostname_dot_hack(raw_query: str) -> str:
     # there is no proper way to lookup host by its hostname
     # ie find "host" with fqdn "host.example.com"
     # besides using name__ic (ie startswith)
@@ -280,9 +291,23 @@ def _hostname_dot_hack(netbox_query: NetboxQuery) -> NetboxQuery:
             raw_query = raw_query + "."
         return raw_query
 
-    raw_query = netbox_query.query
     if isinstance(raw_query, list):
         for i, name in enumerate(raw_query):
             raw_query[i] = add_dot(name)
 
-    return NetboxQuery(raw_query)
+    return raw_query
+
+
+def parse_glob(globs: list[str]) -> dict[str, list[str]]:
+    query_groups: dict[str, list[str]] = {"tag": [], "site": [], "name__ic": []}
+    for q in globs:
+        if ":" in q:
+            glob_type, param = q.split(":", 2)
+            if glob_type not in query_groups:
+                raise Exception(f"unknown query type: '{glob_type}'")
+            if not param:
+                raise Exception(f"empty param for '{glob_type}'")
+            query_groups[glob_type].append(param)
+        else:
+            query_groups["name__ic"].append(q)
+    return query_groups

{annet-0.16.33 → annet-0.16.34}/annet/annlib/netdev/devdb/data/devdb.json

@@ -166,6 +166,8 @@
 
     "B4com": "^[Bb]4com",
     "B4com.CS2148P": "^[Bb]4com B4T-CS2148P.*",
+    "B4com.CS4100": "^[Bb]4com B4T-CS41.*",
+    "B4com.CS4132U": "^[Bb]4com B4T-CS4132U.*",
     "B4com.CS4148Q": "^[Bb]4com B4T-CS4148Q.*",
-    "B4com.CS4146U": "^[Bb]4com B4T-CS4146U.*"
+    "B4com.CS4164U": "^[Bb]4com B4T-CS4164U.*"
 }

{annet-0.16.33 → annet-0.16.34}/annet/annlib/rulebook/common.py

@@ -346,14 +346,14 @@ def apply(hw, do_commit, do_finalize, **_):
         after.add_cmd(Command("exit"))
     elif hw.B4com.CS2148P:
         before.add_cmd(Command("conf t"))
-        after.add_cmd(Command("exit"))
+        after.add_cmd(Command("end"))
         if do_finalize:
             after.add_cmd(Command("write", timeout=40))
     elif hw.B4com:
         before.add_cmd(Command("conf t"))
-        after.add_cmd(Command("exit"))
         if do_commit:
             after.add_cmd(Command("commit"))
+            after.add_cmd(Command("end"))
         if do_finalize:
             after.add_cmd(Command("write", timeout=40))
     elif hw.H3C:

{annet-0.16.33 → annet-0.16.34}/annet/bgp_models.py

@@ -142,7 +142,6 @@ class Peer:
 class Aggregate:
     policy: str = ""
     routes: tuple[str, ...] = ()  # "182.168.1.0/24",
-    export_policy: str = ""
     as_path: str = ""
     reference: str = ""
     suppress: bool = False
@@ -290,21 +289,18 @@ def _used_policies(peer: Union[Peer, PeerGroup]) -> Iterable[str]:
 
 
 def _used_redistribute_policies(opts: Union[GlobalOptions, VrfOptions]) -> Iterable[str]:
-    for red in opts.ipv4_unicast.redistributes:
-        if red.policy:
-            yield red.policy
-    for red in opts.ipv6_unicast.redistributes:
-        if red.policy:
-            yield red.policy
-    for red in opts.ipv4_labeled_unicast.redistributes:
-        if red.policy:
-            yield red.policy
-    for red in opts.ipv6_labeled_unicast.redistributes:
-        if red.policy:
-            yield red.policy
-    for red in opts.l2vpn_evpn.redistributes:
-        if red.policy:
-            yield red.policy
+    for family_opts in (
+        opts.ipv4_unicast,
+        opts.ipv6_unicast,
+        opts.ipv4_labeled_unicast,
+        opts.ipv6_labeled_unicast,
+        opts.l2vpn_evpn,
+    ):
+        for red in family_opts.redistributes:
+            if red.policy:
+                yield red.policy
+        if family_opts.aggregate and family_opts.aggregate.policy:
+            yield family_opts.aggregate.policy
 
 
 def extract_policies(config: BgpConfig) -> Sequence[str]:

{annet-0.16.33 → annet-0.16.34}/annet/mesh/device_models.py

@@ -8,7 +8,6 @@ from .peer_models import MeshPeerGroup
 class Aggregate(BaseMeshModel):
     policy: str
     routes: Annotated[tuple[str, ...], Concat()]
-    export_policy: str
     as_path: str
     reference: str
     suppress: bool
@@ -22,7 +21,7 @@ class FamilyOptions(BaseMeshModel):
         super().__init__(**kwargs)
     family: Family
     vrf_name: str
-    multipath: int = 0
+    multipath: int
     global_multipath: int
     aggregate: Annotated[Aggregate, Merge()]
     redistributes: Annotated[tuple[Redistribute, ...], Concat()]

{annet-0.16.33 → annet-0.16.34}/annet/mesh/executor.py

@@ -144,8 +144,17 @@ class MeshExecutor:
         for rule in rules:
             handler_name = self._handler_name(rule.handler)
             if rule.direct_order:
+                if rule.name_right not in neigbors:
+                    print(list(neigbors), flush=True)
+                    raise ValueError(
+                        f"Device `{device.fqdn}` has no neighbor `{rule.name_right}` required for `{handler_name}`. {list(neigbors)}",
+                    )
                 neighbor_device = neigbors[rule.name_right]
             else:
+                if rule.name_left not in neigbors:
+                    raise ValueError(
+                        f"Device `{device.fqdn}` has no neighbor `{rule.name_left}` required for `{handler_name}`",
+                    )
                 neighbor_device = neigbors[rule.name_left]
             all_connected_ports = [
                 (p1.name, p2.name)

{annet-0.16.33 → annet-0.16.34}/annet/mesh/registry.py

@@ -208,11 +208,11 @@ class MeshRulesRegistry:
 
     def lookup_direct(self, device: str, neighbors: list[str]) -> list[MatchedDirectPair]:
         found = []
-        device = self._normalize_host(device)
+        device_norm = self._normalize_host(device)
         for neighbor in neighbors:
-            neighbor = self._normalize_host(neighbor)
+            neighbor_norm = self._normalize_host(neighbor)
             for rule in self.direct_rules:
-                if args := rule.matcher.match_pair(device, neighbor):
+                if args := rule.matcher.match_pair(device_norm, neighbor_norm):
                     found.append(MatchedDirectPair(
                         handler=rule.handler,
                         port_processor=rule.port_processor,
@@ -222,7 +222,7 @@ class MeshRulesRegistry:
                         match_left=args[0],
                         match_right=args[1],
                     ))
-                if args := rule.matcher.match_pair(neighbor, device):
+                if args := rule.matcher.match_pair(neighbor_norm, device_norm):
                     found.append(MatchedDirectPair(
                         handler=rule.handler,
                         port_processor=rule.port_processor,
@@ -238,11 +238,11 @@ class MeshRulesRegistry:
 
     def lookup_indirect(self, device: str, devices: list[str]) -> list[MatchedIndirectPair]:
         found = []
-        device = self._normalize_host(device)
+        device_norm = self._normalize_host(device)
         for other_device in devices:
-            other_device = self._normalize_host(other_device)
+            other_device_norm = self._normalize_host(other_device)
             for rule in self.indirect_rules:
-                if args := rule.matcher.match_pair(device, other_device):
+                if args := rule.matcher.match_pair(device_norm, other_device_norm):
                     found.append(MatchedIndirectPair(
                         handler=rule.handler,
                         direct_order=True,
@@ -251,7 +251,7 @@ class MeshRulesRegistry:
                         match_left=args[0],
                         match_right=args[1],
                     ))
-                if args := rule.matcher.match_pair(other_device, device):
+                if args := rule.matcher.match_pair(other_device_norm, device_norm):
                     found.append(MatchedIndirectPair(
                         handler=rule.handler,
                         direct_order=False,
@@ -266,9 +266,9 @@ class MeshRulesRegistry:
 
     def lookup_virtual(self, device: str) -> list[MatchedVirtualPair]:
         found = []
-        device = self._normalize_host(device)
+        device_norm = self._normalize_host(device)
         for rule in self.virtual_rules:
-            if args := rule.matcher.match_one(device):
+            if args := rule.matcher.match_one(device_norm):
                 found.append(MatchedVirtualPair(
                     handler=rule.handler,
                     match=args,
@@ -280,9 +280,9 @@ class MeshRulesRegistry:
 
     def lookup_global(self, device: str) -> list[MatchedGlobal]:
         found = []
-        device = self._normalize_host(device)
+        device_norm = self._normalize_host(device)
         for rule in self.global_rules:
-            if args := rule.matcher.match_one(device):
+            if args := rule.matcher.match_one(device_norm):
                 found.append(MatchedGlobal(
                     handler=rule.handler,
                     match=args,

annet-0.16.34/annet/rulebook/b4com/iface.py

@@ -0,0 +1,42 @@
+from annet.annlib.types import Op
+
+from annet.rulebook import common
+
+
+def mtu(rule, key, diff, **kwargs):
+    """
+    Удаляем mtu без указания значения
+    """
+    if diff[Op.REMOVED]:
+        yield (False, "no mtu", None)
+    elif diff[Op.ADDED]:
+        yield from common.default(rule, key, diff, **kwargs)
+
+
+def sflow(rule, key, diff, **kwargs):
+    """
+    Команда sflow sampling-rate * direction ingress max-header-size *
+    сносится без указания sampling-rate и max-header-size
+    """
+    result = common.default(rule, key, diff, **kwargs)
+    for op, cmd, ch in result:
+        if diff[Op.REMOVED]:
+            if "ingress" in diff[Op.REMOVED][0]["row"]:
+                yield (op, "no sflow sampling-rate direction ingress", ch)
+            elif "egress" in diff[Op.REMOVED][0]["row"]:
+                yield (op, "no sflow sampling-rate direction egress", ch)
+            else:
+                yield (op, cmd, ch)
+    return result
+
+
+def lldp(rule, key, diff, **kwargs):
+    """
+    Не удаляем все что начинается с set, т.к. set перезаписывает предыдущий конфиг
+    """
+    result = common.default(rule, key, diff, **kwargs)
+    for op, cmd, ch in result:
+        if diff[Op.REMOVED] and "set lldp" in cmd:
+            pass
+        else:
+            yield (op, cmd, ch)

{annet-0.16.33 → annet-0.16.34}/annet/rulebook/texts/b4com.rul

@@ -1,6 +1,6 @@
 # Операторы:
-#   *  Один аргумент в undo
-#   ~  Несколько аргументов (минимум один) в undo
+#   *  Один аргумент в no
+#   ~  Несколько аргументов (минимум один) в no
 #
 # Параметры:
 #   %global         Команда действует на любом уровне ниже
@@ -11,8 +11,13 @@
 #                   Сделано в основном для того чтобы генерировать специальные команды для наливки
 # -----
 # Physical
+sflow *
+
 interface */(ce|xe)[0-9\/]+$/     %logic=common.permanent %diff_logic=cisco.iface.diff
     ipv6 address *
-    mtu *
+    mtu *                         %logic=b4com.iface.mtu
+    sflow *                       %logic=b4com.iface.sflow
     lldp-agent
-    ~         %rewrite %global
+        ~ %global                 %logic=b4com.iface.lldp
+        !dcbx *
+        !exit

{annet-0.16.33 → annet-0.16.34/annet.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: annet
-Version: 0.16.33
+Version: 0.16.34
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT
@@ -23,7 +23,7 @@ Requires-Dist: yarl>=1.8.2
 Requires-Dist: adaptix==3.0.0b7
 Requires-Dist: dataclass-rest==0.4
 Provides-Extra: netbox
-Requires-Dist: annetbox[sync]>=0.1.10; extra == "netbox"
+Requires-Dist: annetbox[sync]>=0.1.12; extra == "netbox"
 Dynamic: home-page
 Dynamic: license
 Dynamic: provides-extra

{annet-0.16.33 → annet-0.16.34}/annet.egg-info/SOURCES.txt

@@ -130,6 +130,7 @@ annet/rulebook/aruba/ap_env.py
 annet/rulebook/aruba/misc.py
 annet/rulebook/b4com/__init__.py
 annet/rulebook/b4com/file.py
+annet/rulebook/b4com/iface.py
 annet/rulebook/cisco/__init__.py
 annet/rulebook/cisco/iface.py
 annet/rulebook/cisco/misc.py

{annet-0.16.33 → annet-0.16.34}/annet.egg-info/requires.txt

@@ -15,4 +15,4 @@ adaptix==3.0.0b7
 dataclass-rest==0.4
 
 [netbox]
-annetbox[sync]>=0.1.10
+annetbox[sync]>=0.1.12

{annet-0.16.33 → annet-0.16.34}/setup.py

@@ -44,7 +44,7 @@ if __name__ == "__main__":
           ],
         },
         extras_require={
-            "netbox": ["annetbox[sync]>=0.1.10"],
+            "netbox": ["annetbox[sync]>=0.1.12"],
         },
         python_requires=">=3.10",
         install_requires=requirements(),