Do not continue on failure if flows are missing
Capturing teardown log for TT tests
Change-Id: I63966967a488c44d0b7e6d69768a2662a4b519d4
diff --git a/libraries/utils.robot b/libraries/utils.robot
index df169e3..397c115 100755
--- a/libraries/utils.robot
+++ b/libraries/utils.robot
@@ -230,10 +230,10 @@
... Run Keyword And Continue On Failure Wait Until Keyword Succeeds ${timeout} 2s
... Verify Eapol Flows Added For ONU ${ONOS_SSH_IP} ${ONOS_SSH_PORT} ${of_id} ${onu_port}
# Verify LLDP flow in ONOS
- Run Keyword And Continue On Failure Wait Until Keyword Succeeds ${timeout} 5s
+ Wait Until Keyword Succeeds ${timeout} 5s
... Verify LLDP Flow Added ${ONOS_SSH_IP} ${ONOS_SSH_PORT} ${of_id} 1
# Verify ONU state in voltha
- Run Keyword And Continue On Failure Wait Until Keyword Succeeds ${timeout} 5s Validate Device
+ Run Keyword Wait Until Keyword Succeeds ${timeout} 5s Validate Device
... ENABLED ACTIVE REACHABLE
... ${src['onu']} onu=True onu_reason=omci-flows-pushed
# Perform Authentication
@@ -259,7 +259,7 @@
... Verify Eapol Flows Added For ONU ${ONOS_SSH_IP} ${ONOS_SSH_PORT} ${of_id}
... ${onu_port} ${src['c_tag']}
# Verify Meters in ONOS
- Run Keyword And Continue On Failure Wait Until Keyword Succeeds ${timeout} 5s
+ Run Keyword Wait Until Keyword Succeeds ${timeout} 5s
... Verify Meters in ONOS ${ONOS_SSH_IP} ${ONOS_SSH_PORT} ${of_id} ${onu_port}
Run Keyword If ${has_dataplane} Validate DHCP and Ping True
... True ${src['dp_iface_name']} ${src['s_tag']} ${src['c_tag']} ${dst['dp_iface_ip_qinq']}
@@ -292,14 +292,14 @@
... Verify Subscriber Access Flows Added Count DT ${ONOS_SSH_IP} ${ONOS_SSH_PORT} ${of_id}
... ${onos_flows_count}
# Verify LLDP flow in ONOS
- Run Keyword And Continue On Failure Wait Until Keyword Succeeds ${timeout} 5s
+ Wait Until Keyword Succeeds ${timeout} 5s
... Verify LLDP Flow Added ${ONOS_SSH_IP} ${ONOS_SSH_PORT} ${of_id} 1
# Verify VOLTHA Flows
# Number of per OLT Flows equals Twice the Number of Active ONUs (each for downstream and upstream) + 1 for LLDP
${olt_flows}= Evaluate 2 * ${num_onus} + 1
# Number of per ONU Flows equals 2 (one each for downstream and upstream)
${onu_flows}= Set Variable 2
- Run Keyword And Continue On Failure Wait Until Keyword Succeeds ${timeout} 5s Validate OLT Flows
+ Run Keyword Wait Until Keyword Succeeds ${timeout} 5s Validate OLT Flows
... ${olt_flows} ${olt_device_id}
${List_ONU_Serial} Create List
Set Suite Variable ${List_ONU_Serial}
@@ -440,7 +440,7 @@
... Verify Added Flow Count for OLT TT ${ONOS_SSH_IP} ${ONOS_SSH_PORT} ${of_id}
... ${onos_flows_count}
# Verify LLDP flow in ONOS
- Run Keyword And Continue On Failure Wait Until Keyword Succeeds ${timeout} 5s
+ Wait Until Keyword Succeeds ${timeout} 5s
... Verify LLDP Flow Added ${ONOS_SSH_IP} ${ONOS_SSH_PORT} ${of_id} 1
# Verify VOLTHA Flows
# Number of per OLT Flows equals 10 * Number of Active ONUs + 3 for default LLDP, IGMP and DHCP
@@ -1131,8 +1131,9 @@
Start Logging Setup or Teardown
[Arguments] ${label}
[Documentation] Start logging for suite ${label}
+ ${file}= Replace String ${label} ${SPACE} -
${kail_process}= Run Keyword If "${container_log_dir}" != "${None}" Start Process kail -n ${NAMESPACE}
- ... -n ${INFRA_NAMESPACE} cwd=${container_log_dir} stdout=${label}-combined.log
+ ... -n ${INFRA_NAMESPACE} cwd=${container_log_dir} stdout=${file}-combined.log
Set Suite Variable ${kail_process}
Run Keyword If ${has_dataplane} Echo Message to OLT Logs START ${label}
diff --git a/tests/tt-workflow/Voltha_TT_PODTests.robot b/tests/tt-workflow/Voltha_TT_PODTests.robot
index 6576539..6242721 100755
--- a/tests/tt-workflow/Voltha_TT_PODTests.robot
+++ b/tests/tt-workflow/Voltha_TT_PODTests.robot
@@ -255,6 +255,8 @@
Teardown Suite
[Documentation] Tear down steps for the suite
+ Start Logging Setup or Teardown Teardown-${SUITE NAME}
Run Keyword If ${has_dataplane} Clean Up Linux
Run Keyword If ${teardown_device} Delete All Devices And Verify
Close All ONOS SSH Connections
+ Stop Logging Setup or Teardown Teardown-${SUITE NAME}