From 4b5944e5488e2fccfbdabd500afbb7ad9a5080cf Mon Sep 17 00:00:00 2001 From: Wenda Ni Date: Wed, 30 Oct 2019 17:49:48 -0700 Subject: [PATCH 1/2] Leave a newline to prevent 'exit' trailing the preceding command Signed-off-by: Wenda Ni --- ansible/roles/test/templates/pfc_storm_stop_arista.j2 | 1 + 1 file changed, 1 insertion(+) diff --git a/ansible/roles/test/templates/pfc_storm_stop_arista.j2 b/ansible/roles/test/templates/pfc_storm_stop_arista.j2 index cb68b2723d6..9b957bdc463 100644 --- a/ansible/roles/test/templates/pfc_storm_stop_arista.j2 +++ b/ansible/roles/test/templates/pfc_storm_stop_arista.j2 @@ -1,5 +1,6 @@ bash cd /mnt/flash {% if pfc_storm_stop_defer_time is defined %} sleep {{pfc_storm_stop_defer_time}} &&{% endif %} sudo pkill -f "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}}" {% if pfc_storm_stop_defer_time is defined %}&{% endif %} + exit exit From 0ecd014d272bff2a7b3d8ec54bdd3e9ebd398bb9 Mon Sep 17 00:00:00 2001 From: Wenda Ni Date: Thu, 31 Oct 2019 11:06:03 -0700 Subject: [PATCH 2/2] Address comment: use if else semantics Signed-off-by: Wenda Ni --- ansible/roles/test/templates/pfc_storm_stop_arista.j2 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ansible/roles/test/templates/pfc_storm_stop_arista.j2 b/ansible/roles/test/templates/pfc_storm_stop_arista.j2 index 9b957bdc463..63dfbcc8ff4 100644 --- a/ansible/roles/test/templates/pfc_storm_stop_arista.j2 +++ b/ansible/roles/test/templates/pfc_storm_stop_arista.j2 @@ -1,6 +1,5 @@ bash cd /mnt/flash -{% if pfc_storm_stop_defer_time is defined %} sleep {{pfc_storm_stop_defer_time}} &&{% endif %} sudo pkill -f "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}}" {% if pfc_storm_stop_defer_time is defined %}&{% endif %} - +{% if pfc_storm_stop_defer_time is defined %} sleep {{pfc_storm_stop_defer_time}} &&{% endif %} sudo pkill -f "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}}" {{'&' if pfc_storm_stop_defer_time is defined else ''}} exit exit