From fd788427d71722ceb83d2f5e4ba94ff5a34e9a43 Mon Sep 17 00:00:00 2001 From: "th.l" <thl-cmk@outlook.com> Date: Thu, 12 May 2022 17:46:50 +0200 Subject: [PATCH] update project --- agent_based/huawei_bgp_peer.py | 32 +++++++++++++++++--------------- huawei_bgp_peer.mkp | Bin 3389 -> 3506 bytes packages/huawei_bgp_peer | 2 +- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/agent_based/huawei_bgp_peer.py b/agent_based/huawei_bgp_peer.py index 7c326d2..8ac7273 100644 --- a/agent_based/huawei_bgp_peer.py +++ b/agent_based/huawei_bgp_peer.py @@ -14,6 +14,8 @@ # 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 +# 2022-05-11: changed bgp_get_peer_entry to get proper parameters instead of Nontransparent list +# added remote_as to BgpPeerItem # # snmpwalk sample @@ -128,20 +130,20 @@ def parse_huawei_bgp_peer(string_table: List[StringTable]) -> Dict[str, BgpPeer] peer_table = {} for entry in hwbgpPeer2Entry: - oid_end, remote_address, state, fsm_established_counter, fsm_established_time, unavail_reason = entry - - bgp_peer = bgp_get_peer_entry([ - remote_address, - state, - '2', # admin_state set to not admin_down - None, # in_updates - None, # out_updates - None, # in_messages - None, # out_messages - fsm_established_counter, - fsm_established_time, - None, # in_update_elapsed_time - ] + oid_end, remote_as, remote_address, state, fsm_established_counter, fsm_established_time, unavail_reason = entry + + bgp_peer = bgp_get_peer_entry( + remote_addr=remote_address, + remote_as=remote_as, + peer_state=state, + admin_state='2', # admin_state set to not admin_down + in_updates=None, # in_updates + out_updates=None, # out_updates + in_messages=None, # in_messages + out_messages=None, # out_messages + fsm_established_transitions=fsm_established_counter, + fsm_established_time=fsm_established_time, + in_update_elapsed_time=None, # in_update_elapsed_time ) if bgp_peer: afi, safi = oid_end.split('.')[1:3] @@ -187,7 +189,7 @@ register.snmp_section( oids=[ OIDEnd(), # 0.afi.safi.adresstype.length.RemotePeerIP # '1', # hwBgpPeerNegotiatedVersion - # '2', # hwBgpPeerRemoteAs + '2', # hwBgpPeerRemoteAs '4', # hwBgpPeerRemoteAddr '5', # hwBgpPeerState '6', # hwBgpPeerFsmEstablishedCounter diff --git a/huawei_bgp_peer.mkp b/huawei_bgp_peer.mkp index 673170459cdda874a40da899f407ced65f412f66..84e8dfefacea368438b79d8c9a38c9b1c70d7c72 100644 GIT binary patch literal 3506 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 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$< diff --git a/packages/huawei_bgp_peer b/packages/huawei_bgp_peer index 30947ac..ffb9558 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': '20220509.v.0.3', + 'version': '20220511.v.0.4', 'version.min_required': '2.0.0', 'version.packaged': '2021.09.20', 'version.usable_until': None} \ No newline at end of file -- GitLab