Update Robot Framework format - step 16

[integration/test.git] / csit / suites / vtn / VTN_C_OF13 / 070__vtn_flowfilter.robot

diff --git a/csit/suites/vtn/VTN_C_OF13/070__vtn_flowfilter.robot b/csit/suites/vtn/VTN_C_OF13/070__vtn_flowfilter.robot
index 79eba68fa56224e5d71a364dce019aa204f2e38f..61c10b96f0576f0f4bd90cb671d149028d2544ff 100644 (file)
--- a/csit/suites/vtn/VTN_C_OF13/070__vtn_flowfilter.robot
+++ b/csit/suites/vtn/VTN_C_OF13/070__vtn_flowfilter.robot
@@ -1,91 +1,77 @@
 *** Settings ***
-Documentation     Test suite for VTN Coordinator
-Suite Setup       Start SuiteVtnCoTest
-Suite Teardown    Stop SuiteVtnCoTest
-Resource          ../../../libraries/VtnCoKeywords.robot
+Documentation       Test suite for VTN Coordinator
+
+Resource            ../../../libraries/VtnCoKeywords.robot
+
+Suite Setup         Start SuiteVtnCoTest
+Suite Teardown      Stop SuiteVtnCoTest
+
 
 *** Test Cases ***
 Add a ODL Controller
     [Documentation]    Add a Controller
-    [Tags]    exclude
-    Add a Controller    odc_test    ${CONTROLLER}
+    Add a Controller    odc_test    ${ODL_SYSTEM_IP}
 
 Verify the Controller Status is waiting_audit
     [Documentation]    Check Controller status
-    [Tags]    exclude
     Wait Until Keyword Succeeds    12s    2s    Check Controller Status    odc_test    waiting_audit
 
 Audit a controller
     [Documentation]    Trigger update audit
-    [Tags]    exclude
     Audit Controller    odc_test
 
 Add a Vtn Tenant1
     [Documentation]    Create Vtn Tenant1
-    [Tags]    exclude
     Add a VTN    Tenant1    VTN_TEST
 
 Create VBR in VTN Tenant1
     [Documentation]    Create a VBR in Tenant1 as Vbridge1
-    [Tags]    exclude
     Create VBR in VTN    Tenant1    Vbridge1    odc_test
 
 Create VBRIF in VBRIDGE Vbridge1 Interface1
     [Documentation]    Create an interface to Vbridge1
-    [Tags]    exclude
     Create VBRIF in VBR    Tenant1    Vbridge1    Interface1    Interface1    201
 
 Create VBRIF in VBRIDGE Vbridge1 Interface2
     [Documentation]    Create an interface to Vbridge1
-    [Tags]    exclude
     Create VBRIF in VBR    Tenant1    Vbridge1    Interface2    Interface2    201
 
 Define Portmap for Interface1
     [Documentation]    Map Interface1 to a logical port
-    [Tags]    exclude
     Define Portmap for VBRIF    Tenant1    Vbridge1    Interface1    PP-OF:openflow:3-s3-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-eth1
 
 Add a Flowlist Flowlist1
     [Documentation]    Create Flowlist Tenant1
-    [Tags]    exclude
     Add a FLOWLIST    Flowlist1    IP
 
 Create Flowlistentry_any in Flowlist1
     [Documentation]    Create an Flowlistentry_any to Flowlist1
-    [Tags]    exclude
     Create FLOWLISTENTRY_ANY in FLOWLIST    Flowlist1
 
 Create VTN in Flowfilter1
     [Documentation]    Create Vtn to Flowfilter
-    [Tags]    exclude
     Create FLOWFILTER in VTN    Tenant1    in
 
 Create FlowfilterEntry in VTNFlowfilter
     [Documentation]    Create Vtn FlowfilterEntry
-    [Tags]    exclude
     Create FLOWFILTERENTRY PASS in VTNFLOWFILTER    Tenant1    pass
 
 Test Ping for Configuration
     [Documentation]    ping between hosts in mininet
-    [Tags]    exclude
-    Wait Until Keyword Succeeds    10s    2s    Test Ping    h1    h3
+    Wait Until Keyword Succeeds    20s    1s    Test Ping    h1    h3
 
 Delete a VTN Tenant1
     [Documentation]    Delete Vtn Tenant1
-    [Tags]    exclude
     Delete a VTN    Tenant1
 
 Delete a FLOWLIST Flowlist1
     [Documentation]    Delete Flowlist
-    [Tags]    exclude
     Delete a FLOWLIST    Flowlist1
 
 Delete a Controller odc1
     [Documentation]    Delete Controller odc1
-    [Tags]    exclude
     Remove Controller    odc_test