Added keyword Clean Up All Nodes to kill stale lxc processes in Suite Teardown
Change-Id: Iac5367cb5eb6158a1897ff05ff2fa1f77a6e3111
diff --git a/tests/functional/Voltha_AlarmTests.robot b/tests/functional/Voltha_AlarmTests.robot
index 8973593..4437135 100755
--- a/tests/functional/Voltha_AlarmTests.robot
+++ b/tests/functional/Voltha_AlarmTests.robot
@@ -381,6 +381,7 @@
Run Keyword If ${teardown_device} Execute ONOS CLI Command use single connection ${ONOS_SSH_IP} ${ONOS_SSH_PORT}
... device-remove ${of_id}
Close All ONOS SSH Connections
+ Run Keyword If ${has_dataplane} Clean Up All Nodes
# Onu Alarms
diff --git a/tests/functional/Voltha_ErrorScenarios.robot b/tests/functional/Voltha_ErrorScenarios.robot
index a9e53d6..7f51af7 100755
--- a/tests/functional/Voltha_ErrorScenarios.robot
+++ b/tests/functional/Voltha_ErrorScenarios.robot
@@ -332,3 +332,4 @@
#Restore all ONUs
# Run Keyword If ${has_dataplane} RestoreONUs ${num_onus}
Close All ONOS SSH Connections
+ Run Keyword If ${has_dataplane} Clean Up All Nodes
diff --git a/tests/functional/Voltha_FailureScenarios.robot b/tests/functional/Voltha_FailureScenarios.robot
index e0e8eb7..add8f1b 100755
--- a/tests/functional/Voltha_FailureScenarios.robot
+++ b/tests/functional/Voltha_FailureScenarios.robot
@@ -805,3 +805,4 @@
Teardown Suite
[Documentation] Clean up ONOS SSH connections
Close All ONOS SSH Connections
+ Run Keyword If ${has_dataplane} Clean Up All Nodes
diff --git a/tests/functional/Voltha_MultiOLT_Tests.robot b/tests/functional/Voltha_MultiOLT_Tests.robot
index c92ba70..fbca7fe 100755
--- a/tests/functional/Voltha_MultiOLT_Tests.robot
+++ b/tests/functional/Voltha_MultiOLT_Tests.robot
@@ -191,3 +191,4 @@
Teardown Suite
[Documentation] Clean up ONOS SSH connections
Close All ONOS SSH Connections
+ Run Keyword If ${has_dataplane} Clean Up All Nodes
diff --git a/tests/functional/Voltha_ScaleFunctionalTests.robot b/tests/functional/Voltha_ScaleFunctionalTests.robot
index 58e6a8e..709336e 100755
--- a/tests/functional/Voltha_ScaleFunctionalTests.robot
+++ b/tests/functional/Voltha_ScaleFunctionalTests.robot
@@ -196,6 +196,7 @@
Run Keyword If ${teardown_device} Execute ONOS CLI Command use single connection ${ONOS_SSH_IP} ${ONOS_SSH_PORT}
... device-remove ${of_id}
Close All ONOS SSH Connections
+ Run Keyword If ${has_dataplane} Clean Up All Nodes
Clean Up Linux
[Documentation] Kill processes and clean up interfaces on src+dst servers