[pfcwd]: support t0-116 and clean up the code

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

@@ -28,10 +28,10 @@
   delegate_to: "{{ptf_host}}"
   when: port_type == "vlan"
 
-  #- name: "Update ARP entry on DUT"
-  #shell: ping {{minigraph_vlan_interfaces[0]['addr']}} -c 5 -I eth{{pfc_wd_test_port_id}}
-  #delegate_to: "{{ptf_host}}"
-  #when: port_type == "vlan"
+- name: "Update ARP entry on DUT"
+  shell: ping {{minigraph_vlan_interfaces[0]['addr']}} -c 10
+  delegate_to: "{{ptf_host}}"
+  when: port_type == "vlan"
 
 - name: "Update ARP entry on DUT"
   shell: docker exec -i swss arping {{pfc_wd_test_neighbor_addr}} -c 5
@@ -108,7 +108,7 @@
 
     - name: Let PFC storm happen for a while
       pause:
-        seconds: 1
+        seconds: 5
 
     - name: "Buffer up the queue in {{pfc_wd_test_port}}"
       include: roles/test/tasks/ptf_runner.yml
@@ -343,6 +343,10 @@
         login: "{{peer_login}}"
       connection: switch
 
+    - name: Let PFC storm happen for a while
+      pause:
+        seconds: 5
+
     - name: Check if logs contain message that PFC WD detected deadlock
       include: roles/test/files/tools/loganalyzer/loganalyzer_analyze.yml
 

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

@@ -46,11 +46,11 @@
 
 - set_fact:
     p: "{{pfc_wd_test_port[1]}}"
-  when: rx_pc_port is defined and test_pc_port is defined and testbed_type in ['t0-64', 't0-112', 't1-lag']
+  when: rx_pc_port is defined and test_pc_port is defined and testbed_type in ['t0-64', 't0-116', 't1-lag']
 
 - set_fact:
     test_ports: "{{ test_ports | combine( {p:{'test_neighbor_addr':pfc_wd_test_neighbor_addr, 'rx_port':pfc_wd_rx_port, 'rx_neighbor_addr': pfc_wd_rx_neighbor_addr, 'peer_device':neighbors[p]['peerdevice'], 'test_port_id': minigraph_port_indices[p], 'rx_port_id': pfc_wd_rx_port_id.split(' ') | list, 'test_portchannel_members': pfc_wd_test_port_id.split(' ') | list, 'test_port_type':'portchannel' }})  }}"
-  when: rx_pc_port is defined and test_pc_port is defined and testbed_type in ['t0-64', 't0-112', 't1-lag']
+  when: rx_pc_port is defined and test_pc_port is defined and testbed_type in ['t0-64', 't0-116', 't1-lag']
 
 - set_fact:
     p: "{{pfc_wd_rx_port[0]}}"
@@ -62,11 +62,11 @@
 
 - set_fact:
     p: "{{pfc_wd_rx_port[1]}}"
-  when: first_pair and testbed_type in ['t0-64', 't0-112']
+  when: first_pair and testbed_type in ['t0-64', 't0-116']
 
 - set_fact:
     test_ports: "{{ test_ports | combine( {p:{'test_neighbor_addr':pfc_wd_rx_neighbor_addr, 'rx_port':pfc_wd_test_port, 'rx_neighbor_addr': pfc_wd_test_neighbor_addr, 'peer_device':neighbors[p]['peerdevice'], 'test_port_id': minigraph_port_indices[p], 'rx_port_id': pfc_wd_test_port_id.split(' ') | list , 'test_portchannel_members': pfc_wd_rx_port_id.split(' ') | list, 'test_port_type':'portchannel' }})  }}"
-  when: first_pair and testbed_type in ['t0-64', 't0-112']
+  when: first_pair and testbed_type in ['t0-64', 't0-116']
 
 - set_fact:
     used: false

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

@@ -1,9 +1,2 @@
-- debug: msg="vlan running"
-- debug: msg="{{pfc_wd_rx_port}}"
-
-    #- name: flush the ip on ptf
-
-
-    #- name: assgin ip to ptf neightbor
 - set_fact:
     test_ports: "{{ test_ports | combine( {item:{'test_neighbor_addr':generated_ips[0].split('/')[0], 'rx_port': pfc_wd_rx_port, 'rx_neighbor_addr': pfc_wd_rx_neighbor_addr, 'peer_device':neighbors[item]['peerdevice'], 'test_port_id': minigraph_port_indices[item], 'rx_port_id': pfc_wd_rx_port_id.split(' ') | list, 'test_port_type':'vlan' }})  }}"

ansible/roles/test/templates/pfc_storm_arista.j2

@@ -1,5 +1,5 @@
 bash
 cd /mnt/flash
-sudo python {{pfc_gen_file}} -p {{(1).__lshift__(pfc_queue_index)}} -t 65535 -n {{pfc_frames_number}} -i {{pfc_fanout_interface | replace("Ethernet", "et")}} -r {{ansible_eth0_ipv4_addr}} &
+sudo python {{pfc_gen_file}} -p {{(1).__lshift__(pfc_queue_index)}} -t 65535 -n {{pfc_frames_number}} -i {{pfc_fanout_interface | replace("Ethernet", "et") | replace("/", "_")}} -r {{ansible_eth0_ipv4_addr}} &
 exit
 exit