annet 1.0.3__tar.gz → 1.0.4__tar.gz

{annet-1.0.3/annet.egg-info → annet-1.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: annet
-Version: 1.0.3
+Version: 1.0.4
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT

{annet-1.0.3 → annet-1.0.4}/README.md

@@ -68,3 +68,8 @@ sphinx-build -M html docs docs-build
 ```
 
 3. Open rendered html in browser docs-build/html/index.html
+
+## Links
+
+* [Online Documentation](https://annetutil.github.io/annet/)
+* [Tutorial](https://annetutil.github.io/annet/main/usage/tutorial.html)

{annet-1.0.3 → annet-1.0.4}/annet/annlib/netdev/devdb/data/devdb.json

@@ -132,6 +132,9 @@
     "PC.Whitebox.Ufispace.S": " S",
     "PC.Whitebox.Ufispace.S.S9100": " S91\\d\\d",
     "PC.Whitebox.Ufispace.S.S9100.S9110_32X": " S9110-32X",
+    "PC.Whitebox.Ufispace.S.S9300": " S93\\d\\d",
+    "PC.Whitebox.Ufispace.S.S9300.S9301_32DB": " S9301-32DB",
+    "PC.Whitebox.Ufispace.S.S9300.S9321_64EO": " S9321-64EO",
     "PC.Nebius": "^Nebius",
     "PC.Nebius.NB-E-BR-DCU-AST2600": "^Nebius NB-E-BR-DCU-AST2600",
 

{annet-1.0.3 → annet-1.0.4}/annet/bgp_models.py

@@ -3,6 +3,77 @@ from dataclasses import dataclass, field
 from typing import Literal, Union, Optional
 
 
+class VidRange:
+    def __init__(self, start: int, stop: int) -> None:
+        self.start = start
+        self.stop = stop
+
+    def is_single(self):
+        return self.start == self.stop
+
+    def __iter__(self):
+        return iter(range(self.start, self.stop + 1))
+
+    def __str__(self):
+        if self.is_single():
+            return str(self.start)
+        return f"{self.start}-{self.stop}"
+
+    def __repr__(self):
+        return f"VlanRange({self.start}, {self.stop})"
+
+    def __eq__(self, other: object) -> bool:
+        if type(other) is VidRange:
+            return self.start == other.start and self.stop == other.stop
+        return NotImplemented
+
+
+def _parse_vlan_ranges(ranges: str) -> Iterable[VidRange]:
+    for range in ranges.split(","):
+        start, sep, stop = range.strip().partition("-")
+        try:
+            if not sep:
+                int_start = int(start)
+                yield VidRange(int_start, int_start)
+            elif not stop or not start:
+                raise ValueError(f"Cannot parse range {range!r}. Expected `start-stop`")
+            else:
+                yield VidRange(int(start), int(stop))
+        except ValueError:
+            raise ValueError(f"Cannot parse range {range!r}. Expected `vid1-vid2` or `vid`")
+
+
+class VidCollection:
+    @staticmethod
+    def parse(ranges: int | str) -> "VidCollection":
+        if isinstance(ranges, int):
+            return VidCollection([VidRange(ranges, ranges)])
+        elif isinstance(ranges, str):
+            return VidCollection(list(_parse_vlan_ranges(ranges)))
+        elif isinstance(ranges, VidCollection):
+            return VidCollection(ranges.ranges)
+        else:
+            raise TypeError(f"Expected str or int, got {type(ranges)}")
+
+    def __init__(self, ranges: list[VidRange]) -> None:
+        self.ranges = ranges
+
+    def __str__(self):
+        return ",".join(map(str, self.ranges))
+
+    def __repr__(self):
+        return f"VlanCollection({str(self)!r})"
+
+    def __iter__(self):
+        for range in self.ranges:
+            yield from range
+
+    def __eq__(self, other: object) -> bool:
+        if type(other) is VidCollection:
+            return self.ranges == other.ranges
+        return False
+
+
 class ASN(int):
     """
     Stores ASN number and formats it as в AS1.AS2
@@ -235,6 +306,17 @@ class PeerGroup:
     mtu: int = 0
 
 
+@dataclass
+class L2VpnOptions:
+    name: str
+    vid: VidCollection
+    l2vni: int  # VNI, possible values are 1 to 2**24-1
+    route_distinguisher: str = ""  # like in VrfOptions
+    rt_import: list[str] = field(default_factory=list)  # like in VrfOptions
+    rt_export: list[str] = field(default_factory=list)  # like in VrfOptions
+    advertise_host_routes: bool = True  # advertise IP+MAC routes into L3VNI
+
+
 @dataclass
 class VrfOptions:
     vrf_name: str
@@ -274,8 +356,8 @@ class GlobalOptions:
     multipath: int = 0
     router_id: str = ""
     vrf: dict[str, VrfOptions] = field(default_factory=dict)
-
     groups: list[PeerGroup] = field(default_factory=list)
+    l2vpn: dict[str, L2VpnOptions] = field(default_factory=dict)
 
 
 @dataclass

{annet-1.0.3 → annet-1.0.4}/annet/mesh/device_models.py

@@ -76,10 +76,21 @@ class VrfOptions(_FamiliesMixin, BaseMeshModel):
     groups: Annotated[dict[str, MeshPeerGroup], DictMerge(Merge())]
 
 
+class L2VpnOptions(BaseMeshModel):
+    name: str
+    vid: str | int  # VLAN ID, possible values are 1 to 4094, ranges can be set as strings
+    l2vni: int  # VNI, possible values are 1 to 2**24-1
+    route_distinguisher: str  # like in VrfOptions
+    rt_import: Annotated[tuple[str, ...], Concat()]  # like in VrfOptions
+    rt_export: Annotated[tuple[str, ...], Concat()]  # like in VrfOptions
+    advertise_host_routes: bool  # advertise IP+MAC routes into L3VNI
+
+
 class GlobalOptionsDTO(_FamiliesMixin, BaseMeshModel):
     def __init__(self, **kwargs):
         kwargs.setdefault("groups", KeyDefaultDict(lambda x: MeshPeerGroup(name=x)))
         kwargs.setdefault("vrf", KeyDefaultDict(lambda x: VrfOptions(vrf_name=x)))
+        kwargs.setdefault("l2vpn", KeyDefaultDict(lambda x: L2VpnOptions(name=x)))
         super().__init__(**kwargs)
 
     as_path_relax: bool
@@ -89,3 +100,4 @@ class GlobalOptionsDTO(_FamiliesMixin, BaseMeshModel):
     router_id: str
     vrf: Annotated[dict[str, VrfOptions], DictMerge(Merge())]
     groups: Annotated[dict[str, MeshPeerGroup], DictMerge(Merge())]
+    l2vpn: Annotated[dict[str, L2VpnOptions], DictMerge(Merge())]

{annet-1.0.3 → annet-1.0.4}/annet/mesh/models_converter.py

@@ -7,7 +7,7 @@ from adaptix import Retort, loader, Chain, name_mapping, as_is_loader
 from .peer_models import DirectPeerDTO, IndirectPeerDTO, VirtualPeerDTO, VirtualLocalDTO
 from ..bgp_models import (
     Aggregate, GlobalOptions, VrfOptions, FamilyOptions, Peer, PeerGroup, ASN, PeerOptions,
-    Redistribute, BFDTimers,
+    Redistribute, BFDTimers, L2VpnOptions, VidCollection,
 )
 
 
@@ -49,8 +49,10 @@ retort = Retort(
     recipe=[
         loader(InterfaceChanges, ObjMapping, Chain.FIRST),
         loader(ASN, ASN),
+        loader(VidCollection, VidCollection.parse),
         loader(GlobalOptions, ObjMapping, Chain.FIRST),
         loader(VrfOptions, ObjMapping, Chain.FIRST),
+        loader(L2VpnOptions, ObjMapping, Chain.FIRST),
         loader(FamilyOptions, ObjMapping, Chain.FIRST),
         loader(Aggregate, ObjMapping, Chain.FIRST),
         loader(PeerOptions, ObjMapping, Chain.FIRST),

annet-1.0.4/annet/rulebook/arista/aaa.py

@@ -0,0 +1,63 @@
+from dataclasses import dataclass
+
+from annet.annlib.types import Op
+
+
+@dataclass
+class UserConfig:
+    name: str
+    privilege: int
+    role: str
+    secret_type: str
+    secret: str
+
+
+def _parse_user_config(config_line):
+    """Convert a user config line into a dataclass. Config example:
+
+    username someuser privilege 15 role network-admin secret sha512 $6$....
+
+    privilege could be omitted if equal to 1
+    role could be omitted
+    secret could be omitted, 'nopassword' is provided instead
+    """
+    splstr = config_line.split()
+    name = splstr[1]
+    priv = 1
+    role = ""
+    secret_type = ""
+    secret = ""
+    if "privilege" in splstr:
+        pos = splstr.index("privilege")
+        priv = int(splstr[pos + 1])
+    if "role" in splstr:
+        pos = splstr.index("role")
+        role = splstr[pos + 1]
+    if "secret" in splstr:
+        pos = splstr.index("secret")
+        secret_type = splstr[pos + 1]
+        secret = splstr[pos + 2]
+    return UserConfig(name=name, privilege=priv, role=role, secret_type=secret_type, secret=secret)
+
+
+def user(key, diff, **_):
+    if diff[Op.ADDED] and not diff[Op.REMOVED]:
+        for add in diff[Op.ADDED]:
+            yield (True, add["row"], None)
+    elif diff[Op.REMOVED] and not diff[Op.ADDED]:
+        for _ in diff[Op.REMOVED]:
+            yield (False, f"no username {key[0]}", None)
+    else:
+        for num, add in enumerate(diff[Op.ADDED]):
+            new_user = _parse_user_config(add["row"])
+            old_user = _parse_user_config(diff[Op.REMOVED][num]["row"])
+            if new_user.privilege != old_user.privilege:
+                yield (True, f"username {key[0]} privilege {new_user.privilege}", None)
+            if new_user.role != old_user.role and not new_user.role:
+                yield (True, f"no username {key[0]} role", None)
+            elif new_user.role != old_user.role:
+                yield (True, f"username {key[0]} role {new_user.role}", None)
+            if new_user.secret != old_user.secret and not new_user.secret:
+                yield (True, f"username {key[0]} nopassword", None)
+            elif new_user.secret != old_user.secret:
+                yield (True, f"username {key[0]} secret {new_user.secret_type} {new_user.secret}", None)

{annet-1.0.3 → annet-1.0.4}/annet/rulebook/texts/arista.rul

@@ -5,7 +5,7 @@ qos profile *
     ~ %global
 
 username * ssh-key
-username *
+username *                %logic=arista.aaa.user
 
 aaa group ~
     ~ %global

{annet-1.0.3 → annet-1.0.4/annet.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: annet
-Version: 1.0.3
+Version: 1.0.4
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT

{annet-1.0.3 → annet-1.0.4}/annet.egg-info/SOURCES.txt

@@ -125,6 +125,7 @@ annet/rulebook/common.py
 annet/rulebook/deploying.py
 annet/rulebook/patching.py
 annet/rulebook/arista/__init__.py
+annet/rulebook/arista/aaa.py
 annet/rulebook/arista/iface.py
 annet/rulebook/aruba/__init__.py
 annet/rulebook/aruba/ap_env.py