Skip to content

Commit dfe80e1

Browse files
authored
Fix System health issue which checks frr_bmp in feature table. (#22985)
<!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md failure_prs.log Make sure all your commits include a signature generated with `git commit -s` ** If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx" or "resolves #xxxx" Please provide the following information: --> #### Why I did it We need skip frr_bmp since it's not container just bmp option used by bgpd from service checker. ##### Work item tracking #22934 (comment) #### How I did it Skipp frr_bmp from feature table. #### How to verify it after frr_bmp feature is enabled, system-health cli does not report frr_bmp in "Not Running" line any more, other containers are not launched which are irrelevant to frr_bmp ![image](https://github.com/user-attachments/assets/e1477c33-a979-4640-9c36-301c9d800ebb) <!-- If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012. --> #### Which release branch to backport (provide reason below if selected) <!-- - Note we only backport fixes to a release branch, *not* features! - Please also provide a reason for the backporting below. - e.g. - [x] 202006 --> - [ ] 202205 - [ ] 202211 - [ ] 202305 - [ ] 202311 - [ ] 202405 - [ ] 202411 - [ ] 202505 #### Tested branch (Please provide the tested image version) <!-- - Please provide tested image version - e.g. - [x] 20201231.100 --> - [ ] <!-- image version 1 --> - [ ] <!-- image version 2 --> #### Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: --> <!-- Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU. --> #### Link to config_db schema for YANG module changes <!-- Provide a link to config_db schema for the table for which YANG model is defined Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md --> #### A picture of a cute animal (not mandatory but encouraged)
1 parent 1df1b5d commit dfe80e1

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

src/system-health/health_checker/service_checker.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,9 @@ def get_expected_running_containers(self, feature_table):
9999

100100
container_list = []
101101
for container_name in feature_table.keys():
102+
# skip frr_bmp since it's not container just bmp option used by bgpd
103+
if container_name == "frr_bmp":
104+
continue
102105
# slim image does not have telemetry container and corresponding docker image
103106
if container_name == "telemetry":
104107
ret = check_docker_image("docker-sonic-telemetry")

0 commit comments

Comments
 (0)