annet 0.16.32__tar.gz → 0.16.33__tar.gz

{annet-0.16.32/annet.egg-info → annet-0.16.33}/PKG-INFO

@@ -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 → annet-0.16.33}/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-0.16.32 → annet-0.16.33}/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 → annet-0.16.33/annet.egg-info}/PKG-INFO

@@ -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