Skip to content

Support yaml testbed file#2466

Merged
lolyu merged 6 commits intosonic-net:masterfrom
lolyu:csv_to_yaml
Nov 12, 2020
Merged

Support yaml testbed file#2466
lolyu merged 6 commits intosonic-net:masterfrom
lolyu:csv_to_yaml

Conversation

@lolyu
Copy link
Collaborator

@lolyu lolyu commented Nov 5, 2020 •
edited
Loading

Description of PR

The goal here is to support yaml testbed file with the support of nested
data structures that could be applicable for multi-DUT scenario.

  1. Enable testbed-cli.sh the capacity to read from yaml testbed file.
  2. Enable Ansible module test_facts with the capacity to read from yaml testbed file.
  3. Enable tbinfo the support of yaml format testbed file and keep the csv
    format compatible. Currently, TestbedInfo will prefer using yaml
    testbed file if there exists one even --testbed-file passes a csv
    testbed file. If --testbed-file passes a csv file and there is no
    yaml testbed file, TestbedInfo will try to dump a yaml testbed file
    for later use.

Summary:
Fixes # (issue)

Type of change

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

Approach

What is the motivation for this PR?

Support yaml testbed file and deprecate csv format in the future.

How did you do it?

Add support of reading yaml file to:

  1. testbed-cli.sh
  2. test_facts module
  3. TestbedInfo class

How did you verify/test it?

  1. run deploy minigraph with/without yaml testbed file present.
  2. run testcase with/without yaml testbed file present.

Any platform specific information?

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

Documentation

@lolyu lolyu changed the title Csv to yaml Support yaml testbed file Nov 5, 2020
@lolyu lolyu force-pushed the csv_to_yaml branch 6 times, most recently from 671bd51 to 11748b0 Compare November 5, 2020 16:07
@sonic-net sonic-net deleted a comment from lgtm-com bot Nov 5, 2020
@sonic-net sonic-net deleted a comment from lgtm-com bot Nov 5, 2020
@lolyu lolyu marked this pull request as ready for review November 5, 2020 16:08
@lolyu lolyu requested a review from a team November 5, 2020 16:08
@lgtm-com
Copy link

lgtm-com bot commented Nov 5, 2020

This pull request fixes 2 alerts when merging 61bbf270efc97f86b854bf3a9d55d7f992e421b1 into f1732c8 - view on LGTM.com

fixed alerts:

  • 2 for Unused import

@lolyu
Copy link
Collaborator Author

lolyu commented Nov 6, 2020

Retest this please

@lgtm-com
Copy link

lgtm-com bot commented Nov 6, 2020

This pull request fixes 2 alerts when merging 4e190fcc15ecad693cefa52973817f59c5bffe34 into 51fb3bb - view on LGTM.com

fixed alerts:

  • 2 for Unused import

@yxieca
Copy link
Collaborator

yxieca commented Nov 9, 2020

@lolyu change looks good. But did you forget to include a new testbed.yaml? Speaking of which, can you provide a tool to convert existing testbed.csv to testbed.yaml? These changes can come as a separate PR.

@lolyu
Copy link
Collaborator Author

lolyu commented Nov 10, 2020

@lolyu change looks good. But did you forget to include a new testbed.yaml? Speaking of which, can you provide a tool to convert existing testbed.csv to testbed.yaml? These changes can come as a separate PR.

Sure, I will create another PR to do this.

lolyu added 3 commits November 10, 2020 03:21
@lolyu
Add support of parsing testbed yaml file
e4f9110 
Signed-off-by: Longxiang Lyu <lolv@microsoft.com>
@lolyu
[test_facts] Add support of parsing yaml file
9ccfbfb 
Enable `test_facts` with capability to read from either yaml or csv
testbed files.

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>
@lolyu
[tbinfo] Support yaml testbed file
2896ad6 
The goal here is to support yaml testbed file so it could support nested
data structures that could be applicable for multi-DUT scenario.

Enable `tbinfo` the support of yaml format testbed file and keep the csv
format compatible. Currently, `TestbedInfo` will prefer using `yaml`
testbed file if there exists one even `--testbed-file` passes a `csv`
testbed file. If `--testbed-file` passes a `csv` file and there is no
yaml testbed file, `TestbedInfo` will try to dump a yaml testbed file
for later use.

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>
@lolyu lolyu force-pushed the csv_to_yaml branch 2 times, most recently from 3b00038 to 1dca088 Compare November 10, 2020 07:21
@lgtm-com
Copy link

lgtm-com bot commented Nov 10, 2020

This pull request introduces 1 alert and fixes 2 when merging 1dca088ceff99fbe899bc94b8bb85124cab0a87e into f031f32 - view on LGTM.com

new alerts:

  • 1 for Unused import

fixed alerts:

  • 2 for Unused import

@lolyu
Copy link
Collaborator Author

lolyu commented Nov 10, 2020

Hi, @wangxin, I've added another two commits which moves TestbedInfo class out of conftest.py, could you please take a review again, thanks!

lolyu added 2 commits November 10, 2020 08:05
@lolyu
[pytest] Secede TestbedInfo from conftest.py
3fc4691 
Let's move class `TestbedInfo` out of the topmost `conftest.py` and save
it under `tests/common/testbed.py`:
1. Since it is a common infrastructure functionality, secede it from
`conftest.py` could make it more accessible and make `conftest.py`
simpler.
2. Make it a runnable script as a tool could do the testbed file
conversion from `CSV` to `YAML`.

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>
@lolyu
Add testbed yaml file
e3914bb 
Signed-off-by: Longxiang Lyu <lolv@microsoft.com>
@lgtm-com
Copy link

lgtm-com bot commented Nov 10, 2020

This pull request fixes 2 alerts when merging e3914bb into f031f32 - view on LGTM.com

fixed alerts:

  • 2 for Unused import

@lolyu lolyu closed this Nov 10, 2020
@lolyu lolyu reopened this Nov 10, 2020
@yxieca
Copy link
Collaborator

yxieca commented Nov 11, 2020

@lolyu did you test without testbed.csv (only having testbed.yaml)?

@lolyu
Copy link
Collaborator Author

lolyu commented Nov 12, 2020

Hi, @yxieca, I've tested bgp_facts with testbed.yaml only and it looks good to me.

wangxin
wangxin reviewed Nov 12, 2020
View reviewed changes
@lolyu
[TestbedInfo] Dump extra blank line between testbeds
d9d9ab3 
Signed-off-by: Longxiang Lyu <lolv@microsoft.com>
@lgtm-com
Copy link

lgtm-com bot commented Nov 12, 2020

This pull request fixes 2 alerts when merging d9d9ab3 into 32258b1 - view on LGTM.com

fixed alerts:

  • 2 for Unused import

@lolyu lolyu merged commit 9247042 into sonic-net:master Nov 12, 2020
@lolyu lolyu deleted the csv_to_yaml branch November 12, 2020 10:28
kazinator-arista pushed a commit to kazinator-arista/sonic-mgmt that referenced this pull request Mar 4, 2026
@yxieca
[202205][linkmgrd][swss][platform-daemon] advance submodule head (son…
1667a08 
…ic-net#12186)

linkmgrd:
* a0834e4 2022-09-22 | [Active-Active] server side admin forwarding state sync up (sonic-net#133) (HEAD -> 202205) [Jing Zhang]
* ea56020 2022-09-21 | Post switchover reasons to STATE DB (sonic-net#131) [Jing Zhang]

swss:
* d9cbf44 2022-09-24 | [orchagent] Fix issue: ip prefix shall be inited even if VRF/VNET is not ready (sonic-net#2461) (HEAD -> 202205, github/202205) [Junchao-Mellanox]
* 3dcd6ff 2022-09-24 | [macsec]: Set MTU for MACsec (sonic-net#2398) (sonic-net#2466) [Ze Gan]

platform-daemon:
* 48b6239 2022-09-27 | [ycabled] add support for getting grpc secerts via shared file (sonic-net#298) (HEAD -> 202205) [vdahiya12]

Signed-off-by: Ying Xie <ying.xie@microsoft.com>

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
kazinator-arista pushed a commit to kazinator-arista/sonic-mgmt that referenced this pull request Mar 4, 2026
@yxieca
[202205][swss][utilities][linkmgrd][sairedis][platform-common] advanc…
4355911 
…e submodule head (sonic-net#13606)

swss:
* 79223f0 2023-01-25 | [bfdorch] add local discriminator to state DB (sonic-net#2629) (HEAD -> 202205) [Baorong Liu]
* 64940d4 2023-01-25 | Vxlan tunnel endpoint custom monitoring APPL DB table. (sonic-net#2589) [siqbal1986]
* 0930529 2023-02-02 | Merge pull request sonic-net#2650 from devpatha/202205 (github/202205) [Kevin Wang]
* 8f5884f 2023-02-01 | Remove counters for Mux ACL [Devesh P Pathak]

utilities:
* 557adfcc 2023-02-01 | show logging CLI support for logs stored in tmpfs (sonic-net#2641) (HEAD -> 202205) [mihirpat1]
* 28d7bb26 2023-01-31 | Making 'show feature autorestart' more resilient to missing auto_restart config in CONFIG_DB (sonic-net#2592) [kartik-arista]
* e0b3b4ab 2023-01-06 | [masic] 'show interfaces counters' reminds to use '-d all' option to check for internal links (sonic-net#2466) [wenyiz2021]
* 5613277d 2023-01-27 | [show_bfd] add local discriminator in show bfd command (sonic-net#2625) [Baorong Liu]

linkmgrd:
* 8803690 2023-01-31 | [active-active] force switch when config == active && target state == active (sonic-net#164) (HEAD -> 202205) [Jing Zhang]

sairedis:
* ad3d4d6 2023-02-01 | [sai_failure_dump]Invoking dump during SAI failure (sonic-net#1198) (HEAD -> 202205) [Sudharsan Dhamal Gopalarathnam]

platform-common:
* 6fd8992 2023-01-30 | Add missing sys imports (sonic-net#343) (HEAD -> 202205) [spilkey-cisco]
* 1fbc864 2023-01-25 | Change get_tx_bias return type to list (sonic-net#342) [mihirpat1]

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
kazinator-arista pushed a commit to kazinator-arista/sonic-mgmt that referenced this pull request Mar 4, 2026
@StormLiangMS
[submodules] advance submodules for 202211 sonic-net#13781
1d155b8 
Why I did it
Submodule advances:
sonic-utilities

8e8e6088 - [202211][dhcp_relay] Remove add field of vlanid to DHCP_RELAY table while adding vlan ([201811 sub-module] advance sub-modules: utilities, swss, swss-common sonic-net#2679) (16 hours ago) [Yaqiang Zhu]
1400fb94 - [GCU] Ignore bgpraw in GCU applier (Fix sfputil indexing for 7170-Q59S20 sonic-net#2623) (15 hours ago) [jingwenxie]
f76a6364 - [vlan] Refresh dhcpv6_relay config while adding/deleting a vlan ([sonic-py-swsssdk] Update submodule sonic-net#2660) (15 hours ago) [Yaqiang Zhu]
7849e18d - [db_migrator] make LOG_LEVEL_DB migration more robust (Mellanox platform: attach queues 2 and 6 to lossy profile using generic buffer template sonic-net#2651) (16 hours ago) [Stepan Blyshchak]
c7df6dfa - Fixed a bug in "show vnet routes all" causing screen overrun. (Add hook to allow customizing link cable lengths sonic-net#2644) (16 hours ago) [siqbal1986]
a5505f02 - show logging CLI support for logs stored in tmpfs (Traceback error seen while issuing show interface commands with if_names sonic-net#2641) (16 hours ago) [mihirpat1]
bbacb91a - [system-health] Fix issue: show system-health CLI crashes (Updating deb package for platform and sai sonic-net#2635) (16 hours ago) [Junchao-Mellanox]
8d724024 - [sai_failure_dump]Invoking dump during SAI failure ([dockers]: Upgrade LLDP docker to stretch build sonic-net#2633) (16 hours ago) [Sudharsan Dhamal Gopalarathnam]
3c3be526 - Add transceiver info CLI support to show output from TRANSCEIVER_INFO for ZR ([submodule]: Update sonic-sairedis pointer sonic-net#2630) (16 hours ago) [mihirpat1]
37f41666 - [show] add support for gRPC show commands for active-active ([bitmap-vnet]: Bitmap vnet test image [DO NOT MERGE] sonic-net#2629) (16 hours ago) [vdahiya12]
b06d7fe4 - [show_bfd] add local discriminator in show bfd command ([Pmon] Selectively load pmon container daemons sonic-net#2625) (16 hours ago) [Baorong Liu]
6adcd3e8 - [GCU] Ignore bgpraw table in GCU operation ([Mellanox] Fix SAI version sonic-net#2628) (16 hours ago) [jingwenxie]
c65bdc35 - [muxcable][config] Add support to enable/disable ceasing to be an advertisement interface when radv service is stopped (Add knob in ConfigDB to enable/disable telemetry container sonic-net#2622) (16 hours ago) [Jing Zhang]
91e9457f - Add Transceiver PM basic CLI support to show output from TRANSCEIVER_PM table for ZR ([201803] Restart SwSS, syncd and dependent services if a critical process in syncd container exits sonic-net#2615) (16 hours ago) [longhuan-cisco]
54cc8c5a - Remove TODO comment which is no longer relevant (Warm-reboot: teamd warm restart caused neighbor deleted and learned again.  sonic-net#2600) (16 hours ago) [Lior Avramov]
6891b4fb - Making 'show feature autorestart' more resilient to missing auto_restart config in CONFIG_DB ([submodule] update mellanox hw-mgmgt pointer (V.2.0.0061) sonic-net#2592) (16 hours ago) [kartik-arista]
1e8bea37 - [storyteller] add link prober state change to story teller ([sonic-buildimage] New feature managementVRF(L3mdev) sonic-net#2585) (16 hours ago) [Jing Zhang]
7481a20f - Extend fast-reboot STATE_DB entry timer ([submodule]: update sonic-swss-common, sonic-py-swsssdk, sonic-snmpagent sonic-net#2577) (16 hours ago) [Aryeh Feigin]
0e08701c - [sonic_installer] use /etc/resolv.conf from the host when migrating packages (Set a rate limit on syslog messages from all Docker containers sonic-net#2573) (16 hours ago) [Stepan Blyshchak]
06096780 - Fixed admin state config CLI for Backport interfaces (Prior to install a new ONIE SONiC image, delete all partitions except EFI/ONIE sonic-net#2557) (16 hours ago) [anamehra]
9f1f13e4 - [show] Add bgpraw to show run all (Fixed typo on paragraph sonic-net#40 sonic-net#2537) (16 hours ago) [jingwenxie]
98bc8bd2 - [chassis][voq] Add "show fabric reachability" command. ([ntp]: Build 4.2.6 locally. sonic-net#2528) (16 hours ago) [jfeng-arista]
3a50b63f - Preserve copp tables through DB migration ([docker-radvd]: upgrade docker radvd to stretch based sonic-net#2524) (16 hours ago) [Aryeh Feigin]
28f6b127 - [masic] 'show interfaces counters' reminds to use '-d all' option to check for internal links (solve dependency issue sonic-net#2466) (16 hours ago) [wenyiz2021]
15026e14 - suppport multi asic for show queue counter ([dockers] Prevent old supervisord messages from gettting re-logged to syslog sonic-net#2439) (16 hours ago) [zhixzhu]
2d773e17 - [masic support] 'show run bgp' support for multi-asic (lo address not synced to the asic sonic-net#2427) (16 hours ago) [wenyiz2021]
sonic-swss

4f304bc - [EVPN]Handling race condition when remote VNI arrives before tunnel map entry ([sonic-quagga] Function defect, do NOT cancel route while connect IP down sonic-net#2642) (15 hours ago) [Sudharsan Dhamal Gopalarathnam]
34fc615 - [sai_failure_dump]Invoking dump during SAI failure (Add hook to allow customizing link cable lengths sonic-net#2644) (15 hours ago) [Sudharsan Dhamal Gopalarathnam]
b817695 - [autoneg]Fixing adv interface types to be set when AN is disabled (Fix issue with platform file path name sonic-net#2638) (15 hours ago) [Sudharsan Dhamal Gopalarathnam]
ab36bd4 - [bfdorch] add local discriminator to state DB ([bitmap-vnet]: Bitmap vnet test image [DO NOT MERGE] sonic-net#2629) (15 hours ago) [Baorong Liu]
6343471 - Remove TODO comments that are no longer relevant (Add knob in ConfigDB to enable/disable telemetry container sonic-net#2622) (15 hours ago) [Lior Avramov]
2b1869c - [refactor]Refactoring sai handle status (Rollback kernel submodule update. sonic-net#2621) (15 hours ago) [Sudharsan Dhamal Gopalarathnam]
c41a1b7 - Fix issue ARP entry is out of sync between kernel and APPL_DB after warm reboot if the ARP entry is updated more than once during warm reboot in PFC watchdog warm reboot test sonic-net#13341 ARP entry can be out of sync between kernel and APPL_DB if multiple updates are received from RTNL ([sub module] advance sonic-utilities sub module for 201811 branch sonic-net#2619) (15 hours ago) [Stephen Sun]
da0cf7a - Changed the BFD default detect multiplier to 10x ("failed to load plugin io.containerd.snapshotter..." seen during linux boot up sonic-net#2614) (15 hours ago) [siqbal1986]
13b5adf - [vstest] Only collect stdout of orchagent_restart_check in vstest ([submodules] update swss and utilities pointers sonic-net#2597) (15 hours ago) [bingwang-ms]
2b9d94d - Avoid aborting orchagent when setting TUNNEL attributes (build failing for PLATFORM=p4 sonic-net#2591) (15 hours ago) [Stephen Sun]
99b7d3b - Only collect stdout of orchagent_restart_check in vstest ( [saibcm-modules]: import new bcm modules sonic-net#2578) (15 hours ago) [bingwang-ms]
5209c42 - dereg acl-rule counters during acl-table del ([201803] Set a rate limit on syslog messages from all Docker containers sonic-net#2574) (15 hours ago) [Vivek]
ae68054 - Fixed set mtu for deleted subintf due to late notification ([vs]: Add option to specify platform name for DVS orchagent sonic-net#2571) (15 hours ago) [EdenGri]
ab13dfa - Remove TODO comments which are no longer needed (support set timezone in ConfigDB sonic-net#2568) (15 hours ago) [Junchao-Mellanox]
a3545cf - Modify coppmgr mergeConfig to support preserving copp tables through reboot. (Added new SN3700/SN3700C Mellanox platforms sonic-net#2548) (15 hours ago) [Aryeh Feigin]
be16e79 - Use github code scanning instead of LGTM ([201803] [services] Restart SwSS service upon unexpected critical process exit sonic-net#2546) (15 hours ago) [Liu Shilong]
63c0234 - Updated handling of VRF_VNI mapping and VLAN_VNI mapping for same VNI ID (Move warm_restart enable/disable config to stateDB WARM_RESTART_ENABL… sonic-net#2538) (15 hours ago) [Tapash Das]
4844111 - Fix potential risks ([mlnx] Fix sai xml path for boxer platform sonic-net#2516) (15 hours ago) [Liran-Ar]
6420808 - [p4orch]: PINS Extension tables support ([build] When generating image version, handle case where current commit has no reachable tags sonic-net#2506) (15 hours ago) [svshah-intel]
sonic-swss-common

1badd46 - Increase the netlink buffer size from 3MB to 16MB. (arp_update doesn't sleep 300 between each execution sonic-net#739) (14 hours ago) [KISHORE KUNAL]
6555057 - Refactor eventpublisher deinit ([acl] Add default deny rule for l3 table sonic-net#734) (14 hours ago) [Zain Budhwani]
f4d6de7 - Use github code scanning instead of LGTM ([sonic-quagga]:update submodule sonic-net#718) (14 hours ago) [Liu Shilong]
sonic-linux-kernel

74f9a8f - Update linux kernel for hw-mgmt V.7.0020.4104 (Move template files to /usr/share/sonic/templates sonic-net#305) (14 hours ago) [Stephen Sun]
6365701 - Fixes for emmc unreliability ([build_debian.sh]: Integrate system dump script sonic-net#270) (14 hours ago) [Samuel Angebault]
How I did it
How to verify it
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wangxin wangxin wangxin approved these changes

@yxieca yxieca yxieca approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@lolyu @yxieca @wangxin