[qos] Fix script to accomodate the per-port buffer settings (#1450)

- Buffer settings are now applied per port. Change the script to not match on multiple ports. - PTF portmap file is needed for all sku's to get the correct ptf port to interface mapping. Copy it to the ptf irrespective of sku type Signed-off-by: Neetha John <[email protected]>
sonic-net · Mar 15, 2020 · 600e59b · 600e59b
1 parent 289265f
commit 600e59b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/ansible/roles/test/tasks/qos_get_ports.yml b/ansible/roles/test/tasks/qos_get_ports.yml
@@ -157,7 +157,7 @@
 - include: roles/test/tasks/qos_get_max_buff_size.yml
   vars:
     target_table: 'BUFFER_PG'
-    target_port_name: "***{{dut_switch_ports[src_port_id|int]}}***"
+    target_port_name: "{{dut_switch_ports[src_port_id|int]}}"
     target_pg: '0'
     target_buffer_profile_type: 'ingress lossy'
 
@@ -179,7 +179,7 @@
 - include: roles/test/tasks/qos_get_max_buff_size.yml
   vars:
     target_table: 'BUFFER_QUEUE'
-    target_port_name: "***{{dut_switch_ports[src_port_id|int]}}***"
+    target_port_name: "{{dut_switch_ports[src_port_id|int]}}"
     target_pg: '3-4'
     target_buffer_profile_type: 'egress lossless'
 
@@ -196,7 +196,7 @@
 - include: roles/test/tasks/qos_get_max_buff_size.yml
   vars:
     target_table: 'BUFFER_QUEUE'
-    target_port_name: "***{{dut_switch_ports[src_port_id|int]}}***"
+    target_port_name: "{{dut_switch_ports[src_port_id|int]}}"
     target_pg: '0-2'
     target_buffer_profile_type: 'egress lossy'
 

diff --git a/ansible/roles/test/tasks/qos_sai.yml b/ansible/roles/test/tasks/qos_sai.yml
@@ -68,9 +68,6 @@
     - name: copy portmap
       copy: src={{ptf_portmap}} dest=/root
       delegate_to: "{{ptf_host}}"
-      when: minigraph_hwsku is defined and
-            (minigraph_hwsku in mellanox_hwskus or minigraph_hwsku in
-            ['Arista-7050-QX-32S', 'Arista-7060CX-32S-C32', 'Celestica-DX010-C32', 'Arista-7260CX3-D108C8', 'Force10-S6100', 'Arista-7260CX3-Q64'])
 
     - name: Init PTF base test parameters
       set_fact: