From 102e544cc31d912bc6b79ac8c5fe9b3bf64683ce Mon Sep 17 00:00:00 2001 From: "priya.ramasubbu" Date: Tue, 31 May 2016 20:13:09 +0530 Subject: [PATCH] Stabilize ovsdb-csit-3node-clustering-only- job Change-Id: If826d8e6a62d954cc51b813552108833606f7972 Signed-off-by: priya.ramasubbu --- csit/libraries/ClusterOvsdb.robot | 10 +++++----- csit/libraries/OVSDB.robot | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/csit/libraries/ClusterOvsdb.robot b/csit/libraries/ClusterOvsdb.robot index 749227a956..6601b0868b 100644 --- a/csit/libraries/ClusterOvsdb.robot +++ b/csit/libraries/ClusterOvsdb.robot @@ -41,7 +41,7 @@ Create Sample Bridge Manually And Verify ${dictionary_operational}= Create Dictionary br-s1=5 ${dictionary_config}= Create Dictionary br-s1=0 Wait Until Keyword Succeeds 5s 1s ClusterKeywords.Check Item Occurrence At URI In Cluster ${controller_index_list} ${dictionary_config} ${CONFIG_TOPO_API} - Wait Until Keyword Succeeds 5s 1s ClusterKeywords.Check Item Occurrence At URI In Cluster ${controller_index_list} ${dictionary_operational} ${OPERATIONAL_TOPO_API} + Wait Until Keyword Succeeds 10s 2s ClusterKeywords.Check Item Occurrence At URI In Cluster ${controller_index_list} ${dictionary_operational} ${OPERATIONAL_TOPO_API} Add Sample Port To The Manual Bridge And Verify [Arguments] ${controller_index_list} @@ -84,9 +84,9 @@ Create Sample Port And Verify ${body} Replace String ${sample} 192.168.1.10 ${TOOLS_SYSTEM_IP} Log ${body} Log URL is ${CONFIG_TOPO_API}/topology/ovsdb:1/node/ovsdb:%2F%2Fuuid%2F${ovsdb_uuid}%2Fbridge%2F${BRIDGE}/termination-point/vx2/ - ${port_dictionary}= Create Dictionary ${BRIDGE}=7 vx2=3 + ${port_dictionary}= Create Dictionary ${BRIDGE}=6 vx2=3 ClusterKeywords.Put And Check At URI In Cluster ${controller_index_list} ${controller_index} ${CONFIG_TOPO_API}/topology/ovsdb:1/node/ovsdb:%2F%2Fuuid%2F${ovsdb_uuid}%2Fbridge%2F${BRIDGE}/termination-point/vx2/ ${body} - Wait Until Keyword Succeeds 5s 1s ClusterKeywords.Check Item Occurrence At URI In Cluster ${controller_index_list} ${port_dictionary} ${OPERATIONAL_TOPO_API} + Wait Until Keyword Succeeds 5s 1s ClusterKeywords.Check Item Occurrence At URI In Cluster ${controller_index_list} ${port_dictionary} ${OPERATIONAL_TOPO_API}/topology/ovsdb:1/node/ovsdb:%2F%2Fuuid%2F${ovsdb_uuid}%2Fbridge%2F${BRIDGE} Modify the destination IP of Sample Port [Arguments] ${controller_index_list} ${controller_index} @@ -100,8 +100,8 @@ Modify the destination IP of Sample Port Verify Sample Port Is Modified [Arguments] ${controller_index_list} [Documentation] Verify dst ip of port vx2 in bridge ${BRIDGE} gets modified in all instances in ${controller_index_list}. - ${port_dictionary} Create Dictionary br01=7 vx2=3 10.0.0.19=1 - Wait Until Keyword Succeeds 5s 1s ClusterKeywords.Check Item Occurrence At URI In Cluster ${controller_index_list} ${port_dictionary} ${OPERATIONAL_TOPO_API} + ${port_dictionary} Create Dictionary br01=6 vx2=3 10.0.0.19=1 + Wait Until Keyword Succeeds 5s 1s ClusterKeywords.Check Item Occurrence At URI In Cluster ${controller_index_list} ${port_dictionary} ${OPERATIONAL_TOPO_API}/topology/ovsdb:1/node/ovsdb:%2F%2Fuuid%2F${ovsdb_uuid}%2Fbridge%2F${BRIDGE} Delete Sample Port And Verify [Arguments] ${controller_index_list} ${controller_index} diff --git a/csit/libraries/OVSDB.robot b/csit/libraries/OVSDB.robot index b5d4de262a..43557343fc 100644 --- a/csit/libraries/OVSDB.robot +++ b/csit/libraries/OVSDB.robot @@ -131,5 +131,5 @@ Add Multiple Managers to OVS Log Check OVS configuration ${output}= Wait Until Keyword Succeeds 5s 1s Verify OVS Reports Connected ${tools_system} Log ${output} - ${ovsdb_uuid}= Wait Until Keyword Succeeds 5s 1s Get OVSDB UUID controller_http_session=controller1 + ${ovsdb_uuid}= Wait Until Keyword Succeeds 30s 2s Get OVSDB UUID controller_http_session=controller1 [Return] ${ovsdb_uuid} -- 2.36.6