Add workaround for onos not respawning

Change-Id: I606947ee548d7b796595a427ec36078c85bd86dd
diff --git a/TestON/tests/HAclusterRestart/HAclusterRestart.py b/TestON/tests/HAclusterRestart/HAclusterRestart.py
index 4e7ac23..835633e 100644
--- a/TestON/tests/HAclusterRestart/HAclusterRestart.py
+++ b/TestON/tests/HAclusterRestart/HAclusterRestart.py
@@ -1739,6 +1739,10 @@
         utilities.assert_equals( expect=main.TRUE, actual=killResults,
                                  onpass="ONOS nodes killed",
                                  onfail="ONOS kill unsuccessful" )
+        # FIXME: Remove once ONOS-4117 is fixed
+        time.sleep(1)
+        for node in main.nodes:
+            main.ONOSbench.onosStart( node.ip_address )
 
         main.step( "Checking if ONOS is up yet" )
         for i in range( 2 ):
diff --git a/TestON/tests/HAsingleInstanceRestart/HAsingleInstanceRestart.py b/TestON/tests/HAsingleInstanceRestart/HAsingleInstanceRestart.py
index 3ab5072..dda9b26 100644
--- a/TestON/tests/HAsingleInstanceRestart/HAsingleInstanceRestart.py
+++ b/TestON/tests/HAsingleInstanceRestart/HAsingleInstanceRestart.py
@@ -1200,6 +1200,9 @@
 
         main.step( "Killing ONOS processes" )
         killResult = main.ONOSbench.onosKill( main.nodes[0].ip_address )
+        # FIXME: Remove once ONOS-4117 is fixed
+        time.sleep(1)
+        main.ONOSbench.onosStart( main.nodes[0].ip_address )
         start = time.time()
         utilities.assert_equals( expect=main.TRUE, actual=killResult,
                                  onpass="ONOS Killed",