From 19d40af20a4586a9f50fc6864129efd90e62605b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Walstr=C3=B6m?= Date: Thu, 26 Sep 2024 16:53:01 +0200 Subject: [PATCH 01/12] syslog: Update test texts for test specification --- test/case/ietf_syslog/basic/Readme.adoc | 9 ++++----- test/case/ietf_syslog/basic/test.py | 9 ++++----- test/case/ietf_syslog/basic/topology.png | Bin 3003 -> 3111 bytes test/case/ietf_syslog/remote/Readme.adoc | 6 +++--- test/case/ietf_syslog/remote/test.py | 19 ++++++++++--------- test/case/ietf_syslog/remote/topology.dot | 8 ++++---- test/case/ietf_syslog/remote/topology.png | Bin 22217 -> 22044 bytes 7 files changed, 25 insertions(+), 26 deletions(-) diff --git a/test/case/ietf_syslog/basic/Readme.adoc b/test/case/ietf_syslog/basic/Readme.adoc index f77ea932..152a29ed 100644 --- a/test/case/ietf_syslog/basic/Readme.adoc +++ b/test/case/ietf_syslog/basic/Readme.adoc @@ -1,7 +1,6 @@ === Syslog Basic ==== Description -- Add syslog actions to log to local files -- Verify new log files have been created +Add syslog actions to log to local files, then verify new log files have been created. ==== Topology ifdef::topdoc[] @@ -16,9 +15,9 @@ image::topology.png[Syslog Basic topology] endif::testgroup[] endif::topdoc[] ==== Test sequence -. Initializing ... -. Add new syslog file action -. Verify log files have been created ... +. Initializing +. Configure DUT +. Verify log files /var/log/bar.log and /var/log/bar.log have been created <<< diff --git a/test/case/ietf_syslog/basic/test.py b/test/case/ietf_syslog/basic/test.py index 189a22bc..992b6954 100755 --- a/test/case/ietf_syslog/basic/test.py +++ b/test/case/ietf_syslog/basic/test.py @@ -2,22 +2,21 @@ """ Syslog Basic -- Add syslog actions to log to local files -- Verify new log files have been created +Add syslog actions to log to local files, then verify new log files have been created. """ import infamy import infamy.ssh as ssh with infamy.Test() as test: - with test.step("Initializing ..."): + with test.step("Initializing"): env = infamy.Env() target = env.attach("target", "mgmt") tgtssh = env.attach("target", "mgmt", "ssh") factory = env.get_password("target") address = target.get_mgmt_ip() - with test.step("Add new syslog file action"): + with test.step("Configure DUT"): target.put_config_dict("ietf-syslog", { "syslog": { "actions": { @@ -59,7 +58,7 @@ with infamy.Test() as test: } }) - with test.step("Verify log files have been created ..."): + with test.step("Verify log files /var/log/bar.log and /var/log/bar.log have been created"): user = tgtssh.runsh("ls /var/log/{foo,bar.log}").stdout if "/var/log/foo" not in user: test.fail() diff --git a/test/case/ietf_syslog/basic/topology.png b/test/case/ietf_syslog/basic/topology.png index 5c6b47225455bf3cf47070ceb9dce77164746586..21661c1820991c72b55ff3a883c46a8868eb56a3 100644 GIT binary patch literal 3111 zcmb7GcTiJV7k>gv7m&6B0wM?!K|!ekQk7mL^j<>f9T%jpA_%CIEFwaJNXbeODIp+D zKq(6W>Alxb5=ww23GhAluWx2&zM1d5nfuDz`|dgC{?70GlFdwXFEaBp0|0PQUr)yz z0B9t^XH`ZTaFlx7tOwrc-3)bgfb*Z%`(`u(09a=9bu=v^@^)rpjG*HJ47;JzTJ}yW z#Wyy__;)NaO=>Padc;co+7tgO;}Nco&8!9{%a5D;AOPjfX=8=AoAu4TCMxuu; z=-Sn*8E7s5i05NyW&nVM#5r03(9$Me0DuDhzuEcu`Pqb2H$Gax-z&~Vh>DAM4%-3| z$j;7ADmB{F^8$gJhX)gN96(r{UsK!J+2P^gd5T_%rGM7uA`@|sg#iMAOifR#A%BTi z+}z$S|MSn!Hc}`PSoOtO1M3&#tt4WQlf} zmuM)k>r-4@e0Fw*>UT4*uBjo;G%T-T^Z?T11!CK&5CCxSN3sI|>6wols-f<7u(Nh> z^YTW@&;SuNafZ^I@r{|J&7TPy=KRMCfAi)pFS$=n&33o4%SJaVTgWMKUZ4%2)KYn+ zGYyKFpD&%P=eI^4LgKzYV_-ib&Q}h4(a_LbyLQdo+&q@Lr%Tu;c#1H6$i)1`HF#ay23FQj*d8)z5?x} zyfgrS>Rik4o34`<6&00{37T(-5l47`PvK#H?nazzo_R|k5R7vbB)L=GzkiR*RSXXg zzsp)U>Vtf_a2?a_R+V?}F+^J0_@jkEv3ZsO#-sO5U7bR%S=xQ_#&Vi^fAw~faBRIx z+tc)PjtZ;k(a{HKuc5dbHIq%@#JTQny&R(wvl|KlGZRx&o6(tE9s7S|XHReQL7`AC z5!k^RPE%9U;YxT;{HQ6J258sC*GRP^}DN)IBe4_rt~OM8;!6p6pCr57Arg}BtI$tZdIcK8|| z=#v{A9Zleot;v`2{X!3N84W>Z(U9-(7i}c+glBuU_$!Hh{Y|( z*i@8Qj?qJRlzJSB!`#g5EAlzTsMd1;1^)C`r-%X!27|?7Yimg(AE8_+AO;|Ea-^f3 z>8>omKp>CyPW67WwEB&)czfWalg%o5Oc=USLGK$dX@sW|4 z#_&KGtf;K)rlKMijZP~0YkYkCxJM#Cnv6#a3JT87&N|1PK8}b`3bw#8iZnDdfN0d$ z*SG%Uz<2p_{o}1M3b8frnBe%OXmV%OWU2kw?9rn~!qK}IW^diNaYI_#-`l%@eIQR+ zn^8GvLBqg+Sw!sW)rH>MtyHi+ZadV=C@I~@?qw2bYio0>Qo4WNNsRO4jzq&FCN&{VyFF zf7{uftN}sDBoZ7P9Jq)tA=7!VWkrDk{p>Hpc{A$c|s>bd`6vtt&5=QdOmr@WU-FEeRYA z4yfE*d(fcJyF3HkhjShIDTzr*6f*f84o==(!{sKV%lnQ6(ZcRbLQT~yq0rE+F=>pQ zF{7lUuw zA1)Y)rmo+zTaMrsA>A|A(1^z=G(RMD3CF$ozO=F770`4lU%Mw7kvuds1UgDN4b$qB z$TIM5T@1CsMMg$$AZ66m)!Q2nw9-Ia{x}U-iL5}Y3$b;`ID80u))=o)^6lF<^>gY$ zcZR6p8!2xuFPqlb)6LN`3Weg>-?h^j%{voH2Lx)&7m(a<&Xzb!^RkE}c-STdF8