[VOL-2553] moving common keyword to libraries
Change-Id: I36de1f23d9d0b9669bbd76d1bd7c5ef555ef9e3f
diff --git a/libraries/utils.robot b/libraries/utils.robot
index 24397b4..91a431c 100644
--- a/libraries/utils.robot
+++ b/libraries/utils.robot
@@ -302,3 +302,22 @@
Run Process kubectl delete pod announcer
Run Process kubectl run announcer -ti --restart Never --image ubuntu
... bash -- -c echo; sleep 1; echo ${message}; sleep 1; date --rfc-3339\=n ; sleep 1; echo; sleep 1
+
+Clean Up Linux
+ [Documentation] Kill processes and clean up interfaces on src+dst servers
+ FOR ${I} IN RANGE 0 ${num_onus}
+ ${src}= Set Variable ${hosts.src[${I}]}
+ ${dst}= Set Variable ${hosts.dst[${I}]}
+ Run Keyword And Ignore Error Kill Linux Process [w]pa_supplicant ${src['ip']}
+ ... ${src['user']} ${src['pass']} ${src['container_type']} ${src['container_name']}
+ Run Keyword And Ignore Error Kill Linux Process [d]hclient ${src['ip']}
+ ... ${src['user']} ${src['pass']} ${src['container_type']} ${src['container_name']}
+ Run Keyword If '${dst['ip']}' != '${None}' Run Keyword And Ignore Error
+ ... Kill Linux Process [d]hcpd ${dst['ip']} ${dst['user']}
+ ... ${dst['pass']} ${dst['container_type']} ${dst['container_name']}
+ Delete IP Addresses from Interface on Remote Host ${src['dp_iface_name']} ${src['ip']}
+ ... ${src['user']} ${src['pass']} ${src['container_type']} ${src['container_name']}
+ Run Keyword If '${dst['ip']}' != '${None}' Delete Interface on Remote Host
+ ... ${dst['dp_iface_name']}.${src['s_tag']} ${dst['ip']} ${dst['user']} ${dst['pass']}
+ ... ${dst['container_type']} ${dst['container_name']}
+ END
diff --git a/tests/functional/Voltha_PODTests.robot b/tests/functional/Voltha_PODTests.robot
index b0497b0..7b8cb46 100644
--- a/tests/functional/Voltha_PODTests.robot
+++ b/tests/functional/Voltha_PODTests.robot
@@ -551,21 +551,3 @@
# Execute normal test Setup Keyword
Setup
-Clean Up Linux
- [Documentation] Kill processes and clean up interfaces on src+dst servers
- FOR ${I} IN RANGE 0 ${num_onus}
- ${src}= Set Variable ${hosts.src[${I}]}
- ${dst}= Set Variable ${hosts.dst[${I}]}
- Run Keyword And Ignore Error Kill Linux Process [w]pa_supplicant ${src['ip']}
- ... ${src['user']} ${src['pass']} ${src['container_type']} ${src['container_name']}
- Run Keyword And Ignore Error Kill Linux Process [d]hclient ${src['ip']}
- ... ${src['user']} ${src['pass']} ${src['container_type']} ${src['container_name']}
- Run Keyword If '${dst['ip']}' != '${None}' Run Keyword And Ignore Error
- ... Kill Linux Process [d]hcpd ${dst['ip']} ${dst['user']}
- ... ${dst['pass']} ${dst['container_type']} ${dst['container_name']}
- Delete IP Addresses from Interface on Remote Host ${src['dp_iface_name']} ${src['ip']}
- ... ${src['user']} ${src['pass']} ${src['container_type']} ${src['container_name']}
- Run Keyword If '${dst['ip']}' != '${None}' Delete Interface on Remote Host
- ... ${dst['dp_iface_name']}.${src['s_tag']} ${dst['ip']} ${dst['user']} ${dst['pass']}
- ... ${dst['container_type']} ${dst['container_name']}
- END