Run onos-service stop before killing onos
Change-Id: I5d5423e7c695958b8e23e3b6934dd1263dd65c88
diff --git a/TestON/tests/SCPF/SCPFcbench/SCPFcbench.py b/TestON/tests/SCPF/SCPFcbench/SCPFcbench.py
index 936bf3d..fee655b 100644
--- a/TestON/tests/SCPF/SCPFcbench/SCPFcbench.py
+++ b/TestON/tests/SCPF/SCPFcbench/SCPFcbench.py
@@ -80,7 +80,8 @@
main.step("Safety check, killing all ONOS processes")
main.step("before initiating environment setup")
for node in range(1, maxNodes + 1):
- main.ONOSbench.onosDie(ONOSIp[node])
+ main.ONOSbench.onosStop(ONOSIp[node])
+ main.ONOSbench.onosKill(ONOSIp[node])
#Uninstall everywhere
main.step( "Cleaning Enviornment..." )
diff --git a/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.py b/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.py
index 2915864..559f30f 100644
--- a/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.py
+++ b/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.py
@@ -88,7 +88,8 @@
main.step("Safety check, killing all ONOS processes")
main.step("before initiating environment setup")
for node in range(1, main.maxNodes + 1):
- main.ONOSbench.onosDie(ONOSIp[node])
+ main.ONOSbench.onosStop(ONOSIp[node])
+ main.ONOSbench.onosKill(ONOSIp[node])
#Uninstall everywhere
main.step( "Cleaning Enviornment..." )
diff --git a/TestON/tests/SCPF/SCPFhostLat/SCPFhostLat.py b/TestON/tests/SCPF/SCPFhostLat/SCPFhostLat.py
index 6c382e4..12b93e6 100644
--- a/TestON/tests/SCPF/SCPFhostLat/SCPFhostLat.py
+++ b/TestON/tests/SCPF/SCPFhostLat/SCPFhostLat.py
@@ -116,7 +116,8 @@
" before initiating environment setup" )
for i in range( main.numCtrls ):
- main.ONOSbench.onosDie( main.ONOSip[ i ] )
+ main.ONOSbench.onosStop( main.ONOSip[ i ] )
+ main.ONOSbench.onosKill( main.ONOSip[ i ] )
main.log.info( "NODE COUNT = %s" % main.numCtrls)
diff --git a/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.py b/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.py
index 3e221a5..cf91077 100644
--- a/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.py
+++ b/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.py
@@ -120,7 +120,8 @@
" before initiating environment setup")
for i in range( main.numCtrls ):
- main.ONOSbench.onosDie( main.ONOSip[i] )
+ main.ONOSbench.onosStop( main.ONOSip[i] )
+ main.ONOSbench.onosKill( main.ONOSip[i] )
main.log.info( "NODE COUNT = %s" % main.numCtrls )
main.ONOSbench.createCellFile(main.ONOSbench.ip_address,
diff --git a/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.py b/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.py
index 412ef29..c6b1f34 100644
--- a/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.py
+++ b/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.py
@@ -118,7 +118,8 @@
" before initiating environment setup")
for i in range(main.numCtrls):
- main.ONOSbench.onosDie(main.ONOSip[i])
+ main.ONOSbench.onosStop(main.ONOSip[i])
+ main.ONOSbench.onosKill(main.ONOSip[i])
main.log.info("NODE COUNT = %s" % main.numCtrls)
main.ONOSbench.createCellFile(main.ONOSbench.ip_address,
diff --git a/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.py b/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.py
index 5138950..4d72293 100644
--- a/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.py
+++ b/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.py
@@ -143,7 +143,8 @@
" before initiating environment setup")
for i in range(main.numCtrls):
- main.ONOSbench.onosDie(main.ONOSip[i])
+ main.ONOSbench.onosStop(main.ONOSip[i])
+ main.ONOSbench.onosKill(main.ONOSip[i])
main.log.info("NODE COUNT = %s" % main.numCtrls)
main.ONOSbench.createCellFile(main.ONOSbench.ip_address,
diff --git a/TestON/tests/SCPF/SCPFportLat/SCPFportLat.py b/TestON/tests/SCPF/SCPFportLat/SCPFportLat.py
index ae38911..b29ca81 100644
--- a/TestON/tests/SCPF/SCPFportLat/SCPFportLat.py
+++ b/TestON/tests/SCPF/SCPFportLat/SCPFportLat.py
@@ -122,7 +122,8 @@
" before initiating environment setup")
for i in range( main.numCtrls ):
- main.ONOSbench.onosDie( main.ONOSip[i] )
+ main.ONOSbench.onosStop( main.ONOSip[i] )
+ main.ONOSbench.onosKill( main.ONOSip[i] )
main.log.info( "NODE COUNT = %s" % main.numCtrls )
main.ONOSbench.createCellFile(main.ONOSbench.ip_address,
diff --git a/TestON/tests/SCPF/SCPFscaleTopo/SCPFscaleTopo.py b/TestON/tests/SCPF/SCPFscaleTopo/SCPFscaleTopo.py
index ea2a6dd..3304d27 100644
--- a/TestON/tests/SCPF/SCPFscaleTopo/SCPFscaleTopo.py
+++ b/TestON/tests/SCPF/SCPFscaleTopo/SCPFscaleTopo.py
@@ -167,7 +167,8 @@
" before initiating environment setup" )
for i in range( main.numCtrls ):
- main.ONOSbench.onosDie( main.ONOSip[ i ] )
+ main.ONOSbench.onosStop( main.ONOSip[ i ] )
+ main.ONOSbench.onosKill( main.ONOSip[ i ] )
tempOnosIp = []
for i in range( main.numCtrls ):
diff --git a/TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.py b/TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.py
index 46714ac..f82d684 100644
--- a/TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.py
+++ b/TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.py
@@ -140,7 +140,8 @@
" before initiating environment setup" )
for i in range( main.numCtrls ):
- main.ONOSbench.onosDie( main.ONOSip[ i ] )
+ main.ONOSbench.onosStop( main.ONOSip[ i ] )
+ main.ONOSbench.onosKill( main.ONOSip[ i ] )
main.log.info( "NODE COUNT = %s" % main.numCtrls)
diff --git a/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.py b/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.py
index 46a5f47..e62951a 100644
--- a/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.py
+++ b/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.py
@@ -125,7 +125,8 @@
" before initiating environment setup")
for i in range(main.numCtrls):
- main.ONOSbench.onosDie(main.ONOSip[i])
+ main.ONOSbench.onosStop(main.ONOSip[i])
+ main.ONOSbench.onosKill(main.ONOSip[i])
main.log.info("NODE COUNT = %s" % main.numCtrls)
main.ONOSbench.createCellFile(main.ONOSbench.ip_address,