Skip to content

[sonic-cfggen]: Update UT to add port lanes#10362

Merged
ganglyu merged 14 commits intosonic-net:masterfrom
ganglyu:fix_port_lanes_speed
Apr 4, 2022
Merged

[sonic-cfggen]: Update UT to add port lanes#10362
ganglyu merged 14 commits intosonic-net:masterfrom
ganglyu:fix_port_lanes_speed

Conversation

@ganglyu
Copy link
Contributor

@ganglyu ganglyu commented Mar 28, 2022 •
edited
Loading

Signed-off-by: Gang Lv [email protected]

Why I did it

Need to run yang validation for sonic-cfggen unit test, and many unit test does not provide lanes for port table.

How I did it

Update port config file.

How to verify it

Run sonic-cfggen unit test,
Use below PR to verify
#10228

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

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111

Description for the changelog

Fix #9553

Link to config_db schema for YANG module changes

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

@ganglyu ganglyu added the sonic-cfggen SONiC Configuration Generator Tool label Mar 28, 2022
@ganglyu ganglyu requested review from qiluo-msft and wen587 March 28, 2022 04:38
@ganglyu ganglyu requested a review from lguohan as a code owner March 28, 2022 04:38
ganglyu added 2 commits March 28, 2022 15:22
Fix py2 unit test
16e1249 
Signed-off-by: Gang Lv [email protected]
Fix unit test.
255b511 
Signed-off-by: Gang Lv [email protected]
@ganglyu ganglyu marked this pull request as draft March 28, 2022 10:02
ganglyu added 2 commits March 28, 2022 18:25
@ganglyu ganglyu marked this pull request as ready for review March 28, 2022 10:33
ganglyu added 2 commits March 28, 2022 23:01
Fix build issue
59255dd 
Signed-off-by: Gang Lv [email protected]
test armhf
aa84d8a 
Signed-off-by: Gang Lv [email protected]
@ganglyu
Copy link
Contributor Author

ganglyu commented Mar 28, 2022

/azpw run Azure.sonic-buildimage

@mssonicbld
Copy link
Collaborator

mssonicbld commented Mar 28, 2022

/AzurePipelines run Azure.sonic-buildimage

@azure-pipelines
Copy link

azure-pipelines bot commented Mar 28, 2022

Azure Pipelines successfully started running 1 pipeline(s).

@ganglyu ganglyu marked this pull request as draft March 29, 2022 02:43
@ganglyu ganglyu marked this pull request as ready for review March 29, 2022 06:57
@ganglyu
Copy link
Contributor Author

ganglyu commented Mar 29, 2022

/azpw run Azure.sonic-buildimage

@mssonicbld
Copy link
Collaborator

mssonicbld commented Mar 29, 2022

/AzurePipelines run Azure.sonic-buildimage

@azure-pipelines
Copy link

azure-pipelines bot commented Mar 29, 2022

Azure Pipelines successfully started running 1 pipeline(s).

qiluo-msft
qiluo-msft reviewed Mar 31, 2022
View reviewed changes
src/sonic-config-engine/tests/sample-arista-7050-t0-minigraph.xml Outdated
<AlternateSpeeds i:nil="true"/>
<EnableFlowControl>true</EnableFlowControl>
<Index>1</Index>
<InterfaceName>Ethernet4</InterfaceName>
Copy link
Collaborator

@qiluo-msft qiluo-msft Mar 31, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Ethernet4

Why Ethernet1/../4 are needed? I checked device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S/port_config.ini. And seems they are not used. And alias Ethernet4 will conflict with SONiC port name. I am not sure if it is problem. #Closed

Copy link
Contributor Author

@ganglyu ganglyu Mar 31, 2022

Choose a reason for hiding this comment

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

There's no speed for these ports.
We shouldn't update device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S/port_config.ini, so I update this xml.

Copy link
Collaborator

@qiluo-msft qiluo-msft Apr 1, 2022

Choose a reason for hiding this comment

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

If port speed is not mandatory, no need to fix?

Copy link
Contributor Author

@ganglyu ganglyu Apr 1, 2022

Choose a reason for hiding this comment

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

I have removed this change

@qiluo-msft
Copy link
Collaborator

qiluo-msft commented Mar 31, 2022 •
edited
Loading 

    <EndPort>Ethernet1</EndPort>

Do you need to change this line at the same time?

In reply to: 1084154358

In reply to: 1084154358

In reply to: 1084154358

Refers to: src/sonic-config-engine/tests/sample_graph.xml:115 in f313124. [](commit_id = f313124, deletion_comment = False)

qiluo-msft
qiluo-msft reviewed Mar 31, 2022
View reviewed changes
qiluo-msft
qiluo-msft reviewed Mar 31, 2022
View reviewed changes
qiluo-msft
qiluo-msft reviewed Mar 31, 2022
View reviewed changes
@ganglyu
Copy link
Contributor Author

ganglyu commented Mar 31, 2022 

    <EndPort>Ethernet1</EndPort>

Do you need to change this line at the same time?

Refers to: src/sonic-config-engine/tests/sample_graph.xml:115 in f313124. [](commit_id = f313124, deletion_comment = False)

There's no Ethernet1 in port_config.ini, so I replace it with Ethernet4

@ganglyu ganglyu changed the title [sonic-cfggen]: Update UT to add port lanes and speed [sonic-cfggen]: Update UT to add port lanes Mar 31, 2022
@ganglyu ganglyu requested a review from qiluo-msft March 31, 2022 22:53
qiluo-msft
qiluo-msft reviewed Apr 1, 2022
View reviewed changes
@ganglyu ganglyu requested a review from qiluo-msft April 1, 2022 12:18
@ganglyu ganglyu marked this pull request as draft April 1, 2022 23:31
qiluo-msft
qiluo-msft reviewed Apr 2, 2022
View reviewed changes
src/sonic-config-engine/tests/test_cfggen.py Outdated
argument = '-m "' + self.sample_graph_simple_case + '" -p "' + self.port_config + '" -v "PORT"'
output = self.run_script(argument)

#self.maxDiff = None
Copy link
Collaborator

@qiluo-msft qiluo-msft Apr 2, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

#self.maxDiff = None

Remove dead code. #Closed

@ganglyu ganglyu marked this pull request as ready for review April 2, 2022 01:17
Remove dead code.
1500fc3 
Signed-off-by: Gang Lv [email protected]
@ganglyu ganglyu requested a review from qiluo-msft April 2, 2022 01:25
qiluo-msft
qiluo-msft reviewed Apr 3, 2022
View reviewed changes
src/sonic-config-engine/tests/test_cfggen.py
output_dict['Ethernet-IB0'],
{'lanes': '133',

'alias': 'Recycle0',
Copy link
Collaborator

@qiluo-msft qiluo-msft Apr 3, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Could you remove the unnecessary new line? #Closed

@ganglyu ganglyu requested a review from qiluo-msft April 3, 2022 05:09
qiluo-msft
qiluo-msft reviewed Apr 3, 2022
View reviewed changes
src/sonic-config-engine/tests/test_multinpu_cfggen.py
self.assertDictEqual(output,
{"Ethernet0": { "admin_status": "up", "alias": "Ethernet1/1", "asic_port_name": "Eth0-ASIC0", "description": "01T2:Ethernet1:config_db", "index": "0", "lanes": "33,34,35,36", "mtu": "9100", "tpid": "0x8100", "pfc_asym": "off", "role": "Ext", "speed": "40000", "autoneg": "on" },
"Ethernet4": { "admin_status": "up", "alias": "Ethernet1/2", "asic_port_name": "Eth1-ASIC0", "description": "01T2:Ethernet2:config_db", "index": "1", "lanes": "29,30,31,32", "mtu": "9100", "tpid": "0x8100", "pfc_asym": "off", "role": "Ext", "speed": "40000", "autoneg": "on" },
"Ethernet8": { "admin_status": "up", "alias": "Ethernet1/3", "asic_port_name": "Eth2-ASIC0", "description": "Ethernet1/3:config_db", "index": "2", "lanes": "41,42,43,44", "mtu": "9100", "tpid": "0x8100", "pfc_asym": "off", "role": "Ext", "speed": "40000" },
Copy link
Collaborator

@qiluo-msft qiluo-msft Apr 3, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Why admin_status disappear? Is it expected? #Closed

Copy link
Contributor Author

@ganglyu ganglyu Apr 3, 2022

Choose a reason for hiding this comment

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

The actual output does not have admin_status

@ganglyu ganglyu merged commit 13aa233 into sonic-net:master Apr 4, 2022
@wen587 wen587 mentioned this pull request Apr 6, 2022
Merged
6 tasks
@ganglyu ganglyu added the Request for 202111 Branch For PRs being requested for 202111 branch label Apr 14, 2022
SuvarnaMeenakshi added a commit to SuvarnaMeenakshi/sonic-buildimage that referenced this pull request Apr 14, 2022
@SuvarnaMeenakshi
Modify test case to retrieve data from config_db
e70dfc7 
as it was before PR sonic-net#10362.

Signed-off-by: Suvarna Meenakshi <[email protected]>
@SuvarnaMeenakshi SuvarnaMeenakshi mentioned this pull request Apr 14, 2022
Merged
6 tasks
judyjoseph pushed a commit that referenced this pull request Apr 18, 2022
@ganglyu @judyjoseph
[sonic-cfggen]: Update UT to add port lanes (#10362)
c3e1e2d 
Why I did it
Need to run yang validation for sonic-cfggen unit test, and many unit test does not provide lanes for port table.

How I did it
Update port config file.

How to verify it
Run sonic-cfggen unit test,
Use below PR to verify
#10228

Signed-off-by: Gang Lv [email protected]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@qiluo-msft qiluo-msft qiluo-msft approved these changes

@wen587 wen587 Awaiting requested review from wen587

@lguohan lguohan Awaiting requested review from lguohan

@SuvarnaMeenakshi SuvarnaMeenakshi Awaiting requested review from SuvarnaMeenakshi

@theasianpianist theasianpianist Awaiting requested review from theasianpianist

@smaheshm smaheshm Awaiting requested review from smaheshm

@dgsudharsan dgsudharsan Awaiting requested review from dgsudharsan

Assignees

No one assigned

Labels

Included in 202111 Branch Request for 202111 Branch For PRs being requested for 202111 branch sonic-cfggen SONiC Configuration Generator Tool

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[yang-models] port validation issue, lanes is mandatory

4 participants

@ganglyu @mssonicbld @qiluo-msft @judyjoseph