VOL-4618: If power_switch_port config is missing skip reboot procedure
on the ONU.
Also add Zyxel ONU back to rlt-1600x OLT on master.
Change-Id: Iec49f1cf856bc017cb6988329bad0643162de39a
diff --git a/tests/dt-workflow/Voltha_DT_FailureScenarios.robot b/tests/dt-workflow/Voltha_DT_FailureScenarios.robot
index 08588db..9637a89 100755
--- a/tests/dt-workflow/Voltha_DT_FailureScenarios.robot
+++ b/tests/dt-workflow/Voltha_DT_FailureScenarios.robot
@@ -91,6 +91,8 @@
${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}
+ # If the power switch port is not specified, continue
+ Continue For Loop If '${src["power_switch_port"]}' == '${None}'
# Disable Power Switch
Disable Switch Outlet ${src['power_switch_port']}
Run Keyword If ${has_dataplane} Run Keyword And Continue On Failure