[PFCWD]: test enhancement by sihuihan88 · Pull Request #456 · sonic-net/sonic-mgmt

sihuihan88 · 2018-02-06T00:19:52Z

Signed-off-by: Sihui Han [email protected]

Description of PR

Fixes # (issue)

Type of change

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

Approach

How did you do it?

Enable PFCWD on all ports for all the tests
Check PFCWD detection function when queue buffer is not empty.
Update PFC generator to support send PFC pause frame on multiple ports.
Check PFCWD function when PFC storm happens on all ports.

How did you verify/test it?
Tested on DUT
Any platform specific information?
Supported testbed topology if it's a new test case?

Documentation

Signed-off-by: Sihui Han <[email protected]>

lguohan · 2018-02-09T14:59:45Z

ansible/library/combine_list_to_dict.py

+
+EXAMPLES = '''
+- name: Combine list to dict
+  get_ip_in_range: keys={{keys}} values={{values}}


combine_list_to_dict

lguohan · 2018-02-09T15:00:22Z

ansible/library/combine_list_to_dict.py

+                combined_dict[key] = [value]
+            else:
+                combined_dict[key].append(value)
+	self.facts['combined_dict'] = combined_dict


convert all your tabs to spaces.

lguohan · 2018-02-09T15:01:58Z

parser.add_option("-i", "--interface", type="string", dest="interface", help="Interface to send packets",metavar="Interface")

since you have change the option, please modify the description accordingly.

Refers to: ansible/roles/test/files/helpers/pfc_gen.py:38 in 9b62f0f. [](commit_id = 9b62f0f, deletion_comment = False)

lguohan · 2018-02-09T15:04:13Z

ansible/roles/test/tasks/pfc_wd/functional_test/functional_test.yml

+- block:
+    - set_fact:
+        pfc_frames_number: 100000000
+      when: peer_hwsku | search("Arista") or peer_hwsku | search("arista")


hen: peer_hwsku | search("Arista") or peer_hwsku | search("arista") [](start = 7, length = 67)

why do we condition on arista here?

lguohan · 2018-02-09T15:12:56Z

ansible/roles/test/tasks/pfc_wd/functional_test/functional_test.yml

+      when: "{{ pfc_wd_tx_drop_after.stdout | int - pfc_wd_tx_drop_before.stdout | int != pfc_wd_test_pkt_count }}"
+
+    - name: Get PFC_WD_QUEUE_STATS_TX_DROPPED_PACKETS_LAST after test
+      shell: "docker exec -i database redis-cli -n 2 HGET COUNTERS:{{ queue_oid.stdout }} PFC_WD_QUEUE_STATS_TX_DROPPED_PACKETS_LAST"


docker exec -i database [](start = 14, length = 24)

you can run redis-cli in the base image, you do not need docker exec -i database.

lguohan · 2018-02-09T15:13:16Z

ansible/roles/test/tasks/pfc_wd/functional_test/functional_test.yml

+      include: roles/test/files/tools/loganalyzer/loganalyzer_end.yml
+
+    - name: Get PFC_WD_QUEUE_STATS_TX_DROPPED_PACKETS after test
+      shell: "docker exec -i database redis-cli -n 2 HGET COUNTERS:{{ queue_oid.stdout }} PFC_WD_QUEUE_STATS_TX_DROPPED_PACKETS"


docker exec -i database [](start = 14, length = 24)

remove "docker exec -i database"

lguohan · 2018-02-09T15:14:07Z

ansible/roles/test/tasks/pfc_wd/functional_test/functional_test.yml

@@ -66,11 +68,217 @@
  shell: "docker exec -i database redis-cli -n 2 HGET COUNTERS_QUEUE_NAME_MAP {{ pfc_wd_test_port }}:{{ pfc_queue_index }}"


docker exec -i database [](start = 10, length = 24)

remove "docker exec -i database"

lguohan · 2018-02-09T15:24:01Z

when: peer_hwsku == "MLNX-OS"

why donot we have pfc_wd_storm_stop_template for mlnx platform?

Refers to: ansible/roles/test/tasks/pfc_wd/functional_test/functional_test.yml:35 in 9b62f0f. [](commit_id = 9b62f0f, deletion_comment = False)

lguohan · 2018-02-09T15:26:53Z

ansible/roles/test/tasks/pfc_wd/functional_test/functional_test.yml

@@ -57,7 +60,6 @@
  delegate_to: "{{peer_mgmt}}"
  become: true
  when: peer_hwsku | search("Arista") or peer_hwsku | search("arista")


can we put pfc generator deployment into a single yml file, since it is used in many places?

deploy_pfc_pktgen.yml in the yml,

lguohan · 2018-02-09T15:27:40Z

ansible/roles/test/tasks/pfc_wd/functional_test/functional_test.yml

+        host: "{{peer_mgmt}}"
+        login: "{{peer_login}}"
+      connection: switch
+      when: peer_hwsku | search("Arista") or peer_hwsku | search("arista")


when: peer_hwsku | search("Arista") or peer_hwsku | search("arista") [](start = 6, length = 68)

stop pfc storm should be called for all fanout platforms, not just arista, right?

I agree. Currently mlnx platform doesn't have stop pfc storm template, so I add this condition to prevent breaking their test env. I will remove this condition to enforce all the platform follow the same logic.

can you add an empty one for them so that it does not break their platform?

lguohan · 2018-02-09T15:28:01Z

ansible/roles/test/tasks/pfc_wd/functional_test/functional_test.yml

+        host: "{{peer_mgmt}}"
+        login: "{{peer_login}}"
+      connection: switch
+      when: peer_hwsku | search("Arista") or peer_hwsku | search("arista")


hen: peer_hwsku | search("Arista") or peer_hwsku | search("arista") [](start = 7, length = 67)

can we remove this line?

is this missed?

lguohan

as comments

Signed-off-by: Sihui Han <[email protected]>

* msft_github/master: (111 commits) add disconnect/connect vm to testbed-cli.sh (sonic-net#566) [dhcp_relay] Increase sleep duration to allow LAG and BGP to come up (sonic-net#565) [pfcwd]: support t0-116 and clean up the code (sonic-net#563) [fanout]: remove vrf management in arista fanout deploy templates (sonic-net#562) [fanout-switch-deploy] Support multiple speeds and port breakout (sonic-net#561) [extract_log] Improve extract_log script (sonic-net#559) Disable upgrade_sonic retry (sonic-net#560) Support for Sonic fanout (sonic-net#555) [Fanout deploy template] enable root user on fanout switches (sonic-net#557) [link state] match exact dut name in the link list (sonic-net#556) [pfcwd]: cache the ansible facts (sonic-net#554) Fix kernel version check (sonic-net#553) [pfcwd]: increase the pause waiting time and ingore snmp errors (sonic-net#551) fix typo (sonic-net#552) [dir_bcast] enable dir_bcast test on t0-116 topology (sonic-net#550) use command to gather host distribution, kernel version facts (sonic-net#549) [minigraph templte] use consistent VLAN subnet (sonic-net#546) [VM config] skip podset 0 tor 0 routing entry (sonic-net#545) Remove job minigraph_facts from boot_onie (sonic-net#548) [fast-reboot] pass VM IP in as ASCII strings (sonic-net#547) [fast-reboot test] fix syslog reading issue (sonic-net#543) add dataacl to minigraph template (sonic-net#544) [service_acl] Make test reliable when testing Arista service ACL solution (sonic-net#542) [pfcwd]: Iterate functional test over all ports (sonic-net#490) [service_acl] Detect expected output message even if it is followed by other text (sonic-net#541) [testbed]: Remove connection local for port_alias module (sonic-net#540) Revert "[minigraph-gen] fix AclInterface entries in minigraph (sonic-net#538)" (sonic-net#539) [minigraph-gen] fix AclInterface entries in minigraph (sonic-net#538) add retries in onie installation (sonic-net#537) Use connection plugin to install sonic image in ONIE. (sonic-net#536) [dhcp_relay]: Add --relax flag to ptf command (sonic-net#535) [minigraph_facts] use minigraph on DUT (sonic-net#534) Fix minigraph_facts: mkdir recursively (sonic-net#533) [minigraph_facts] use mingraph on DUT to test (sonic-net#532) generate minigraph based on topology file (sonic-net#531) Need to double-escape when using 'args' syntax (sonic-net#529) Fix improper 'local_action' syntax (sonic-net#528) Unify style of 'wait_for' actions across playbooks (sonic-net#527) [minigraph_facts] retrieving dhcp server list from vlan configuration instead of DhcpResources (sonic-net#526) [snmp_facts] increase get command timeout to fix cpu test failure (sonic-net#525) [everflow_test]: Add copy ptftests folder to use the remote.py file (sonic-net#522) Fix snmp_facts on PSU oid (sonic-net#520) Fix snmp queue test (sonic-net#519) [lag_test]: Remove the unnecessary testbed_type check (sonic-net#518) [ip_decap_test]: Support t0-64 topology (sonic-net#517) [acl_test]: Copy ptftests folder for the remote.py file (sonic-net#516) Add test case for PSU (sonic-net#514) [mtu]: Add t1-64-lag topology support for MTU test (sonic-net#513) [ip_decap]: Add t1-64-lag support in the script for the list of source port (sonic-net#512) [everflow]: Add missing spaces in ptf command (sonic-net#511) [acl_test]: Add ptf_platform_dir: ptftests to use customized platform code to support 64 ports (sonic-net#510) [crm]: Implement test for CRM (sonic-net#473) [everflow]: Add support for t1-64-lag topology (sonic-net#502) Fix sonic_image_version: get from sonic_version.yml, no dependency on grub (sonic-net#508) [topology]: Update t1-64-lag topology template to add AclInterfaces piece (sonic-net#505) Pull syncd-rpc with sonic version tag (sonic-net#507) Remove leading and trailing whitespaces when reading veos file (sonic-net#506) [lag_2] remove hard coded interval_count so it can be set by test (sonic-net#503) ptf_runner: Add one line comment for ptf_platform_dir (sonic-net#501) [testbed]: add port speed and fec configuration in sonic fanout (sonic-net#498) [typo]: Replace string t1-lag-64 with t1-64-lag (sonic-net#499) Adding sensor data for S6100 (sonic-net#496) [fib_test]: Add t1-64-lag src_ports in FIB test (sonic-net#497) Fix typo in acl test case name (sonic-net#494) Add one more Mellanox SKU string in everflow_tb_test script (sonic-net#495) Adding sensor data for Z9100 (sonic-net#492) [service_acl] Make test more robust and efficient (sonic-net#489) [dhcp relay test] adding more test scenarios (sonic-net#440) fix sanity check failed to recover (sonic-net#488) Fix PFC_WD test (sonic-net#479) add sonic fanout support (sonic-net#485) Update README.test.md Update README.test.md Fix table caption in testbed.csv and documentation (sonic-net#482) [test case] Add test: restart swss service (sonic-net#483) Add test case port toggle (sonic-net#484) [test infrastructure] allow overriding recover system actioin (sonic-net#480) [SNMP]add new SNMP counters tests to snmp.yml (sonic-net#477) add t0-52 topology (sonic-net#476) add command line option for creategraph.py (sonic-net#475) Add support for additional timestamp format (sonic-net#474) Ignore ansible output in extract_log (sonic-net#472) Add extract_logs action to concatenate logs after log rotate (sonic-net#471) Add ACL ICMP test (sonic-net#2) (sonic-net#465) [pfcwd]:add docker exec to avoid tty error (sonic-net#470) [test_tag]remove pfc_wd test tag from test by tag main yaml (sonic-net#469) [ansible]gather fact by default (sonic-net#468) [sensors]fix Dell S6000 sensors test fail (sonic-net#462) [vlan]improve test to wait a bit longer for config reload (sonic-net#463) one more place for hwsku of new Mellanox 2700 (sonic-net#464) [sensors]sensors test add new hwsku for Mellanox 2700 (sonic-net#461) [PFCWD]: test enhancement (sonic-net#456) [sensors] remove redundant sensor data definitin for sku MSN2100 (sonic-net#460) when call testcase by name, fetch all vms management info from testbed_facts (sonic-net#457) [acl test] error in ACL rule json file for destination ip (sonic-net#434) [sensor data] add sensor data for Mellanox MSN2410 and MSN2100 (sonic-net#449) Fix sku-sensors-data for 7050-QX32 (sonic-net#454) [deploy minigraph]add default enable BGP to deploy minigraph step (sonic-net#455) [upgrade]save bgp UP state after they are brough up (sonic-net#453) [reboot test] call sudo reboot to reboot dut (sonic-net#452) ...

…et#456)  ### Description of PR  Summary: Add topo t1-isolated-d510u2 in veos ### Type of change  - [x] Bug fix - [ ] Testbed and Framework(new/improvement) - [ ] New Test case - [ ] Skipped for non-supported platforms - [ ] Test case improvement ### Back port request - [ ] 202205 - [ ] 202305 - [ ] 202311 - [ ] 202405 - [ ] 202411 - [x] 202505 ### Approach #### What is the motivation for this PR? Add topo t1-isolated-d510u2 in veos #### How did you do it? Add topo t1-isolated-d510u2 in veos #### How did you verify/test it? Verified by deploy topo. #### Any platform specific information? #### Supported testbed topology if it's a new test case? ### Documentation

Change in this update: b75aab7 [swss-common] Add LINKMGR CFG and MUX LINKMGR state table names (sonic-net#421) 4a77d1c [ci]: add vstest (sonic-net#459) 07258a6 [ci]: use build template (sonic-net#457) ddcae3e runRedisScript api to process integer returned by script run in the redis (sonic-net#447) 33d89c7 [systemlag] Schema defs for system lag (sonic-net#448) af01f37 spell check fixes (sonic-net#456) 7afd43d Update to make getNamespaces() API at par with the get_ns_list() swssdk-py API. (sonic-net#455) signed-off-by: Tamer Ahmed <[email protected]>

[PFCWD]: test enhancement

9b62f0f

Signed-off-by: Sihui Han <[email protected]>

lguohan reviewed Feb 9, 2018

View reviewed changes

lguohan requested changes Feb 9, 2018

View reviewed changes

Sihui Han added 3 commits February 9, 2018 23:28

update as comments

9d34a76

Signed-off-by: Sihui Han <[email protected]>

add empty mlnx stop pfc template and resolve comments

ea01838

seperate set storm templates logic

fce484e

Signed-off-by: Sihui Han <[email protected]>

sihuihan88 force-pushed the dev/sihan/enhance branch from 5ca97df to fce484e Compare February 10, 2018 00:16

lguohan approved these changes Feb 11, 2018

View reviewed changes

sihuihan88 merged commit 3e1b339 into sonic-net:master Feb 11, 2018

sihuihan88 deleted the dev/sihan/enhance branch February 11, 2018 19:19

		@@ -66,11 +68,217 @@
		shell: "docker exec -i database redis-cli -n 2 HGET COUNTERS_QUEUE_NAME_MAP {{ pfc_wd_test_port }}:{{ pfc_queue_index }}"

Conversation

sihuihan88 commented Feb 6, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description of PR

Type of change

Approach

Documentation

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

lguohan commented Feb 9, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

lguohan commented Feb 9, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sihuihan88 Feb 9, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

lguohan left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

sihuihan88 commented Feb 6, 2018 •

edited

Loading

sihuihan88 Feb 9, 2018 •

edited

Loading