annet 0.16.15__tar.gz → 0.16.16__tar.gz

{annet-0.16.15/annet.egg-info → annet-0.16.16}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: annet
-Version: 0.16.15
+Version: 0.16.16
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 License-File: LICENSE
 License-File: AUTHORS
 Requires-Dist: colorama>=0.4.6

{annet-0.16.15 → annet-0.16.16}/annet/__init__.py

@@ -56,6 +56,6 @@ def init(options: Namespace):
 
 
 def assert_python_version():
-    if sys.version_info < (3, 9, 0):
-        sys.stderr.write("Error: you need python 3.9.0 or higher\n")
+    if sys.version_info < (3, 10, 0):
+        sys.stderr.write("Error: you need python 3.10.0 or higher\n")
         sys.exit(1)

{annet-0.16.15 → annet-0.16.16}/annet/bgp_models.py

@@ -67,7 +67,7 @@ class BFDTimers:
     multiplier: int = 4
 
 
-Family = Literal["ipv4_unicast", "ipv6_unicast", "ipv4_labeled", "ipv6_labeled"]
+Family = Literal["ipv4_unicast", "ipv6_unicast", "ipv4_labeled_unicast", "ipv6_labeled_unicast"]
 
 
 @dataclass(frozen=True)
@@ -182,6 +182,8 @@ class PeerGroup:
     internal_name: str = ""
     description: str = ""
     update_source: str = ""
+    import_policy: str = ""
+    export_policy: str = ""
 
     # more strict version of PeerOptions
     local_as: ASN = ASN(None)
@@ -242,8 +244,6 @@ class VrfOptions:
     ipv6_labeled_unicast: FamilyOptions
 
     vrf_name_global: Optional[str] = None
-    import_policy: Optional[str] = None
-    export_policy: Optional[str] = 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)

{annet-0.16.15 → annet-0.16.16}/annet/mesh/device_models.py

@@ -41,8 +41,8 @@ class _FamiliesMixin:
     def __init__(self, **kwargs):
         kwargs.setdefault("ipv4_unicast", FamilyOptions(family="ipv4_unicast"))
         kwargs.setdefault("ipv6_unicast", FamilyOptions(family="ipv6_unicast"))
-        kwargs.setdefault("ipv4_labeled_unicast", FamilyOptions(family="ipv4_labeled"))
-        kwargs.setdefault("ipv6_labeled_unicast", FamilyOptions(family="ipv6_labeled"))
+        kwargs.setdefault("ipv4_labeled_unicast", FamilyOptions(family="ipv4_labeled_unicast"))
+        kwargs.setdefault("ipv6_labeled_unicast", FamilyOptions(family="ipv6_labeled_unicast"))
         super().__init__(**kwargs)
     ipv4_unicast: Annotated[FamilyOptions, Merge()]
     ipv6_unicast: Annotated[FamilyOptions, Merge()]
@@ -54,8 +54,8 @@ class VrfOptions(_FamiliesMixin, BaseMeshModel):
     def __init__(self, vrf_name: str, **kwargs):
         kwargs.setdefault("ipv4_unicast", FamilyOptions(family="ipv4_unicast", vrf_name=vrf_name))
         kwargs.setdefault("ipv6_unicast", FamilyOptions(family="ipv6_unicast", vrf_name=vrf_name))
-        kwargs.setdefault("ipv4_labeled_unicast", FamilyOptions(family="ipv4_labeled", vrf_name=vrf_name))
-        kwargs.setdefault("ipv6_labeled_unicast", FamilyOptions(family="ipv6_labeled", vrf_name=vrf_name))
+        kwargs.setdefault("ipv4_labeled_unicast", FamilyOptions(family="ipv4_labeled_unicast", vrf_name=vrf_name))
+        kwargs.setdefault("ipv6_labeled_unicast", FamilyOptions(family="ipv6_labeled_unicast", vrf_name=vrf_name))
         kwargs.setdefault("groups", KeyDefaultDict(lambda x: MeshPeerGroup(name=x)))
         super().__init__(vrf_name=vrf_name, **kwargs)
 

{annet-0.16.15 → annet-0.16.16}/annet/mesh/models_converter.py

@@ -61,9 +61,6 @@ retort = Retort(
         }),
         loader(list[PeerGroup], lambda x: list(x.values()), Chain.FIRST),
         loader(PeerGroup, ObjMapping, Chain.FIRST),
-        name_mapping(PeerGroup, map={
-            "local_as": "asnum",
-        }),
     ]
 )
 

{annet-0.16.15 → annet-0.16.16}/annet/mesh/peer_models.py

@@ -3,7 +3,7 @@ from typing import Literal, Annotated, Union, Optional
 from .basemodel import BaseMeshModel, Concat
 from ..bgp_models import BFDTimers
 
-FamilyName = Literal["ipv4_unicast", "ipv6_unicast", "ipv4_labeled", "ipv6_labeled"]
+FamilyName = Literal["ipv4_unicast", "ipv6_unicast", "ipv4_labeled_unicast", "ipv6_labeled_unicast"]
 
 
 class _SharedOptionsDTO(BaseMeshModel):
@@ -117,7 +117,11 @@ class VirtualPeerDTO(MeshSession):
 class MeshPeerGroup(_OptionsDTO):
     name: str
     families: Annotated[set[FamilyName], Concat()]
+    local_as: Union[int, str]
     remote_as: Union[int, str]
     internal_name: str
     update_source: str
     description: str
+
+    import_policy: str
+    export_policy: str

{annet-0.16.15 → annet-0.16.16/annet.egg-info}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: annet
-Version: 0.16.15
+Version: 0.16.16
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 License-File: LICENSE
 License-File: AUTHORS
 Requires-Dist: colorama>=0.4.6

{annet-0.16.15 → annet-0.16.16}/setup.py

@@ -46,7 +46,7 @@ if __name__ == "__main__":
         extras_require={
             "netbox": ["annetbox[sync]>=0.1.8"],
         },
-        python_requires=">=3.9",
+        python_requires=">=3.10",
         install_requires=requirements(),
         include_package_data=True,
     )