diff --git a/ansible/roles/test/tasks/lag_fanout_ports_test.yml b/ansible/roles/test/tasks/lag_fanout_ports_test.yml index dbd8c3b0dc9..7a6f87063f4 100644 --- a/ansible/roles/test/tasks/lag_fanout_ports_test.yml +++ b/ansible/roles/test/tasks/lag_fanout_ports_test.yml @@ -31,6 +31,12 @@ config_iface: "{{ portmap_dut_fn[dut_lag_member] }}" state: 'shutdown' + - debug: + msg: "Wait for configuration to be applied..." + + - pause: + seconds: 30 + - include: lag_run_ptf.yml vars: lag_ptf_test_name: LagMembersTrafficTest @@ -47,5 +53,11 @@ config_iface: "{{ portmap_dut_fn[dut_lag_member] }}" state: 'no shutdown' -# Invert PTF interface index -- include: roles/test/files/helpers/invert_iface_behind_lag_member.yml + - debug: + msg: "Wait for configuration to be applied..." + + - pause: + seconds: 100 + + # Invert PTF interface index + - include: roles/test/files/helpers/invert_iface_behind_lag_member.yml diff --git a/ansible/roles/test/tasks/lag_vm_ports_test.yml b/ansible/roles/test/tasks/lag_vm_ports_test.yml deleted file mode 100644 index ceaca6a252e..00000000000 --- a/ansible/roles/test/tasks/lag_vm_ports_test.yml +++ /dev/null @@ -1,72 +0,0 @@ -#--------------------------------------------------------- -# --- Part of lagall.yml test --- -#--------------------------------------------------------- -# Shutdown each LAG member on VMs and verify traffic. -# -# The following actions are to be done for each LAG (and each VM): -# 1) Put DOWN EOS interface on VM (simulation of the halt of sending LACP packets). -# 2) Verify all the traffic goes through another LAG member and no packets lost. -# -# @ params: login_creds - credentials for Arista VM -# @ params: vm_name -# @ params: lag_ip - LAG interface IP address -# @ params: lag_member_0 - First LAG member on VM -# @ params: lag_member_1 - Second LAG member on VM -# @ params: iface_behind_lag_member_0 - PTF docker iface, connected to LAG VM -# @ params: iface_behind_lag_member_1 - PTF docker iface, connected to LAG VM -# @ params: not_behind_lag_iface - PTF docker interface that is connected to non-LAG VM (meaning eth31) -# @ params: vm_ip - VM mgmt IP; taken from lag_link_flap_vars.yml -# @ params: num_of_pkts - number of packets to send while PTF test. -#--------------------------------------------------------- - - # --- TEST FIRST LAG MEMBER --- -- block: - - name: Put down LAG member interface {{ lag_member_0 }} on {{ vm_name }}. - include: run_cisco_script.yml - vars: - template: roles/vm_set/templates/lag_vm_ports.j2 - host: "{{ vm_ip }}" - log_in: "{{ login_creds }}" - config_iface: "{{ lag_member_0 }}" - state: 'shutdown' - - - include: lag_run_ptf.yml - vars: - lag_ptf_test_name: LagMembersTrafficTest - params: "dst_addr='{{ lag_ip }}';src_iface={{ not_behind_lag_iface }};check_pkts_iface={{ iface_behind_lag_member_1 }};num_of_pkts={{ num_of_pkts }};dut_mac='{{ dut_mac }}'" - change_dir: /tmp - always: - - name: Put up LAG member interface {{ lag_member_0 }} on {{ vm_name }}. - include: run_cisco_script.yml - vars: - template: roles/vm_set/templates/lag_vm_ports.j2 - host: "{{ vm_ip }}" - log_in: "{{ login_creds }}" - config_iface: "{{ lag_member_0 }}" - state: 'no shutdown' - - # --- TEST SECOND LAG MEMBER --- -- block: - - name: Put down LAG member interface {{ lag_member_1 }} on {{ vm_name }}. - include: run_cisco_script.yml - vars: - template: roles/vm_set/templates/lag_vm_ports.j2 - host: "{{ vm_ip }}" - log_in: "{{ login_creds }}" - config_iface: "{{ lag_member_1 }}" - state: 'shutdown' - - - include: lag_run_ptf.yml - vars: - lag_ptf_test_name: LagMembersTrafficTest - params: "dst_addr='{{ lag_ip }}';src_iface={{ not_behind_lag_iface }};check_pkts_iface={{ iface_behind_lag_member_0 }};num_of_pkts={{ num_of_pkts }};dut_mac='{{ dut_mac }}'" - change_dir: /tmp - always: - - name: Put up LAG member interface {{ lag_member_1 }} on {{ vm_name }}. - include: run_cisco_script.yml - vars: - template: roles/vm_set/templates/lag_vm_ports.j2 - host: "{{ vm_ip }}" - log_in: "{{ login_creds }}" - config_iface: "{{ lag_member_1 }}" - state: 'no shutdown' diff --git a/ansible/roles/test/tasks/lagall.yml b/ansible/roles/test/tasks/lagall.yml index 063d1d78152..99c88edcb05 100644 --- a/ansible/roles/test/tasks/lagall.yml +++ b/ansible/roles/test/tasks/lagall.yml @@ -94,22 +94,6 @@ - name: Include testbed topology configuration (to get LAG IP and PTF docker ifaces, that are behind LAG VMs). include_vars: vars/topo_t1-lag.yml -- name: --TEST-- LAG members UP and DOWN on all VMs. - include: lag_vm_ports_test.yml - vars: - login_creds: "{{ switch_login['Arista'] }}" - dut_mac_addr: "{{ dut_mac }}" - lag_ip: "{{ configuration[item]['interfaces']['Port-Channel1']['ipv4'] }}" - lag_member_0: "{{ lag_vms[item][1] }}" - lag_member_1: "{{ lag_vms[item][2] }}" - iface_behind_lag_member_0: "{{ topology['VMs'][item]['vlans'][0] }}" - iface_behind_lag_member_1: "{{ topology['VMs'][item]['vlans'][1] }}" - not_behind_lag_iface: 29 - vm_ip: "{{ lag_vms[item][0] }}" - vm_name: "{{ item }}" - num_of_pkts: 100 - with_items: lag_vms.keys() - - name: --TEST-- LACP verification on all VMs. include: lag_vm_lacp_test.yml vars: diff --git a/ansible/roles/vm_set/templates/lag_vm_ports.j2 b/ansible/roles/vm_set/templates/lag_vm_ports.j2 deleted file mode 100644 index 946c75cb983..00000000000 --- a/ansible/roles/vm_set/templates/lag_vm_ports.j2 +++ /dev/null @@ -1,5 +0,0 @@ -enable -configure -interface {{ config_iface }} -{{ state }} -end