Reordered get onu_device_id after get onu_port due to bbsim lag in olt-reconnect fix
Change-Id: I7d33b5d4ade143702f36f036c382be2cfff39c4d
diff --git a/tests/tt-workflow/Voltha_TT_FailureScenarios.robot b/tests/tt-workflow/Voltha_TT_FailureScenarios.robot
index 73857dc..976a75c 100755
--- a/tests/tt-workflow/Voltha_TT_FailureScenarios.robot
+++ b/tests/tt-workflow/Voltha_TT_FailureScenarios.robot
@@ -93,9 +93,9 @@
${dst}= Set Variable ${hosts.dst[${I}]}
${service_type}= Get Variable Value ${src['service_type']} "null"
${of_id}= Get ofID From OLT List ${src['olt']}
- ${onu_device_id}= Get Device ID From SN ${src['onu']}
${onu_port}= Wait Until Keyword Succeeds ${timeout} 2s
... Get ONU Port in ONOS ${src['onu']} ${of_id}
+ ${onu_device_id}= Get Device ID From SN ${src['onu']}
# If the power switch port is not specified, continue
Continue For Loop If '${src["power_switch_port"]}' == '${None}'
# Disable Power Switch
@@ -211,9 +211,9 @@
${dst}= Set Variable ${hosts.dst[${I}]}
${service_type}= Get Variable Value ${src['service_type']} "null"
${of_id}= Get ofID From OLT List ${src['olt']}
- ${onu_device_id}= Get Device ID From SN ${src['onu']}
${onu_port}= Wait Until Keyword Succeeds ${timeout} 2s
... Get ONU Port in ONOS ${src['onu']} ${of_id}
+ ${onu_device_id}= Get Device ID From SN ${src['onu']}
Reboot Device ${onu_device_id}
# TODO: Add verification for MCAST
Run Keyword If ${has_dataplane} and '${service_type}' != 'mcast' Run Keyword And Continue On Failure
@@ -374,9 +374,9 @@
${dst}= Set Variable ${hosts.dst[${I}]}
${service_type}= Get Variable Value ${src['service_type']} "null"
${of_id}= Get ofID From OLT List ${src['olt']}
- ${onu_device_id}= Get Device ID From SN ${src['onu']}
${onu_port}= Wait Until Keyword Succeeds ${timeout} 2s
... Get ONU Port in ONOS ${src['onu']} ${of_id}
+ ${onu_device_id}= Get Device ID From SN ${src['onu']}
# Verify ONU state in voltha
Run Keyword And Continue On Failure Wait Until Keyword Succeeds ${timeout} 5s Validate Device
... ENABLED ACTIVE REACHABLE
diff --git a/tests/tt-workflow/Voltha_TT_PODTests.robot b/tests/tt-workflow/Voltha_TT_PODTests.robot
index 4d57cb9..b720586 100755
--- a/tests/tt-workflow/Voltha_TT_PODTests.robot
+++ b/tests/tt-workflow/Voltha_TT_PODTests.robot
@@ -195,9 +195,9 @@
${dst}= Set Variable ${hosts.dst[${I}]}
${service_type}= Get Variable Value ${src['service_type']} "null"
${of_id}= Get ofID From OLT List ${src['olt']}
- ${onu_device_id}= Get Device ID From SN ${src['onu']}
${onu_port}= Wait Until Keyword Succeeds ${timeout} 2s Get ONU Port in ONOS ${src['onu']}
... ${of_id} ${src['uni_id']}
+ ${onu_device_id}= Get Device ID From SN ${src['onu']}
# Remove Subscriber Access
${del_sub_cmd}= Run Keyword If ${unitag_sub}
... Catenate volt-remove-subscriber-unitag --tpId ${src['tp_id']} --sTag ${src['s_tag']}
@@ -258,9 +258,9 @@
Continue For Loop If -1 != ${onu_id}
Append To List ${onu_list} ${sn}
${of_id}= Get ofID From OLT List ${src['olt']}
- ${onu_device_id}= Get Device ID From SN ${src['onu']}
${onu_port}= Get Onu Ports in ONOS For ALL UNI per ONU ${src['onu']} ${of_id}
Log ${onu_port}
+ ${onu_device_id}= Get Device ID From SN ${src['onu']}
Disable Device ${onu_device_id}
Run Keyword And Continue On Failure Wait Until Keyword Succeeds ${timeout} 5s
... Validate Device DISABLED UNKNOWN