Skip to content

Split frr_bmp feature switch for turn on FRR side bmp tunneling via Liquid#22148

Merged
qiluo-msft merged 5 commits intosonic-net:masterfrom
FengPan-Frank:frr_featureswitch
Apr 4, 2025
Merged

Split frr_bmp feature switch for turn on FRR side bmp tunneling via Liquid#22148
qiluo-msft merged 5 commits intosonic-net:masterfrom
FengPan-Frank:frr_featureswitch

Conversation

@FengPan-Frank
Copy link
Contributor

@FengPan-Frank FengPan-Frank commented Mar 26, 2025

liquid.

Why I did it

Use new feature switch to turn on FRR side bmp tunneling, so that we can control FRR side feature switch in image first, and BMP container side feature will be controlled via kubeSonic rollout.

Work item tracking
  • Microsoft ADO (number only):30807821

How I did it

Create new feature switch for FRR side bmp tunneling

How to verify it

Unit test is covered.

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

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111
  • 202205
  • 202211
  • 202305

Tested branch (Please provide the tested image version)

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

@FengPan-Frank FengPan-Frank requested a review from lguohan as a code owner March 26, 2025 07:01
@mssonicbld
Copy link
Collaborator

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

{# set bmp info #}
{% if (FEATURE is defined) and ('bmp' in FEATURE) and ('state' in FEATURE['bmp']) and (FEATURE['bmp']['state'] == 'enabled') %}
{# set frr_bmp info #}
{% if (FEATURE is defined) and ('frr_bmp' in FEATURE) and ('state' in FEATURE['frr_bmp']) and (FEATURE['frr_bmp']['state'] == 'enabled') %}
Copy link
Collaborator

@qiluo-msft qiluo-msft Apr 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

better to make the config backward compatible:
bmp -> bmp (control the bmp functionality inside FRR)
bmp -> bmp_container (control whether to start bpm container) #Closed

Copy link
Contributor Author

@FengPan-Frank FengPan-Frank Apr 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems current mgmt test flow will regard any item in FEATURE table as container, and broke in mgmt test refer https://elastictest.org/scheduler/testplan/67ee3c711a569391805d4f44?testcase=test_pretest.py%7C%7C%7Cvms-kvm-t0_497835&type=console

image

we should need keep bmp as bmp container by default and used in mgmt test, frr_bmp only used for liquid feature switch control. Thus add one more feature switch frr_bmp into here:

  1. For mgmt test, we don't need any change and "bmp" is used to turn on both FRR and bmp container for testing.
  2. For FRR only enable option, we can use "frr_bmp" liquid to control it dynamically.
  3. For FRR + bmp container enable option, we can use liquid "bmp" to control it dynamically.

@mssonicbld
Copy link
Collaborator

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@qiluo-msft qiluo-msft enabled auto-merge (squash) April 4, 2025 01:04
@qiluo-msft qiluo-msft merged commit 8110eb9 into sonic-net:master Apr 4, 2025
19 checks passed
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.

3 participants