Revert Add optional parameter in Openstack lib.

[integration/test.git] / csit / libraries / Genius.robot

diff --git a/csit/libraries/Genius.robot b/csit/libraries/Genius.robot
index dca2e853287afe72701a113792cbcdbd76e2e37b..2483fcc3b80ef7a90189f512d812524c2443ac3b 100644 (file)
--- a/csit/libraries/Genius.robot
+++ b/csit/libraries/Genius.robot
@@ -9,6 +9,7 @@ Library           string
 Resource          ClusterManagement.robot
 Resource          DataModels.robot
 Resource          KarafKeywords.robot
+Resource          ODLTools.robot
 Resource          OVSDB.robot
 Resource          Utils.robot
 Resource          VpnOperations.robot
@@ -160,10 +161,16 @@ Genius Test Setup
     BuiltIn.Run Keyword And Ignore Error    KarafKeywords.Log_Testcase_Start_To_Controller_Karaf
 
 Genius Test Teardown
-    [Arguments]    ${data_models}
+    [Arguments]    ${data_models}    ${test_name}=${SUITE_NAME}.${TEST_NAME}    ${fail}=${FAIL_ON_EXCEPTIONS}
     OVSDB.Get DumpFlows And Ovsconfig    ${conn_id_1}    BR1
     OVSDB.Get DumpFlows And Ovsconfig    ${conn_id_2}    BR2
     BuiltIn.Run Keyword And Ignore Error    DataModels.Get Model Dump    ${ODL_SYSTEM_IP}    ${data_models}
+    KarafKeywords.Fail If Exceptions Found During Test    ${test_name}    fail=${fail}
+    ODLTools.Get All    test_name=${test_name}
+
+Genius Suite Debugs
+    [Arguments]    ${data_models}
+    Genius Test Teardown    ${data_models}    test_name=${SUITE_NAME}    fail=False
 
 ITM Direct Tunnels Start Suite
     [Documentation]    start suite for itm scalability
@@ -300,10 +307,10 @@ SRM Start Suite
     ${tunnel} =    BuiltIn.Wait Until Keyword Succeeds    40    20    Genius.Get Tunnel    ${dpn_Id_1}    ${dpn_Id_2}
     ...    odl-interface:tunnel-type-vxlan
     BuiltIn.Wait Until Keyword Succeeds    60s    5s    Genius.Verify Tunnel Status as UP    TZA
-    Genius Test Teardown    ${data_models}
+    Genius Suite Debugs    ${data_models}
 
 SRM Stop Suite
     [Documentation]    Stop suite for service recovery.
     Delete All Vteps
-    Genius Test Teardown    ${data_models}
+    Genius Suite Debugs    ${data_models}
     Genius Suite Teardown