Skip to content

Add new regex matches to support MONIT logging innew images#2376

Merged
vaibhavhd merged 1 commit intosonic-net:masterfrom
vaibhavhd:qos_sai_ignore_logs
Oct 20, 2020
Merged

Add new regex matches to support MONIT logging innew images#2376
vaibhavhd merged 1 commit intosonic-net:masterfrom
vaibhavhd:qos_sai_ignore_logs

Conversation

@vaibhavhd
Copy link
Copy Markdown
Contributor

Description of PR

Summary: Updated regex match lists to support new MONIT logging format
Fixes # (issue)

Type of change

  • Bug fix
  • Testbed and Framework(new/improvement)
  • [] Test case(new/improvement)

Approach

What is the motivation for this PR?

Monit warning/err message format has changed. This has caused the existing regex ignore match strings to become obsolete for new images. New regex strings are added here to support testing new images.

How did you do it?

Updated ignoreRegex list for qos_sai and copp testcases.

How did you verify/test it?

With old list of ignoreRegex, the testcase fails:


qos/test_qos_sai.py::TestQosSai::testParameter PASSED                                                                                                                                                                 [  5%]
qos/test_qos_sai.py::TestQosSai::testQosSaiPfcXoffLimit[xoff_1] PASSED                                                                                                                                                [ 11%]
qos/test_qos_sai.py::TestQosSai::testQosSaiPfcXoffLimit[xoff_1] ERROR                                                                                                                                                 [ 11%]
qos/test_qos_sai.py::TestQosSai::testQosSaiPfcXoffLimit[xoff_2] PASSED                                                                                                                                                [ 16%]
qos/test_qos_sai.py::TestQosSai::testQosSaiPfcXonLimit[xon_1] PASSED                                                                                                                                                  [ 22%]
qos/test_qos_sai.py::TestQosSai::testQosSaiPfcXonLimit[xon_1] ERROR                                                                                                                                                   [ 22%]
qos/test_qos_sai.py::TestQosSai::testQosSaiPfcXonLimit[xon_2] PASSED                                                                                                                                                  [ 27%]
qos/test_qos_sai.py::TestQosSai::testQosSaiPfcXonLimit[xon_2] ERROR                                                                                                                                                   [ 27%]
qos/test_qos_sai.py::TestQosSai::testQosSaiHeadroomPoolSize PASSED                                                                                                                                                    [ 33%]
qos/test_qos_sai.py::TestQosSai::testQosSaiHeadroomPoolSize ERROR                                                                                                                                                     [ 33%]
qos/test_qos_sai.py::TestQosSai::testQosSaiBufferPoolWatermark[wm_buf_pool_lossless] SKIPPED                                                                                                                          [ 38%]
qos/test_qos_sai.py::TestQosSai::testQosSaiBufferPoolWatermark[wm_buf_pool_lossy] SKIPPED                                                                                                                             [ 44%]
qos/test_qos_sai.py::TestQosSai::testQosSaiLossyQueue PASSED                                                                                                                                                          [ 50%]
qos/test_qos_sai.py::TestQosSai::testQosSaiDscpQueueMapping PASSED                                                                                                                                                    [ 55%]
qos/test_qos_sai.py::TestQosSai::testQosSaiDscpQueueMapping ERROR                                                                                                                                                     [ 55%]
qos/test_qos_sai.py::TestQosSai::testQosSaiDwrr PASSED                                                                                                                                                                [ 61%]
qos/test_qos_sai.py::TestQosSai::testQosSaiPgSharedWatermark[wm_pg_shared_lossless] PASSED                                                                                                                            [ 66%]
qos/test_qos_sai.py::TestQosSai::testQosSaiPgSharedWatermark[wm_pg_shared_lossless] ERROR                                                                                                                             [ 66%]
qos/test_qos_sai.py::TestQosSai::testQosSaiPgSharedWatermark[wm_pg_shared_lossy] PASSED                                                                                                                               [ 72%]
qos/test_qos_sai.py::TestQosSai::testQosSaiPgSharedWatermark[wm_pg_shared_lossy] ERROR                                                                                                                                [ 72%]
qos/test_qos_sai.py::TestQosSai::testQosSaiPgHeadroomWatermark PASSED                                                                                                                                                 [ 77%]
qos/test_qos_sai.py::TestQosSai::testQosSaiPgHeadroomWatermark ERROR                                                                                                                                                  [ 77%]
qos/test_qos_sai.py::TestQosSai::testQosSaiQSharedWatermark[wm_q_shared_lossless] PASSED                                                                                                                              [ 83%]
qos/test_qos_sai.py::TestQosSai::testQosSaiQSharedWatermark[wm_q_shared_lossless] ERROR                                                                                                                               [ 83%]
qos/test_qos_sai.py::TestQosSai::testQosSaiQSharedWatermark[wm_q_shared_lossy] PASSED                                                                                                                                 [ 88%]
qos/test_qos_sai.py::TestQosSai::testQosSaiQSharedWatermark[wm_q_shared_lossy] ERROR                                                                                                                                  [ 88%]
qos/test_qos_sai.py::TestQosSai::testQosSaiDscpToPgMapping SKIPPED                                                                                                                                                    [ 94%]
qos/test_qos_sai.py::TestQosSai::testQosSaiDwrrWeightChange PASSED                                                                                                                                                    [100%]


common/plugins/loganalyzer/loganalyzer.py:85: LogAnalyzerError
================================================================================================== short test summary info ==================================================================================================
SKIPPED [2] /var/src/6100-5/Networking-acs-sonic-mgmt/tests/qos/test_qos_sai.py:208: Buffer Pool watermark test is disabled
SKIPPED [1] /var/src/6100-5/Networking-acs-sonic-mgmt/tests/qos/test_qos_sai.py:501: DSCP to PG mapping test disabled
ERROR qos/test_qos_sai.py::TestQosSai::testQosSaiPfcXoffLimit[xoff_1] - LogAnalyzerError: {'match_messages': {'/tmp/syslog.2020-10-20-18:37:39': ["Oct 20 18:37:44.325056 str-dx010-acs-5 ERR monit[557]: 'lldp|lldpd_moni...
ERROR qos/test_qos_sai.py::TestQosSai::testQosSaiPfcXonLimit[xon_1] - LogAnalyzerError: {'match_messages': {'/tmp/syslog.2020-10-20-18:39:56': ["Oct 20 18:39:45.726438 str-dx010-acs-5 ERR monit[557]: 'lldp|lldpd_monito...
ERROR qos/test_qos_sai.py::TestQosSai::testQosSaiPfcXonLimit[xon_2] - LogAnalyzerError: {'match_messages': {'/tmp/syslog.2020-10-20-18:41:15': ["Oct 20 18:40:46.303142 str-dx010-acs-5 ERR monit[557]: 'lldp|lldpd_monito...
ERROR qos/test_qos_sai.py::TestQosSai::testQosSaiHeadroomPoolSize - LogAnalyzerError: {'match_messages': {'/tmp/syslog.2020-10-20-18:43:07': ["Oct 20 18:41:46.928118 str-dx010-acs-5 ERR monit[557]: 'lldp|lldpd_monitor'...
ERROR qos/test_qos_sai.py::TestQosSai::testQosSaiDscpQueueMapping - LogAnalyzerError: {'match_messages': {'/tmp/syslog.2020-10-20-18:44:58': ["Oct 20 18:44:48.724415 str-dx010-acs-5 ERR monit[557]: 'lldp|lldpd_monitor'...
ERROR qos/test_qos_sai.py::TestQosSai::testQosSaiPgSharedWatermark[wm_pg_shared_lossless] - LogAnalyzerError: {'match_messages': {'/tmp/syslog.2020-10-20-18:47:03': ["Oct 20 18:45:49.324536 str-dx010-acs-5 ERR monit[55...
ERROR qos/test_qos_sai.py::TestQosSai::testQosSaiPgSharedWatermark[wm_pg_shared_lossy] - LogAnalyzerError: {'match_messages': {'/tmp/syslog.2020-10-20-18:48:45': ["Oct 20 18:47:50.616420 str-dx010-acs-5 ERR monit[557]:...
ERROR qos/test_qos_sai.py::TestQosSai::testQosSaiPgHeadroomWatermark - LogAnalyzerError: {'match_messages': {'/tmp/syslog.2020-10-20-18:50:28': ["Oct 20 18:49:51.940461 str-dx010-acs-5 ERR monit[557]: 'lldp|lldpd_monit...
ERROR qos/test_qos_sai.py::TestQosSai::testQosSaiQSharedWatermark[wm_q_shared_lossless] - LogAnalyzerError: {'match_messages': {'/tmp/syslog.2020-10-20-18:52:11': ["Oct 20 18:50:52.540502 str-dx010-acs-5 ERR monit[557]...
ERROR qos/test_qos_sai.py::TestQosSai::testQosSaiQSharedWatermark[wm_q_shared_lossy] - LogAnalyzerError: {'match_messages': {'/tmp/syslog.2020-10-20-18:53:53': ["Oct 20 18:52:53.676470 str-dx010-acs-5 ERR monit[557]: '...
===================================================================================== 15 passed, 3 skipped, 10 error in 1688.74 seconds =====================================================================================

With new regex, the test has started passing again:

qos/test_qos_sai.py::TestQosSai::testParameter PASSED                                                                                                                                                                 [  5%]
qos/test_qos_sai.py::TestQosSai::testQosSaiPfcXoffLimit[xoff_1] PASSED                                                                                                                                                [ 11%]
qos/test_qos_sai.py::TestQosSai::testQosSaiPfcXoffLimit[xoff_2] PASSED                                                                                                                                                [ 16%]
qos/test_qos_sai.py::TestQosSai::testQosSaiPfcXonLimit[xon_1] PASSED                                                                                                                                                  [ 22%]
qos/test_qos_sai.py::TestQosSai::testQosSaiPfcXonLimit[xon_2] PASSED                                                                                                                                                  [ 27%]
qos/test_qos_sai.py::TestQosSai::testQosSaiHeadroomPoolSize PASSED                                                                                                                                                    [ 33%]
qos/test_qos_sai.py::TestQosSai::testQosSaiBufferPoolWatermark[wm_buf_pool_lossless] SKIPPED                                                                                                                          [ 38%]
qos/test_qos_sai.py::TestQosSai::testQosSaiBufferPoolWatermark[wm_buf_pool_lossy] SKIPPED                                                                                                                             [ 44%]
qos/test_qos_sai.py::TestQosSai::testQosSaiLossyQueue PASSED                                                                                                                                                          [ 50%]
qos/test_qos_sai.py::TestQosSai::testQosSaiDscpQueueMapping PASSED                                                                                                                                                    [ 55%]
qos/test_qos_sai.py::TestQosSai::testQosSaiDwrr PASSED                                                                                                                                                                [ 61%]
qos/test_qos_sai.py::TestQosSai::testQosSaiPgSharedWatermark[wm_pg_shared_lossless] PASSED                                                                                                                            [ 66%]
qos/test_qos_sai.py::TestQosSai::testQosSaiPgSharedWatermark[wm_pg_shared_lossy] PASSED                                                                                                                               [ 72%]
qos/test_qos_sai.py::TestQosSai::testQosSaiPgHeadroomWatermark PASSED                                                                                                                                                 [ 77%]
qos/test_qos_sai.py::TestQosSai::testQosSaiQSharedWatermark[wm_q_shared_lossless] PASSED                                                                                                                              [ 83%]
qos/test_qos_sai.py::TestQosSai::testQosSaiQSharedWatermark[wm_q_shared_lossy] PASSED                                                                                                                                 [ 88%]
qos/test_qos_sai.py::TestQosSai::testQosSaiDscpToPgMapping SKIPPED                                                                                                                                                    [ 94%]
qos/test_qos_sai.py::TestQosSai::testQosSaiDwrrWeightChange PASSED                                                                                                                                                    [100%]

Any platform specific information?

Supported testbed topology if it's a new test case?

Documentation

@vaibhavhd vaibhavhd requested a review from a team October 20, 2020 22:41
@vaibhavhd vaibhavhd merged commit d208629 into sonic-net:master Oct 20, 2020
kazinator-arista pushed a commit to kazinator-arista/sonic-mgmt that referenced this pull request Mar 4, 2026
47dc7ea Added support for tunnel route status in show vnet routes all. (sonic-net#2341)
7b8a62f Vnet_route_check Vxlan tunnel route update. (sonic-net#2281) (sonic-net#2376)
b21e2ce [202012][sonic_installer] consider existing swap when setting up swap

Signed-off-by: Xichen Lin <lukelin0907@gmail.com>
kazinator-arista pushed a commit to kazinator-arista/sonic-mgmt that referenced this pull request Mar 4, 2026
…rm-common] advance submodule head (sonic-net#11578)

linkmgrd:
* e0fe1d4 2022-07-27 | TSA enhancement (sonic-net#98) (HEAD -> 202205) [Jing Zhang]

utilities:
* 7d7e15e 2022-07-18 | [vnet_route_check] Align DB data parse logic with format used by swsscommon API (sonic-net#2268) (HEAD -> 202205) [Volodymyr Samotiy]
* b3d5d18 2022-07-20 | [MultiAsic] sudo reboot command doesn't gracefully stop Asic syncd# on multiasic platform (sonic-net#2258) [Marty Y. Lok]
* 504ebe6 2022-07-08 | Add 'traffic_shift_away' option to config load_minigraph (sonic-net#2240) [tjchadaga]
* 4079e4a 2022-06-20 | Gives cisco-8000 more flexibility to easily add subcommnads under show platform (sonic-net#2213) [Nathan Cohen]
* 46443c6 2022-07-27 | Update db_migrator to support `PORT_QOS_MAP|global` (sonic-net#2205) [bingwang-ms]
* d7fbdd6 2022-05-26 | fix for non-coherent cmis modules (sonic-net#2163) [qinchuanares]
* 79b4439 2022-06-24 | [sfpshow/sfputil] Enhance sfpshow and sfputil to behavior correctly on RJ45 ports (sonic-net#2111) [Kebo Liu]

swss:
* 275f311 2022-07-26 | [DualToR] Handle race condition between tunnel_decap and mux orchestrator (sonic-net#2397) (HEAD -> 202205) [Devesh Pathak]
* 47586e8 2022-07-22 | [EVPN]Fix missing Vlan member update notification in P2MP scenario (sonic-net#2388) [Sudharsan Dhamal Gopalarathnam]
* 7d5c73f 2022-07-19 | [macsecmgr]: Fix cleanup macsec objs if container stop (sonic-net#2376) [Ze Gan]
* c03996f 2022-07-17 | [orchagent]: Enhance initSaiPhyApi (sonic-net#2367) [andywongarista]
* 57890d7 2022-07-27 | Fix for remote system interface not getting created (sonic-net#2364) [skeesara-nokia]
* 1a93ec9 2022-07-13 | Orchagent changes for synchronizing npu/phy device Tx in the data path before enabling transceiver<CMIS compliant> Tx. (sonic-net#2277) [jaganbal-a]

sairedis:
* a4903be 2022-07-20 | Update PN with XPN support (sonic-net#1081) (HEAD -> 202205, github/202205) [Ze Gan]
* 2cb5671 2022-07-27 | Add SAI_OBJECT_TYPE_TUNNEL object to break-before-make list (sonic-net#1075) [Vaibhav Hemant Dixit]

platform-daemon:
* 901c6a1 2022-06-28 | [CMIS]Improved 400G link bring up sequence (sonic-net#254) (HEAD -> 202205) [Prince George]

platform-common:
* f223b3f 2022-07-09 | Support get_port_or_cage_type (sonic-net#288) (HEAD -> 202205) [Stephen Sun]

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants