annet 0.16.6__py3-none-any.whl → 0.16.8__py3-none-any.whl

annet/executor.py

@@ -15,6 +15,8 @@ from typing import Any, Callable, Dict, List, Optional, Tuple, Union
 
 import colorama
 import psutil
+
+import annet.lib
 from annet.annlib.command import Command, CommandList, Question  # noqa: F401
 from annet.storage import Device
 
@@ -146,7 +148,7 @@ def async_bulk(
     kwargs["policy"] = policy
 
     if processes == 1:
-        host_res, host_duration = asyncio.get_event_loop().run_until_complete(bulk(executor, devices, coro_gen, *args, **kwargs))
+        host_res, host_duration = annet.lib.do_async(bulk(executor, devices, coro_gen, *args, **kwargs))
         res.update(host_res)
         deploy_durations.update(host_duration)
     else:
@@ -313,10 +315,7 @@ def _print_failed(host, res):
 
 
 def _mp_async_bulk(res_q: multiprocessing.Queue, *args, **kwargs):
-    asyncio.get_event_loop().close()
-    loop = asyncio.new_event_loop()
-    asyncio.set_event_loop(loop)
-    res = loop.run_until_complete(bulk(*args, **kwargs))
+    res = annet.lib.do_async(bulk(*args, **kwargs))
     res_q.put(res)
     res_q.close()
 

annet/implicit.py

@@ -133,6 +133,11 @@ def _implicit_tree(device):
                         no shutdown
             """
     elif device.hw.Cisco:
+        text += r"""
+            !interface
+                no shutdown
+                no ip address
+        """
         if device.hw.Cisco.Catalyst:
             # this configuration is not visible in running-config when enabled
             text += r"""

annet/rulebook/texts/cisco.order

@@ -52,8 +52,6 @@ spanning-tree
 no system jumbomtu %order_reverse
 system jumbomtu
 
-route-map
-
 service dhcp
 ip dhcp relay
 ipv6 dhcp relay
@@ -74,9 +72,14 @@ interface *
 
 interface */\S+\.\d+/
 
+route-map
+
 # удалять eth-trunk можно только после того, как вычистим member interfaces
 undo interface */port-channel\d+/  %order_reverse
 
+# remote as of neighbors should be assigned before peer-group, the rule is applied to neighbors, not peer-groups
 router bgp
+    neighbor */[\da-f\.\:]+/ remote-as
+    neighbor */[\da-f\.\:]+/ peer-group
 
 line

annet/rulebook/texts/cisco.rul

@@ -42,12 +42,17 @@ no snmp-server sysobjectid type stack-oid
 
 !interface */(mgmt|ipmi|Vlan1$)/
 
+interface Loopback
+    ipv6 address *
+    ip address ~
+
 # SVI/Subifs/Lagg
 interface */(Vlan|Ethernet.*\.|port-channel.*\.?)\d+$/ %diff_logic=cisco.iface.diff
     vrf member
     ipv6 link-local
     ipv6 address *
     ipv6 nd ~                      %logic=cisco.misc.no_ipv6_nd_suppress_ra
+    ip address ~
     mtu
 
 # Physical
@@ -59,6 +64,7 @@ interface */\w*Ethernet[0-9\/]+$/     %logic=common.permanent %diff_logic=cisco.
     vrf member
     ipv6 link-local
     ipv6 address *
+    ip address ~
     channel-group
     mtu
     storm-control * level

{annet-0.16.6.dist-info → annet-0.16.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: annet
-Version: 0.16.6
+Version: 0.16.8
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT

{annet-0.16.6.dist-info → annet-0.16.8.dist-info}/RECORD

@@ -6,11 +6,11 @@ annet/cli_args.py,sha256=KQlihxSl-Phhq1-9oJDdNSbIllEX55LlPfH6viEKOuw,13483
 annet/connectors.py,sha256=-Lghz3PtWCBU8Ohrp0KKQcmm1AUZtN0EnOaZ6IQgCQI,5105
 annet/deploy.py,sha256=pM7r8ipk7y-b4OIenc8FMqZpy5F6TmKdo8DDUJNRBlY,18956
 annet/diff.py,sha256=zLcaCnb4lZRUb7frpH1CstQ3kacRcCblZs1uLG8J5lk,3391
-annet/executor.py,sha256=FrYAUuh2TpSVX42SlTN_PhuSHmXG4Wj1nieY9Wqv9so,19122
+annet/executor.py,sha256=Jny-hm0otZA1naPpFWR-R16SbaZioSQ8pkx-Yd2PYlM,19004
 annet/filtering.py,sha256=ZtqxPsKdV9reZoRxtQyBg22BqyMqd-2SotYcxZ-68AQ,903
 annet/gen.py,sha256=rOAveprvBaEXbLyaQUhQ0QtOvcDfndlIOpchNhu8M1U,33499
 annet/hardware.py,sha256=_iR28dWiPtt6ZYdk-qg1sxazkSRJE3ukqKB-fFFfQak,1141
-annet/implicit.py,sha256=_3eY9NKqpLUm25vlJIP2cHN4gdTgzO6rG6mwCKJYMnQ,5439
+annet/implicit.py,sha256=pX1FCZobkx-b5Y9otJDcr2eJQ1BUk_pG-ElKIMUSXWE,5553
 annet/lib.py,sha256=lOdz3UJFYkO0wnuzIRRq3FpULQliqBtfmGmKOGVFO4Q,4238
 annet/output.py,sha256=BNPzjuhMa7gSJ8ze_1O-Ey0tTxSyhAiwfztZMQwhMzk,7176
 annet/parallel.py,sha256=hLkzEht0KhzmzUWDdO4QFYQHzhxs3wPlTA8DxbB2ziw,17160
@@ -110,8 +110,8 @@ annet/rulebook/texts/b4com.deploy,sha256=SVX8-yLHM90tJC4M-ekpGuGM1aQZW3euSGyg67l
 annet/rulebook/texts/b4com.order,sha256=G3aToAIHHzKzDCM3q7_lyr9wJvuVOXVbVvF3wm5PiTE,707
 annet/rulebook/texts/b4com.rul,sha256=5mqyUg_oLRSny2iH6QdhfDWVu6kzgDURtlSATD7DFno,1056
 annet/rulebook/texts/cisco.deploy,sha256=XvXWeOMahE8Uc9RF0xkJj8jGknD4vit8H_f24ubPX7w,1226
-annet/rulebook/texts/cisco.order,sha256=eE9ddPQr8ZumjffQsMvl-BBymOwV6juETZU3r7kpRvk,1709
-annet/rulebook/texts/cisco.rul,sha256=HGg62zXCn8UVXu9x_Ja5QivPcY5Yo5BYi1CaOXCaDHA,2869
+annet/rulebook/texts/cisco.order,sha256=OvNHMNqkCc-DN2dEjLCTKv_7ZhiaHt4q2X4Y4Z8dvR4,1901
+annet/rulebook/texts/cisco.rul,sha256=7st2vuEMuq18rt0aDbZav24F8Sqj4h8IRoHOlNr7kuM,2959
 annet/rulebook/texts/huawei.deploy,sha256=azEC6_jQRzwnTSrNgag0hHh6L7hezS_eMk6ZDZfWyXI,10444
 annet/rulebook/texts/huawei.order,sha256=ENllPX4kO6xNw2mUQcx11yhxo3tKStZ5mUyc0C6s3d0,10657
 annet/rulebook/texts/huawei.rul,sha256=02Fi1RG4YYea2clHCluBuJDKNbT0hS9jtsk6_h6GK8k,12958
@@ -133,10 +133,10 @@ annet/rulebook/texts/routeros.rul,sha256=ipfxjj0mjFef6IsUlupqx4BY_Je_OUb8u_U1019
 annet_generators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet_generators/example/__init__.py,sha256=zVd8_DrXuOASrNzg2Ab94rPyvJff83L-_HppDFxnUjM,228
 annet_generators/example/lldp.py,sha256=24bGvShxbio-JxUdaehyPRu31LhH9YwSwFDrWVRn6yo,2100
-annet-0.16.6.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-0.16.6.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
-annet-0.16.6.dist-info/METADATA,sha256=IdPHd6vyAZE-Esfiin603XZKEGGSFT1lpbi9ovqLck8,694
-annet-0.16.6.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-annet-0.16.6.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
-annet-0.16.6.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-0.16.6.dist-info/RECORD,,
+annet-0.16.8.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-0.16.8.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-0.16.8.dist-info/METADATA,sha256=L55WvsDQ5-LzYasLfs0viQIqM1NgV7qFzUQk5veY-Xc,694
+annet-0.16.8.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+annet-0.16.8.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
+annet-0.16.8.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-0.16.8.dist-info/RECORD,,

{annet-0.16.6.dist-info → annet-0.16.8.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
+Generator: setuptools (75.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any