Skip to content

Fix Qos Xon Test#12151

Merged
liat-grozovik merged 1 commit intosonic-net:masterfrom
slutati1536:fix_qos_xon_test
Apr 16, 2024
Merged

Fix Qos Xon Test#12151
liat-grozovik merged 1 commit intosonic-net:masterfrom
slutati1536:fix_qos_xon_test

Conversation

@slutati1536
Copy link
Copy Markdown
Contributor

@slutati1536 slutati1536 commented Mar 25, 2024

Description of PR

Without this PR the Qos tests would fail on testQosSaiPfcXonLimit, because step 1 of the tests, which disable TX for dst_port_id, dst_port_2_id, dst_port_3_id is getting incorrect DST ports

Test was broken by: #9780

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?

With my fix:
step 1: disable TX for dst_port_id, dst_port_2_id, dst_port_3_id
[dst_port_id, dst_port_2_id, dst_port_3_id] = [1, 3, 4]

Without my fix:
step 1: disable TX for dst_port_id, dst_port_2_id, dst_port_3_id
[dst_port_id, dst_port_2_id, dst_port_3_id] = [1, 1, 1]

How did you do it?

Run the tests to find the root cause of the failure

How did you verify/test it?

Run the tests with my fix to see that the tests are passing

Any platform-specific information?

tests only failed on SN2700 with t0 topology
and SN4700 with t0-56-o8v48/t1-28-lag

@slutati1536 slutati1536 reopened this Mar 25, 2024
ttl=ttl)
dst_port_2_id = self.get_rx_port(
src_port_id, pkt_dst_mac, dst_port_2_ip, src_port_ip, dst_port_2_id, src_port_vlan
src_port_id, pkt_dst_mac2, dst_port_2_ip, src_port_ip, dst_port_2_id, src_port_vlan
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

No, tests pass with this fix also on t1 topology, also this fix is included in 202305 Xon test code, this is not new code to the test.

@liat-grozovik liat-grozovik merged commit fa5b94c into sonic-net:master Apr 16, 2024
Copy link
Copy Markdown
Contributor

@vivekverma-arista vivekverma-arista left a comment

Choose a reason for hiding this comment

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

            pkt2 = construct_ip_pkt(packet_length,
                                    pkt_dst_mac,
                                    src_port_mac,
                                    src_port_ip,
                                    dst_port_2_ip,
                                    dscp,
                                    src_port_vlan,
                                    ecn=ecn,
                                    ttl=ttl)

@slutati1536 shouldn't we be passing pkt_dst_mac2 here as well instead of pkt_dst_mac? We are seeing this same failure on Arista-7050CX3-32S-C32 and just this addition to your fix fixes that for us.

And again this additional change already exists in 202305 so it won't break T1.

@vivekverma-arista
Copy link
Copy Markdown
Contributor

Cherry picked to 202311: #12648 with additional fix.

@vivekverma-arista
Copy link
Copy Markdown
Contributor

            pkt2 = construct_ip_pkt(packet_length,
                                    pkt_dst_mac,
                                    src_port_mac,
                                    src_port_ip,
                                    dst_port_2_ip,
                                    dscp,
                                    src_port_vlan,
                                    ecn=ecn,
                                    ttl=ttl)

@slutati1536 shouldn't we be passing pkt_dst_mac2 here as well instead of pkt_dst_mac? We are seeing this same failure on Arista-7050CX3-32S-C32 and just this addition to your fix fixes that for us.

And again this additional change already exists in 202305 so it won't break T1.

Raised #12649 for this additional fix to master.

Keeping @StormLiangMS in the loop.

mssonicbld pushed a commit to mssonicbld/sonic-mgmt that referenced this pull request May 17, 2024
Without this PR the Qos tests would fail on testQosSaiPfcXonLimit, because step 1 of the tests, which disable TX for dst_port_id, dst_port_2_id, dst_port_3_id is getting incorrect DST ports

Test was broken by sonic-net#9780
@mssonicbld
Copy link
Copy Markdown
Collaborator

Cherry-pick PR to 202311: #12885

mssonicbld pushed a commit that referenced this pull request May 17, 2024
Without this PR the Qos tests would fail on testQosSaiPfcXonLimit, because step 1 of the tests, which disable TX for dst_port_id, dst_port_2_id, dst_port_3_id is getting incorrect DST ports

Test was broken by #9780
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants