Added DPC role support for SmartSwitch.#18157
Added DPC role support for SmartSwitch.#18157prabhataravind merged 2 commits intosonic-net:masterfrom
Conversation
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
@prabhataravind @rameshraghupathy @bhavani |
7beccdd to
486149a
Compare
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
486149a to
5ed4e1f
Compare
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
5ed4e1f to
94d7446
Compare
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
94d7446 to
45aa896
Compare
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
45aa896 to
2cca800
Compare
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
2cca800 to
8bf3f74
Compare
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
@congh-nvidia @wen587 please review if there are any concerns as this is generic code.. |
|
@kperumalbfn could you help add this to 202411? |
* added support for subtype for smartswicth * checking subtype only if its defined in lab file
|
Cherry-pick PR to 202411: #19894 |
* added support for subtype for smartswicth * checking subtype only if its defined in lab file
* added support for subtype for smartswicth * checking subtype only if its defined in lab file
|
Cherry-pick PR to 202505: #19902 |
* added support for subtype for smartswicth * checking subtype only if its defined in lab file
| <MultiPortsInterface>false</MultiPortsInterface> | ||
| <PortName>0</PortName> | ||
| <Priority>0</Priority> | ||
| {% if subtype is defined and subtype == 'SmartSwitch' and index > 27 %} |
There was a problem hiding this comment.
Hi @prabhataravind @nnelluri-cisco , looks like this will cause issue on the hwsku with more than 28 ports like Mellanox-SN4280-O8C40, And I still don't understand why we need this since we can add the Dpc role in the hwsku.json and when deploying mingraph it will be taken to the config_db.json automatically by sonic.
For example: https://github.com/sonic-net/sonic-buildimage/blob/3e0bdc60b22e68e11c8b513c4e63f0eab1529147/device/mellanox/x86_64-nvidia_sn4280-r0/Mellanox-SN4280-O8C40/hwsku.json#L247
It doesn't look like a proper way to handle this in test.
There was a problem hiding this comment.
@nnelluri-cisco please check and update on the plan to address this without breaking any other platform.
There was a problem hiding this comment.
@prabhataravind
will check and Ramesh and will address the issue.
There was a problem hiding this comment.
@prabhataravind @nnelluri-cisco You don't have to check the index at all. You can check only the role as shown
{% for index in range(num_of_intf) %}
<a:EthernetInterface>
<ElementType>DeviceInterface</ElementType>
<AlternateSpeeds i:nil="true"/>
<EnableFlowControl>true</EnableFlowControl>
<Index>1</Index>
<InterfaceName>{{ port_alias[index] }}</InterfaceName>
<InterfaceType i:nil="true"/>
<MultiPortsInterface>false</MultiPortsInterface>
<PortName>0</PortName>
<Priority>0</Priority>
{% set intf = port_alias[index] %}
{% if subtype is defined and subtype == 'SmartSwitch' and intf[8:]|int >= 224 %}
<role>Dpc</role>
{% endif %}
</a:EthernetInterface>
{% endfor %}
* added support for subtype for smartswicth * checking subtype only if its defined in lab file
* added support for subtype for smartswicth * checking subtype only if its defined in lab file
* added support for subtype for smartswicth * checking subtype only if its defined in lab file
Code sync sonic-net/sonic-mgmt:202411 => 202412 ``` * c3fd4c0 (HEAD -> code-sync-202412, origin/code-sync-202412) r12f 250802:1704 - Merge remote-tracking branch 'base/202411' into code-sync-202412 |\ | * a7a638a (base/202411) nnelluri-cisco 250722:1131 - cherry pick for the PR#17101 (sonic-net#19748) | * fd4ae21 siva-prasad-cisco 250731:0002 - Ignore log analyzer error message related to source port GID mapping in kernel (sonic-net#19879) | * f986cfa Xu Chen 250730:2120 - Fix saithrift URL generation for Mellanox on internal-202411 branch sonic-net#19899 | * a07fb04 nnelluri-cisco 250604:1347 - filterd backplane ports while checking 'sudo sfputil show error-status' (sonic-net#17859) | * d707fcf nnelluri-cisco 250729:1208 - Added DPC role support for SmartSwitch. (sonic-net#18157) | * 80ea05a dypet 250414:1059 - Fix BFD status check and ipv6 PTF intermittent issue. (sonic-net#17819) | * fc623da Xu Chen 250725:1036 - support dynamic saithrift URL generation (sonic-net#19528) | * 0e5fc8a Mai Bui 250724:1807 - [202411] Ignore auditd error in loganalyzer (sonic-net#19767) | * d03770d Hua Liu 250218:1409 - [TACACS] Increase tacacs server reachability check timeout (sonic-net#16971) | * e8111ac nnelluri-cisco 250717:1033 - Generate new npu-dpu ports Ethernet224 To Ethernet280 for cisco smartswicth "Cisco-8102-28FH-DPU-O" (sonic-net#19257) | * e0060fa Zain Budhwani 250716:1109 - Remove yang_validate option from 202411 (sonic-net#19674) | * 89c4281 AharonMalkin 250715:2042 - Add Nvidia to supported platforms on intf_fec test (sonic-net#19398) | * f35fc20 mssonicbld 250716:0129 - Fix buffer queue cnt test to account for different BUFFER_QUEUE configs (sonic-net#19310) (sonic-net#19466) | * 3e0cabd Chuan Wu 250704:0327 - Update vlan ping test to override the affection of secondary vlan ip (sonic-net#18867) | * ff9d112 Longxiang Lyu 250714:1508 - [dualtor-io] Fix `test_active_link_admin_down_config_reload_link_up_downstream_standby` on Cisco/MLNX (sonic-net#18829) (sonic-net#19511) | * e870d66 Yawen 250714:1246 - [manual cherry-pick] add topo dualtor-aa-64-breakout to qos_sai_base.py (sonic-net#19543) | * 8369780 prabhataravind 250711:0929 - Enable skipped BFD and VxLAN tests on smartswitch T1 (sonic-net#19498) ```
* added support for subtype for smartswicth * checking subtype only if its defined in lab file Signed-off-by: opcoder0 <[email protected]>
* added support for subtype for smartswicth * checking subtype only if its defined in lab file Signed-off-by: Guy Shemesh <[email protected]>
* added support for subtype for smartswicth * checking subtype only if its defined in lab file Signed-off-by: Aharon Malkin <[email protected]>
* added support for subtype for smartswicth * checking subtype only if its defined in lab file Signed-off-by: Guy Shemesh <[email protected]>
* added support for subtype for smartswicth * checking subtype only if its defined in lab file
* added support for subtype for smartswicth * checking subtype only if its defined in lab file Signed-off-by: Guy Shemesh <[email protected]>
* added support for subtype for smartswicth * checking subtype only if its defined in lab file Signed-off-by: Yael Tzur <[email protected]>
Description of PR
Summary:added support for subtype for smartswicth
Fixes # (issue)
Type of change
Back port request
Approach
What is the motivation for this PR?
The SmartSwitch platform introduced new backplane interfaces that require role configuration.
How did you do it?
added new config in device specific template.
ansible/templates/minigraph_device.j2
How did you verify/test it?
Deployed the minigraph and confirmed that the DPU configuration is present for all backplane interfaces.
Any platform specific information?
HwSKU: Cisco-8102-28FH-DPU-O
Supported testbed topology if it's a new test case?
t1-28-lag
Documentation