From 207f5ba6eedd4d544a10817448d8adcd4708b580 Mon Sep 17 00:00:00 2001 From: "th.l" <thl-cmk@outlook.com> Date: Tue, 10 May 2022 19:07:49 +0200 Subject: [PATCH] update project --- agent_based/huawei_bgp_peer.py | 4 +++- huawei_bgp_peer.mkp | Bin 3325 -> 3389 bytes packages/huawei_bgp_peer | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/agent_based/huawei_bgp_peer.py b/agent_based/huawei_bgp_peer.py index 7746ade..7c326d2 100644 --- a/agent_based/huawei_bgp_peer.py +++ b/agent_based/huawei_bgp_peer.py @@ -13,6 +13,7 @@ # # 2020-07-20: added BGP prefix counter # 2022-04-30: code cleanup/streamlining +# 2022-05-09: added item to BgpPeer class, this is used in the discovery function # # snmpwalk sample @@ -132,7 +133,7 @@ def parse_huawei_bgp_peer(string_table: List[StringTable]) -> Dict[str, BgpPeer] bgp_peer = bgp_get_peer_entry([ remote_address, state, - '2', # admin_state not admin_down + '2', # admin_state set to not admin_down None, # in_updates None, # out_updates None, # in_messages @@ -148,6 +149,7 @@ def parse_huawei_bgp_peer(string_table: List[StringTable]) -> Dict[str, BgpPeer] item = f'{remote_address} {adress_family}' bgp_peer[remote_address].peer_unavail_reason = int(unavail_reason) bgp_peer[remote_address].peer_unavail_reason_str = _huawei_bgp_peer_unavail_reason(int(unavail_reason)) + bgp_peer[remote_address].item['address_family'] = adress_family bgp_peer = {item: bgp_peer[remote_address]} peer_table.update(bgp_peer) diff --git a/huawei_bgp_peer.mkp b/huawei_bgp_peer.mkp index f8069bee4b1d376b101ba5bebaf85110eb89aab0..673170459cdda874a40da899f407ced65f412f66 100644 GIT binary patch literal 3389 zcmbWkhd&gK!vJ8!7oB;y?2)~)&nTNhR%Dlx5#h2&MhKUgEz04XjNBP_W@bi58J&H& z#3h@OJ??)0!uxrjM<|_vVeNgCI}ODr>`8>zGl;u)ASBSsD_CAxQCV40O;Ph!_$|d- zDz~71fmFMXDIpbRz~!<l+25nA8}OUu?gj-B1#KgHRWc)0K<xg<N9i{ex4MM?oVthm z$x<$kn97A~er*#w-&p|*5Y^FDoz>Ar`UWMn7b}?})YGn6-Pgd&UUob&+0kYWyWg(# z8z}m@;ylAShbsbXbchv0TUTTrVf@PY&wa&;z`gTVuq6DWJ2xJPmMlU;f^@<CseH+; z+ds18)k})@Dx{lzO&SB;&IbXh+uxmU)EgSiv3`F$9N9;Eb$oXH@e?MxOocXFZ&_&z zqVj5Y3lkf3>|$%QEP#N4h4VqJIh!7$gVezS88kZzsj2wsBX;np=7F9Gu2D{ip86dx zz@1`L6BOREBQnrr&1k4m4X*nZq1Z~pIj;2S{R=HF$y<Bc(~fMf<tpf$4J7p$O>#Jm zw?<yC+JNZCls}g~`N5}>VQ@pcoqWX+%I1bD2r7AvxZwl0be9X-i$chLBBNA95zwWu zQBCmvjT5+dxZGR-2d-Z*X3%opG<xb;L<|XmReZ(9f{B%bUWck-doO;@*FV|J39zM~ zU*No}Ee>XhXX1zc*MD?dv=79em8|*iMy&YUg|xY|Q&a!79*_J|fw2^hP>{x9Do^NF zUmcq#Z<_j0rY~q_*(9Aeo_TOOv%RX|K7x^yw+34eRaF8YTEMpzV&PbC<3F@ST-@D3 z?^qybd3G>o>KZyJM~+5F+zLqd1)g~{%*Z&iF0OGw>dcIz`3t!e4TMwNFZa#5Gfx%1 z0kbIk9F*;#%Lc!i9$oUBOHC;wrFn8{fD*Cpm7txvx(xUJvhJ=(-fL96m{sBuQ=)si zDmnAhzA3-RSgxGrHhMskKWlqP*s)BHE~R+qkX+>Sx+rx^)e~d?Yr>Wwr#BhGSM^~X zNSwr;ofc^p1F|x5VK_N`UI7lUY3QhpXQHUJW)5`fZgmrXT0V}If8y?!IwM|&WnJ<K zVLj&3f%8Qli4tAT4f-)nJ}6gDS-!Y3vP+wExM;fKYEi)d3vSch=&8P9KM%aYzPO;@ zwtorXq>tM+q85``4Q<34{je%x(jYES`%(lj&3^3ORS2n)R@P^xyHw*Ph8S2<En?zr z+lESbW5E1|%qMJWajD_`<Qze4M>4F{N;-by_?%zj;`XG%_mV#Ugh{>J?1kI~dv`Kl zYHEQv2aq<LS+wYh`TeI7XC1V4pb)`kE>lCrlRgmgB<7B|t{!`Kyi^?ct<U}L@EgN= z+T6upaLMpCt%&(E5ZGM1gpgLhT=>Q&Tx<}awSEfyjknh`7G-cQ=LHI%X406E8aFeH zX{M5yPB|<@ag{3aJ~tJaOOj9A=1-&)L8X}pqx_-zntnf4GG~!SdhCPE^aD34oOQpe z_%Tb|$9cOA1q%#Nws3y)v>MQiij0SCVA;n49q`r-?>N`IY&=_T*GSc#$eF4mx3S+Q z{;C>IzR?lzJ;;&pd$)8^>6;j(hQIPo)#>DiztriT&33j(J2$Yi&r^;p&VSBY(HiP# zF^k7~#(vgas3nLozLY)hJj9gRaf$Yh@~l$X2VH*Msg`7MXT;Dbmui}vG}(xSmD>xY zy3C_tF0Gf0NPocMI@5<(fx?-sYfl>v@{#qGf_6e&F5JH#L5yuEjP<<@nO1-IW1pH} z0#~#kQ@>eFOFIWu)Wx!U&;cXja4}#&ZCZ|@dAr#gR$)26KLA2-RE;T+dHj#e$d1}o zLG;2yuQK{0i~VH+%&#lZFowUYXG1l>jy=GMT&Lz1r?p6^;49)=aqt`cDxf&p;l|57 z+B8!>^^ur)$|+|#$EEYd7NxF;pIT753AjAZEZ;o%)7aS{y)L{veL|eGHFN?J2}v&N zk<YUI{AmM}9-gG>h8a-2`D0uOnq@+DQ3U(L!5GVEec_Lz>SH5TY04Mv0Ty^WQJfBS zgAhnY*4)1A_D0>JXTesPa>YrLg4oN$!@tfQ04x5Cf?f2qZ%gfd|ID5hYdwtJDY9Ou zA_SNuA8IhFsA-{au=y2PgtAK~3=NNZ6aS>N=iBNqx8B<z@gV$m{=QimTN|1g#%buB zM}-G(IsWzj)Wz{1t5`{!@0j-p7lO~R?T_kk+fRu@M1<%k9SbLip90B)EQ6tF`H9TJ z@xU4mE2~zW(681Jrjt2?5@>$4HKd2H#B368GjMa{ouGDrSjoJE*+5Y)==#r=TBTcV z<mH6jzxl!zd=>c3-g|Ah_1!FpLNDC)&3KQi#KUGRl7!!7Ru)~R586J+n|hx$=k4&q zJ?%UQlkiXaN1rBgQOwh<aan^LI_ue~?Vp@nuQlsLwDW*%%=rpA&d&G5S~&(V%Le7V zlixBVwAKB4Z(bZzX|U2k^Aet~Gm9biDE+8hR>wb%r)0$QLLEMjSqd~3LS<IKf-!ti z?I}Bf*sgou8pc(`AKnI-&A3KcRz0$qE|jk@>(t=!;;Q9W#(eYVVHSS1e^=!B0K+xN zx9!NafuOn9vZOS<1z}4QcoV_kP))EJPyA15raw(9WrW}&&q(#;*KHq}%dg*}jCyCg z1d}uMb69k=gPBs^x9(ww2@L(7=7TuRU4SyNo3f#0tDGK_SdSCo;{##&Di&Yx3^806 z@A)DjaX*9qE$@<N7{-Vw$6j@o0KLD8;z<_l)co8c&uQ@TfStU;F61qJuEh85l=LP3 z&cd}2OQcPq&4+wRYa&z5rWQ+A8{-(tc3?1Bhlv~F`^Yno&S?>hJav39s;63?NW)<l z4HNol5qpg}vrx;T!_lL|t%R{WPr{dyw+2&UYn^mcPlYPSwWnus73MhmXm28*p2==a zsFeA8MIQ)CYCcObtz)CUY~Fd;RvYT1$0>F8fKR3^@4x&4x!8Y^S7io8J#|G&$_@^3 zOoz(npMZUs{PdyX&kHzU;)rggabgA*U$NBD9@cR)a2N!zh8drD@X%ckG?}ZY?HnAM zz7{;Q0hN+>X12UrY8<isZ6c8_oP#QnPL&h5!ou=_b1}awFGV`W$|2OB&o!HE-AA$x z`Fo3_xPAw@mf~>6Ia;WZ!5s-^<a;Hhio?vpe{HI}yBC<lJ^GH>V5+~@;8gCe^<)q7 zF}nGP6oXE61TrRQXSSX7|Hcv$de4eWp96ZuZ_0kHl;HuKaSEI3d0L8m=<+cypJ_oa z356WZ;*BzhH950>RUCktVP&oR8Ff%(Zli4qL>wXcBW5x-q=QAlwD<`uTQhBFHZ7FP zqm+d56C{O+?0(jUZFH*cFibuFMY1tWaiQL|*aCRP`m~z)4Qb0f9E}Kdd0Z!@giJF> zo4%x4KkUK3!2j78)6V>FTP4hTcK<ibV^v7v*g*A_A8k0?;nzBke&d_N>3igqSBfpv z%mV;X)%D@Z&X>=E&>FuY9*L+{9YIWonm$?xZepO_j1LfINh7p?lu&cQc`#|GJiZ)1 z-I|fCgjQlFU1YcyAmf-EddlF+DA~^sMY`iTHtVYd-C8GjAOL)HF3d|kNEtdwF#e>V zB?tHSltSlY1yzVYK}LdA4>h>o%&q4xT32(ADnGjYA}WV4e2=5OneY0A!!%vtt7AyO zdQswo#Fh4+Hh<}!BS##~Zo;K(ZPS`kH;+F0czA=xha!Vbipw5z&GUb+l_xdDGNMqq zm<Q62XJvk<EXh{Wp2$xgtNRdaY;(+s!m^JQWbFBNP~e3UdNFP7g_;)Uap~*XAD9<* zzM9u=sfR&S<DP;iqnOoq?1KlwY@+T#<RVwO(n)i_gX>HSCV6pk9{%WQ`3BE|H0c=% zHE)Mxec@74!p7qo)s(5}GTLscXS;V{Jw8o|Ti|Uw48izL+_=kb`RH?ch2}>j$QaO- z?jKxJR9$r^-L18DK5-Xx$(zjOdvv|xIU&?P0*$OdY0pR$lLpDAPa6XnoV?myUHnn# z8ZqiJSYib<`6=3o)CLa@{6FcUVm;j(E4?UkKlvwA;QIG0%cfWI-@0xO{jsjZvE44@ z;1YMLG7sS~`G`8!OU7trdyy}3Cw-LVe?oQI!|X5ZC;W<xjl>QRc{<tp4Qmr0vVu*% zn2<Y|M@~vNLZ(U41KvF=V=6eo<LX=1Ps+G3I8{#>bZ>a&jUF9!r	LqsFLik-=rh zKI#L~ewK?taL6Y%O|i=5rKd-E0UDnZ1Srw;PJ7(er|q^;WWUI0UN#N~&gETu_5i!x zJJ#;HV)|=)CpKp-3kycc6oc}H!MCOgQIlqotNe!)uIbrjtEK0QAfW#$D&N7Z=L|l4 fT@3}Lk@y~>LtOd!|8rV~i=$#z`ZP{ePDS-UVaT$< literal 3325 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 W>(Kv7gd4?cI*PYJgCxZyB>w^b+f)Yt diff --git a/packages/huawei_bgp_peer b/packages/huawei_bgp_peer index 68061a0..30947ac 100644 --- a/packages/huawei_bgp_peer +++ b/packages/huawei_bgp_peer @@ -16,7 +16,7 @@ 'name': 'huawei_bgp_peer', 'num_files': 2, 'title': 'Huawei BGP Peer', - 'version': '20220418.v.0.2', + 'version': '20220509.v.0.3', 'version.min_required': '2.0.0', 'version.packaged': '2021.09.20', 'version.usable_until': None} \ No newline at end of file -- GitLab