Tidied updated tests.

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

diff --git a/csit/suites/vtn/VTN_Mgr_OF10/010__vtn_manager_flowfilter.robot b/csit/suites/vtn/VTN_Mgr_OF10/010__vtn_manager_flowfilter.robot
index ded18605715be48b3b8f4824c295f3829e8ad6d6..4255839b0e4925f22f65a0a500dc5db9a86299ff 100644 (file)
--- a/csit/suites/vtn/VTN_Mgr_OF10/010__vtn_manager_flowfilter.robot
+++ b/csit/suites/vtn/VTN_Mgr_OF10/010__vtn_manager_flowfilter.robot
@@ -6,18 +6,12 @@ Resource          ../../../libraries/VtnMaKeywords.robot
 
 *** Variables ***
 ${flowconditiondata}    "vtn-flow-match":[{"vtn-inet-match":{"source-network":"10.0.0.1/32","protocol":1,"destination-network":"10.0.0.3/32"},"index":"1"}]
-
 ${flowfilterInetdata}    "vtn-flow-filter":[{"condition":"cond_1","vtn-pass-filter":{},"vtn-flow-action":[{"order": "1","vtn-set-inet-src-action":{"ipv4-address":"10.0.0.1/32"}},{"order": "2","vtn-set-inet-dst-action":{"ipv4-address":"10.0.0.3/32"}}],"index": "1"}]
-
 ${flowfilterInetdropdata}    "vtn-flow-filter":[{"condition":"cond_1","vtn-drop-filter":{},"vtn-flow-action":[{"order": "1","vtn-set-inet-src-action":{"ipv4-address":"10.0.0.1/32"}},{"order": "2","vtn-set-inet-dst-action":{"ipv4-address":"10.0.0.3/32"}}],"index": "1"}]
-
 ${flowfilterIcmpCodedata}    "vtn-flow-filter":[{"condition":"cond_1","vtn-pass-filter":{},"vtn-flow-action":[{"order": "1","vtn-set-inet-src-action":{"ipv4-address":"10.0.0.1/32"}},{"order": "2","vtn-set-inet-dst-action":{"ipv4-address":"10.0.0.3/32"}}],"index": "1"}]
-
 ${flowfilterTpsrcTpdstdata}    "vtn-flow-filter": [{"condition": "cond_1","vtn-pass-filter": {},"vtn-flow-action": [{"order": "1","vtn-set-port-src-action": {"port": "5"}},{"order": "2","vtn-set-port-dst-action": {"port": "10"}}],"index": "1"}]
-
-${flowfilterDscpdata}   "vtn-flow-filter":[{"condition": "cond_1","vtn-pass-filter": {},"vtn-flow-action": [{"order": "1","vtn-set-inet-dscp-action": {"dscp":"32"}}],"index":"1"}]
-
-${flowfiltervlanpcp}   "vtn-flow-filter":[{"condition":"cond_1","vtn-pass-filter":{},"vtn-flow-action":[{"order":"3","vtn-set-icmp-code-action":{"code":"1"}},{"order":"4","vtn-set-vlan-pcp-action":{"vlan-pcp":"3"}}],"index":"1"}]
+${flowfilterDscpdata}    "vtn-flow-filter":[{"condition": "cond_1","vtn-pass-filter": {},"vtn-flow-action": [{"order": "1","vtn-set-inet-dscp-action": {"dscp":"32"}}],"index":"1"}]
+${flowfiltervlanpcp}    "vtn-flow-filter":[{"condition":"cond_1","vtn-pass-filter":{},"vtn-flow-action":[{"order":"3","vtn-set-icmp-code-action":{"code":"1"}},{"order":"4","vtn-set-vlan-pcp-action":{"vlan-pcp":"3"}}],"index":"1"}]
 
 *** Test Cases ***
 Check if switch1 detected
@@ -99,7 +93,7 @@ Verify inet4src and inet4dst of vtn flowfilter
 
 Add a vbr flowfilter with inet4src and inet4dst
     [Documentation]    Create a flowfilter with inet4 and Verify ping
-    Add a vbr flowfilter    Tenant1    vBridge1     ${flowfilterInetdata}
+    Add a vbr flowfilter    Tenant1    vBridge1    ${flowfilterInetdata}
     Wait_Until_Keyword_Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h3
 
 Verify inet4src and inet4dst of vbr flowfilter
@@ -122,7 +116,7 @@ Add a vtn flowfilter with Icmp code
 
 Verify icmp action for vtn flowfilter
     [Documentation]    Verify actions in Flow Enties for icmp code and type
-    Wait_Until_Keyword_Succeeds    20s    1s    Verify Flow Entries for Flowfilter    ${DUMPFLOWS_OF10}     @{icmp_action}
+    Wait_Until_Keyword_Succeeds    20s    1s    Verify Flow Entries for Flowfilter    ${DUMPFLOWS_OF10}    @{icmp_action}
 
 Add a vbr flowfilter with Icmp code
     [Documentation]    Create a flowfilter with icmp code and Verify ping
@@ -140,7 +134,7 @@ Add a vbrif flowfilter with Icmp code
 
 Verify icmp action for vbrif flowfilter
     [Documentation]    Verify actions in Flow Enties for icmp code and type
-    Wait_Until_Keyword_Succeeds    20s    1s    Verify Flow Entries for Flowfilter    ${DUMPFLOWS_OF10}     @{icmp_action}
+    Wait_Until_Keyword_Succeeds    20s    1s    Verify Flow Entries for Flowfilter    ${DUMPFLOWS_OF10}    @{icmp_action}
 
 Add a flowfilter with tpsrc and tpdst
     [Documentation]    Create a flowfilter with tpsrc and tpdst and Verify ping
@@ -154,7 +148,7 @@ Add a vtn flowfilter with dscp
 
 Verify dscp action for vtn flowfilter
     [Documentation]    Verify actions in Flow Enties for dscp
-    Wait_Until_Keyword_Succeeds    20s    1s    Verify flowactions     ${dscp_flow}    ${DUMPFLOWS_OF10}
+    Wait_Until_Keyword_Succeeds    20s    1s    Verify flowactions    ${dscp_flow}    ${DUMPFLOWS_OF10}
 
 Add a vbr flowfilter with dscp
     [Documentation]    Create a flowfilter with dscp and Verify ping
@@ -163,7 +157,7 @@ Add a vbr flowfilter with dscp
 
 Verify dscp action for vbr flowfilter
     [Documentation]    Verify actions in Flow Enties for dscp
-    Wait_Until_Keyword_Succeeds    20s    1s    Verify flowactions     ${dscp_flow}    ${DUMPFLOWS_OF10}
+    Wait_Until_Keyword_Succeeds    20s    1s    Verify flowactions    ${dscp_flow}    ${DUMPFLOWS_OF10}
 
 Add a vbrif flowfilter with dscp
     [Documentation]    Create a flowfilter with dscp and Verify ping
@@ -172,7 +166,7 @@ Add a vbrif flowfilter with dscp
 
 Verify dscp action for vbrif flowfilter
     [Documentation]    Verify actions in Flow Enties for dscp
-    Wait_Until_Keyword_Succeeds    20s    1s    Verify flowactions     ${dscp_flow}    ${DUMPFLOWS_OF10}
+    Wait_Until_Keyword_Succeeds    20s    1s    Verify flowactions    ${dscp_flow}    ${DUMPFLOWS_OF10}
 
 Add a flowfilter with vlanpcp
     [Documentation]    Create a flowfilter with vlanpcp and Verify ping