Fix bmp_basic test on neon

[integration/test.git] / csit / suites / vtn / VTN_Mgr_OF10 / 010__vtn_vlanmap.robot

diff --git a/csit/suites/vtn/VTN_Mgr_OF10/010__vtn_vlanmap.robot b/csit/suites/vtn/VTN_Mgr_OF10/010__vtn_vlanmap.robot
index c0196a7ac7c46d60425956451e6a3d0ad4679818..c043deb47cd6dbdf2672e5074c2ac01ba536eb9a 100644 (file)
--- a/csit/suites/vtn/VTN_Mgr_OF10/010__vtn_vlanmap.robot
+++ b/csit/suites/vtn/VTN_Mgr_OF10/010__vtn_vlanmap.robot
@@ -2,9 +2,12 @@
 Documentation     Test suite for VTN Manager using OF10
 Suite Setup       Start SuiteVtnMaTest
 Suite Teardown    Stop SuiteVtnMaTest
-Force Tags        exclude
 Resource          ../../../libraries/VtnMaKeywords.robot
 
+*** Variables ***
+${flowconditiondata}    "vtn-flow-match":[{"vtn-inet-match":{"source-network":"10.0.0.1/32","destination-network":"10.0.0.5/32"},"index":"1"}]
+${flowfiltervlanpcp}    "vtn-flow-filter":[{"condition":"cond_1","vtn-pass-filter":{},"vtn-flow-action":[{"order":"1","vtn-set-vlan-pcp-action":{"vlan-pcp":"6"}}],"index":"1"}]
+
 *** Test Cases ***
 Start topology
     [Documentation]    Add a vlan topology
@@ -22,13 +25,17 @@ Check if switch3 detected
     [Documentation]    Check if openflow:3 is detected
     BuiltIn.Wait_Until_Keyword_Succeeds    3    1    Fetch vtn switch inventory    openflow:3
 
+Add a Topology Wait
+    [Documentation]    Add a topology wait to wait for a completion of inter-switch link
+    Add a Topology wait    6000
+
 Add a vtn Tenant1
     [Documentation]    Add a vtn Tenant1
-    Add a vtn    Tenant1    {}
+    Add a vtn    Tenant1
 
 Add a vBridge vBridge1
     [Documentation]    Add a vBridge vBridge1 in vtn Tenant1
-    Add a vBridge    Tenant1    vBridge1    {}
+    Add a vBridge    Tenant1    vBridge1
 
 Add a vlanmap for bridge1
     [Documentation]    Add a Vlanmap for bridge1 in vtn Tenant1
@@ -36,31 +43,61 @@ Add a vlanmap for bridge1
 
 Add a vBridge vBridge2
     [Documentation]    Add a vBridge vBridge2 in vtn Tenant1
-    Add a vBridge    Tenant1    vBridge2    {}
+    Add a vBridge    Tenant1    vBridge2
 
 Add a vlanmap for bridge2
     [Documentation]    Add a Vlanmap for bridge1 in vtn Tenant1
     Add a vlanmap    Tenant1    vBridge2    ${vlanmap_bridge2}
 
-Get vlanflow h1 h3
-    [Documentation]    ping h1 to h3
-    Wait Until Keyword Succeeds    10s    2s    Mininet Ping Should Succeed    h1    h3
-
 Get vlanflow h1 h5
     [Documentation]    ping h1 to h5
-    Wait Until Keyword Succeeds    10s    2s    Mininet Ping Should Succeed    h1    h5
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h5
+
+Get vlanflow h3 h5
+    [Documentation]    ping h3 to h5
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h3    h5
 
 Get vlanflow h2 h4
     [Documentation]    ping h2 to h4
-    Wait Until Keyword Succeeds    10s    2s    Mininet Ping Should Succeed    h2    h4
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h2    h4
 
 Get vlanflow h2 h6
     [Documentation]    ping h2 to h6
-    Wait Until Keyword Succeeds    10s    2s    Mininet Ping Should Succeed    h2    h6
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h2    h6
+
+Get vlanflow h1 h4
+    [Documentation]    ping h1 to h4
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Not Succeed    h1    h4
+
+Add a flowcondition
+    [Documentation]    Create a flowcondition cond_1 using restconfig api
+    Add a flowcondition    cond_1    ${flowconditiondata}
+
+Add a vtn flowfilter with vlanpcp
+    [Documentation]    Create a flowfilter with vlanpcp and Verify ping
+    Add a vtn flowfilter    Tenant1    ${flowfiltervlanpcp}
+    Wait_Until_Keyword_Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h5
+
+Verify vlanpcp of vtn flowfilter
+    [Documentation]    Verify vtn flowfilter actions in Flow Enties for vlanpcp
+    Wait_Until_Keyword_Succeeds    20s    1s    Verify Flow Entries for Flowfilter    ${FF_DUMPFLOWS_OF10}    ${vlanpcp_action}
+
+Remove vtn Flowfilter index
+    [Documentation]    Remove a index of vtn flowfilter
+    Remove a vtn flowfilter    Tenant1    ${filter_index}
+
+Add a vbr flowfilter with vlanpcp
+    [Documentation]    Create a flowfilter with vlanpcp and Verify ping
+    Add a vbr flowfilter    Tenant1    vBridge1    ${flowfiltervlanpcp}
+    Wait_Until_Keyword_Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h5
+
+Verify vlanpcp of vbr flowfilter
+    [Documentation]    Verify actions in Flow Enties for vlanpcp
+    Wait_Until_Keyword_Succeeds    20s    1s    Verify Flow Entries for Flowfilter    ${FF_DUMPFLOWS_OF10}    ${vlanpcp_action}
 
-Get vlanflow h2 h5
-    [Documentation]    ping h2 to h5
-    Mininet Ping Should Not Succeed    h2    h5
+Remove vbr Flowfilter index
+    [Documentation]    Remove a index of vbr flowfilter
+    Remove a vbr flowfilter    Tenant1    vBridge1    ${filter_index}
 
 Delete a vtn Tenant1
     [Documentation]    Delete a vtn Tenant1