From eb8b61d7c7c93f4237d952e4f449974e631bc686 Mon Sep 17 00:00:00 2001 From: srajappa Date: Tue, 18 Sep 2018 14:36:00 +0530 Subject: [PATCH] keyword change for ITM Auto Tunnel Another change amended in keyword to avoid csit failure for new change in ITM auto tunnle feature Change-Id: I707379532c5dc346c64f6d3937c32e0c8f0e2b92 Signed-off-by: srajappa --- csit/libraries/Genius.robot | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/csit/libraries/Genius.robot b/csit/libraries/Genius.robot index 06ea17f435..9b95ec4afa 100644 --- a/csit/libraries/Genius.robot +++ b/csit/libraries/Genius.robot @@ -25,6 +25,7 @@ ${DEFAULT_MONITORING_INTERVAL} Tunnel Monitoring Interval (for VXLAN tunnels) @{GENIUS_DIAG_SERVICES} OPENFLOW IFM ITM DATASTORE OVSDB ${vlan} 0 ${gateway-ip} 0.0.0.0 +@{PORT} BR1-eth1 BR2-eth1 *** Keywords *** Genius Suite Setup @@ -150,11 +151,24 @@ BFD Suite Stop Delete All Vteps [Documentation] This will delete vtep. - ${resp} RequestsLibrary.Delete Request session ${CONFIG_API}/itm:transport-zones/ data=${vtep_body} - Should Be Equal As Strings ${resp.status_code} 200 + ${dpn_id_1} = Genius.Get Dpn Ids ${conn_id_1} + ${dpn_id_2} = Genius.Get Dpn Ids ${conn_id_2} + ${cmd} = BuiltIn.Set Variable tep:delete ${dpn_id_1} @{PORT}[0] ${vlan} ${TOOLS_SYSTEM_IP} ${subnet}/24 null ${itm_created[0]} + ${cmd2} = BuiltIn.Set Variable tep:delete ${dpn_id_2} @{PORT}[1] ${vlan} ${TOOLS_SYSTEM_2_IP} ${subnet}/24 null ${itm_created[0]} + KarafKeywords.Issue Command On Karaf Console ${cmd} + KarafKeywords.Issue Command On Karaf Console tep:commit + KarafKeywords.Issue Command On Karaf Console ${cmd2} + KarafKeywords.Issue Command On Karaf Console tep:commit + ${resp} = RequestsLibrary.Delete Request session ${CONFIG_API}/itm:transport-zones/ data=${vtep_body} Log "Before disconnecting CSS with controller" ${output} = Issue Command On Karaf Console ${TEP_SHOW} + BuiltIn.Should Not Contain ${output} ${itm_created[0]} BuiltIn.Wait Until Keyword Succeeds 30 5 Verify All Tunnel Delete on DS + BuiltIn.Run Keyword And Ignore Error Remove All Elements At URI And Verify ${CONFIG_API}/itm:transport-zones/transport-zone/${itm_created[0]}/ + ${resp} = RequestsLibrary.Get Request session ${OPERATIONAL_API}/itm:not-hosted-transport-zones/ + ${respjson} RequestsLibrary.To Json ${resp.content} pretty_print=True + BuiltIn.Log ${respjson} + BuiltIn.Should Not Contain ${resp.content} ${itm_created[0]} Genius Test Setup [Documentation] Genius test case setup -- 2.36.6