Skip to content

[action] [PR:11160] [dualtor] use 'get_pdu_controller' to ensure same dut in test_power_off_reboot#11201

Merged
mssonicbld merged 1 commit intosonic-net:202305from
mssonicbld:cherry/202305/11160
Jan 5, 2024
Merged

[action] [PR:11160] [dualtor] use 'get_pdu_controller' to ensure same dut in test_power_off_reboot#11201
mssonicbld merged 1 commit intosonic-net:202305from
mssonicbld:cherry/202305/11160

Conversation

@mssonicbld
Copy link
Collaborator

Description of PR

#8646 made a change in fixture 'pdu_controller' to always choose supervisor if device is chassis, for non-chassis it'll choose a random dut. PR 8646 will work in the same way for single-dut, but for dualtor, the randomly chosen dut could be different dut than the one under testing.

This PR call 'get_pdu_controller' to ensure pdu_controller is getting on the same dut.

There is no generic fix for this scenario that use "enum_supervisor_dut_hostname" for both tests and fixture pdu_controller, because platform_tests/conftest.py have a autouse fixture skip_on_simx that makes all platform tests use rand_one_dut_hostname.

Summary:
Fixes # (issue)

Type of change

  • Bug fix
  • Testbed and Framework(new/improvement)
  • Test case(new/improvement)

Back port request

  • 201911
  • 202012
  • 202205
  • 202305

Approach

What is the motivation for this PR?

How did you do it?

How did you verify/test it?

Any platform specific information?

Supported testbed topology if it's a new test case?

Documentation

@mssonicbld
Copy link
Collaborator Author

Original PR: #11160

@mssonicbld mssonicbld merged commit e7e3cb0 into sonic-net:202305 Jan 5, 2024
@mssonicbld mssonicbld deleted the cherry/202305/11160 branch February 4, 2024 09:18
kazinator-arista pushed a commit to kazinator-arista/sonic-mgmt that referenced this pull request Mar 4, 2026
…) (sonic-net#13441)

Why I did it
Fix issue caused by dualtor support PR [dhcpmon] Open different socket for dual tor to enable interface filtering sonic-net#11201
Improve code
How I did it
On single ToR, packets received count was duplicated due to socket filter set to "inbound"
Tx count not increasing due to filter set to "inbound". Added an outbound socket to count tx packets
Added vlan member interface mapping for Ethernet interface to vlan interface lookup in reference to PR Fix multiple vlan issue sonic-dhcp-relay#27
Exit when socket fails to initialize to allow dhcp_relay docker to restart
How to verify it
Tested on vstestbed single tor and dual tor, sent packets and verify printed out dhcpmon rx and tx counters is correct

Correct number of tx increases
Tx does not increase when ToR is on standby
kazinator-arista pushed a commit to kazinator-arista/sonic-mgmt that referenced this pull request Mar 4, 2026
…) (sonic-net#13439)

Why I did it
Fix issue caused by dualtor support PR [dhcpmon] Open different socket for dual tor to enable interface filtering sonic-net#11201
Improve code
How I did it
On single ToR, packets received count was duplicated due to socket filter set to "inbound"
Tx count not increasing due to filter set to "inbound". Added an outbound socket to count tx packets
Added vlan member interface mapping for Ethernet interface to vlan interface lookup in reference to PR Fix multiple vlan issue sonic-dhcp-relay#27
Exit when socket fails to initialize to allow dhcp_relay docker to restart
How to verify it
Tested on vstestbed single tor and dual tor, sent packets and verify printed out dhcpmon rx and tx counters is correct

Correct number of tx increases
Tx does not increase when ToR is on standby
kazinator-arista pushed a commit to kazinator-arista/sonic-mgmt that referenced this pull request Mar 4, 2026
Why I did it
Fix issue caused by dualtor support PR [dhcpmon] Open different socket for dual tor to enable interface filtering sonic-net#11201
Improve code
How I did it
On single ToR, packets received count was duplicated due to socket filter set to "inbound"
Tx count not increasing due to filter set to "inbound". Added an outbound socket to count tx packets
Added vlan member interface mapping for Ethernet interface to vlan interface lookup in reference to PR Fix multiple vlan issue sonic-dhcp-relay#27
Exit when socket fails to initialize to allow dhcp_relay docker to restart
How to verify it
Tested on vstestbed single tor and dual tor, sent packets and verify printed out dhcpmon rx and tx counters is correct

Correct number of tx increases
Tx does not increase when ToR is on standby
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.

2 participants