From: Vishal Thapar <vthapar@redhat.com>
Date: Tue, 21 Aug 2018 09:43:42 +0000 (+0530)
Subject: Specify ODL IP for ODLTools
X-Git-Tag: pre-potassium~584
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=e6d452636b85c2ac4b81df1ac2210d015eac2c5c;p=integration%2Ftest.git

Specify ODL IP for ODLTools

ODLTools currently uses HA_PROXY_IP, which Genius
doesn't currently support. Change ODLTools method
signatures to get ip form caller and set default
to ODL_SYSTEM_IP.

Change-Id: Ia5f48a96b0a883e9dad504e5291cf7541e99df8d
Signed-off-by: Vishal Thapar <vthapar@redhat.com>
---

diff --git a/csit/libraries/Genius.robot b/csit/libraries/Genius.robot
index 2483fcc3b8..06ea17f435 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    test_name=${test_name}
+    ODLTools.Get All    node_ip=${ODL_SYSTEM_IP}    test_name=${test_name}
 
 Genius Suite Debugs
     [Arguments]    ${data_models}
diff --git a/csit/libraries/ODLTools.robot b/csit/libraries/ODLTools.robot
index df41eb0434..51188e19a4 100644
--- a/csit/libraries/ODLTools.robot
+++ b/csit/libraries/ODLTools.robot
@@ -12,7 +12,7 @@ Version
     [Return]    ${output}
 
 Get EOS
-    [Arguments]    ${node_ip}=${TOOLS_SYSTEM_IP}    ${port}=${RESTCONFPORT}    ${test_name}=${SUITE_NAME}.${TEST_NAME}
+    [Arguments]    ${node_ip}=${ODL_SYSTEM_IP}    ${port}=${RESTCONFPORT}    ${test_name}=${SUITE_NAME}.${TEST_NAME}
     [Documentation]    Get the various ODL entity ownership information
     ${dstdir} =    Get Path    ${test_name}
     ${cmd} =    BuiltIn.Set Variable    odltools show eos -i ${node_ip} -t ${port} -u ${ODL_RESTCONF_USER} -w ${ODL_RESTCONF_PASSWORD} --path ${dstdir}
@@ -30,7 +30,7 @@ Get Cluster Info
     \    BuiltIn.Log    output: ${output}
 
 Analyze Tunnels
-    [Arguments]    ${node_ip}=${TOOLS_SYSTEM_IP}    ${port}=${RESTCONFPORT}    ${test_name}=${SUITE_NAME}.${TEST_NAME}
+    [Arguments]    ${node_ip}=${ODL_SYSTEM_IP}    ${port}=${RESTCONFPORT}    ${test_name}=${SUITE_NAME}.${TEST_NAME}
     [Documentation]    Analyze Tunnel Mesh creation for any errors and log results
     ${dstdir} =    Get Path    ${test_name}
     ${cmd} =    BuiltIn.Set Variable    odltools analyze tunnels -i ${node_ip} -t ${port} -u ${ODL_RESTCONF_USER} -w ${ODL_RESTCONF_PASSWORD} --path ${dstdir}
@@ -40,11 +40,11 @@ Analyze Tunnels
     [Return]    ${output}
 
 Get All
-    [Arguments]    ${node_ip}=${TOOLS_SYSTEM_IP}    ${port}=${RESTCONFPORT}    ${test_name}=${SUITE_NAME}.${TEST_NAME}
+    [Arguments]    ${node_ip}=${ODL_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}    test_name=${test_name}
-    BuiltIn.run Keyword And Ignore Error    ODLTools.Analyze Tunnels    ${HA_PROXY_IP}    test_name=${test_name}
+    BuiltIn.run Keyword And Ignore Error    ODLTools.Get EOS    ${node_ip}    test_name=${test_name}
+    BuiltIn.run Keyword And Ignore Error    ODLTools.Analyze Tunnels    ${node_ip}    test_name=${test_name}
 
 Get Path
     [Arguments]    ${test_name}=${SUITE_NAME}.${TEST_NAME}
diff --git a/csit/libraries/OpenStackOperations.robot b/csit/libraries/OpenStackOperations.robot
index 9a37748874..6f050e5838 100644
--- a/csit/libraries/OpenStackOperations.robot
+++ b/csit/libraries/OpenStackOperations.robot
@@ -560,7 +560,7 @@ Get OvsDebugInfo
 
 Get Test Teardown Debugs
     [Arguments]    ${test_name}=${SUITE_NAME}.${TEST_NAME}    ${fail}=${FAIL_ON_EXCEPTIONS}
-    ODLTools.Get All    test_name=${test_name}
+    ODLTools.Get All    node_ip=${HA_PROXY_IP}    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}