Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[bgpcfgd][voq] Fix for unit test failure in bgpcfgd config for voq switch #8278

Merged
merged 1 commit into from
Jul 29, 2021

Conversation

vganesan-nokia
Copy link
Contributor

Why I did it

To fix Azure pipeline failure due to unit test failure in sonic-bgpcfgd submodule.

How I did it

The unit test failure was due to missing bgp graceful restart select defer time configuration in voq_chassis.conf. Modified sample output data file voq_chassis.conf to include this configuration.

How to verify it

  • Trigger Azure pipeline build.
  • Observe pipeline completes successfully.

Which release branch to backport (provide reason below if selected)

N/A

Description for the changelog

Fix for unit test failure in bgpcfgd for voq switch

@vganesan-nokia vganesan-nokia requested a review from lguohan as a code owner July 28, 2021 15:07
@vganesan-nokia
Copy link
Contributor Author

@abdosi, would you please review this and get this merged? This fixes the unit test failure in sonic-bgpcfgd and resultant Azure pipeline failure introduced after PR #8049. Thanks.

abdosi
abdosi previously approved these changes Jul 28, 2021
The unit test failure was due to missing bgp graceful restart select
defer time configuration in voq_chassis.conf. Modified sample output
data file voq_chassis.conf to include this configuration.

Signed-off-by: vedganes <[email protected]>
@abdosi
Copy link
Contributor

abdosi commented Jul 29, 2021

@vganesan-nokia can you please clarify how #8049 got merged when it can cause build failure ?

@vganesan-nokia
Copy link
Contributor Author

@vganesan-nokia can you please clarify how #8049 got merged when it can cause build failure ?

I can think of the following reasoning: Even though the PR #7533 that introduced bgp graceful-restart select time configuration in file dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2 got merged before #8049 merge, PR #8049's pipeline checks have all passed before that. Since the changes from PR #7533 and changes from PR #8049 for this file did not generate any conflict, git did not notify us of conflict either during merging (or before merging) and merging was successful.

The build failure was due to ut failure in sonic-bgpcfgd. The ut failure was because of voq_chassis.conf which is a new file and is pre-pr #7533 sample output (i.e the file voq_chassis.conf did not have the graceful restart select timer config), After merging #8049, during Azure build UT failed while comparing generated file (based on post-pr #7533, which has graceful restart select timer configuration) with pre-pr #7533 sample output file (which did not have the graceful restart select timer config)

@lguohan lguohan merged commit 25b31e1 into sonic-net:master Jul 29, 2021
@lguohan lguohan mentioned this pull request Jul 29, 2021
carl-nokia pushed a commit to carl-nokia/sonic-buildimage that referenced this pull request Aug 7, 2021
…sonic-net#8278)

The unit test failure was due to missing bgp graceful restart select
defer time configuration in voq_chassis.conf. Modified sample output
data file voq_chassis.conf to include this configuration.

Signed-off-by: vedganes <[email protected]>
judyjoseph pushed a commit that referenced this pull request Aug 25, 2021
…#8278)

The unit test failure was due to missing bgp graceful restart select
defer time configuration in voq_chassis.conf. Modified sample output
data file voq_chassis.conf to include this configuration.

Signed-off-by: vedganes <[email protected]>
judyjoseph added a commit that referenced this pull request Aug 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants