From 2f798baea716682e0b122a008f19081fe62cf1a3 Mon Sep 17 00:00:00 2001 From: senthil Date: Fri, 17 Apr 2015 17:54:25 -0700 Subject: [PATCH] Added "Wait Until Keyword" instead of sleep Change-Id: Ia1be8bcaee9ef8bf171e3e6aba2a000131affcf4 Signed-off-by: senthil --- .../vtn/VTN_C_OF10/020__vtn_coordinator.txt | 21 +++++++--------- .../vtn/VTN_C_OF10/030__vtn_coordinator.txt | 23 ++++++++--------- .../vtn/VTN_C_OF10/040__vtn_coordinator.txt | 13 ++++------ .../vtn/VTN_C_OF13/020__vtn_coordinator.txt | 25 ++++++++----------- .../vtn/VTN_C_OF13/030__vtn_coordinator.txt | 23 ++++++++--------- .../vtn/VTN_C_OF13/040__vtn_coordinator.txt | 13 ++++------ 6 files changed, 50 insertions(+), 68 deletions(-) diff --git a/test/csit/suites/vtn/VTN_C_OF10/020__vtn_coordinator.txt b/test/csit/suites/vtn/VTN_C_OF10/020__vtn_coordinator.txt index 7ab79a03ed..63dace305f 100644 --- a/test/csit/suites/vtn/VTN_C_OF10/020__vtn_coordinator.txt +++ b/test/csit/suites/vtn/VTN_C_OF10/020__vtn_coordinator.txt @@ -20,31 +20,31 @@ Add a ODL Controller Verify the Controller Status is up [Documentation] Check Controller status - [Tags] vtnc - Check Controller Status odc_test + [Tags] vtnc + Wait Until Keyword Succeeds 30s 2s Check Controller Status odc_test Add a Vtn Tenant1 [Documentation] Create Vtn Tenant1 - [Tags] vtnc + [Tags] vtnc Add a VTN Tenant1 VTN_TEST Create VBR in VTN Tenant1 [Documentation] Create a VBR in Tenant1 as Vbridge1 - [Tags] vtnc + [Tags] vtnc Create VBR in VTN Tenant1 Vbridge1 odc_test Create VBRIF in VBRIDGE Vbridge1 Interface1 [Documentation] Create an interface to Vbridge1 - [Tags] vtnc + [Tags] vtnc Create VBRIF in VBR Tenant1 Vbridge1 Interface1 Interface1 Create VBRIF in VBRIDGE Vbridge1 Interface2 [Documentation] Create an interface to Vbridge1 - [Tags] vtnc + [Tags] vtnc Create VBRIF in VBR Tenant1 Vbridge1 Interface2 Interface2 @@ -56,14 +56,14 @@ Define Portmap for Interface1 Define Portmap for Interface2 [Documentation] Map Interface2 to a logical port - [Tags] vtnc + [Tags] vtnc Define Portmap for VBRIF Tenant1 Vbridge1 Interface2 PP-OF:00:00:00:00:00:00:00:02-s2-eth1 Test Ping for Configuration1 [Documentation] ping between hosts in mininet - [Tags] vtnc - Test Ping h1 h3 + [Tags] vtnc + Wait Until Keyword Succeeds 30s 2s Test Ping h1 h3 Delete a VTN Tenant1 @@ -99,7 +99,6 @@ Remove Controller Check Controller Status [Arguments] ${ctrlname} [Documentation] Get controller status - Sleep 15 ${resp} Get session ${VTNWEBAPI}/${CTRLS}/${ctrlname}.json ${contents} To JSON ${resp.content} ${controllerblock} Get From Dictionary ${contents} controller @@ -152,8 +151,6 @@ Define Portmap for VBRIF Test Ping [Arguments] ${host1} ${host2} [Documentation] Ping hosts to check connectivity - Sleep 5 Write ${host1} ping -w 10 ${host2} - Sleep 10 ${result} Read Should Contain ${result} 64 bytes diff --git a/test/csit/suites/vtn/VTN_C_OF10/030__vtn_coordinator.txt b/test/csit/suites/vtn/VTN_C_OF10/030__vtn_coordinator.txt index cc10eea702..cf0ecbf008 100644 --- a/test/csit/suites/vtn/VTN_C_OF10/030__vtn_coordinator.txt +++ b/test/csit/suites/vtn/VTN_C_OF10/030__vtn_coordinator.txt @@ -20,37 +20,37 @@ Add a ODL Controller Verify the Controller Status is up [Documentation] Check Controller status [Tags] vtnc - Check Controller Status odc_test up 20 + Wait Until Keyword Succeeds 30s 2s Check Controller Status odc_test up Verify switch1 [Documentation] Get switch1 [Tags] vtnc - Verify Switch odc_test 00:00:00:00:00:00:00:01 30 + Wait Until Keyword Succeeds 30s 2s Verify Switch odc_test 00:00:00:00:00:00:00:01 Verify switch2 [Documentation] Get switch2 [Tags] vtnc - Verify Switch odc_test 00:00:00:00:00:00:00:02 1 + Wait Until Keyword Succeeds 30s 2s Verify Switch odc_test 00:00:00:00:00:00:00:02 Verify switch3 [Documentation] Get switch3 [Tags] vtnc - Verify Switch odc_test 00:00:00:00:00:00:00:03 1 + Wait Until Keyword Succeeds 30s 2s Verify Switch odc_test 00:00:00:00:00:00:00:03 Verify switchPort switch1 [Documentation] Get switchport/switch1 [Tags] vtnc - Verify SwitchPort odc_test 00:00:00:00:00:00:00:01 15 + Wait Until Keyword Succeeds 16s 2s Verify SwitchPort odc_test 00:00:00:00:00:00:00:01 Verify switchPort switch2 [Documentation] Get switchport/switch2 [Tags] vtnc - Verify SwitchPort odc_test 00:00:00:00:00:00:00:02 1 + Wait Until Keyword Succeeds 16s 2s Verify SwitchPort odc_test 00:00:00:00:00:00:00:02 Verify switchPort switch3 [Documentation] Get switchport/switch3 [Tags] vtnc - Verify SwitchPort odc_test 00:00:00:00:00:00:00:03 1 + Wait Until Keyword Succeeds 16s 2s Verify SwitchPort odc_test 00:00:00:00:00:00:00:03 Delete a Controller [Documentation] Delete Controller odc1 @@ -75,9 +75,8 @@ Remove Controller Should Be Equal As Strings ${resp.status_code} 204 Check Controller Status - [Arguments] ${ctrlname} ${stat} ${sec} + [Arguments] ${ctrlname} ${stat} [Documentation] Get controller status - Sleep ${sec} ${resp} Get session ${VTNWEBAPI}/${CTRLS}/${ctrlname}.json ${contents} To JSON ${resp.content} ${controllerblock} Get From Dictionary ${contents} controller @@ -85,9 +84,8 @@ Check Controller Status Should Be Equal As Strings ${status} ${stat} Verify Switch - [Arguments] ${ctrlname} ${switch_id} ${sec} + [Arguments] ${ctrlname} ${switch_id} [Documentation] Get switch - Sleep ${sec} ${resp} Get session ${VTNWEBAPI}/${CTRLS}/${ctrlname}/${SW}/${switch_id}.json ${contents} To JSON ${resp.content} ${switchblock} Get From Dictionary ${contents} switch @@ -95,8 +93,7 @@ Verify Switch Should Be Equal As Strings ${status} ${switch_id} Verify SwitchPort - [Arguments] ${ctrlname} ${switch_id} ${sec} + [Arguments] ${ctrlname} ${switch_id} [Documentation] Get switch - Sleep ${sec} ${resp} Get session ${VTNWEBAPI}/${CTRLS}/${ctrlname}/${SW}/${switch_id}/${PORTS} Should Be Equal As Strings ${resp.status_code} 200 diff --git a/test/csit/suites/vtn/VTN_C_OF10/040__vtn_coordinator.txt b/test/csit/suites/vtn/VTN_C_OF10/040__vtn_coordinator.txt index 2fad4bb582..b790bd71d0 100644 --- a/test/csit/suites/vtn/VTN_C_OF10/040__vtn_coordinator.txt +++ b/test/csit/suites/vtn/VTN_C_OF10/040__vtn_coordinator.txt @@ -19,7 +19,7 @@ Add a ODL Controller Verify the Controller Status is up [Documentation] Check Controller status [Tags] vtnc - Check Controller Status odc_test up 20 + Wait Until Keyword Succeeds 30s 2s Check Controller Status odc_test up Add a Vtn Tenant1 [Documentation] Create Vtn Tenant1 @@ -39,7 +39,7 @@ Update controller ip invalid Verify the Controller State is down [Documentation] Check Controller status [Tags] vtnc - Check Controller Status odc_test down 45 + Wait Until Keyword Succeeds 40s 2s Check Controller Status odc_test down Create VBRIF in VBRIDGE Vbridge1 Interface1 [Documentation] Create an interface to Vbridge1 @@ -59,7 +59,7 @@ Update controller ip valid Verify the Controller State is up [Documentation] Check Controller status [Tags] vtnc - Check Controller Status odc_test up 45 + Wait Until Keyword Succeeds 40s 2s Check Controller Status odc_test up Define Portmap for Interface1 [Documentation] Map Interface1 to a logical port @@ -74,7 +74,7 @@ Define Portmap for Interface2 Test Ping for Configuration1 [Documentation] ping between hosts in mininet [Tags] vtnc - Test Ping h1 h2 + Wait Until Keyword Succeeds 40s 2s Test Ping h1 h2 Delete a VTN Tenant1 [Documentation] Delete Vtn Tenant1 @@ -114,9 +114,8 @@ Update Controller Check Controller Status - [Arguments] ${ctrlname} ${stat} ${sec} + [Arguments] ${ctrlname} ${stat} [Documentation] Get controller status - Sleep ${sec} ${resp} Get session ${VTNWEBAPI}/${CTRLS}/${ctrlname}.json ${contents} To JSON ${resp.content} ${controllerblock} Get From Dictionary ${contents} controller @@ -169,8 +168,6 @@ Define Portmap for VBRIF Test Ping [Arguments] ${host1} ${host2} [Documentation] Ping hosts to check connectivity - Sleep 5 Write ${host1} ping -w 10 ${host2} - Sleep 10 ${result} Read Should Contain ${result} 64 bytes diff --git a/test/csit/suites/vtn/VTN_C_OF13/020__vtn_coordinator.txt b/test/csit/suites/vtn/VTN_C_OF13/020__vtn_coordinator.txt index 7ab79a03ed..c55ab98b48 100644 --- a/test/csit/suites/vtn/VTN_C_OF13/020__vtn_coordinator.txt +++ b/test/csit/suites/vtn/VTN_C_OF13/020__vtn_coordinator.txt @@ -20,31 +20,31 @@ Add a ODL Controller Verify the Controller Status is up [Documentation] Check Controller status - [Tags] vtnc - Check Controller Status odc_test + [Tags] vtnc + Wait Until Keyword Succeeds 30s 2s Check Controller Status odc_test up Add a Vtn Tenant1 [Documentation] Create Vtn Tenant1 - [Tags] vtnc + [Tags] vtnc Add a VTN Tenant1 VTN_TEST Create VBR in VTN Tenant1 [Documentation] Create a VBR in Tenant1 as Vbridge1 - [Tags] vtnc + [Tags] vtnc Create VBR in VTN Tenant1 Vbridge1 odc_test Create VBRIF in VBRIDGE Vbridge1 Interface1 [Documentation] Create an interface to Vbridge1 - [Tags] vtnc + [Tags] vtnc Create VBRIF in VBR Tenant1 Vbridge1 Interface1 Interface1 Create VBRIF in VBRIDGE Vbridge1 Interface2 [Documentation] Create an interface to Vbridge1 - [Tags] vtnc + [Tags] vtnc Create VBRIF in VBR Tenant1 Vbridge1 Interface2 Interface2 @@ -56,14 +56,14 @@ Define Portmap for Interface1 Define Portmap for Interface2 [Documentation] Map Interface2 to a logical port - [Tags] vtnc + [Tags] vtnc Define Portmap for VBRIF Tenant1 Vbridge1 Interface2 PP-OF:00:00:00:00:00:00:00:02-s2-eth1 Test Ping for Configuration1 [Documentation] ping between hosts in mininet - [Tags] vtnc - Test Ping h1 h3 + [Tags] vtnc + Wait Until Keyword Succeeds 30s 5s Test Ping h1 h3 Delete a VTN Tenant1 @@ -97,14 +97,13 @@ Remove Controller Check Controller Status - [Arguments] ${ctrlname} + [Arguments] ${ctrlname} ${stat} [Documentation] Get controller status - Sleep 15 ${resp} Get session ${VTNWEBAPI}/${CTRLS}/${ctrlname}.json ${contents} To JSON ${resp.content} ${controllerblock} Get From Dictionary ${contents} controller ${status} Get From Dictionary ${controllerblock} operstatus - Should Be Equal As Strings ${status} up + Should Be Equal As Strings ${status} ${stat} Add a VTN @@ -152,8 +151,6 @@ Define Portmap for VBRIF Test Ping [Arguments] ${host1} ${host2} [Documentation] Ping hosts to check connectivity - Sleep 5 Write ${host1} ping -w 10 ${host2} - Sleep 10 ${result} Read Should Contain ${result} 64 bytes diff --git a/test/csit/suites/vtn/VTN_C_OF13/030__vtn_coordinator.txt b/test/csit/suites/vtn/VTN_C_OF13/030__vtn_coordinator.txt index cc10eea702..032b431804 100644 --- a/test/csit/suites/vtn/VTN_C_OF13/030__vtn_coordinator.txt +++ b/test/csit/suites/vtn/VTN_C_OF13/030__vtn_coordinator.txt @@ -20,37 +20,37 @@ Add a ODL Controller Verify the Controller Status is up [Documentation] Check Controller status [Tags] vtnc - Check Controller Status odc_test up 20 + Wait Until Keyword Succeeds 30s 2s Check Controller Status odc_test up Verify switch1 [Documentation] Get switch1 [Tags] vtnc - Verify Switch odc_test 00:00:00:00:00:00:00:01 30 + Wait Until Keyword Succeeds 30s 2s Verify Switch odc_test 00:00:00:00:00:00:00:01 Verify switch2 [Documentation] Get switch2 [Tags] vtnc - Verify Switch odc_test 00:00:00:00:00:00:00:02 1 + Wait Until Keyword Succeeds 30s 2s Verify Switch odc_test 00:00:00:00:00:00:00:02 Verify switch3 [Documentation] Get switch3 [Tags] vtnc - Verify Switch odc_test 00:00:00:00:00:00:00:03 1 + Wait Until Keyword Succeeds 30s 2s Verify Switch odc_test 00:00:00:00:00:00:00:03 Verify switchPort switch1 [Documentation] Get switchport/switch1 [Tags] vtnc - Verify SwitchPort odc_test 00:00:00:00:00:00:00:01 15 + Wait Until Keyword Succeeds 30s 2s Verify SwitchPort odc_test 00:00:00:00:00:00:00:01 Verify switchPort switch2 [Documentation] Get switchport/switch2 [Tags] vtnc - Verify SwitchPort odc_test 00:00:00:00:00:00:00:02 1 + Wait Until Keyword Succeeds 30s 2s Verify SwitchPort odc_test 00:00:00:00:00:00:00:02 Verify switchPort switch3 [Documentation] Get switchport/switch3 [Tags] vtnc - Verify SwitchPort odc_test 00:00:00:00:00:00:00:03 1 + Wait Until Keyword Succeeds 30s 2s Verify SwitchPort odc_test 00:00:00:00:00:00:00:03 Delete a Controller [Documentation] Delete Controller odc1 @@ -75,9 +75,8 @@ Remove Controller Should Be Equal As Strings ${resp.status_code} 204 Check Controller Status - [Arguments] ${ctrlname} ${stat} ${sec} + [Arguments] ${ctrlname} ${stat} [Documentation] Get controller status - Sleep ${sec} ${resp} Get session ${VTNWEBAPI}/${CTRLS}/${ctrlname}.json ${contents} To JSON ${resp.content} ${controllerblock} Get From Dictionary ${contents} controller @@ -85,9 +84,8 @@ Check Controller Status Should Be Equal As Strings ${status} ${stat} Verify Switch - [Arguments] ${ctrlname} ${switch_id} ${sec} + [Arguments] ${ctrlname} ${switch_id} [Documentation] Get switch - Sleep ${sec} ${resp} Get session ${VTNWEBAPI}/${CTRLS}/${ctrlname}/${SW}/${switch_id}.json ${contents} To JSON ${resp.content} ${switchblock} Get From Dictionary ${contents} switch @@ -95,8 +93,7 @@ Verify Switch Should Be Equal As Strings ${status} ${switch_id} Verify SwitchPort - [Arguments] ${ctrlname} ${switch_id} ${sec} + [Arguments] ${ctrlname} ${switch_id} [Documentation] Get switch - Sleep ${sec} ${resp} Get session ${VTNWEBAPI}/${CTRLS}/${ctrlname}/${SW}/${switch_id}/${PORTS} Should Be Equal As Strings ${resp.status_code} 200 diff --git a/test/csit/suites/vtn/VTN_C_OF13/040__vtn_coordinator.txt b/test/csit/suites/vtn/VTN_C_OF13/040__vtn_coordinator.txt index 2fad4bb582..ddb8782c24 100644 --- a/test/csit/suites/vtn/VTN_C_OF13/040__vtn_coordinator.txt +++ b/test/csit/suites/vtn/VTN_C_OF13/040__vtn_coordinator.txt @@ -19,7 +19,7 @@ Add a ODL Controller Verify the Controller Status is up [Documentation] Check Controller status [Tags] vtnc - Check Controller Status odc_test up 20 + Wait Until Keyword Succeeds 30s 2s Check Controller Status odc_test up Add a Vtn Tenant1 [Documentation] Create Vtn Tenant1 @@ -39,7 +39,7 @@ Update controller ip invalid Verify the Controller State is down [Documentation] Check Controller status [Tags] vtnc - Check Controller Status odc_test down 45 + Wait Until Keyword Succeeds 40s 2s Check Controller Status odc_test down Create VBRIF in VBRIDGE Vbridge1 Interface1 [Documentation] Create an interface to Vbridge1 @@ -59,7 +59,7 @@ Update controller ip valid Verify the Controller State is up [Documentation] Check Controller status [Tags] vtnc - Check Controller Status odc_test up 45 + Wait Until Keyword Succeeds 40s 2s Check Controller Status odc_test up Define Portmap for Interface1 [Documentation] Map Interface1 to a logical port @@ -74,7 +74,7 @@ Define Portmap for Interface2 Test Ping for Configuration1 [Documentation] ping between hosts in mininet [Tags] vtnc - Test Ping h1 h2 + Wait Until Keyword Succeeds 30s 2s Test Ping h1 h2 Delete a VTN Tenant1 [Documentation] Delete Vtn Tenant1 @@ -114,9 +114,8 @@ Update Controller Check Controller Status - [Arguments] ${ctrlname} ${stat} ${sec} + [Arguments] ${ctrlname} ${stat} [Documentation] Get controller status - Sleep ${sec} ${resp} Get session ${VTNWEBAPI}/${CTRLS}/${ctrlname}.json ${contents} To JSON ${resp.content} ${controllerblock} Get From Dictionary ${contents} controller @@ -169,8 +168,6 @@ Define Portmap for VBRIF Test Ping [Arguments] ${host1} ${host2} [Documentation] Ping hosts to check connectivity - Sleep 5 Write ${host1} ping -w 10 ${host2} - Sleep 10 ${result} Read Should Contain ${result} 64 bytes -- 2.36.6