annet 1.0.0__tar.gz → 1.0.2__tar.gz

{annet-1.0.0/annet.egg-info → annet-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: annet
-Version: 1.0.0
+Version: 1.0.2
 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.12; extra == "netbox"
+Requires-Dist: annetbox[sync]>=0.1.13; extra == "netbox"
 Dynamic: home-page
 Dynamic: license
 Dynamic: provides-extra

{annet-1.0.0 → annet-1.0.2}/annet/adapters/netbox/common/manufacturer.py

@@ -54,7 +54,7 @@ def get_breed(manufacturer: str, model: str):
         return "bcom-os"
     elif manufacturer == "MikroTik":
         return "routeros"
-    elif manufacturer == "Moxa":
+    elif manufacturer in ("Moxa", "Nebius"):
         return "moxa"
     elif manufacturer == "PC":
         return "pc"

{annet-1.0.0 → annet-1.0.2}/annet/adapters/netbox/common/models.py

@@ -214,7 +214,8 @@ class NetboxDevice(Entity):
         return type(self) is type(other) and self.url == other.url
 
     def is_pc(self) -> bool:
-        return self.device_type.manufacturer.name in ("Mellanox", "NVIDIA", "Moxa") or self.breed == "pc"
+        custom_breed_pc = ("Mellanox", "NVIDIA", "Moxa", "Nebius")
+        return self.device_type.manufacturer.name in custom_breed_pc or self.breed == "pc"
 
     def _make_interface(self, name: str, type: InterfaceType) -> Interface:
         return Interface(

{annet-1.0.0 → annet-1.0.2}/annet/adapters/netbox/common/query.py

@@ -5,7 +5,7 @@ from typing import cast, List, Union, Iterable, Optional, TypedDict
 from annet.storage import Query
 
 FIELD_VALUE_SEPARATOR = ":"
-ALLOWED_GLOB_GROUPS = ["site", "tag", "role"]
+ALLOWED_GLOB_GROUPS = ["site", "tag", "role", "device_type"]
 
 
 class Filter(TypedDict, total=False):
@@ -13,6 +13,7 @@ class Filter(TypedDict, total=False):
     tag: list[str]
     role: list[str]
     name: list[str]
+    device_type: list[str]
 
 
 @dataclass

{annet-1.0.0 → annet-1.0.2}/annet/adapters/netbox/v37/storage.py

@@ -312,8 +312,10 @@ def _match_query(exact_host_filter: bool, query: NetboxQuery, device_data: api_m
     hostnames = [subquery.strip() for subquery in query.globs if FIELD_VALUE_SEPARATOR not in subquery]
     if not hostnames:
         return True  # no hostnames to check
+
     short_name = device_data.name.split(".")[0]
     for hostname in hostnames:
+        hostname = hostname.strip().rstrip(".")
         if short_name == hostname or device_data.name == hostname:
             return True
     return False

{annet-1.0.0 → annet-1.0.2}/annet/annlib/netdev/devdb/data/devdb.json

@@ -104,7 +104,7 @@
     "Nokia.NS7750": " 7750",
     "Nokia.SR_1s": "SR-1s",
 
-    "PC": "^(PC|pc|[Mm]ellanox SN|[Ee]dge-?[Cc]ore|[Mm]oxa|NVIDIA|[Aa]sterfusion CX|[Uu]fi[Ss]pace)",
+    "PC": "^(PC|pc|[Mm]ellanox SN|[Ee]dge-?[Cc]ore|[Mm]oxa|NVIDIA|Nebius|[Aa]sterfusion CX|[Uu]fi[Ss]pace)",
 
     "PC.Whitebox": "([Mm]ellanox SN|[Ee]dge-?[Cc]ore|NVIDIA|[Aa]sterfusion CX|[Uu]fi[Ss]pace)",
     "PC.Whitebox.Mellanox": "[Mm]ellanox",
@@ -132,6 +132,8 @@
     "PC.Whitebox.Ufispace.S": " S",
     "PC.Whitebox.Ufispace.S.S9100": " S91\\d\\d",
     "PC.Whitebox.Ufispace.S.S9100.S9110_32X": " S9110-32X",
+    "PC.Nebius": "^Nebius",
+    "PC.Nebius.NB-E-BR-DCU-AST2600": "^Nebius NB-E-BR-DCU-AST2600",
 
     "RouterOS": "^([Rr]outer[Oo][Ss]|[Mm]ikro[Tt]ik)",
 

{annet-1.0.0 → annet-1.0.2}/annet/bgp_models.py

@@ -245,8 +245,10 @@ class VrfOptions:
     l2vpn_evpn: FamilyOptions
 
     vrf_name_global: Optional[str] = None
-    l3vni: Optional[int] = None
+    import_policy: str = ""
+    export_policy: str = ""
     as_path_relax: bool = False
+    l3vni: Optional[int] = None
     rt_import: list[str] = field(default_factory=list)
     rt_export: list[str] = field(default_factory=list)
     rt_import_v4: list[str] = field(default_factory=list)
@@ -281,7 +283,7 @@ class BgpConfig:
     peers: list[Peer]
 
 
-def _used_policies(peer: Union[Peer, PeerGroup]) -> Iterable[str]:
+def _used_policies(peer: Union[Peer, PeerGroup, VrfOptions]) -> Iterable[str]:
     if peer.import_policy:
         yield peer.import_policy
     if peer.export_policy:
@@ -309,6 +311,7 @@ def extract_policies(config: BgpConfig) -> Sequence[str]:
         for group in vrf.groups:
             result.extend(_used_policies(group))
         result.extend(_used_redistribute_policies(vrf))
+        result.extend(_used_policies(vrf))
     for group in config.global_options.groups:
         result.extend(_used_policies(group))
     for peer in config.peers:

{annet-1.0.0 → annet-1.0.2}/annet/gen.py

@@ -407,7 +407,7 @@ def old_new(
         files_to_download = _get_files_to_download(devices, gens)
         devices_with_files = [device for device in devices if device in files_to_download]
         fetcher = get_fetcher()
-        fetched_packages, failed_packages = do_async(fetcher.fetch_packages(devices_with_files))
+        fetched_packages, failed_packages = do_async(fetcher.fetch_packages(devices_with_files), new_thread=True)
 
     ctx = OldNewDeviceContext(
         config=config,

{annet-1.0.0 → annet-1.0.2}/annet/rpl_generators/prefix_lists.py

@@ -110,7 +110,9 @@ class PrefixListFilterGenerator(PartialGenerator, ABC):
     def acl_arista(self, _):
         return r"""
         ip prefix-list
+            seq
         ipv6 prefix-list
+            seq
         """
 
     def _arista_prefix_list(
@@ -120,21 +122,18 @@ class PrefixListFilterGenerator(PartialGenerator, ABC):
             match: PrefixMatchValue,
             plist: IpPrefixList,
     ) -> Iterable[Sequence[str]]:
-        for i, prefix in enumerate(plist.members):
-            addr_mask = ip_interface(prefix)
-            yield (
-                prefix_type,
-                "prefix-list",
-                name,
-                f"seq {i * 5 + 5}",
-                "permit",
-                str(addr_mask.ip).upper(),
-                str(addr_mask.network.prefixlen),
-            ) + (
-                ("ge", str(match.greater_equal)) if match.greater_equal is not None else ()
-            ) + (
-                ("le", str(match.less_equal)) if match.less_equal is not None else ()
-            )
+        with self.block(prefix_type, "prefix-list", name):
+            for i, prefix in enumerate(plist.members):
+                addr_mask = ip_interface(prefix)
+                yield (
+                    f"seq {i * 10 + 10}",
+                    "permit",
+                    addr_mask.with_prefixlen,
+                ) + (
+                    ("ge", str(match.greater_equal)) if match.greater_equal is not None else ()
+                ) + (
+                    ("le", str(match.less_equal)) if match.less_equal is not None else ()
+                )
 
     def run_arista(self, device: Any):
         policies = self.get_policies(device)

{annet-1.0.0 → annet-1.0.2}/annet/rulebook/texts/arista.order

@@ -88,6 +88,7 @@ interface
 
 (?:ip|ipv6) routing
 
+ip prefix-list
 
 ip community-list
 

{annet-1.0.0 → annet-1.0.2/annet.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: annet
-Version: 1.0.0
+Version: 1.0.2
 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.12; extra == "netbox"
+Requires-Dist: annetbox[sync]>=0.1.13; extra == "netbox"
 Dynamic: home-page
 Dynamic: license
 Dynamic: provides-extra

{annet-1.0.0 → annet-1.0.2}/annet.egg-info/requires.txt

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

{annet-1.0.0 → annet-1.0.2}/setup.py

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