Add audit test cases to verify VTN coordinator functionality

    * Enable exclude tags in audit test cases.
    * Modify VBRIF function in VtnCoKeywords file
    * Change waiting audit to down state in audit test files to check controller status.

Change-Id: I8aa98b0b5f76edf4da17f2bee38546a69c1365ac
Signed-off-by: Karthik.S <siva-karthik@hcl.com>

diff --git a/csit/libraries/VtnCoKeywords.robot b/csit/libraries/VtnCoKeywords.robot
index b63683e89e1ce9103e7f60b7a1e0d1a77e049bb8..5befd8912222ed4c36efed9f04f94cc0848798ec 100644 (file)
--- a/csit/libraries/VtnCoKeywords.robot
+++ b/csit/libraries/VtnCoKeywords.robot
@@ -134,9 +134,7 @@ Create VBRIF in VBR
     ${vbrifinfo}    Create Dictionary    if_name=${vbrifname}    description=${ifdescription}
     ${vbrifcreate}    Create Dictionary    interface=${vbrifinfo}
     ${vbrifcreate_json}=    json.dumps    ${vbrifcreate}
-    : For  ${i}  IN RANGE    1   5
-    \    ${resp}    RequestsLibrary.Post    session    ${VTNWEBAPI}/${VTNS}/${vtnname}/${VBRS}/${vbrname}/${VBRIFS_CREATE}    data=${vbrifcreate_json}
-    \    Exit For Loop If    '${resp.status_code}' == '${retcode}'
+    ${resp}    RequestsLibrary.Post    session    ${VTNWEBAPI}/${VTNS}/${vtnname}/${VBRS}/${vbrname}/${VBRIFS_CREATE}    data=${vbrifcreate_json}
     Should Be Equal As Strings    ${resp.status_code}    ${retcode}
 
 Define Portmap for VBRIF

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..8fff788daa4df525cac8b49d363a537c9760e3ad 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
@@ -27,52 +27,42 @@ Create VBR in VTN Tenant1
 
 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
 
 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 Vbridge1 Interface2
     [Documentation]    Create an interface to Vbridge1
-    [Tags]    exclude
     Create VBRIF in VBR    Tenant1    Vbridge1    Interface2    Interface2    202
 
 Update controller ip valid
     [Documentation]    Update Controller ip to valid
-    [Tags]    exclude
     Update Controller    odc_test    ${CONTROLLER}    valid_IP
 
-Verify the Controller State is in waiting_audit
+Verify the Controller State is in down state
     [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    down
 
 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 Interface2
     [Documentation]    Map Interface2 to a logical port
-    [Tags]    exclude
     Define Portmap for VBRIF    Tenant1    Vbridge1    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
 
 Delete a VTN Tenant1

diff --git a/csit/suites/vtn/VTN_C_OF13/040__vtn_vbrif_audit.robot b/csit/suites/vtn/VTN_C_OF13/040__vtn_vbrif_audit.robot
index 586b9022d2f99a7142bb90515485a75fd2ced448..8b696a70fcf42fb8cb4a07d44b61d301ef8f1c03 100644 (file)
--- a/csit/suites/vtn/VTN_C_OF13/040__vtn_vbrif_audit.robot
+++ b/csit/suites/vtn/VTN_C_OF13/040__vtn_vbrif_audit.robot
@@ -27,52 +27,42 @@ Create VBR in VTN Tenant1
 
 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
 
 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 Vbridge1 Interface2
     [Documentation]    Create an interface to Vbridge1
-    [Tags]    exclude
     Create VBRIF in VBR    Tenant1    Vbridge1    Interface2    Interface2    202
 
 Update controller ip valid
     [Documentation]    Update Controller ip to valid
-    [Tags]    exclude
     Update Controller    odc_test    ${CONTROLLER}    valid_IP
 
-Verify the Controller State is in waiting_audit
+Verify the Controller State is in down state
     [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   down
 
 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 Interface2
     [Documentation]    Map Interface2 to a logical port
-    [Tags]    exclude
     Define Portmap for VBRIF    Tenant1    Vbridge1    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
 
 Delete a VTN Tenant1