Fix the ping keyword to include dataplane settings
Change-Id: I7bd8d91b67c94510b9e9fd39c631586728773834
diff --git a/libraries/utils.robot b/libraries/utils.robot
index 50e33f2..3aaba81 100755
--- a/libraries/utils.robot
+++ b/libraries/utils.robot
@@ -938,7 +938,8 @@
${dst}= Set Variable ${hosts.dst[${I}]}
${onu_device_id}= Get Device ID From SN ${src['onu']}
${pingStatus} Run Keyword If '${onu_device_id}' == '${exceptional_onu_id}' Set Variable False
- Run Keyword And Continue On Failure Wait Until Keyword Succeeds 60s 2s
+ Run Keyword If ${has_dataplane} Run Keyword And Continue On Failure
+ ... Wait Until Keyword Succeeds 60s 2s
... Check Ping ${pingStatus} ${dst['dp_iface_ip_qinq']} ${src['dp_iface_name']}
... ${src['ip']} ${src['user']} ${src['pass']} ${src['container_type']} ${src['container_name']}
END
@@ -953,7 +954,8 @@
${olt_device_id}= Get Device ID From SN ${src['olt']}
Continue For Loop If "${olt_device_id}"=="${exceptional_olt_id}"
#${pingStatus} Run Keyword If '${olt_device_id}' == '${exceptional_olt_id}' Set Variable False
- Run Keyword And Continue On Failure Wait Until Keyword Succeeds 60s 2s
+ Run Keyword If ${has_dataplane} Run Keyword And Continue On Failure
+ ... Wait Until Keyword Succeeds 60s 2s
... Check Ping True ${dst['dp_iface_ip_qinq']} ${src['dp_iface_name']}
... ${src['ip']} ${src['user']} ${src['pass']} ${src['container_type']} ${src['container_name']}
END