From 056dccee2fcd331a1148d0f9fd7e12604cb09c9c Mon Sep 17 00:00:00 2001 From: Jamo Luhrsen Date: Fri, 20 Apr 2018 13:44:24 -0700 Subject: [PATCH] Remove hardcoded line nos in status output matches Change-Id: I198b20cbb05940d9c993cd4fadd1794859c38118 Signed-off-by: Jamo Luhrsen --- csit/libraries/Genius.robot | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/csit/libraries/Genius.robot b/csit/libraries/Genius.robot index c0bc37f934..c3d3fc4d5b 100644 --- a/csit/libraries/Genius.robot +++ b/csit/libraries/Genius.robot @@ -18,6 +18,7 @@ ${genius_config_dir} ${CURDIR}/../variables/genius ${Bridge-1} BR1 ${Bridge-2} BR2 ${DEFAULT_MONITORING_INTERVAL} Tunnel Monitoring Interval (for VXLAN tunnels): 1000 +@{DIAG_SERVICES} OPENFLOW IFM ITM DATASTORE *** Keywords *** Genius Suite Setup @@ -93,9 +94,8 @@ Check Service Status [Documentation] Issues the karaf shell command showSvcStatus to verify the ready and service states are the same as the arguments passed ${service_status_output} Issue_Command_On_Karaf_Console showSvcStatus ${ODL_SYSTEM_IP} 8101 Should Contain ${service_status_output} ${system_ready_state} - @{split} Split To Lines ${service_status_output} 3 7 - : FOR ${var} IN @{split} - \ Should Contain ${var} ${service_state} + : FOR ${service} IN @{DIAG_SERVICES} + \ Should Match Regexp ${service_status_output} ${service} +: ${service_state} Create Vteps [Arguments] ${Dpn_id_1} ${Dpn_id_2} ${TOOLS_SYSTEM_IP} ${TOOLS_SYSTEM_2_IP} ${vlan} ${gateway-ip} -- 2.36.6