From 9e20809c5736499d54391bed242a64d96e49a105 Mon Sep 17 00:00:00 2001
From: Ying Xie <ying.xie@microsoft.com>
Date: Fri, 23 Feb 2018 03:44:25 -0800
Subject: [PATCH 1/2] [test case] Add test: restart swss service

There was a script to restart swss, it was used as utility by a
few other tests. And it didn't wait long enough for swss service
to recover, it didn't check if the system recovered eventually.

This test also restarts dhcp_relay service to make sure that it
will listen on right interfaces. So the system would be left at
a healthy state.
---
 ansible/roles/test/tasks/restart_swss.yml | 25 +++++++++++++++++++++++
 ansible/roles/test/vars/testcases.yml     |  4 ++++
 2 files changed, 29 insertions(+)
 create mode 100644 ansible/roles/test/tasks/restart_swss.yml

diff --git a/ansible/roles/test/tasks/restart_swss.yml b/ansible/roles/test/tasks/restart_swss.yml
new file mode 100644
index 00000000000..63379db9090
--- /dev/null
+++ b/ansible/roles/test/tasks/restart_swss.yml
@@ -0,0 +1,25 @@
+- name: Restart swss service
+  become: true
+  service:
+    name: swss
+    state: restarted
+
+- name: wait for 2 minutes for swss service to recover
+  pause:
+    seconds: 120
+
+- name: do basic sanity check before each test
+  include: base_sanity.yml
+  vars:
+     recover: false
+
+- name: validate all interfaces are up
+  include: interface.yml
+  vars:
+     recover: false
+
+- name: Restart dhcp_relay service
+  become: true
+  service:
+    name: dhcp_relay
+    state: restarted
diff --git a/ansible/roles/test/vars/testcases.yml b/ansible/roles/test/vars/testcases.yml
index d629f50da4c..eb209843e8c 100644
--- a/ansible/roles/test/vars/testcases.yml
+++ b/ansible/roles/test/vars/testcases.yml
@@ -154,6 +154,10 @@ testcases:
       filename: run_config_cleanup.yml
       topologies: [t0, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, ptf32, ptf64]
 
+    restart_swss_service:
+      filename: restart_swss.yml
+      topologies: [t0, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, ptf32, ptf64]
+
     sensors:
       filename: sensors_check.yml
       topologies: [t0, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, ptf32, ptf64]

From a973a853ae2355200a78477e052a27a776bcbccc Mon Sep 17 00:00:00 2001
From: Ying Xie <ying.xie@microsoft.com>
Date: Fri, 23 Feb 2018 09:38:34 -0800
Subject: [PATCH 2/2] [swss restart] change wording

---
 ansible/roles/test/tasks/restart_swss.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/roles/test/tasks/restart_swss.yml b/ansible/roles/test/tasks/restart_swss.yml
index 63379db9090..cd64bd33081 100644
--- a/ansible/roles/test/tasks/restart_swss.yml
+++ b/ansible/roles/test/tasks/restart_swss.yml
@@ -8,7 +8,7 @@
   pause:
     seconds: 120
 
-- name: do basic sanity check before each test
+- name: check basic sanity of the device
   include: base_sanity.yml
   vars:
      recover: false