annet 0.16.32__py3-none-any.whl → 0.16.33__py3-none-any.whl

annet/adapters/netbox/common/status_client.py

@@ -20,6 +20,6 @@ class NetboxStatusClient(BaseNetboxClient):
             name_mapping(name_style=NameStyle.LOWER_KEBAB)
         ])
 
-    @get("status")
+    @get("status/")
     def status(self) -> Status:
         ...

annet/rpl_generators/cumulus_frr.py

@@ -100,7 +100,7 @@ class CumulusPolicyGenerator(ABC):
                 ip_type,
                 "prefix-list",
                 name,
-                f"seq {i * 10 + 5}",
+                f"seq {i * 5 + 5}",
                 "permit", f"{addr_mask.ip}/{addr_mask.network.prefixlen}",
             ) + (
                 ("ge", str(match.greater_equal)) if match.greater_equal is not None else ()
@@ -151,13 +151,14 @@ class CumulusPolicyGenerator(ABC):
         return get_used_united_community_lists(communities=communities.values(), policies=policies)
 
     def _cumulus_community(
-            self, name: str, cmd: str, member: str, use_regex: bool,
+            self, name: str, cmd: str, member: str, use_regex: bool, seq: int,
     ) -> Iterable[Sequence[str]]:
         if use_regex:
             yield (
                 cmd,
                 "expanded",
                 name,
+                f"seq {seq}",
                 "permit",
                 member,
             )
@@ -166,6 +167,7 @@ class CumulusPolicyGenerator(ABC):
                 cmd,
                 "standard",
                 name,
+                f"seq {seq}",
                 "permit",
                 member,
             )
@@ -182,6 +184,7 @@ class CumulusPolicyGenerator(ABC):
             return
         for community_list_union in community_unions:
             name = mangle_united_community_list_name([c.name for c in community_list_union])
+            comm_number = 0
 
             for clist in community_list_union:
                 if clist.type is CommunityType.BASIC:
@@ -207,13 +210,15 @@ class CumulusPolicyGenerator(ABC):
                     else:
                         member = " ".join(f"{member_prefix}{m}" for m in clist.members)
                     yield from self._cumulus_community(
-                        name=name, cmd=cmd, member=member, use_regex=clist.use_regex,
+                        name=name, cmd=cmd, member=member, use_regex=clist.use_regex, seq=(comm_number + 1) * 10,
                     )
                 else:
-                    for member_value in clist.members:
+                    for comm_number, member_value in enumerate(clist.members, start=comm_number):
                         yield from self._cumulus_community(
                             name=name, cmd=cmd, member=member_prefix + member_value, use_regex=clist.use_regex,
+                            seq=(comm_number + 1) * 10,
                         )
+                comm_number += 1
         yield "!"
 
     def _get_match_community_names(self, condition: SingleCondition[Sequence[str]]) -> Sequence[str]:

{annet-0.16.32.dist-info → annet-0.16.33.dist-info}/METADATA

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

{annet-0.16.32.dist-info → annet-0.16.33.dist-info}/RECORD

@@ -35,7 +35,7 @@ annet/adapters/netbox/common/client.py,sha256=PaxHG4W9H8_uunIwMBNYkLq4eQJYoO6p6g
 annet/adapters/netbox/common/manufacturer.py,sha256=LAPT6OlV_ew96GhtwNrCpeiT0IGrg2_9__MMdZk431U,1733
 annet/adapters/netbox/common/models.py,sha256=Xq6Dc3kY9_QyvS9DiKEq1AxjTxiF4qEKhs1EMtBw-k4,7384
 annet/adapters/netbox/common/query.py,sha256=ziUFM7cUEbEIf3k1szTll4aO-OCUa-2Ogxbebi7Tegs,646
-annet/adapters/netbox/common/status_client.py,sha256=W4nTb2yvBlJ2UkWUmUhKQ2PaSQb1shjhHj5ebb4s2s4,591
+annet/adapters/netbox/common/status_client.py,sha256=XXx0glomaBaglmkUEy6YtFOxQQkHb59CDA0h1I-IhxM,592
 annet/adapters/netbox/common/storage_opts.py,sha256=5tt6wxUUJTIzNbOVXMnYBwZedNAIqYlve3YWl6GdbZM,1197
 annet/adapters/netbox/v24/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/adapters/netbox/v24/storage.py,sha256=THI592VLx3ehixsPZQ1Ko3mYIAZQbnDY-toIziqBbL8,6005
@@ -101,7 +101,7 @@ annet/rpl/statement_builder.py,sha256=sVGOYsCV0s_SFQUy2WtUyQqKy5H4MOfmRCJWGj-UOJ
 annet/rpl_generators/__init__.py,sha256=ZLWs-flcpyIbdhxSDfNt-ORDrLe8ins25sWdXTWeUoA,748
 annet/rpl_generators/aspath.py,sha256=kZakwPLfGGiXu9fC6I1z-pvy7Fe-4dy93_-lYcx39_4,2038
 annet/rpl_generators/community.py,sha256=SWpaOvoQUNISuRm41-IvGPFmntvgFv9ee4zegsMyeo0,11496
-annet/rpl_generators/cumulus_frr.py,sha256=iY4e5gEVVlTbUsEqAHroS76ryRixewNBBzIVJRcfeVs,20854
+annet/rpl_generators/cumulus_frr.py,sha256=F-LRT-UPnztUqinp3KYKqh796L9dqkzPKBUxMkiFjF8,21111
 annet/rpl_generators/entities.py,sha256=DIpgAQ8Tslo2hq6iFBaYkJX12BFBiccN8GOaRVxR1Uk,1985
 annet/rpl_generators/execute.py,sha256=wS6e6fwcPWywsHB0gBMqZ17eF0s4YOBgDgwPB_cr5Rw,431
 annet/rpl_generators/policy.py,sha256=NeqB0reRN_KuY8LYkeGT3dRPe2HFDT9RfmVy5fcA3zw,32570
@@ -175,10 +175,10 @@ annet_generators/rpl_example/generator.py,sha256=zndIGfV4ZlTxPgAGYs7bMQvTc_tYScO
 annet_generators/rpl_example/items.py,sha256=Ez1RF5YhcXNCusBmeApIjRL3rBlMazNZd29Gpw1_IsA,766
 annet_generators/rpl_example/mesh.py,sha256=z_WgfDZZ4xnyh3cSf75igyH09hGvtexEVwy1gCD_DzA,288
 annet_generators/rpl_example/route_policy.py,sha256=z6nPb0VDeQtKD1NIg9sFvmUxBD5tVs2frfNIuKdM-5c,2318
-annet-0.16.32.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-0.16.32.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
-annet-0.16.32.dist-info/METADATA,sha256=AuXHwlU5wtRbDB9bSbMuU0AgcIYa5Xt_oAjBm70YVsg,854
-annet-0.16.32.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-annet-0.16.32.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
-annet-0.16.32.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-0.16.32.dist-info/RECORD,,
+annet-0.16.33.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-0.16.33.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-0.16.33.dist-info/METADATA,sha256=4FDrHTUVwwM6GIzoAZ96e3XHrSiSHvSShAY7v7jw4qg,854
+annet-0.16.33.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+annet-0.16.33.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
+annet-0.16.33.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-0.16.33.dist-info/RECORD,,