[VOL-2945] Extend ErrorScenarios TCs to support DT workflow
Change-Id: I75296008d2c7a8d23a332df8948e2f0a43a5ead1
diff --git a/Makefile b/Makefile
index 1037615..4806352 100644
--- a/Makefile
+++ b/Makefile
@@ -121,6 +121,11 @@
bbsim-errorscenarios: ROBOT_CONFIG_FILE := $(ROBOT_SANITY_SINGLE_PON_FILE)
bbsim-errorscenarios: voltha-test
+bbsim-errorscenarios-dt: ROBOT_MISC_ARGS += -X $(ROBOT_DEBUG_LOG_OPT)
+bbsim-errorscenarios-dt: ROBOT_FILE := Voltha_ErrorScenarios.robot
+bbsim-errorscenarios-dt: ROBOT_CONFIG_FILE := $(ROBOT_SANITY_DT_SINGLE_PON_FILE)
+bbsim-errorscenarios-dt: voltha-test
+
bbsim-failurescenarios: ROBOT_MISC_ARGS += -X $(ROBOT_DEBUG_LOG_OPT) -e PowerSwitch
bbsim-failurescenarios: ROBOT_FILE := Voltha_FailureScenarios.robot
bbsim-failurescenarios: ROBOT_CONFIG_FILE := $(ROBOT_SANITY_SINGLE_PON_FILE)
diff --git a/tests/data/bbsim-kind-dt.yaml b/tests/data/bbsim-kind-dt.yaml
index c301af8..25b6799 100644
--- a/tests/data/bbsim-kind-dt.yaml
+++ b/tests/data/bbsim-kind-dt.yaml
@@ -17,6 +17,7 @@
# Automated deployment configuration for kind-voltha running BBSim
# Change default values in tests
+workflow: DT
has_dataplane: false
teardown_device: true
ONOS_REST_PORT: 8181
diff --git a/tests/functional/Voltha_ErrorScenarios.robot b/tests/functional/Voltha_ErrorScenarios.robot
index 61492a4..96df01e 100644
--- a/tests/functional/Voltha_ErrorScenarios.robot
+++ b/tests/functional/Voltha_ErrorScenarios.robot
@@ -50,6 +50,7 @@
${has_dataplane} True
${teardown_device} False
${scripts} ../../scripts
+${workflow} ATT
# Per-test logging on failure is turned off by default; set this variable to enable
${container_log_dir} ${None}
@@ -125,6 +126,7 @@
... Assuming devices are already created, up and running fine; test1 or sanity was
... executed where all the ONUs are authenticated/DHCP/pingable
... VOL-2411
+ #TODO: If this TC gets updated in future, To add support for DT workflow as well (refer JIRA: VOL-2945)
[Tags] functional DeleteBeforeDisableCheck notready
[Setup] Start Logging DeleteBeforeDisableCheck
[Teardown] Run Keywords Collect Logs
@@ -183,12 +185,13 @@
... ${olt_serial_number}
${logical_id}= Get Logical Device ID From SN ${olt_serial_number}
Set Suite Variable ${logical_id}
+ ${onu_reason}= Set Variable If '${workflow}' == 'DT' initial-mib-downloaded omci-flows-pushed
FOR ${I} IN RANGE 0 ${num_onus}
${src}= Set Variable ${hosts.src[${I}]}
${dst}= Set Variable ${hosts.dst[${I}]}
Run Keyword And Continue On Failure Wait Until Keyword Succeeds ${timeout} 5s Validate Device
... ENABLED ACTIVE REACHABLE
- ... ${src['onu']} onu=True onu_reason=omci-flows-pushed
+ ... ${src['onu']} onu=True onu_reason=${onu_reason}
END
Disable and Delete the logical device directly