annet 0.14.12__py3-none-any.whl → 0.15.0__py3-none-any.whl

annet/adapters/netbox/common/manufacturer.py

@@ -9,6 +9,7 @@ _VENDORS = {
     "catalyst": "Cisco Catalyst",
     "nexus": "Cisco Nexus",
     "huawei": "Huawei",
+    "optixtrans": "Huawei OptiXtrans",
     "juniper": "Juniper",
     "arista": "Arista",
     "pc": "PC",

annet/annlib/netdev/devdb/data/devdb.json

@@ -52,8 +52,6 @@
     "Huawei.CE.CE8800.CE8850": " CE8850",
     "Huawei.CE.CE8800.CE8851": " CE8851",
     "Huawei.CE.CE9800": " CE98\\d\\d",
-    "Huawei.DC": " DC\\d+",
-    "Huawei.DC.DC908": " DC908",
     "Huawei.Quidway": " S\\d+",
     "Huawei.Quidway.S2x": " S2\\d{3}",
     "Huawei.Quidway.S2x.S2300": " S23\\d\\d",
@@ -67,6 +65,9 @@
     "Huawei.EI": "-EI(-|$)",
     "Huawei.HI": "-HI(-|$)",
     "Huawei.SI": "-SI(-|$)",
+    "Huawei.OptiXtrans": " OptiXtrans|DC",
+    "Huawei.OptiXtrans.DC": " DC",
+    "Huawei.OptiXtrans.DC.DC908": " DC908",
 
     "Juniper": "^[Jj]uniper",
     "Juniper.MX": " MX",
@@ -119,7 +120,8 @@
     "PC.Whitebox.Asterfusion.CX.CX500.CX532P-N": " CX532P-N",
     "PC.Whitebox.Ufispace": "[Uu]fi[Ss]pace",
     "PC.Whitebox.Ufispace.S": " S",
-    "PC.Whitebox.Ufispace.S.S9110-32X": " S9110-32X",
+    "PC.Whitebox.Ufispace.S.S9100": " S91\\d\\d",
+    "PC.Whitebox.Ufispace.S.S9100.S9110_32X": " S9110-32X",
 
     "RouterOS": "^([Rr]outer[Oo][Ss]|[Mm]ikro[Tt]ik)",
 

annet/annlib/netdev/views/hardware.py

@@ -77,6 +77,8 @@ def hw_to_vendor(hw: HardwareView) -> Optional[str]:
         return "nexus"
     elif hw.Cisco:
         return "cisco"
+    elif hw.OptiXtrans:
+        return "optixtrans"
     elif hw.Huawei:
         return "huawei"
     elif hw.Juniper:
@@ -105,6 +107,7 @@ def vendor_to_hw(vendor):
             "catalyst": "Cisco Catalyst",
             "nexus": "Cisco Nexus",
             "huawei": "Huawei",
+            "optixtrans": "Huawei OptiXtrans",
             "juniper": "Juniper",
             "arista": "Arista",
             "pc": "PC",

annet/annlib/rbparser/platform.py

@@ -1,5 +1,6 @@
 VENDOR_REVERSES = {
     "huawei": "undo",
+    "optixtrans": "undo",
     "cisco": "no",
     "nexus": "no",
     "juniper": "delete",
@@ -13,6 +14,7 @@ VENDOR_REVERSES = {
 
 VENDOR_DIFF = {
     "huawei": "common.default_diff",
+    "optixtrans": "common.default_diff",
     "cisco": "common.default_diff",
     "nexus": "common.default_diff",
     "juniper": "juniper.default_diff",
@@ -26,6 +28,7 @@ VENDOR_DIFF = {
 
 VENDOR_DIFF_ORDERED = {
     "huawei": "common.ordered_diff",
+    "optixtrans": "common.ordered_diff",
     "cisco": "common.ordered_diff",
     "nexus": "common.ordered_diff",
     "juniper": "juniper.ordered_diff",
@@ -39,6 +42,7 @@ VENDOR_DIFF_ORDERED = {
 
 VENDOR_EXIT = {
     "huawei": "quit",
+    "optixtrans": "quit",
     "cisco": "exit",
     "nexus": "exit",
     "arista": "exit",

annet/annlib/tabparser.py

@@ -263,6 +263,10 @@ class HuaweiFormatter(BlockExitFormatter):
         yield from super().block_exit(context)
 
 
+class OptixtransFormatter(CommonFormatter):
+    pass
+
+
 class CiscoFormatter(BlockExitFormatter):
     def __init__(self, indent="  "):
         super().__init__("exit", indent)
@@ -644,6 +648,7 @@ def make_formatter(vendor, **kwargs):
         "cisco": CiscoFormatter,
         "nexus": CiscoFormatter,
         "huawei": HuaweiFormatter,
+        "optixtrans": OptixtransFormatter,
         "arista": CiscoFormatter,
         "nokia": NokiaFormatter,
         "routeros": RosFormatter,

annet/rulebook/texts/optixtrans.deploy

@@ -0,0 +1,18 @@
+# Рулбук деплоя на устройства
+#
+# Операторы:
+#   *  Один аргумент
+#   ~  Несколько аргументов (минимум один)
+#
+# Параметры:
+#   %timeout=...  Таймаут выполнения команды (в секундах, по умолчанию 30)
+#
+# Ответы на вопросы
+#
+# <команда>
+#   dialog: <вопрос> ::: <ответ> <параметры>
+#
+# Если <вопрос> заключён в слеши (//), то воспринимается как регулярка, иначе - точное совпадение.
+# Параметы:
+#   %send_nl=...  Посылать ли перевод строки после ответа (bool, по умолчанию true)
+# -----

annet/rulebook/texts/optixtrans.order

@@ -0,0 +1,5 @@
+# В этом файле определяется порядок команд, в котором их следует подавать на устройство.
+# - Если порядок команды не важен - ее можно не писать сюда совсем.
+# - Если команда начинается с undo и прописан параметр %order_reverse - команда считается
+#   обратной, но занимает место между прямыми там, где указано (т.е. undo vlan batch
+#   будет стоять после блоков interface).

annet/rulebook/texts/optixtrans.rul

@@ -0,0 +1,13 @@
+# Операторы:
+#   *  Один аргумент в undo
+#   ~  Несколько аргументов (минимум один) в undo
+#
+# Параметры:
+#   %global         Команда действует на любом уровне ниже
+#   %logic=...      Кастомная функция обработки правила
+#   %diff_logic=... Кастомная функция построения диффа.
+#                   данная функция работает для подблоков (в отличие от %logic)
+#   %comment=...    Добавить коммент после строки который будет видно с опцией patch --add-comments
+#                   Сделано в основном для того чтобы генерировать специальные команды для наливки
+# -----
+clock timezone

annet/tabparser.py

@@ -3,6 +3,7 @@ from annet.annlib.tabparser import (  # pylint: disable=unused-import
     CiscoFormatter,
     CommonFormatter,
     HuaweiFormatter,
+    OptixtransFormatter,
     JuniperFormatter,
     JuniperList,
     NokiaFormatter,
@@ -14,7 +15,9 @@ from annet.annlib.tabparser import (  # pylint: disable=unused-import
 
 
 def make_formatter(hw, **kwargs):
-    if hw.Huawei:
+    if hw.OptiXtrans:
+        cls = OptixtransFormatter
+    elif hw.Huawei:
         cls = HuaweiFormatter
     elif hw.Cisco.ASR or hw.Cisco.XRV:
         cls = AsrFormatter

{annet-0.14.12.dist-info → annet-0.15.0.dist-info}/METADATA

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

{annet-0.14.12.dist-info → annet-0.15.0.dist-info}/RECORD

@@ -17,7 +17,7 @@ annet/parallel.py,sha256=hLkzEht0KhzmzUWDdO4QFYQHzhxs3wPlTA8DxbB2ziw,17160
 annet/patching.py,sha256=nILbY5oJajN0b1j3f0HEJm05H3HVThnWvB7vDVh7UQw,559
 annet/reference.py,sha256=B8mH8VUMcecPnzULiTVb_kTQ7jQrCL7zp4pfIZQa5fk,4035
 annet/storage.py,sha256=Wr_D_w7JQD08nD2IvC6bcGJLH6Uv62tKznUyWWWVW5Q,3144
-annet/tabparser.py,sha256=ZjiI43ZVbrpMVR8qNbTbNh_U3oZ26VDc_2Y9wkkDkYA,874
+annet/tabparser.py,sha256=dEavhVBd9TEFf2NOW_JpTDcz2rzNtP4siQPceWalpl0,957
 annet/text_term_format.py,sha256=CHb6viv45vmYl-SK1A1vyPHGhaEni6jVybBusaQnct8,2813
 annet/tracing.py,sha256=ndpM-au1c88uBBpOuH_z52qWZL773edYozNyys_wA68,4044
 annet/types.py,sha256=f2HwqoKa6AucwFwDMszoouB6m1B8n6VmdjHMktO30Kc,7175
@@ -26,7 +26,7 @@ annet/adapters/netbox/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 annet/adapters/netbox/provider.py,sha256=Gymku2Ad7um4GR9MqzQzm2o2cBLHLhIYbF1Ytl0r0MA,1076
 annet/adapters/netbox/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/adapters/netbox/common/client.py,sha256=-lWZmphD-OPuLIHNKhW_h2bnjrVaiyKYAD_MUPasEbo,2483
-annet/adapters/netbox/common/manufacturer.py,sha256=QrgHNaufLrKxGdbttO7yqk4Xh19TgAGsQkT7Y6QBEyY,1373
+annet/adapters/netbox/common/manufacturer.py,sha256=K1z2ioP9ZikxjjfSAuAAszZALW0o9w1kLTnW5cR16tU,1412
 annet/adapters/netbox/common/models.py,sha256=Vgxbl_Mm-zOAi2BTlEzDppTTgZjafFEC5F9s_MTd_xU,3263
 annet/adapters/netbox/common/query.py,sha256=ziUFM7cUEbEIf3k1szTll4aO-OCUa-2Ogxbebi7Tegs,646
 annet/adapters/netbox/common/status_client.py,sha256=W4nTb2yvBlJ2UkWUmUhKQ2PaSQb1shjhHj5ebb4s2s4,591
@@ -44,20 +44,20 @@ annet/annlib/jsontools.py,sha256=J_pToAAXQphP1QFh6uLQH9PnmHO68I5WV64qIQXLeDQ,380
 annet/annlib/lib.py,sha256=eJ4hcVuQ6pdYBzLs4YKCHFtq45idOfZCYp92XfF7_QI,15317
 annet/annlib/output.py,sha256=_SjJ6G6bejvnTKqNHw6xeio0FT9oO3OIkLaOC3cEga4,7569
 annet/annlib/patching.py,sha256=GwG2lT4w-I1Ls3Eswn6SPJLBUVt2M3Ysw1fmXsWamYw,19793
-annet/annlib/tabparser.py,sha256=oV2sR_paW_tXUfHuAtL9OtV2V4PZICQuxH4VXOjhcqM,25793
+annet/annlib/tabparser.py,sha256=TnDVxJ8PkQzn_IPdwkcantGzckRNIYPQAtlHwo9bnXY,25891
 annet/annlib/types.py,sha256=VHU0CBADfYmO0xzB_c5f-mcuU3dUumuJczQnqGlib9M,852
 annet/annlib/netdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/annlib/netdev/db.py,sha256=fI_u5aya4l61mbYSjj4JwlVfi3s7obt2jqERSuXGRUI,1634
 annet/annlib/netdev/devdb/__init__.py,sha256=aKYjjLbJebdKBjnGDpVLQdSqrV2JL24spGm58tmMWVU,892
-annet/annlib/netdev/devdb/data/devdb.json,sha256=_jq8dw27nc3p3s8s9UCZIGNcb7op5ArS5cC1jQjYHdI,5453
+annet/annlib/netdev/devdb/data/devdb.json,sha256=0c7r0_NF0QQVPd0p84yyFLKIn5iusuU0S45NDorLWEM,5570
 annet/annlib/netdev/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/annlib/netdev/views/dump.py,sha256=rIlyvnA3uM8bB_7oq1nS2KDxTp6dQh2hz-FbNhYIpOU,4630
-annet/annlib/netdev/views/hardware.py,sha256=o-w-k1bOORWwEnSGsDq-9Q_oIeH3yQv9eiCJn_UgG-Y,3324
+annet/annlib/netdev/views/hardware.py,sha256=6453atMaeoLWJSXzZxQ0zeTrdtRwCv0dlu6ivvpcdYE,3423
 annet/annlib/rbparser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/annlib/rbparser/acl.py,sha256=RR8yPt6t96_IiyuKVbeZ-3x32cyhBAT2wC1y99oWBO8,3931
 annet/annlib/rbparser/deploying.py,sha256=ACT8QNhDAhJx3ZKuGh2nYBOrpdka2qEKuLDxvQAGKLk,1649
 annet/annlib/rbparser/ordering.py,sha256=DiKqyY8Khz-5MTxNF1GSNtZgtyKwT3YYCXpahIPB6Ps,1779
-annet/annlib/rbparser/platform.py,sha256=iyqy4A-6vUKM4j6hrOA6tsgWBXk7LcvkFrS2QHgkqho,1231
+annet/annlib/rbparser/platform.py,sha256=_W84Gt3XwURT2MLngZSmwZbWgqsnbrwzjNgHIHa8Xug,1365
 annet/annlib/rbparser/syntax.py,sha256=iZ7Y-4QQBw4L3UtjEh54qisiRDhobl7HZxFNdP8mi54,3577
 annet/annlib/rulebook/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/annlib/rulebook/common.py,sha256=9kCZwZpsH5UliF2OzaN9nLs2eLlz_d__4L7_oZ3SrCw,16054
@@ -115,6 +115,9 @@ annet/rulebook/texts/nexus.deploy,sha256=9YNAQEw7aQxtYZJbE-dMD6qJrTzs_G92Ifrx3Ft
 annet/rulebook/texts/nexus.order,sha256=AZMKCD5Zf_mBOlE36aMDvO4w5rdbepTz1Dsyv7xP9Qs,1834
 annet/rulebook/texts/nexus.rul,sha256=veixbi_ztbX6OMV_WjdkgpEXa47yDxOkPE0YQ6r4wqs,2558
 annet/rulebook/texts/nokia.rul,sha256=gxK7FCRdjGUs7tDHTUebVOgkzWINAGibMPtz8tzvwg4,1077
+annet/rulebook/texts/optixtrans.deploy,sha256=SVX8-yLHM90tJC4M-ekpGuGM1aQZW3euSGyg67l--R0,781
+annet/rulebook/texts/optixtrans.order,sha256=NbeEP5oBsC-Iw84T8dpmc_s3BXJofXYeTdGdjUmPsYM,623
+annet/rulebook/texts/optixtrans.rul,sha256=MvQX16Gyc1loCgPgLd2Ei1BYrTDZ33CayQurc_j9xVk,898
 annet/rulebook/texts/pc.order,sha256=WTSosHmIA5LyHO_DNAH1VDeuXHEgZ9e_aDFyAtIW6rE,275
 annet/rulebook/texts/pc.rul,sha256=zwIkSdOsJ6gmIj1sfy0xa4_yQRRBRjSQEqopsqFE2u8,302
 annet/rulebook/texts/ribbon.deploy,sha256=hCq2XeAcwaYanyQ8lTdnez6Pgq-gRqpNuR8dAleIn3U,864
@@ -124,10 +127,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=68CLrK7vxTQQy9XIBxtywuEdBNlIlfXGYj8_wYWs5UI,1146
-annet-0.14.12.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-0.14.12.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
-annet-0.14.12.dist-info/METADATA,sha256=InkwrEKTMz3m65rKm8CO1hU5j68JfvX0mtcE3yuB3_Q,695
-annet-0.14.12.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
-annet-0.14.12.dist-info/entry_points.txt,sha256=yHimujIzR2bwNIbb--MTs_GpXiAve89Egpu2LlgTEkg,119
-annet-0.14.12.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-0.14.12.dist-info/RECORD,,
+annet-0.15.0.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-0.15.0.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-0.15.0.dist-info/METADATA,sha256=YnR3Nr5WQwY-i1k4A8V_fKC_QIVrG36hp_oEhzebxTA,694
+annet-0.15.0.dist-info/WHEEL,sha256=ixB2d4u7mugx_bCBycvM9OzZ5yD7NmPXFRtKlORZS2Y,91
+annet-0.15.0.dist-info/entry_points.txt,sha256=yHimujIzR2bwNIbb--MTs_GpXiAve89Egpu2LlgTEkg,119
+annet-0.15.0.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-0.15.0.dist-info/RECORD,,

{annet-0.14.12.dist-info → annet-0.15.0.dist-info}/WHEEL

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