annet 3.12.0__py3-none-any.whl → 3.13.0__py3-none-any.whl

annet/adapters/netbox/common/models.py

@@ -189,6 +189,8 @@ class Interface(Entity, Generic[_IpAddressT, _FHRPGroupAssignmentT]):
     lag_min_links: int | None = None
     speed: int | None = None
 
+    custom_fields: Dict[str, Any] = field(default_factory=dict)
+
     ip_addresses: List[_IpAddressT] = field(default_factory=list)
     count_ipaddresses: int = 0
     fhrp_groups: List[_FHRPGroupAssignmentT] = field(default_factory=list)

annet/adapters/netbox/provider.py

@@ -45,12 +45,13 @@ def storage_factory(opts: NetboxStorageOpts) -> Storage:
 
 class NetboxProvider(StorageProvider, AdapterWithName, AdapterWithConfig):
     def __init__(self, url: Optional[str] = None, token: Optional[str] = None, insecure: bool = False,
-                 exact_host_filter: bool = False, threads: int = 1):
+                 exact_host_filter: bool = False, threads: int = 1, all_hosts_filter: dict[str, list[str]] | None = None):
         self.url = url
         self.token = token
         self.insecure = insecure
         self.exact_host_filter = exact_host_filter
         self.threads = threads
+        self.all_hosts_filter = all_hosts_filter
 
     @classmethod
     def with_config(cls, **kwargs: Dict[str, Any]) -> T:

annet/api/__init__.py

@@ -338,7 +338,8 @@ def diff(
             fetcher.fetch(
                 [device for device in loader.devices if device.id in device_ids],
                 processes=args.parallel
-            )
+            ),
+            new_thread=True
         )
     stdin = args.stdin(filter_acl=args.filter_acl, config=None)
 

annet/bgp_models.py

@@ -255,6 +255,8 @@ class FamilyOptions:
     rib_group: bool = False
     loops: int = 0
     advertise_bgp_static: bool = False
+    import_policy: Optional[str] = None
+    export_policy: Optional[str] = None
 
 
 @dataclass(frozen=True)
@@ -387,7 +389,7 @@ def _used_policies(peer: Union[Peer, PeerGroup, VrfOptions]) -> Iterable[str]:
         yield peer.export_policy
 
 
-def _used_redistribute_policies(opts: Union[GlobalOptions, VrfOptions]) -> Iterable[str]:
+def _used_families_policies(opts: Union[GlobalOptions, VrfOptions]) -> Iterable[str]:
     for family_opts in (
         opts.ipv4_unicast,
         opts.ipv6_unicast,
@@ -400,6 +402,13 @@ def _used_redistribute_policies(opts: Union[GlobalOptions, VrfOptions]) -> Itera
                 yield red.policy
         if family_opts.aggregate and family_opts.aggregate.policy:
             yield family_opts.aggregate.policy
+        for aggregate in family_opts.aggregates:
+            if aggregate.policy:
+                yield aggregate.policy
+        if family_opts.export_policy:
+            yield family_opts.export_policy
+        if family_opts.import_policy:
+            yield family_opts.import_policy
 
 
 def extract_policies(config: BgpConfig) -> Sequence[str]:
@@ -407,11 +416,11 @@ def extract_policies(config: BgpConfig) -> Sequence[str]:
     for vrf in config.global_options.vrf.values():
         for group in vrf.groups:
             result.extend(_used_policies(group))
-        result.extend(_used_redistribute_policies(vrf))
+        result.extend(_used_families_policies(vrf))
         result.extend(_used_policies(vrf))
     for group in config.global_options.groups:
         result.extend(_used_policies(group))
     for peer in config.peers:
         result.extend(_used_policies(peer))
-    result.extend(_used_redistribute_policies(config.global_options))
+    result.extend(_used_families_policies(config.global_options))
     return result

annet/mesh/device_models.py

@@ -36,6 +36,8 @@ class FamilyOptions(BaseMeshModel):
     rib_group: bool
     loops: int
     advertise_bgp_static: bool
+    import_policy: Optional[str]
+    export_policy: Optional[str]
 
 
 class _FamiliesMixin:

annet/rulebook/texts/huawei.rul

@@ -72,6 +72,11 @@ bfd
 
 observe-port *
 
+drop-profile *
+    color *
+    ecn weight
+    ecn
+
 qos local-precedence-queue-map *
 
 qos group %logic=huawei.misc.undo_children

annet/vendors/tabparser.py

@@ -823,41 +823,23 @@ class RosFormatter(CommonFormatter):
             (re.compile(r"^add "), ""),
             (re.compile(r"^print file="), "name="),
         )
-        patch_items = []
+
+        commands = odict()
         for item in patch.itms:
             key, childs, context = item.row, item.child, item.context
             if childs:
-                patch_items.append((key, childs, context))
+                childs_prev = f"{_prev} {key.strip()}".lstrip()
+                commands.update(self.cmd_paths(childs, _prev=childs_prev))
             else:
-                patch_items.append((key, None, context))
+                if key.startswith("remove"):
+                    find_cmd = key.removeprefix("remove").strip()
+                    for regex, repl_line in rm_regexs:
+                        find_cmd = regex.sub(repl_line, find_cmd)
+                    cmd = f"/{_prev} remove [ find {find_cmd} ]"
+                else:
+                    cmd = f"/{_prev} {key}"
+                commands[(cmd,)] = context
 
-        commands = odict()
-        prev_cmd = None
-        prev_context = None
-        for childs, items in itertools.groupby(patch_items, lambda x: x[1]):
-            if childs is None:
-                if prev_cmd:
-                    commands[(prev_cmd,)] = prev_context
-                for key, _, context in items:
-                    if key.startswith("remove"):
-                        find_cmd = key.replace("remove", "", 1).strip()
-                        for (regex, repl_line) in rm_regexs:
-                            find_cmd = regex.sub(repl_line, find_cmd)
-                        cmd = "remove [ find " + find_cmd + " ]"
-                    else:
-                        cmd = key
-                    commands[(cmd,)] = context
-            else:
-                for key, _, context in items:
-                    if _prev:
-                        prev_cmd = _prev
-                        prev_context = context
-                        block_cmd = f"{_prev} {key}"
-                    else:
-                        block_cmd = f"/{key}"
-                    commands[(block_cmd,)] = context
-                    for k, v in self.cmd_paths(childs, block_cmd).items():
-                        commands[k] = v
         return commands
 
 

{annet-3.12.0.dist-info → annet-3.13.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: annet
-Version: 3.12.0
+Version: 3.13.0
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT

{annet-3.12.0.dist-info → annet-3.13.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
 annet/__init__.py,sha256=eDQub3o0HdHcTWU4ZJpySrJuffGkbWts5CHXZYwVV9A,1915
 annet/annet.py,sha256=vyQ__n5hkjub3aWO8tksHPoUSbTeK97MyMcR_U8_BSU,1016
 annet/argparse.py,sha256=v1MfhjR0B8qahza0WinmXClpR8UiDFhmwDDWtNroJPA,12855
-annet/bgp_models.py,sha256=avbt0dR9_vxNUGFJ20pJHpgQifFzCbEzZClwlQPLULY,12709
+annet/bgp_models.py,sha256=QTzA6wu2_XWIr-Omq303LOfaNo3z_pHbc5g_zm0vz7g,13062
 annet/cli.py,sha256=shq3hHzrTxFL3x1_zTOR43QHo0JYs8QSwyOvGtL86Co,12733
 annet/cli_args.py,sha256=d0WuGiZfe42-nMvurX1bOb3iUMg0TSK-hxk8J1THxSY,13728
 annet/connectors.py,sha256=aoiDVLPizx8CW2p8SAwGCzyO_WW8H9xc2aujbGC4bDg,4882
@@ -28,12 +28,12 @@ annet/adapters/fetchers/stub/fetcher.py,sha256=FzpkIzPJBQVuNNSdXKoGzkALmIGMgo2gm
 annet/adapters/file/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/adapters/file/provider.py,sha256=3hNt0QQg46SVymLQ4Bh9G4VNYyhnB7gV5yu5OiIJpZE,7307
 annet/adapters/netbox/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-annet/adapters/netbox/provider.py,sha256=K6P5I2UjGZ3N3ayoUaVw10mf9lE5SD8W0kpB7TSefNA,2272
+annet/adapters/netbox/provider.py,sha256=iUkG0Dc0wBeck1dQMysej-olFLugKW6r-GJVutjMUYs,2375
 annet/adapters/netbox/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/adapters/netbox/common/adapter.py,sha256=1rR9PZAU72hIreozWFVb9CKpFVjfUH_i9kQEbaNiEUI,2639
 annet/adapters/netbox/common/client.py,sha256=PaxHG4W9H8_uunIwMBNYkLq4eQJYoO6p6gY-ciQs7Nc,2563
 annet/adapters/netbox/common/manufacturer.py,sha256=9jTfzwx5XmETrjSbIJu_FhNaByaUbGQE787c5rBor-4,1137
-annet/adapters/netbox/common/models.py,sha256=wm0aIxsv7nvQfCXoqI5sWSxRW3guLCB_aQU7KDiB0YY,8925
+annet/adapters/netbox/common/models.py,sha256=nMruBugAKNY8D63rqUnPYyMYGMIU-haxX0vnfxLGNWc,8990
 annet/adapters/netbox/common/query.py,sha256=0GeIiW_ttnESaNKHIziF61P-3DX0XD592UHQGn_1m60,1911
 annet/adapters/netbox/common/status_client.py,sha256=POaqiQJ0jPcqUQH-X_fWHVnKB7TBYveNriaT0eNTlfI,769
 annet/adapters/netbox/common/storage_base.py,sha256=lMRiDkzQylpA5Fxa4B6CUOWzq2d1cpjeSDbFGp8jH7o,9787
@@ -75,7 +75,7 @@ annet/annlib/rbparser/platform.py,sha256=d1jFH8hGMOf_qiveKE4H-c0OfNnzwmt2VYpSiSO
 annet/annlib/rbparser/syntax.py,sha256=PlKyWqS3zwPwumILmKIci-DmEAbfZp8YycpW1mNqADM,3602
 annet/annlib/rulebook/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/annlib/rulebook/common.py,sha256=6A3sOkOanDRTuR7F426zakShGaGKRBmBLDCnqBbBJr8,13531
-annet/api/__init__.py,sha256=LqCBT_-yL-FmDrF80fzm_qEZSCRbiiiyiivExOCgALo,34061
+annet/api/__init__.py,sha256=yVF4742g45sdvVDtJrM4pIwchy5AsxROEmXcz31xFno,34090
 annet/configs/context.yml,sha256=RVLrKLIHpCty7AGwOnmqf7Uu0iZQCn-AjYhophDJer8,259
 annet/configs/logging.yaml,sha256=EUagfir99QqA73Scc3k7sfQccbU3E1SvEQdyhLFtCl4,997
 annet/generators/__init__.py,sha256=LnW6G_7K5ScGYkFjFk7_QfuUaFAk5oTSHYaTaL6xUwA,16735
@@ -91,7 +91,7 @@ annet/generators/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 annet/generators/common/initial.py,sha256=qYBxXFhyOPy34cxc6hsIXseod-lYCmmbuNHpM0uteY0,1244
 annet/mesh/__init__.py,sha256=lcgdnBIxc2MAN7Er1bcErEKPqrjWO4uIp_1FldMXTYg,557
 annet/mesh/basemodel.py,sha256=E6NTOneiMDwB1NCpjDRECoaeQ0f3n_fmTLnKTrSHTU4,4917
-annet/mesh/device_models.py,sha256=0qWyNlk6ICviWs4pt0XJK2wptwdwM3UwxjyNHe56CjU,4829
+annet/mesh/device_models.py,sha256=K_JqI03GyikROM6MmfV03jjA1Raxr8btuAoANOY0aEo,4895
 annet/mesh/executor.py,sha256=gfRQXSTivL0DJrhnGH-4kmCTiIxDS_vReQyle3bF2FI,17970
 annet/mesh/match_args.py,sha256=CR3kdIV9NGtyk9E2JbcOQ3TRuYEryTWP3m2yCo2VCWg,5751
 annet/mesh/models_converter.py,sha256=nCtzFR3s65MVkCE_xJm1Ci5c2hUwsr6ajfBiSmy3r_8,3565
@@ -160,7 +160,7 @@ annet/rulebook/texts/cisco.order,sha256=DarNICBBAEXR8VOFV8SNnuQmwGAG-TGwXlMWpFMT
 annet/rulebook/texts/cisco.rul,sha256=cX9CyqKpgpr8B1Qe3aEe66wZpfaGg7fmsIsmgW6Yip4,3619
 annet/rulebook/texts/huawei.deploy,sha256=5vrvhai2BjaJ793A3EHHCthic3dnGKp2_rAgViVIouI,10951
 annet/rulebook/texts/huawei.order,sha256=4qXuoqfJ8Hck11LACKwaWP2ARHwPrtLfCut1BDRAg7E,11244
-annet/rulebook/texts/huawei.rul,sha256=xVGFGOidwnQPaMbXhQCRuk-yUEMVTl5A9_TsOxQbjNY,13765
+annet/rulebook/texts/huawei.rul,sha256=asuQeZgADkOYsNMP5t2tIRbJnlTYgicxSV6S94ozYXw,13816
 annet/rulebook/texts/iosxr.deploy,sha256=Hu0NkcGv3f1CWUrnbzI3eQOPXJxtH4NNOPRV68IrW4U,1226
 annet/rulebook/texts/iosxr.order,sha256=gUp6XHwzqkDsArCUAwtx3rR1qlGfYsHy2vP9oZN2oDk,1922
 annet/rulebook/texts/iosxr.rul,sha256=JMFJ94ORNeDQo_X73iPS6pFUmXYTBuL5pkUypgHcOig,2966
@@ -183,7 +183,7 @@ annet/rulebook/texts/routeros.rul,sha256=ipfxjj0mjFef6IsUlupqx4BY_Je_OUb8u_U1019
 annet/vendors/__init__.py,sha256=gQcDFlKeWDZB6vxJ_MdPWEoE-C5dg-YgXvgGkuV9YLw,569
 annet/vendors/base.py,sha256=AmM3--gqC-Rpw5Xu_-hqthWZ9EoZRL8x6eOHwadZGbo,1145
 annet/vendors/registry.py,sha256=LgPg4oxWrgxsfpLpJ6OWEGFmUzlVlHzziSXsZTi82uc,2540
-annet/vendors/tabparser.py,sha256=BXPYppgJf4OaobFrlpVr7APzG-NY6e0wwgGdp6YsVdU,32953
+annet/vendors/tabparser.py,sha256=cPHCqq9oZ3TBR0GlV4oCaPA_UZuaEJfyfYb-uh3n5Oo,32167
 annet/vendors/library/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/vendors/library/arista.py,sha256=J4ltZ7sS_TgIECg2U7fizvxwfS4-s35Of0tNDNWWYbE,1302
 annet/vendors/library/aruba.py,sha256=tvrSFSA43n0uelCv-NLQnqxO01d0y2mrfhncpOX7zoQ,1257
@@ -199,8 +199,8 @@ annet/vendors/library/optixtrans.py,sha256=VdME69Ca4HAEgoaKN21fZxnmmsqqaxOe_HZja
 annet/vendors/library/pc.py,sha256=vfv31_NPi7M-4AUDL89UcpawK2E6xvCpELA209cd1ho,1086
 annet/vendors/library/ribbon.py,sha256=DDOBq-_-FL9dCxqXs2inEWZ-pvw-dJ-A-prA7cKMhec,1216
 annet/vendors/library/routeros.py,sha256=iQa7m_4wjuvcgBOI9gyZwlw1BvzJfOkvUbyoEk-NI9I,1254
-annet-3.12.0.dist-info/licenses/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-3.12.0.dist-info/licenses/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-3.13.0.dist-info/licenses/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-3.13.0.dist-info/licenses/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
 annet_generators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet_generators/example/__init__.py,sha256=OJ77uj8axc-FIyIu_Xdcnzmde3oQW5mk5qbODkhuVc8,355
 annet_generators/example/hostname.py,sha256=RloLzNVetEoWPLITzfJ13Nk3CC0yi-cZB1RTd6dnuhI,2541
@@ -213,8 +213,8 @@ annet_generators/rpl_example/generator.py,sha256=EWah19gOH8G-QyNyWqxCqdRi0BK7GbM
 annet_generators/rpl_example/items.py,sha256=HPgxScDvSqJPdz0c2SppDrH82DZYC4zUaniQwcWmh4A,1176
 annet_generators/rpl_example/mesh.py,sha256=z_WgfDZZ4xnyh3cSf75igyH09hGvtexEVwy1gCD_DzA,288
 annet_generators/rpl_example/route_policy.py,sha256=z6nPb0VDeQtKD1NIg9sFvmUxBD5tVs2frfNIuKdM-5c,2318
-annet-3.12.0.dist-info/METADATA,sha256=XJu0SgF3B3HRMka4Qd0fPAZKXPWvHQVdx7FYepCMpqQ,816
-annet-3.12.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-annet-3.12.0.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
-annet-3.12.0.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-3.12.0.dist-info/RECORD,,
+annet-3.13.0.dist-info/METADATA,sha256=ZdefKvmfVnjAqz3UKtqNkKtSgGfwzgrNP2J0j5Q-WYY,816
+annet-3.13.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+annet-3.13.0.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
+annet-3.13.0.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-3.13.0.dist-info/RECORD,,