Skip to content

Sweeping changes for Dual ToR - use duthosts and rand_one_dut_hostname#2513

Merged
vaibhavhd merged 10 commits intosonic-net:masterfrom
vaibhavhd:multi_dut_common_change
Nov 13, 2020
Merged

Sweeping changes for Dual ToR - use duthosts and rand_one_dut_hostname#2513
vaibhavhd merged 10 commits intosonic-net:masterfrom
vaibhavhd:multi_dut_common_change

Conversation

@vaibhavhd
Copy link
Contributor

Description of PR

Summary: Common, repetitive changes to make testcases compatible for Dual ToR testbed.

Type of change

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

Approach

What is the motivation for this PR?

Testing Dual ToR testbed. The changes included in this PR are common changes done for each testcase. To avoid repetitive conflicts and changes in several PRs, this PR does it all at once.

How did you do it?

Use two recently introduced fixtures - duthosts, rand_one_dut_hostname and retrieve duthost instance from duthosts[rand_one_dut_hostname].

Also, modified the scope of rand_one_dut_hostname fixture to module.
This is needed in the cases when test_setup fixture is parametrized for different params and rand_one_dut_hostname fixture might return random (different) DUT for each param.
Module scope ensures that all the testcases in one module work on same DUT in the dual ToR testbed.
Additionally, many fixtures in testcases have module scope, and using function scope fixture throws an errors:
ScopeMismatch: You tried to access the 'function' scoped fixture 'rand_one_dut_hostname' with a 'module' scoped request object, involved factories

How did you verify/test it?

Executed a few testcases successfully - test_lldp, test_iface_namingmode (still testing a few more).

Any platform specific information?

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

Documentation

@vaibhavhd vaibhavhd requested a review from a team November 11, 2020 19:38
@lgtm-com
Copy link

lgtm-com bot commented Nov 11, 2020

This pull request introduces 145 alerts when merging a309551 into 1317643 - view on LGTM.com

new alerts:

  • 139 for Unused local variable
  • 4 for Wrong number of arguments in a call
  • 1 for Unnecessary pass
  • 1 for Wrong number of arguments in a class instantiation

@vaibhavhd vaibhavhd marked this pull request as draft November 11, 2020 20:15
@lgtm-com
Copy link

lgtm-com bot commented Nov 11, 2020

This pull request introduces 137 alerts when merging d189ece into 1317643 - view on LGTM.com

new alerts:

  • 137 for Unused local variable

@vaibhavhd vaibhavhd marked this pull request as ready for review November 11, 2020 22:09
@vaibhavhd
Copy link
Contributor Author

Retest vsimage please

@neethajohn
Copy link
Contributor

@yxieca, was the plan to have all testcases run against the same dut? I was under the assumption that picking diff duts per test case would enable us to introduce some logic after collection to distribute load across duts

@vaibhavhd
Copy link
Contributor Author

@yxieca, was the plan to have all testcases run against the same dut? I was under the assumption that picking diff duts per test case would enable us to introduce some logic after collection to distribute load across duts

Help me understand why do you think that the all testcases will run against the same dut? The rand_one_dut_hostname fixture selects random DUT for every test module:

        dut_hostnames = generate_params_dut_hostname(metafunc)
        if len(dut_hostnames) > 1:
            dut_hostnames = random.sample(dut_hostnames, 1)
        metafunc.parametrize("rand_one_dut_hostname", dut_hostnames, scope='module')

@neethajohn
Copy link
Contributor

@vaibhavhd, all good. was assuming its session scoped

@lgtm-com
Copy link

lgtm-com bot commented Nov 12, 2020

This pull request introduces 1 alert when merging 6ef2058 into 1317643 - view on LGTM.com

new alerts:

  • 1 for Unused local variable

@lgtm-com
Copy link

lgtm-com bot commented Nov 12, 2020

This pull request introduces 1 alert when merging 339cd5f into ffb0902 - view on LGTM.com

new alerts:

  • 1 for Unused local variable

@yxieca
Copy link
Collaborator

yxieca commented Nov 12, 2020

We also want to revert change under platform_tests/api/, right?

@vaibhavhd
Copy link
Contributor Author

We also want to revert change under platform_tests/api/, right?

Yes, that change is already added. We are not touching platform_tests/api/ Do you see something unintended in the diff?

@vaibhavhd vaibhavhd merged commit 853cc7a into sonic-net:master Nov 13, 2020
@vaibhavhd vaibhavhd deleted the multi_dut_common_change branch November 13, 2020 03:29
yxieca pushed a commit that referenced this pull request Nov 15, 2020
Description of PR
Summary: Add more changes to support MULTI DUT testing using random hostname fixture

Approach
What is the motivation for this PR?
This is in continuation to merged PR #2513.
Some Pytest fixtures changes were still missing.

How did you do it?
Use two recently introduced fixtures - duthosts, rand_one_dut_hostname and retrieve duthost instance from duthosts[rand_one_dut_hostname].
kazinator-arista pushed a commit to kazinator-arista/sonic-mgmt that referenced this pull request Mar 4, 2026
sonic-net#13202

advance sonic-utilities submodule for 202211 branch

34428157 - (HEAD, origin/202211) Revert "Optimize the execution time of the 'show techsupport' script to 5-10%, (Qos config change sonic-net#2504)" (6 days ago) [stormliang]
c3bd01f6 - Revert "[generate_dump] Optimize the execution time of 'show techsupport' CLI by parallel function execution ([201811][Devices] Add new device CIG CS6436-56P sonic-net#2512)" (6 days ago) [stormliang]
5a326d8b - [Mellanox] Change severity to NOTICE in Mellanox buffer migrator when unable to fetch DEVICE_METADATA due to empty CONFIG_DB during initialization ([warm boot] cherry-pick PR sonic-net#2538 and advance related sub-modules in 201811 branch sonic-net#2569) (2 weeks ago) [Stephen Sun]
50b36ef3 - Fix issue: unconfigured PGs are displayed in watermarkstat ([docker-lldp]: fix several issues in lldpd docker sonic-net#2556) (2 weeks ago) [Stephen Sun]
a9fd2a79 - [Command Ref] Add doc for syslog rate limit ([sub module] move sairedis and swss to 201811 branch sonic-net#2508) (2 weeks ago) [Junchao-Mellanox]
80546ff3 - [generate_dump] Optimize the execution time of 'show techsupport' CLI by parallel function execution ([201811][Devices] Add new device CIG CS6436-56P sonic-net#2512) (2 weeks ago) [Vadym Hlushko]
6649ca8a - [timer.unit.j2] use wanted-by in timer unit ([201803] [services] Restart SwSS service upon unexpected critical process exit sonic-net#2546) (2 weeks ago) [Stepan Blyshchak]
dd23d0ef - Fixes [Sub-If|VRF] Unbind sub-interface from VRF is failed sonic-net#12170: Delete subinterface and recreate the subinterface in ([VLAN] "show mac" doesn't work when interface added to vlan as tagged member sonic-net#2513) (2 weeks ago) [Preetham]
236749d3 - [db_migrator] Fix migration of Loopback data: handle all Loopback interfaces (DellEMC S6000 xcvrd support sonic-net#2560) (2 weeks ago) [Vaibhav Hemant Dixit]
5762d814 - Optimize the execution time of the 'show techsupport' script to 5-10%, (Qos config change sonic-net#2504) (2 weeks ago) [Vadym Hlushko]
d3c3e368 - [muxcable][show] update show mux tunnel-route to separate ASIC and kernel into two columns (build errors on branch 201811 for centec platform sonic-net#2553) (2 weeks ago) [Jing Zhang]
c98648a1 - [show]Fix show route return code on error (Dell SMF driver hwmon number reorder fix for Dell S6100/Z9100 sonic-net#2542) (2 weeks ago) [Sudharsan Dhamal Gopalarathnam]
01374673 - [route_check]: Ignore ASIC only SOC IPs (Added new SN3700/SN3700C Mellanox platforms sonic-net#2548) (2 weeks ago) [Lawrence Lee]
d2967805 - YANG Validation for ConfigDB Updates: WARM_RESTART, SFLOW_SESSION, SFLOW, VXLAN_TUNNEL, VXLAN_EVPN_NVO, VXLAN_TUNNEL_MAP, MGMT_VRF_CONFIG, CABLE_LENGTH, VRF tables ([submodule 201811] advance sairedis and swss submodule for 201811 branch sonic-net#2526) (2 weeks ago) [isabelmsft]
88b01ffd - [db_migrator] Remove import of swsssdk as it is not supported in master ([build]: apply proxy setting to curl. sonic-net#2544) (2 weeks ago) [Vaibhav Hemant Dixit]
4ae970c6 - Support syslog rate limit configuration for containers and host (Move FRR from 4.0 to 6.0.2 and make new frr version and pkg compile sonic-net#2454) (2 weeks ago) [Junchao-Mellanox]
608ed147 - [generate_dump] [Mellanox] Fix the duplicate dfw dump collection problem by adding symlinks ('show vlan config' is not displaying the VLAN members, after the clear config and reload with default l2 configuration. sonic-net#2536) (2 weeks ago) [Vivek]
bdc2599f - [config] Add check in config interface ip command to block if the interface is portchannel member ([sub module] advance sonic-swss sub module sonic-net#2539) (2 weeks ago) [Sudharsan Dhamal Gopalarathnam]
cff4fed5 - [system-health] Improve code structure of system health CLIs ([sub-module] advance sonic-swss sub-module sonic-net#2453) (2 weeks ago) [Junchao-Mellanox]
488e5714 - Transceiver eeprom dom CLI modification to show output from TRANSCEIVER_DOM_THRESHOLD table (Fix for KeyError: 'DEVICE_NEIGHBOR' when executing 'show interfaces neighbor expected' command sonic-net#2535) (2 weeks ago) [mihirpat1]
07ca5def - sonic-utilities: Update config reload() to verify formatting of an input file ([ntp]: Do not disable reader for error ENOBUFS sonic-net#2529) (2 weeks ago) [Caitlin Choate]
f0f083a2 - [GCU] Add RemoveCreateOnlyDependency Validator/Generator (Enabling Fast-reboot command in s6100 loaded with T0 topo getting Failed unmounting /host error sonic-net#2500) (2 weeks ago) [jingwenxie]
eca0253c - [QoS] Introduce delay to the qos reload flow (Config reload/load_minigraph not clearing State DB sonic-net#2503) (2 weeks ago) [DavidZagury]
35158ee0 - Use github code scanning instead of LGTM ([sub module] sub module sonic-swss-common tracking 201811 branch sonic-net#2530) (2 weeks ago) [Liu Shilong]
682b5cee - Change show kube command default value of insecure key to True ([submodule] update sonic-snmpagent sonic-net#2517) (2 weeks ago) [lixiaoyuner]
ce19e631 - Add db_migrator_constants.py script to setup.py (Add device data for Arista 7060PX/DX4-32 sonic-net#2534) (2 weeks ago) [Vaibhav Hemant Dixit]
0d0c2693 - [drop counters] Fix CLI script for unconfigured PGs ([config] Do not fail for minigraphs which do not have neighbors listed in <Devices> section sonic-net#2518) (2 weeks ago) [Lior Avramov]
2c69d0fd - Update vrf add, del commands for duplicate/non-existing VRFs (solve package build dependency issue sonic-net#2467) (2 weeks ago) [Muhammad Danish]
efc09280 - Port 202012 DB migration changes to newer branches ([vs]: Force10-S6000 buffer settings for virtual switch sonic-net#2515) (2 weeks ago) [Vaibhav Hemant Dixit]
70a15aaa - [VXLAN]Fixing traceback in show remotemac when mac moves during command execution ([build] When generating image version, handle case where current commit has no reachable tags sonic-net#2506) (2 weeks ago) [Sudharsan Dhamal Gopalarathnam]
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.

3 participants