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

[device/dell] Added dynamic sai.profile generation #1518

Merged
merged 2 commits into from
Mar 21, 2018

Conversation

vharish02
Copy link
Contributor

This commit addds new code for generating dynamic sai.profile file.
The sai.profile.j2 will generate the sai.profile dynamically based on
the topology. It will generate the sai.profile under /etc/sai.d/ directory
in syncd. Before syncd is started this J2 file will be run from the start.sh
file from /usr/bin/ directory. Since the sai.profile is dynamically generated
the old sai.profile file is not required so deleted the file for S6100.
It also address couple of more changes for port_config.ini support is added
for speed in the file which can be used later to find the port speed. Also
the buffer_default_t*.j2 file the ports should be from 0 to 64 changed.

Unit tested the code on S6100 for dynamic generation of sai.profile file for
both T0 and T1 and the file was created in /etc/sai.d/sai.profile
Similarly tested the sonic binary on S6000 to make sure that the sai.profile is
copied from the /usr/share/sonic/hwsku/sai.profile to /etc/sai.d/sai.profile.

Signed-off-by: Harish Venkatraman Harish_Venkatraman@dell.com

- What I did

- How I did it

- How to verify it

- Description for the changelog

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

This commit addds new code for generating dynamic sai.profile file.
The sai.profile.j2 will generate the sai.profile dynamically based on
the topology. It will generate the sai.profile under /etc/sai.d/ directory
in syncd. Before syncd is started this J2 file will be run from the start.sh
file from /usr/bin/ directory. Since the sai.profile is dynamically generated
the old sai.profile file is not required so deleted the file for S6100.
It also address couple of more changes for port_config.ini support is added
for speed in the file which can be used later to find the port speed. Also
the buffer_default_t*.j2 file the ports should be from 0 to 64 changed.

Unit tested the code on S6100 for dynamic generation of sai.profile file for
both T0 and T1 and the file was created in /etc/sai.d/sai.profile
Similarly tested the sonic binary on S6000 to make sure that the sai.profile is
copied from the /usr/share/sonic/hwsku/sai.profile to /etc/sai.d/sai.profile.

Signed-off-by: Harish Venkatraman <Harish_Venkatraman@dell.com>
@vharish02
Copy link
Contributor Author

@yxieca Can you please review the changes.

@yxieca
Copy link
Contributor

yxieca commented Mar 20, 2018

You need to make swss change first, and add submodule update to this review.


rm -f /var/run/rsyslogd.pid


Copy link
Contributor

Choose a reason for hiding this comment

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

Can you remove this empty line?

{%- set sai_profile_filename = 'SAI_INIT_CONFIG_FILE=/etc/bcm/th-s6100-64x40G-t1.config.bcm' -%}
{%- endif %}
{# Write the contents of sai_ profile_filename to sai.profile file #}
{{ sai_profile_filename }}
Copy link
Contributor

Choose a reason for hiding this comment

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

s/sai_profile_filename/sai_profile_contents/

Copy link
Contributor

@yxieca yxieca left a comment

Choose a reason for hiding this comment

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

Please fix a couple minor issues. The rest looks pretty good.

Thanks,
Ying

Updating the sonic-sairedis point.

Signed-off-by: Harish Venkatraman <Harish_Venkatraman@dell.com>
@vharish02 vharish02 force-pushed the dynamic_sai_profile branch from a3e631f to 07ba665 Compare March 21, 2018 02:02
@vharish02
Copy link
Contributor Author

@yxieca All minor changes done.

@yxieca yxieca merged commit 87e9423 into sonic-net:master Mar 21, 2018
abdosi added a commit to abdosi/sonic-buildimage that referenced this pull request Dec 4, 2020
17adc13 (HEAD -> 201911, origin/201911) Add a check for warm-restart, and do a clear only when warm-restart is enable. (sonic-net#1498)
d097260 Fixed compilation failure with debug option (sonic-net#1518)

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
abdosi added a commit that referenced this pull request Dec 4, 2020
17adc13 (HEAD -> 201911, origin/201911) Add a check for warm-restart, and do a clear only when warm-restart is enable. (#1498)
d097260 Fixed compilation failure with debug option (#1518)

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
abdosi added a commit that referenced this pull request Dec 15, 2020
7f50b98 (HEAD -> 201911, origin/201911) handled update() function of fdb orchagent for FDB FLUSH event (#1534)
17adc13 Add a check for warm-restart, and do a clear only when warm-restart is enable. (#1498)
d097260 Fixed compilation failure with debug option (#1518)

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
raphaelt-nvidia pushed a commit to raphaelt-nvidia/sonic-buildimage that referenced this pull request Jan 14, 2021
abdosi added a commit that referenced this pull request May 5, 2021
1f249282e8066a5837f2b34478eb4e0f6b4a654c (HEAD -> 201911, origin/201911) [201911] soft-reboot - support ssd_fw_update  (#1518)
30a3cb3c085a7f208a44b58060ba797e4299214a [route_check] Filter out VNET routes (#1582)

Signed-off-by: Abhishek Dosi <abdosi@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.

2 participants