deploy script changes for smartswitch lit mode#21174
deploy script changes for smartswitch lit mode#21174nnelluri-cisco wants to merge 3 commits intosonic-net:masterfrom
Conversation
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
@prabhataravind and @rameshraghupathy |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
hi @nnelluri-cisco - looks like we are failing some checks |
2c55666 to
68e1ac0
Compare
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
@KrisNey-MSFT |
|
Hi @prabhataravind - looks like this is fixed. Would you mind merging please? |
|
hi @yxieca could you help merge this? |
| <PortName>0</PortName> | ||
| <Priority>0</Priority> | ||
| {% set intf = port_name[index] %} | ||
| {% set intf = port_alias[index] %} |
There was a problem hiding this comment.
This could be a dangerous change. It could potentially break the other platforms where port_name works.
There was a problem hiding this comment.
hi @yxieca I checked again. This won't work. I have requested changes..
There was a problem hiding this comment.
@nnelluri-cisco please confirm what port_alias[index] resolves to. If it is etp, this change won't work.
There was a problem hiding this comment.
Thanks @prabhataravind for catching the error.
I have provided the correct fix , please review it and I deployed minigrapg and changes are wokring fine "Dpc" role is generated in "minigraph.xml" file.
Sample snippet for etp28 and etp29 ports. <a:EthernetInterface> <ElementType>DeviceInterface</ElementType> <AlternateSpeeds i:nil="true"/> <EnableFlowControl>true</EnableFlowControl> <Index>1</Index> <InterfaceName>etp28</InterfaceName> <InterfaceType i:nil="true"/> <MultiPortsInterface>false</MultiPortsInterface> <PortName>0</PortName> <Priority>0</Priority> <role>Dpc</role> <Speed>200000</Speed> </a:EthernetInterface> <a:EthernetInterface> <ElementType>DeviceInterface</ElementType> <AlternateSpeeds i:nil="true"/> <EnableFlowControl>true</EnableFlowControl> <Index>1</Index> <InterfaceName>etp29</InterfaceName> <InterfaceType i:nil="true"/> <MultiPortsInterface>false</MultiPortsInterface> <PortName>0</PortName> <Priority>0</Priority> <role>Dpc</role> <Speed>200000</Speed>
prabhataravind
left a comment
There was a problem hiding this comment.
Port alias index check against 227 will never work. This is not right.
Head branch was pushed to by a user without write access
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
1 similar comment
|
Azure Pipelines successfully started running 1 pipeline(s). |
| {% set intf = port_name[index] %} | ||
| {% if subtype is defined and subtype == 'SmartSwitch' and intf[8:]|int >= 224 %} | ||
| {% set alias = port_alias[index] %} | ||
| {% if alias in port_alias_map %} |
There was a problem hiding this comment.
@nnelluri-cisco can we check if "port_alias_map is defined" as shown {% if port_alias_map is defined and alias in port_alias_map %}
There was a problem hiding this comment.
@rameshraghupathy
Check the "port_alias_map" which will be defined during deploy-mg workflow.
"port_alias_map": { "etp0": "Ethernet0", "etp1": "Ethernet8", "etp10": "Ethernet80", "etp11": "Ethernet88", "etp12": "Ethernet96", "etp13": "Ethernet104", "etp14": "Ethernet112", "etp15": "Ethernet120", "etp16": "Ethernet128", "etp17": "Ethernet136", "etp18": "Ethernet144", "etp19": "Ethernet152", "etp2": "Ethernet16", "etp20": "Ethernet160", "etp21": "Ethernet168", "etp22": "Ethernet176", "etp23": "Ethernet184", "etp24": "Ethernet192", "etp25": "Ethernet200", "etp26": "Ethernet208", "etp27": "Ethernet216", "etp28": "Ethernet224", "etp29": "Ethernet232", "etp3": "Ethernet24", "etp30": "Ethernet240", "etp31": "Ethernet248", "etp32": "Ethernet256", "etp33": "Ethernet264", "etp34": "Ethernet272", "etp35": "Ethernet280", "etp4": "Ethernet32", "etp5": "Ethernet40", "etp6": "Ethernet48", "etp7": "Ethernet56", "etp8": "Ethernet64", "etp9": "Ethernet72" },
|
LGTM |
bfd1843 to
977dbdf
Compare
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
977dbdf to
3e1cac5
Compare
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run |
|
Commenter does not have sufficient privileges for PR 21174 in repo sonic-net/sonic-mgmt |
3e1cac5 to
c8ebdc4
Compare
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Signed-off-by: nnelluri-cisco <nnelluri@cisco.com>
Signed-off-by: nnelluri-cisco <nnelluri@cisco.com>
Signed-off-by: nnelluri-cisco <nnelluri@cisco.com>
c8ebdc4 to
b8138f1
Compare
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
hi guys, are all of the fixes in here? |
|
yes @KrisNey-MSFT |
|
hi @prsunny or @prabhataravind - could we have someone to review/merge on the SONiC team please? |
|
@vvolam to possibly help? |
|
@rameshraghupathy is this needed now that port "role" is part of the image itself? |
|
@rameshraghupathy PLAY RECAP ************************************************************************************************************************************************* sco@swicth1:~$ show ver | head SONiC Software Version: SONiC.20251110.16 |
Description of PR
incorporated the DPC role fix in the minigraph by replacing port_name with port_alias, since port_name was not functioning correctly.
Summary:
Fixes # (issue)
Type of change
Back port request
Approach
What is the motivation for this PR?
port_name is causing deploy_mg to be failed.
replaced port_name with port_alias
How did you do it?
Deployed minigraph and make sure deploy-mg went fine without any error.
How did you verify/test it?
Deployed minigraph and make sure deploy-mg went fine without any error.
Any platform specific information?
Smartswitch
Supported testbed topology if it's a new test case?
Documentation