From 73cf61d55ae19963acf7b6fb989a6c653c12cb6a Mon Sep 17 00:00:00 2001 From: Andrey Pazychev Date: Fri, 14 Aug 2020 14:25:41 +0300 Subject: [PATCH 1/5] #1361 work on. ConfDB syntax protocol dns name-server and search Juniper.JUNOS normalizator with "crap&wood" style. --- core/confdb/syntax/protocols/base.py | 2 ++ core/confdb/syntax/protocols/dns/__init__.py | 0 core/confdb/syntax/protocols/dns/base.py | 23 +++++++++++++++++++ .../Juniper/JUNOS/confdb/normalizer.py | 14 ++++++++++- 4 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 core/confdb/syntax/protocols/dns/__init__.py create mode 100644 core/confdb/syntax/protocols/dns/base.py diff --git a/core/confdb/syntax/protocols/base.py b/core/confdb/syntax/protocols/base.py index 57edff00fe..041b4f4dac 100644 --- a/core/confdb/syntax/protocols/base.py +++ b/core/confdb/syntax/protocols/base.py @@ -14,6 +14,7 @@ from .spanningtree.base import PROTOCOLS_SPANNING_TREE_SYNTAX from .udld.base import PROTOCOLS_UDLD_SYNTAX from .loopdetect.base import PROTOCOLS_LOOP_DETECT_SYNTAX from .lacp.base import PROTOCOLS_LACP_SYNTAX +from .dns.base import PROTOCOLS_DNS_SYNTAX PROTOCOLS_SYNTAX = DEF( @@ -26,5 +27,6 @@ PROTOCOLS_SYNTAX = DEF( PROTOCOLS_SPANNING_TREE_SYNTAX, PROTOCOLS_LOOP_DETECT_SYNTAX, PROTOCOLS_LACP_SYNTAX, + PROTOCOLS_DNS_SYNTAX, ], ) diff --git a/core/confdb/syntax/protocols/dns/__init__.py b/core/confdb/syntax/protocols/dns/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/core/confdb/syntax/protocols/dns/base.py b/core/confdb/syntax/protocols/dns/base.py new file mode 100644 index 0000000000..db038f6398 --- /dev/null +++ b/core/confdb/syntax/protocols/dns/base.py @@ -0,0 +1,23 @@ +# ---------------------------------------------------------------------- +# ConfDB protocols ntp syntax +# ---------------------------------------------------------------------- +# Copyright (C) 2007-2020 The NOC Project +# See LICENSE for details +# ---------------------------------------------------------------------- + +# NOC modules +from ...defs import DEF +from ...patterns import ANY, IP_ADDRESS + +PROTOCOLS_DNS_SYNTAX = DEF( + "dns", + [ + DEF( + "name-server", + [ + DEF(IP_ADDRESS, name="ip", multi=True, required=True, gen="make_dns_name_server_ip"), + ], + ), + DEF("search", [DEF(ANY, name="suffix", gen="make_dns_name_server_search_suffix")]), + ], +) diff --git a/sa/profiles/Juniper/JUNOS/confdb/normalizer.py b/sa/profiles/Juniper/JUNOS/confdb/normalizer.py index 7a49b094bc..fc273d4c53 100644 --- a/sa/profiles/Juniper/JUNOS/confdb/normalizer.py +++ b/sa/profiles/Juniper/JUNOS/confdb/normalizer.py @@ -1,12 +1,13 @@ # ---------------------------------------------------------------------- # Juniper.JunOS config normalizer # ---------------------------------------------------------------------- -# Copyright (C) 2007-2019 The NOC Project +# Copyright (C) 2007-2020 The NOC Project # See LICENSE for details # ---------------------------------------------------------------------- # NOC modules from noc.core.confdb.normalizer.base import BaseNormalizer, match, ANY, REST, deferable +from noc.core.confdb.syntax.patterns import IP_ADDRESS class JunOSNormalizer(BaseNormalizer): @@ -155,3 +156,14 @@ class JunOSNormalizer(BaseNormalizer): @match("system", "ntp", "server", ANY, ANY, ANY, ANY, ANY) def normalize_ntp_server(self, tokens): yield self.make_ntp_server_address(name=tokens[3], address=tokens[3]) + + @match("system", "name-server", IP_ADDRESS) + def normalize_dns_name_server(self, tokens): + yield self.make_dns_name_server_ip(ip=tokens[2]) + + @match("system", "domain-search", REST) + def normalize_dns_name_server_search_suffix(self, tokens): + for item in tokens[tokens.index("domain-search") + 1:tokens.__len__() - 1]: + if item == "[" or item == "]": + continue + yield self.make_dns_name_server_search_suffix(suffix=item) -- GitLab From 6faa0bfbdfe095d11a3a8e18388e8fb2c14e1e41 Mon Sep 17 00:00:00 2001 From: maksmile13 Date: Sun, 16 Aug 2020 18:38:57 +0300 Subject: [PATCH 2/5] Add Eltex MES24xx mib --- collections/fm.mibs/ARICENT-ISS-MIB.json.gz | Bin 0 -> 24276 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 collections/fm.mibs/ARICENT-ISS-MIB.json.gz diff --git a/collections/fm.mibs/ARICENT-ISS-MIB.json.gz b/collections/fm.mibs/ARICENT-ISS-MIB.json.gz new file mode 100644 index 0000000000000000000000000000000000000000..07b30ef2f6d3cbfc56db5706eac5f6e64c6a6712 GIT binary patch literal 24276 zcmV(%K;pk2iwFq3Q8`}%|3OkoLq$$hElE>TElo*6E^2dcZUF6lX>;4!mEd2w^*#)x zDvH+br7B$|%XS`TBwH=Y@Ab@ZDh-j4gfYdB`u^k9&Tur^IUm0LrT@z`%qD5H$fG2N->>dM1>dWiBvtUt z03MhHS^k&hVjAS(6rR}M-P_;UeZ8}L1i#&fX+|&Z;XsQpo@Rf+kN@|V;RhLi`0@SK z&dIxXm+#G#qmSno_xn4e^P&B4b^6Qy>;IBJF2ZSell}7Mzkj(%()=vSa{T)`$ilzi zkFbDGlRV5vc^bvHzx@60FmI3tFynv!l0>+^y}`lYc(6A(g#YgEzC0eh+JjlDxBuo% zlx0O2#LL;N|4a55=fPK)8>Uz>^k8@O;2)Dbx``$M4*k@b1`QjzN`u8|65m9(mtmGC zX;^W(QKoWuOl8q+3=0e4Bb<1)oJ_(jyIIauO0Uv-RdS=oG5sFghf_77v6uYgFP#?N z0Hw3!78idGYY1*vEjuP~!m4T6VVWkHO5$-mdd%{0u3#K>6V1Xwr`7GRUfg+>ekSaH ze;>yAhaj4j7I+e?@>8-{K6?c_$lwR{a2Lk7_%x)il6eR)zJbS=_)Y8sSxxSO_!c&b zW5Ur)!UzxICQarF?~OXSg&zhm0V$pgKV-@!@UC9{rjK59XKEBYK5ky| zMe-1)qvc{Tdwd%F?~_>$*yRBmV6Qjx)UCX1-pb|4`R95BU%d}_S1s{nH36gt>?r~t zaBBi@z!Tk&=2i2$KY)mFxAw|!@a=KzE&eH3{<_72gLss~P0Q9=ZxE}D-p1dU5>Al` zAXT3x5Bw`EKT*qt{0(??A5DPZg1i-U*-nGVz4h&`VcBJC6wz6dAGDd1d@oeK+em|Uh; zp3(k^y}_AYhvS&#DcCAt3b5I6d}WwvFHUgUp32M&`CX7#4IhVuH!uba$}(DUFuEIE z#)Dg*n9)!kp%L&8+KG%YC05AC=0WQNe2oWPTt^ztlRSLVLhRf;n92xuiZj7|N%N)1 z!JFB2Z^UD&Q%{D$z4mDOajum5UEgm5kYPMY2`IDRRt53Y|Mg^<(@9^Y(d{kZPXKH? z3v(F_aV1?M4UUk}??3lL(`C1P}nqtP%$dK$wbznDeW$X%M90!+kh@ z0aq%XUO&Q6DP6b#ZZ$(8my4a%E>_=Gy}Q2MXJMhh{g)uRAS^1D)NM6*(ceBA{H})K zPyo0tLhAz%l-B!dg{%!+_;P-Eg-hs$rnqX&$I5u>pyW9I75EUmeTo8C1D;LbnLg1O z&;V1b4##khfIG7IlLm1X(P6T_D`x~F@Uiu2QTPhcaAK}$xI?$RKaSzgD2DfgS@cK9 zwD%5<_W|kbB$+Q}VIIyN8&*oYs#~dQyHFOT&Fq4e!ngf(4lExj@F{px3l4;##DU>2 zo`V+D*JL=#EJ&_pg*TwhA{-Ji>BuT+BQVT$lHbv^sdLKkTQ%Za7y*3NMfSTS7d%IN zXochZO*sCp2FLC3x)Onp-)Kl&%z_vQf<7yk<^}+M_#R+r9z=W(01}HJMNBZ?ufnQv zjDiLY)HkP4COiOsraUgX09C$CgE_8t92(ZYTpONAwTfJM_Kh{kyGFk(FMZo)Xm zm$T$1=a+AQ-iW-K0KSi3AbRXr3~!{#8Wse&3gHXK%V7F@`>0tA-;*>18WgU8OkMy? zYoM@Z2IKs788P&ucoO=Q0bYY+Ht=AZ9DyyEJp_*#+S*oKhY=m@x;KK+LN0}dPpga3 zU;;ax0izbdr+7IG!70(dtIN;t`$anR5Y1+USU4m~0SGY-jhbiKsEpLjO6tyUaxXrd zoQ>YA;5LZjbpePnvla(YE^P(7!`86V>PW*XC#42<%Y*nM&r+8+r>o_I}>n4~mh4}64 zmb($=1?{c)dpcuq5&KzwwFi(s!<9(Dr5~Z*@c)>81Op%3I z##mb#jaL?0%;6yecN`f7*aDB!hljF60UFJt*tkLh7Q+ft%GIZfHA}-_`l!-n44XvN z+~Fd?oirBm2B&Kfz+L!NHiWMuJ=BA>A%hLJ@=`e*K0B;EZlgt@G(SgXkgp zFx)@p**7>BSjX@PfoyVxVU&2`a()dGCBRx>Eu(|Sq5AO*v*>57%uqfj7*Mku6!bP(OB zUWI|O#}1k#LxF_lA=i>EQji^S8ZOchz2m^~(SYkR{pDhjqJ5nwE#f*ZQM@nTEn{Me z$Vfr9?mmzE>b2xzs26UYQBh152!UG<*l^y~;8bASWl$y|p>L#SfhXG0Eg7Crt2~>RhBDARM zYhi{0w*M&OkV0}fy1GE)*Ais|a-Hx!19&eM@Cc3_Fp7T7y%{wNmgzuTNJEk=^yvPa zxHW!KD1d$pUd$CJ1Pi^4S$H3Uan<=7rB`FYV8 zMf~;A=*c+C_=Wz9F@6!`cZBVhhx~N)we04*nunj3d7JA}R2hwQIR!xF5t<~HIX(%z2lVZW zG?_1QwH3lFJNoDCO;LoSCNnMQ5R)&k)S=eKE6uj51?Ff2ZYCotGo%eD7{{0AX!D;h zV;xj5aGsO97e?gAhYtX99P+Kco@y&exA9KK@YXec`yL-fK^A`&IlypR#0+at7I59~NpCX05pHn8fkTps*8ohdhzj=!hfM_!v(>jEJK@c(ZekdoxRf z8-*6#d6ehO8$bjBuJI+zK}-4=ka&9*#mlei>hxm#0)8dvx<>%OnA}AnO7u7s?O~B7 zc``|6zDnopx(aw^=eP|*3kLuiq@cyQK>e6Z!$@Kf3fnJkRk=HbMQ6_JyyI37bBCc( zEX35{B#n@-)&r{yD&Sq!z;dKt9WjtCuW`BOLH0$6oknai^XYkg46j5-gxruJN9S_t zQ4M?9_-$AQk&swX_&1IU3-GXyMp7Js;aIaA6K@`TfxC5cLwA^seK1Z8oD;^sPS$rH zCCRlgw21Jk6+3G%a$JOAdd4DUP2kTJi)XiF*5EJ(AxHR)8w{lVfFh!*NW0_4@id7+ z{2m|Sp$c}Fh8OIbXSMXx#DNuY&;o_j6V+LFozOpziAG3mZ zpaU&hLA$}MAP~Z6b-2G}@;^kk&#w_^Lnrq^Gz+dHvJr96m~T`i%MAkqZU=#r%&({; z;Fkb&eIBASZhEh14)iVrQlH=-RGu8kk|oG#9SHN z$CT_0M6<=}KaMdN;%r#+b1`mho~6yvYWih|F$yvOHvqK)F%DPsY51-<{$x|*uquyJb2**uLQf-tVt@ndmm!;U`NU%hRub&K4sX$I z2OxL|(y11(Z&HkNR97V!Mx^&)ywQZL%Sea;np#}A4siq?nu9=75WPuDCCiV5XV}|H z`lZ8LgN$qg;f^e*?^?p>7ts3yvWn3f)e`92%%ybvHO8Y}hhc2PmadqS+s#` z1WPvp)(kTUC{DmV7Dgl_-GA_M#F%1GeG? z4F;(p#nR=W#hL1W7l~dL`K%gYiDz4nA&O;@3_nGs=fqH#3RYTr*+d-*#b(9~V#19l z$)*@+hw@0PZpU{MnSKV@RVLPZ;E-&GxcF) z2qqyTkzOuf_Fjo}Jf{eH*p|%JxYYS;ynm}uYwch&bQi@J7(EwK7WBS+IWpP6qVVCD zoCGS7^q?r{d)A8I9JK+22;`j-ZmRFCsV% z4ma8=b)|He`Z+5nD};p^Nu~9r!!+C#>svej!e*N9Q_2N@YJn2R9Z+ITPccF1fg-l+ zaRoz0@5`)B%dV{fJSfRAt-ZnQ3l?KugE!bfq|PDi_=Dxy=W_?Y>~N+lyhTM$>VyGS zxOYVCG}(1zUR(bdHw21TU8Iz{at&ocrN07`t&Pa+UXn_EMq3J}Xatb80tlun`qv-; z>2+*U2zo~5{kj7(*M`J}I@8xr1+6x^Jei}*K*M<9Gj;jC#MkBfr?B?@b~@2-QYWSe zA^HB>>O)P6o2Ww{;HnH4m4`T7xSVE={+u{0@)y>TEFE(6q_ufNyFejt11lMW_vEuN zhL-whEjwVya#R2j`zWhr*kU-_(8BlIk#X5TSwfNDnLN@n>RpK}J|k7zKWGeI+KBJ# zpVsHK-=On-Uf|hFw9Hk~iQW{#U~a|mra`=1JP)-gZJ|tYfS>Ehi;q7a(K%`rKU+(5 ztkmf{-389t+zjWCF(=?CAx(!c0rkfXLfSuWN7z2k1WYSPn}rA9Dn=sW^M)K7u@mqq z5S*qcyj~S5^^B%WaMd`XQCn47jhvHwP6=`UWs`$Zo1h!bI~rAdyN=SZsQeiSsm^U@ zfjro*(wj2TZar+|7p}K06=4XM9$Y_cZ32H^S#oc3u0mu|eYfoEOHP{LVw}Za=&pe!ki#w3oFp&

i$$fFvt6e0v{HIwT{N9Ll)BCISD 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 H)(Zjv7jFu^ literal 0 HcmV?d00001 -- GitLab From e6531e6d319aafdd23ca53c472715e65b1583328 Mon Sep 17 00:00:00 2001 From: Andrey Pazychev Date: Mon, 17 Aug 2020 09:03:25 +0300 Subject: [PATCH 3/5] According MR#4162 remove crutches --- sa/profiles/Juniper/JUNOS/confdb/normalizer.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sa/profiles/Juniper/JUNOS/confdb/normalizer.py b/sa/profiles/Juniper/JUNOS/confdb/normalizer.py index fc273d4c53..1261b4a23f 100644 --- a/sa/profiles/Juniper/JUNOS/confdb/normalizer.py +++ b/sa/profiles/Juniper/JUNOS/confdb/normalizer.py @@ -161,9 +161,7 @@ class JunOSNormalizer(BaseNormalizer): def normalize_dns_name_server(self, tokens): yield self.make_dns_name_server_ip(ip=tokens[2]) - @match("system", "domain-search", REST) + @match("system", "domain-search", ANY) def normalize_dns_name_server_search_suffix(self, tokens): - for item in tokens[tokens.index("domain-search") + 1:tokens.__len__() - 1]: - if item == "[" or item == "]": - continue - yield self.make_dns_name_server_search_suffix(suffix=item) + yield self.make_dns_name_server_ip(ip=tokens[2]) + -- GitLab From 998a9ca8a135f045759963fee02dc911ce99aff9 Mon Sep 17 00:00:00 2001 From: Andrey Pazychev Date: Mon, 17 Aug 2020 09:16:35 +0300 Subject: [PATCH 4/5] Fix pipeline, remove MIB file from not chained commit. --- collections/fm.mibs/ARICENT-ISS-MIB.json.gz | Bin 24276 -> 0 bytes sa/profiles/Juniper/JUNOS/confdb/normalizer.py | 1 - 2 files changed, 1 deletion(-) delete mode 100644 collections/fm.mibs/ARICENT-ISS-MIB.json.gz diff --git a/collections/fm.mibs/ARICENT-ISS-MIB.json.gz b/collections/fm.mibs/ARICENT-ISS-MIB.json.gz deleted file mode 100644 index 07b30ef2f6d3cbfc56db5706eac5f6e64c6a6712..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24276 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

i$$fFvt6e0v{HIwT{N9Ll)BCISD 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 H)(Zjv7jFu^ diff --git a/sa/profiles/Juniper/JUNOS/confdb/normalizer.py b/sa/profiles/Juniper/JUNOS/confdb/normalizer.py index 1261b4a23f..a29a80bf37 100644 --- a/sa/profiles/Juniper/JUNOS/confdb/normalizer.py +++ b/sa/profiles/Juniper/JUNOS/confdb/normalizer.py @@ -164,4 +164,3 @@ class JunOSNormalizer(BaseNormalizer): @match("system", "domain-search", ANY) def normalize_dns_name_server_search_suffix(self, tokens): yield self.make_dns_name_server_ip(ip=tokens[2]) - -- GitLab From 45aa6273c641153e5e9ae900c04c5642b76cacd8 Mon Sep 17 00:00:00 2001 From: Andrey Pazychev Date: Mon, 17 Aug 2020 09:20:39 +0300 Subject: [PATCH 5/5] Bugfix. variable name suffix --- sa/profiles/Juniper/JUNOS/confdb/normalizer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sa/profiles/Juniper/JUNOS/confdb/normalizer.py b/sa/profiles/Juniper/JUNOS/confdb/normalizer.py index a29a80bf37..7790a01675 100644 --- a/sa/profiles/Juniper/JUNOS/confdb/normalizer.py +++ b/sa/profiles/Juniper/JUNOS/confdb/normalizer.py @@ -163,4 +163,4 @@ class JunOSNormalizer(BaseNormalizer): @match("system", "domain-search", ANY) def normalize_dns_name_server_search_suffix(self, tokens): - yield self.make_dns_name_server_ip(ip=tokens[2]) + yield self.make_dns_name_server_ip(suffix=tokens[2]) -- GitLab