From 0722279725b99cfbe1d559ab42581ead25e24e36 Mon Sep 17 00:00:00 2001 From: Vishal Thapar Date: Thu, 12 Jul 2018 17:45:30 +0530 Subject: [PATCH] EOS information in teardowns Capture EOS information of different entities in teardown logs Change-Id: I0c3c5d3b419454156ca7c23c23a145cde89df870 Signed-off-by: Vishal Thapar --- csit/libraries/ODLTools.robot | 10 ++++++++++ csit/libraries/OpenStackOperations.robot | 2 ++ 2 files changed, 12 insertions(+) diff --git a/csit/libraries/ODLTools.robot b/csit/libraries/ODLTools.robot index dc07700acc..860fd30d13 100644 --- a/csit/libraries/ODLTools.robot +++ b/csit/libraries/ODLTools.robot @@ -1,5 +1,6 @@ *** Settings *** Documentation Robot wrapper around ODLTools. +Resource ../variables/Variables.robot *** Keywords *** Version @@ -9,3 +10,12 @@ Version BuiltIn.Log rc: ${rc}, output: ${output} BuiltIn.Should Be True '${rc}' == '0' [Return] ${output} + +Get EOS + [Arguments] ${node_ip}=${TOOLS_SYSTEM_IP} ${port}=${RESTCONFPORT} + [Documentation] Get the odltools version + ${cmd} = BuiltIn.Set Variable odltools show eos -i ${node_ip} -t ${port} -u ${ODL_RESTCONF_USER} -w ${ODL_RESTCONF_PASSWORD} + ${rc} ${output} = OperatingSystem.Run And Return Rc And Output ${cmd} + BuiltIn.Log rc: ${rc}, output: ${output} + BuiltIn.Should Be True '${rc}' == '0' + [Return] ${output} diff --git a/csit/libraries/OpenStackOperations.robot b/csit/libraries/OpenStackOperations.robot index 00ae90f8fc..1e482b40dc 100644 --- a/csit/libraries/OpenStackOperations.robot +++ b/csit/libraries/OpenStackOperations.robot @@ -9,6 +9,7 @@ Resource DataModels.robot Resource DevstackUtils.robot Resource KarafKeywords.robot Resource L2GatewayOperations.robot +Resource ODLTools.robot Resource OVSDB.robot Resource SetupUtils.robot Resource SSHKeywords.robot @@ -551,6 +552,7 @@ Get Test Teardown Debugs [Arguments] ${test_name}=${SUITE_NAME}.${TEST_NAME} OpenStackOperations.Get OvsDebugInfo BuiltIn.Run Keyword And Ignore Error DataModels.Get Model Dump ${HA_PROXY_IP} ${netvirt_data_models} + BuiltIn.run Keyword And Ignore Error ODLTools.Get EOS ${HA_PROXY_IP} Run Keyword If "${FAIL_ON_EXCEPTIONS}"=="True" KarafKeywords.Fail If Exceptions Found During Test ${test_name} Get Test Teardown Debugs For SFC -- 2.36.6