Replace deprecated variables in suites/vtn (1).

[integration/test.git] / csit / suites / vtn / VTN_C_OF10 / 040__vtn_vbrif_audit.robot

diff --git a/csit/suites/vtn/VTN_C_OF10/040__vtn_vbrif_audit.robot b/csit/suites/vtn/VTN_C_OF10/040__vtn_vbrif_audit.robot
index 586b9022d2f99a7142bb90515485a75fd2ced448..b982353c334c074ec513db7129d62aa6b545d7a5 100644 (file)
--- a/csit/suites/vtn/VTN_C_OF10/040__vtn_vbrif_audit.robot
+++ b/csit/suites/vtn/VTN_C_OF10/040__vtn_vbrif_audit.robot
@@ -3,77 +3,56 @@ Documentation     Test suite for VTN Coordinator
 Suite Setup       Start SuiteVtnCoTest
 Suite Teardown    Stop SuiteVtnCoTest
 Resource          ../../../libraries/VtnCoKeywords.robot
+Resource          ../../../libraries/WaitForFailure.robot
 
 *** Test Cases ***
-Add a ODL Controller
+Add a ODL Controller with Invalid IP
     [Documentation]    Add a Controller
-    Add a Controller    odc_test    ${CONTROLLER}
+    Add a Controller    odc_test    10.0.0.1
 
-Verify the Controller Status is waiting_audit
+Verify the Controller Status is down
     [Documentation]    Check Controller status
-    Wait Until Keyword Succeeds    12s    2s   Check Controller Status    odc_test   waiting_audit
-
-Audit a controller
-    [Documentation]    Trigger update audit
-    Audit Controller    odc_test
+    WaitForFailure.Verify_Keyword_Does_Not_Fail_Within_Timeout    12s    1s    Check Controller Status    odc_test    down
 
 Add a Vtn Tenant1
     [Documentation]    Create Vtn Tenant1
     Add a VTN    Tenant1    VTN_TEST
 
 Create VBR in VTN Tenant1
-    [Documentation]    Create a VBR in Tenant1 as Vbridge1
-    Create VBR in VTN    Tenant1    Vbridge1    odc_test
-
-Update controller ip invalid
-    [Documentation]    Update Controller ip to invalid
-    [Tags]    exclude
-    Update Controller    odc_test    10.0.0.1    invalid_IP
-
-Verify the Controller State is down
-    [Documentation]    Check Controller status
-    [Tags]    exclude
-    Wait Until Keyword Succeeds    12s    2s   Check Controller Status    odc_test    down
+    [Documentation]    Create a VBR in Tenant1 as Vbr_audit
+    Create VBR in VTN    Tenant1    Vbr_audit    odc_test
 
-Create VBRIF in VBRIDGE Vbridge1 Interface1
-    [Documentation]    Create an interface to Vbridge1
-    [Tags]    exclude
-    Create VBRIF in VBR    Tenant1    Vbridge1    Interface1    Interface1    202
+Create VBRIF in VBRIDGE Vbr_audit Interface1
+    [Documentation]    Create an interface to Vbr_audit
+    Create VBRIF in VBR    Tenant1    Vbr_audit    Interface1    Interface1    202
 
-Create VBRIF in VBRIDGE Vbridge1 Interface2
-    [Documentation]    Create an interface to Vbridge1
-    [Tags]    exclude
-    Create VBRIF in VBR    Tenant1    Vbridge1    Interface2    Interface2    202
+Create VBRIF in VBRIDGE Vbr_audit Interface2
+    [Documentation]    Create an interface to Vbr_audit
+    Create VBRIF in VBR    Tenant1    Vbr_audit    Interface2    Interface2    202
 
-Update controller ip valid
-    [Documentation]    Update Controller ip to valid
-    [Tags]    exclude
-    Update Controller    odc_test    ${CONTROLLER}    valid_IP
+Update controller to Valid IP
+    [Documentation]    Update Controller ip to valid from invalid
+    Update Controller    odc_test    ${ODL_SYSTEM_IP}    valid_IP
 
 Verify the Controller State is in waiting_audit
     [Documentation]    Check Controller status
-    [Tags]    exclude
-    Wait Until Keyword Succeeds    12s    2s   Check Controller Status    odc_test    waiting_audit
+    Wait Until Keyword Succeeds    12s    2s    Check Controller Status    odc_test    waiting_audit
 
 Audit a controller manually
     [Documentation]    Trigger update audit
-    [Tags]    exclude
     Audit Controller    odc_test
 
 Define Portmap for Interface1
     [Documentation]    Map Interface1 to a logical port
-    [Tags]    exclude
-    Define Portmap for VBRIF    Tenant1    Vbridge1    Interface1     PP-OF:openflow:2-s2-eth1
+    Define Portmap for VBRIF    Tenant1    Vbr_audit    Interface1    PP-OF:openflow:2-s2-eth1
 
 Define Portmap for Interface2
     [Documentation]    Map Interface2 to a logical port
-    [Tags]    exclude
-    Define Portmap for VBRIF    Tenant1    Vbridge1    Interface2    PP-OF:openflow:2-s2-eth2
+    Define Portmap for VBRIF    Tenant1    Vbr_audit    Interface2    PP-OF:openflow:2-s2-eth2
 
 Test Ping for Configuration1
     [Documentation]    ping between hosts in mininet
-    [Tags]    exclude
-    Wait Until Keyword Succeeds    10s    2s    Test Ping    h1    h2
+    Wait Until Keyword Succeeds    20s    1s    Test Ping    h1    h2
 
 Delete a VTN Tenant1
     [Documentation]    Delete Vtn Tenant1