From: Jozef Behran <jbehran@cisco.com>
Date: Tue, 25 Aug 2015 05:57:22 +0000 (+0200)
Subject: Make hold time configurable via Robot variable
X-Git-Tag: release/lithium-sr2~54
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=b9afc064d5d119c1a6a3e0a623be5b2681ee19c9;p=integration%2Ftest.git

Make hold time configurable via Robot variable

The default value for hold time is 180 seconds. If that is
not desired, another value can be passed via the ROBOT
variable HOLDTIME.

Change-Id: I21ee13d4a7810936a5de7b7f0b5d56ec904fa1fe
Signed-off-by: Jozef Behran <jbehran@cisco.com>
---

diff --git a/test/csit/suites/bgpcep/bgpuser/cases.robot b/test/csit/suites/bgpcep/bgpuser/cases.robot
index 683770ab53..43f14ddaad 100644
--- a/test/csit/suites/bgpcep/bgpuser/cases.robot
+++ b/test/csit/suites/bgpcep/bgpuser/cases.robot
@@ -30,6 +30,7 @@ Resource          ${CURDIR}/../../../libraries/Utils.robot
 ${directory_for_actual_responses}    ${TEMPDIR}/actual
 ${directory_for_expected_responses}    ${TEMPDIR}/expected
 ${directory_with_template_folders}    ${CURDIR}/../../../variables/bgpuser/
+${HOLDTIME}    180
 
 *** Test Cases ***
 Check_For_Empty_Topology_Before_Talking
@@ -40,7 +41,7 @@ Check_For_Empty_Topology_Before_Talking
 
 Reconfigure_ODL_To_Accept_Connection
     [Documentation]    Configure BGP peer module with initiate-connection set to false.
-    ${template_as_string}=    BuiltIn.Set_Variable    {'IP': '${MININET}', 'INITIATE': 'false'}
+    ${template_as_string}=    BuiltIn.Set_Variable    {'IP': '${MININET}', 'HOLDTIME': '${HOLDTIME}', 'INITIATE': 'false'}
     Put_Xml_Template_Folder_Config_Via_Restconf    ${directory_with_template_folders}${/}bgp_peer    ${template_as_string}
 
 Start_Talking_BGP_speaker
@@ -94,7 +95,7 @@ Check_For_Empty_Topology_Before_Listening
 
 Reconfigure_ODL_To_Initiate_Connection
     [Documentation]    Replace BGP peer config module, now with initiate-connection set to true.
-    ${template_as_string}=    BuiltIn.Set_Variable    {'IP': '${MININET}', 'INITIATE': 'true'}
+    ${template_as_string}=    BuiltIn.Set_Variable    {'IP': '${MININET}', 'HOLDTIME': '${HOLDTIME}', 'INITIATE': 'true'}
     Put_Xml_Template_Folder_Config_Via_Restconf    ${directory_with_template_folders}${/}bgp_peer    ${template_as_string}
 
 Check_Listening_Connection_Is_Established
diff --git a/test/csit/variables/bgpuser/bgp_peer/data.xml b/test/csit/variables/bgpuser/bgp_peer/data.xml
index f0dad99124..1bf8c6ef22 100644
--- a/test/csit/variables/bgpuser/bgp_peer/data.xml
+++ b/test/csit/variables/bgpuser/bgp_peer/data.xml
@@ -3,7 +3,7 @@
     <name>example-bgp-peer</name>
     <host xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">$IP</host>
     <port xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">17900</port>
-    <holdtimer xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">180</holdtimer>
+    <holdtimer xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">$HOLDTIME</holdtimer>
     <initiate-connection xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">$INITIATE</initiate-connection>
     <rib xmlns="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">
         <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:cfg">prefix:rib</type>