From: Sam Hague <shague@redhat.com>
Date: Sun, 19 Aug 2018 14:20:12 +0000 (-0400)
Subject: Set test_name for suite or test
X-Git-Tag: pre-potassium~599
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Ftest.git;a=commitdiff_plain;h=09a995a3a18ba1e05da0a5fe74d5a358d06da31e

Set test_name for suite or test

Change-Id: I1b52f4f7fbb955db648a6b8b96436384d7b908b3
Signed-off-by: Sam Hague <shague@redhat.com>
---

diff --git a/csit/libraries/Genius.robot b/csit/libraries/Genius.robot
index a81e7fbe88..2483fcc3b8 100644
--- a/csit/libraries/Genius.robot
+++ b/csit/libraries/Genius.robot
@@ -166,7 +166,7 @@ Genius Test Teardown
     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
+    ODLTools.Get All    test_name=${test_name}
 
 Genius Suite Debugs
     [Arguments]    ${data_models}
diff --git a/csit/libraries/ODLTools.robot b/csit/libraries/ODLTools.robot
index 73521ca2b7..04fdf72403 100644
--- a/csit/libraries/ODLTools.robot
+++ b/csit/libraries/ODLTools.robot
@@ -22,7 +22,7 @@ Get EOS
 
 Get Cluster Info
     [Arguments]    ${port}=${RESTCONFPORT}
-    [Documentation]    Get ODL Cluster related information like transaction counts, commit rates etc
+    [Documentation]    Get ODL Cluster related information like transaction counts, commit rates, etc.
     : FOR    ${i}    IN RANGE    ${NUM_ODL_SYSTEM}
     \    ${cmd} =    BuiltIn.Set Variable    odltools show cluster-info -i ${ODL_SYSTEM_${i+1}_IP} -t ${port} -u ${ODL_RESTCONF_USER} -w ${ODL_RESTCONF_PASSWORD}
     \    ${output} =    OperatingSystem.Run    ${cmd}
@@ -30,7 +30,7 @@ Get Cluster Info
 
 Analyze Tunnels
     [Arguments]    ${node_ip}=${TOOLS_SYSTEM_IP}    ${port}=${RESTCONFPORT}    ${test_name}=${SUITE_NAME}.${TEST_NAME}
-    [Documentation]    Analyze Tunnel Mesh creation for any errorsand log results
+    [Documentation]    Analyze Tunnel Mesh creation for any errors and log results
     ${cmd} =    BuiltIn.Set Variable    odltools analyze tunnels -i ${node_ip} -t ${port} -u ${ODL_RESTCONF_USER} -w ${ODL_RESTCONF_PASSWORD} --path /tmp/${test_name}
     ${rc}    ${output} =    OperatingSystem.Run And Return Rc And Output    ${cmd}
     BuiltIn.Log    rc: ${rc}, output: ${output}
@@ -38,8 +38,8 @@ Analyze Tunnels
     [Return]    ${output}
 
 Get All
-    [Arguments]    ${node_ip}=${TOOLS_SYSTEM_IP}    ${port}=${RESTCONFPORT}
+    [Arguments]    ${node_ip}=${TOOLS_SYSTEM_IP}    ${port}=${RESTCONFPORT}    ${test_name}=${SUITE_NAME}.${TEST_NAME}
     [Documentation]    Get all results provided by ODLTools
     ODLTools.Get Cluster Info
-    BuiltIn.run Keyword And Ignore Error    ODLTools.Get EOS    ${HA_PROXY_IP}
-    BuiltIn.run Keyword And Ignore Error    ODLTools.Analyze Tunnels    ${HA_PROXY_IP}
+    BuiltIn.run Keyword And Ignore Error    ODLTools.Get EOS    ${HA_PROXY_IP}    test_name=${test_name}
+    BuiltIn.run Keyword And Ignore Error    ODLTools.Analyze Tunnels    ${HA_PROXY_IP}    test_name=${test_name}
diff --git a/csit/libraries/OpenStackOperations.robot b/csit/libraries/OpenStackOperations.robot
index 6f8cf1fdcb..b43ee7aeae 100644
--- a/csit/libraries/OpenStackOperations.robot
+++ b/csit/libraries/OpenStackOperations.robot
@@ -551,7 +551,7 @@ Get OvsDebugInfo
 
 Get Test Teardown Debugs
     [Arguments]    ${test_name}=${SUITE_NAME}.${TEST_NAME}    ${fail}=${FAIL_ON_EXCEPTIONS}
-    ODLTools.Get All
+    ODLTools.Get All    test_name=${test_name}
     OpenStackOperations.Get OvsDebugInfo
     BuiltIn.Run Keyword And Ignore Error    DataModels.Get Model Dump    ${HA_PROXY_IP}    ${netvirt_data_models}
     KarafKeywords.Fail If Exceptions Found During Test    ${test_name}    fail=${fail}