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

Summary:New smartswitch DPU config template #16201

Merged
merged 11 commits into from
Jan 22, 2025

Conversation

nnelluri-cisco
Copy link
Contributor

Description of PR

New smartswitch DPU config template.

Summary: smartswitch DPU config
Fixes # (issue)

Type of change

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

Back port request

  • 201911
  • 202012
  • 202205
  • 202305
  • 202311

Approach

What is the motivation for this PR?

configure the DPU's for the smartswicth.

How did you do it?

Added New dpu_config.j2 to generate DPU config for the smartswicth.

How did you verify/test it?

Verified using below command
./testbed-cli.sh deploy-mg cmono_t1 ./lab ./password.txt

Wednesday 20 November 2024  02:22:32 +0000 (0:00:00.374)       0:03:09.175 **** 
=============================================================================== 
execute cli "config load_minigraph --override_config -y" to apply new minigraph ------------------------------------------------------------------------------------------------------------- 79.14s
Sync DUT system time with NTP server -------------------------------------------------------------------------------------------------------------------------------------------------------- 61.89s
Wait for switch to become reachable again --------------------------------------------------------------------------------------------------------------------------------------------------- 10.28s
Configure TACACS with PTF TACACS server ------------------------------------------------------------------------------------------------------------------------------------------------------ 5.64s
Configure TACACS ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- 5.57s
Start ntp.service on DUT --------------------------------------------------------------------------------------------------------------------------------------------------------------------- 3.07s
execute cli "config save -y" to save current minigraph as startup-config --------------------------------------------------------------------------------------------------------------------- 2.47s
execute cli "config bgp startup all" to bring up all bgp sessions for test ------------------------------------------------------------------------------------------------------------------- 1.94s
Wait for ntp.service restart after reload minigraph ------------------------------------------------------------------------------------------------------------------------------------------ 1.61s
Set the RTC from the system time ------------------------------------------------------------------------------------------------------------------------------------------------------------- 1.20s
create new minigraph file for SONiC device --------------------------------------------------------------------------------------------------------------------------------------------------- 1.08s
Stop ntp.service on DUT ---------------------------------------------------------------------------------------------------------------------------------------------------------------------- 1.06s
find interface name mapping and individual interface speed if defined from dut --------------------------------------------------------------------------------------------------------------- 1.05s
Generate server cert using openssl. ---------------------------------------------------------------------------------------------------------------------------------------------------------- 0.96s
active dpu config ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- 0.76s
Generate dsmsroot cert using openssl. -------------------------------------------------------------------------------------------------------------------------------------------------------- 0.66s
create dpu config file for SONiC device ------------------------------------------------------------------------------------------------------------------------------------------------------ 0.56s
Generate server cert using openssl. ---------------------------------------------------------------------------------------------------------------------------------------------------------- 0.52s
gather testbed VM information ---------------------------------------------------------------------------------------------------------------------------------------------------------------- 0.45s
Generate golden_config_db.json --------------------------------------------------------------------------------------------------------------------------------------------------------------- 0.40s
Done

Any platform specific information?

hwsku: Cisco-8102-28FH-DPU-O-T1

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

smartswicth

Documentation

@mssonicbld
Copy link
Collaborator

/azp run

Copy link

linux-foundation-easycla bot commented Dec 23, 2024

CLA Signed

The committers listed above are authorized under a signed CLA.

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@nnelluri-cisco
Copy link
Contributor Author

@prabhataravind
Please review.

@mssonicbld
Copy link
Collaborator

/azp run

Copy link

Pull request contains merge conflicts.

@nnelluri-cisco
Copy link
Contributor Author

@wen587
Generated DPU config using single file generate_golden_config_db.py. Please review

@wen587
Copy link
Contributor

wen587 commented Jan 8, 2025

Hi @nnelluri-cisco , I think there are some conflict where the master code has already support this Golden Config.
The problem is that is there platform or hwsku dependent variable to check how many dpu are there. I already know some are 4 and some are 8. Can we put this number in yml file, so that golden config can derive DPU related config based on dpu number?

@nnelluri-cisco
Copy link
Contributor Author

nnelluri-cisco commented Jan 8, 2025

Hi @nnelluri-cisco , I think there are some conflict where the master code has already support this Golden Config. The problem is that is there platform or hwsku dependent variable to check how many dpu are there. I already know some are 4 and some are 8. Can we put this number in yml file, so that golden config can derive DPU related config based on dpu number?

@wen587
I resolved merge conflicts, the conflict came due to editing same file.
Regarding DPU config we dont need yaml file , the file already defined below dict specific to cisco husku.

smartswitch_hwsku_config = {
"Cisco-8102-28FH-DPU-O-T1": {
"dpu_num": 8,
"port_key": "Ethernet-BP{}",
"interface_key": "Ethernet-BP{}|18.{}.202.0/31",
"dpu_key": "dpu{}"
}
}

@mssonicbld
Copy link
Collaborator

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

bpar9
bpar9 previously approved these changes Jan 9, 2025
Copy link
Contributor

@bpar9 bpar9 left a comment

Choose a reason for hiding this comment

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

lgtm

@mssonicbld
Copy link
Collaborator

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

bpar9
bpar9 previously approved these changes Jan 9, 2025
}
},
"GNMI": {
"GNMI": {
Copy link
Contributor

Choose a reason for hiding this comment

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

@nnelluri-cisco can you check alignment here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@prabhataravind
Fixed the alignment issue.

@prabhataravind
Copy link
Contributor

@oleksandrivantsiv @JibinBao fyi

@mssonicbld
Copy link
Collaborator

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@JibinBao
Copy link
Contributor

@oleksandrivantsiv @JibinBao fyi

thanks

@nnelluri-cisco nnelluri-cisco requested a review from bpar9 January 15, 2025 16:57
Copy link
Contributor

@prabhataravind prabhataravind left a comment

Choose a reason for hiding this comment

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

lgtm

Copy link
Contributor

@zjswhhh zjswhhh left a comment

Choose a reason for hiding this comment

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

@r12f for your vis.

@prabhataravind
Copy link
Contributor

/azpw run

@bingwang-ms bingwang-ms merged commit eb7cc6f into sonic-net:master Jan 22, 2025
18 checks passed
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.

8 participants