From 6a9660f55fa25240c3b89b80f2e883a86c501e33 Mon Sep 17 00:00:00 2001
From: Jozef Behran <jbehran@cisco.com>
Date: Thu, 14 Jan 2016 11:57:28 +0100
Subject: [PATCH] Tidied new and updated test suites

Change-Id: I35a20c5b5a2f6e3e240bcdb777b84a1e4247931e
Signed-off-by: Jozef Behran <jbehran@cisco.com>
---
 csit/libraries/ClusterOvsdb.robot             |  2 +-
 csit/libraries/OVSDB.robot                    | 17 ++++++-------
 csit/libraries/VtnMaKeywords.robot            |  6 ++---
 .../demo-asymmetric-chain/010_set_odl.robot   |  4 +--
 .../010__Ovsdb_Southbound_Cluster.robot       |  2 +-
 .../010__configure_1_ovsdb_node.robot         |  6 ++---
 .../020__connection_manager.robot             | 16 ++++++------
 .../030__configure_exit_ovsdb_node.robot      |  8 +++---
 .../040__Vxlan_Extension_Test.robot           |  6 ++---
 .../010__vtn_manager_flowfilter.robot         | 25 ++++++++-----------
 .../020__vtn_pathmap_pathpolicy.robot         |  8 +++---
 .../010__vtn_manager_flowfilter.robot         | 25 ++++++++-----------
 .../020__vtn_pathmap_pathpolicy.robot         |  8 +++---
 13 files changed, 59 insertions(+), 74 deletions(-)

diff --git a/csit/libraries/ClusterOvsdb.robot b/csit/libraries/ClusterOvsdb.robot
index 911ba9ae5f..3565d83f8d 100644
--- a/csit/libraries/ClusterOvsdb.robot
+++ b/csit/libraries/ClusterOvsdb.robot
@@ -66,7 +66,7 @@ Create Bridge And Verify
     # need to get UUID which should be the same on all controllers in cluster, so asking controller1
     ${ovsdb_uuid}=    Get OVSDB UUID    controller_http_session=controller1
     ${body}=    OperatingSystem.Get File    ${CURDIR}/../variables/ovsdb/create_bridge_3node.json
-    ${body}    Replace String    ${body}     ovsdb://127.0.0.1:61644    ovsdb://uuid/${ovsdb_uuid}
+    ${body}    Replace String    ${body}    ovsdb://127.0.0.1:61644    ovsdb://uuid/${ovsdb_uuid}
     ${body}    Replace String    ${body}    tcp:controller1:6633    tcp:${ODL_SYSTEM_1_IP}:6640
     ${body}    Replace String    ${body}    tcp:controller2:6633    tcp:${ODL_SYSTEM_2_IP}:6640
     ${body}    Replace String    ${body}    tcp:controller3:6633    tcp:${ODL_SYSTEM_3_IP}:6640
diff --git a/csit/libraries/OVSDB.robot b/csit/libraries/OVSDB.robot
index ef5746edae..8a5e5bc328 100644
--- a/csit/libraries/OVSDB.robot
+++ b/csit/libraries/OVSDB.robot
@@ -68,29 +68,28 @@ Verify OVS Reports Connected
     Should Contain    ${output}    is_connected
 
 Get OVSDB UUID
-    [Arguments]    ${ovs_system_ip}=${TOOLS_SYSTEM_IP}    ${controller_ip}=${ODL_SYSTEM_IP}     ${controller_http_session}=session
-    [Documentation]  Queries the topology in the operational datastore and searches for the node that has
-    ...  the ${ovs_system_ip} argument as the "remote-ip".  If found, the value returned will be the value of
-    ...  node-id stripped of "ovsdb://uuid/".  If not found, ${EMPTY} will be returned.
+    [Arguments]    ${ovs_system_ip}=${TOOLS_SYSTEM_IP}    ${controller_ip}=${ODL_SYSTEM_IP}    ${controller_http_session}=session
+    [Documentation]    Queries the topology in the operational datastore and searches for the node that has
+    ...    the ${ovs_system_ip} argument as the "remote-ip". If found, the value returned will be the value of
+    ...    node-id stripped of "ovsdb://uuid/". If not found, ${EMPTY} will be returned.
     ${uuid}=    Set Variable    ${EMPTY}
     ${resp}=    RequestsLibrary.Get Request    ${controller_http_session}    ${OPERATIONAL_TOPO_API}/topology/ovsdb:1
     Should Be Equal As Strings    ${resp.status_code}    200
     ${resp_json}=    To Json    ${resp.content}
-    ${topologies}=    Get From Dictionary   ${resp_json}    topology
+    ${topologies}=    Get From Dictionary    ${resp_json}    topology
     ${topology}=    Get From List    ${topologies}    0
     ${node_list}=    Get From Dictionary    ${topology}    node
     Log    ${node_list}
     : FOR    ${node}    IN    @{node_list}
     \    ${node_id}=    Get From Dictionary    ${node}    node-id
     \    ${node_uuid}=    Replace String    ${node_id}    ovsdb://uuid/    ${EMPTY}
-    # Since  bridges are also listed as nodes, but will not have the extra "ovsdb:connection-info data, we need to
-    # use "Run Keyword And Ignore Error" below.
+    \    # Since    bridges are also listed as nodes, but will not have the extra "ovsdb:connection-info data, we need to
+    \    # use "Run Keyword And Ignore Error" below.
     \    ${status}    ${connection_info}    Run Keyword And Ignore Error    Get From Dictionary    ${node}    ovsdb:connection-info
     \    ${status}    ${remote_ip}    Run Keyword And Ignore Error    Get From Dictionary    ${connection_info}    remote-ip
     \    ${uuid}=    Set Variable If    '${remote_ip}' == '${ovs_system_ip}'    ${node_uuid}    ${uuid}
     [Return]    ${uuid}
 
-
 Collect OVSDB Debugs
     [Arguments]    ${switch}=br-int
     [Documentation]    Used to log useful test debugs for OVSDB related system tests.
@@ -102,7 +101,7 @@ Collect OVSDB Debugs
 Clean OVSDB Test Environment
     [Arguments]    ${tools_system}=${TOOLS_SYSTEM_IP}
     [Documentation]    General Use Keyword attempting to sanitize test environment for OVSDB related
-    ...    tests.  Not every step will always be neccessary, but should not cause any problems for
+    ...    tests. Not every step will always be neccessary, but should not cause any problems for
     ...    any new ovsdb test suites.
     Clean Mininet System    ${tools_system}
     Run Command On Remote System    ${tools_system}    sudo ovs-vsctl del-manager
diff --git a/csit/libraries/VtnMaKeywords.robot b/csit/libraries/VtnMaKeywords.robot
index 05321af56c..e237ea3eff 100644
--- a/csit/libraries/VtnMaKeywords.robot
+++ b/csit/libraries/VtnMaKeywords.robot
@@ -162,7 +162,7 @@ Delete a pathmap
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Delete a pathpolicy
-    [Arguments]   ${policy_id}
+    [Arguments]    ${policy_id}
     [Documentation]    Delete a pathpolicy for a vtn
     ${resp}=    RequestsLibrary.Post Request    session    restconf/operations/vtn-path-policy:remove-path-policy    data={"input":{"id":"${policy_id}"}}
     Should Be Equal As Strings    ${resp.status_code}    200
@@ -275,7 +275,7 @@ Verify macaddress
 Add a vtn flowfilter
     [Arguments]    ${vtn_name}    ${vtnflowfilter_data}
     [Documentation]    Create a flowfilter for a vtn
-    ${resp}=    RequestsLibrary.Post Request    session    restconf/operations/vtn-flow-filter:set-flow-filter   data={"input": {"tenant-name": "${vtn_name}",${vtnflowfilter_data}}}
+    ${resp}=    RequestsLibrary.Post Request    session    restconf/operations/vtn-flow-filter:set-flow-filter    data={"input": {"tenant-name": "${vtn_name}",${vtnflowfilter_data}}}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Add a vbr flowfilter
@@ -287,7 +287,7 @@ Add a vbr flowfilter
 Add a vbrif flowfilter
     [Arguments]    ${vtn_name}    ${vBridge_name}    ${interface_name}    ${vbrif_flowfilter_data}
     [Documentation]    Create a flowfilter for a vbrif
-    ${resp}=    RequestsLibrary.Post Request    session     restconf/operations/vtn-flow-filter:set-flow-filter    data={"input": {"tenant-name": ${vtn_name}, "bridge-name": "${vBridge_name}","interface-name":"${interface_name}",${vbrif_flowfilter_data}}}
+    ${resp}=    RequestsLibrary.Post Request    session    restconf/operations/vtn-flow-filter:set-flow-filter    data={"input": {"tenant-name": ${vtn_name}, "bridge-name": "${vBridge_name}","interface-name":"${interface_name}",${vbrif_flowfilter_data}}}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Verify Flow Entry for Inet Flowfilter
diff --git a/csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-asymmetric-chain/010_set_odl.robot b/csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-asymmetric-chain/010_set_odl.robot
index 41467b6b4a..deb94a07b8 100644
--- a/csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-asymmetric-chain/010_set_odl.robot
+++ b/csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-asymmetric-chain/010_set_odl.robot
@@ -42,11 +42,11 @@ Wait For Manager and Switch Connected on GBPSFC4
 
 Put Service Function Chains
     [Documentation]    Register Service Function Chains to ODL
-    Add Elements To URI From File    ${SFC_PATH}    ${SFC_ASYMM_FILE}   ${HEADERS_YANG_JSON}
+    Add Elements To URI From File    ${SFC_PATH}    ${SFC_ASYMM_FILE}    ${HEADERS_YANG_JSON}
 
 Put Service Function Paths
     [Documentation]    Register Service Function Paths to ODL
-    Add Elements To URI From File    ${SFP_PATH}    ${SFP_ASYMM_FILE}   ${HEADERS_YANG_JSON}
+    Add Elements To URI From File    ${SFP_PATH}    ${SFP_ASYMM_FILE}    ${HEADERS_YANG_JSON}
 
 Put Tunnels
     [Documentation]    Send tunnel augmentation to ODL
diff --git a/csit/suites/ovsdb/Southbound_Cluster/010__Ovsdb_Southbound_Cluster.robot b/csit/suites/ovsdb/Southbound_Cluster/010__Ovsdb_Southbound_Cluster.robot
index 4223671587..ef7b02dc87 100644
--- a/csit/suites/ovsdb/Southbound_Cluster/010__Ovsdb_Southbound_Cluster.robot
+++ b/csit/suites/ovsdb/Southbound_Cluster/010__Ovsdb_Southbound_Cluster.robot
@@ -39,4 +39,4 @@ Check Entity Owner Status And Find Owner and Candidate Before Fail
 Create Bridge In Owner and Verify Before Fail
     [Documentation]    Create Bridge in Owner and verify it gets applied from all instances.
     Create Bridge And Verify    ${original_cluster_list}    ${original_owner}
-    [Teardown]    Report_Failure_Due_To_Bug    4908
\ No newline at end of file
+    [Teardown]    Report_Failure_Due_To_Bug    4908
diff --git a/csit/suites/ovsdb/Southbound_Domain/010__configure_1_ovsdb_node.robot b/csit/suites/ovsdb/Southbound_Domain/010__configure_1_ovsdb_node.robot
index c69a875990..4f1cb03469 100644
--- a/csit/suites/ovsdb/Southbound_Domain/010__configure_1_ovsdb_node.robot
+++ b/csit/suites/ovsdb/Southbound_Domain/010__configure_1_ovsdb_node.robot
@@ -143,13 +143,13 @@ Get Config Topology After Reconnect
     Wait Until Keyword Succeeds    8s    2s    Check For Elements At URI    ${OPERATIONAL_TOPO_API}/topology/ovsdb:1    ${node_list}
 
 Check For Bug 4756
-    [Documentation]  bug 4756 has been seen in the OVSDB Southbound suites.  This test case should be one of the last test
+    [Documentation]    bug 4756 has been seen in the OVSDB Southbound suites. This test case should be one of the last test
     ...    case executed.
     Check Karaf Log File Does Not Have Messages    ${ODL_SYSTEM_IP}    SimpleShardDataTreeCohort.*Unexpected failure in validation phase
     [Teardown]    Report_Failure_Due_To_Bug    4756
 
 Check For Bug 4794
-    [Documentation]  bug 4794 has been seen in the OVSDB Southbound suites.  This test case should be one of the last test
+    [Documentation]    bug 4794 has been seen in the OVSDB Southbound suites. This test case should be one of the last test
     ...    case executed.
     Check Karaf Log File Does Not Have Messages    ${ODL_SYSTEM_IP}    Shard.*shard-topology-operational An exception occurred while preCommitting transaction
     [Teardown]    Report_Failure_Due_To_Bug    4794
@@ -160,7 +160,7 @@ Configure 1 OVSDB Node Suite Setup
     Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
 
 Configure 1 OVSDB Node Suite Teardown
-    [Documentation]  Cleans up test environment, close existing sessions.
+    [Documentation]    Cleans up test environment, close existing sessions.
     Clean OVSDB Test Environment    ${TOOLS_SYSTEM_IP}
     RequestsLibrary.Delete Request    session    ${CONFIG_TOPO_API}/topology/ovsdb:1/node/ovsdb:%2F%2F${TOOLS_SYSTEM_IP}:${OVSDB_PORT}
     ${resp}    RequestsLibrary.Get Request    session    ${CONFIG_TOPO_API}
diff --git a/csit/suites/ovsdb/Southbound_Domain/020__connection_manager.robot b/csit/suites/ovsdb/Southbound_Domain/020__connection_manager.robot
index 67382896f4..a5080536a5 100644
--- a/csit/suites/ovsdb/Southbound_Domain/020__connection_manager.robot
+++ b/csit/suites/ovsdb/Southbound_Domain/020__connection_manager.robot
@@ -13,8 +13,8 @@ Resource          ../../../libraries/OVSDB.robot
 
 *** Variables ***
 ${OVSDB_PORT}     6634
-${BRIDGE1}         ovsdb-csit-test-bridge1
-${BRIDGE2}         ovsdb-csit-test-bridge2
+${BRIDGE1}        ovsdb-csit-test-bridge1
+${BRIDGE2}        ovsdb-csit-test-bridge2
 ${SOUTHBOUND_CONFIG_API}    ${CONFIG_TOPO_API}/topology/ovsdb:1/node/ovsdb:%2F%2F${TOOLS_SYSTEM_IP}:${OVSDB_PORT}
 ${OVSDB_CONFIG_DIR}    ${CURDIR}/../../../variables/ovsdb
 @{node_list}      ovsdb://${TOOLS_SYSTEM_IP}:${OVSDB_PORT}    ${TOOLS_SYSTEM_IP}    ${OVSDB_PORT}
@@ -54,7 +54,7 @@ Get Config Topology to verify the manually added bridge is not added to the conf
 Create a Bridge through controller
     [Documentation]    This will create bridge on the specified OVSDB node.
     ${body}    OperatingSystem.Get File    ${OVSDB_CONFIG_DIR}/create_bridge.json
-    ${body}    Replace String    ${body}     ovsdb://127.0.0.1:61644    ovsdb://uuid/${ovsdb_uuid}
+    ${body}    Replace String    ${body}    ovsdb://127.0.0.1:61644    ovsdb://uuid/${ovsdb_uuid}
     ${body}    Replace String    ${body}    tcp:127.0.0.1:6633    tcp:${ODL_SYSTEM_IP}:6640
     ${body}    Replace String    ${body}    127.0.0.1    ${TOOLS_SYSTEM_IP}
     ${body}    Replace String    ${body}    br01    ${BRIDGE2}
@@ -80,7 +80,7 @@ Get Config Topology to verify the entry added to the config datastore
 Create bridge of already added bridge
     [Documentation]    This will add bridge to the config datastore
     ${body}    OperatingSystem.Get File    ${OVSDB_CONFIG_DIR}/create_bridge.json
-    ${body}    Replace String    ${body}     ovsdb://127.0.0.1:61644    ovsdb://uuid/${ovsdb_uuid}
+    ${body}    Replace String    ${body}    ovsdb://127.0.0.1:61644    ovsdb://uuid/${ovsdb_uuid}
     ${body}    Replace String    ${body}    tcp:127.0.0.1:6633    tcp:${ODL_SYSTEM_IP}:6640
     ${body}    Replace String    ${body}    127.0.0.1    ${TOOLS_SYSTEM_IP}
     ${body}    Replace String    ${body}    br01    ${BRIDGE1}
@@ -124,13 +124,13 @@ Get Operational Topology after Deletion of Bridge
     Wait Until Keyword Succeeds    8s    2s    Check For Elements Not At URI    ${OPERATIONAL_TOPO_API}/topology/ovsdb:1    ${list}
 
 Check For Bug 4756
-    [Documentation]  bug 4756 has been seen in the OVSDB Southbound suites.  This test case should be one of the last test
+    [Documentation]    bug 4756 has been seen in the OVSDB Southbound suites. This test case should be one of the last test
     ...    case executed.
     Check Karaf Log File Does Not Have Messages    ${ODL_SYSTEM_IP}    SimpleShardDataTreeCohort.*Unexpected failure in validation phase
     [Teardown]    Report_Failure_Due_To_Bug    4756
 
 Check For Bug 4794
-    [Documentation]  bug 4794 has been seen in the OVSDB Southbound suites.  This test case should be one of the last test
+    [Documentation]    bug 4794 has been seen in the OVSDB Southbound suites. This test case should be one of the last test
     ...    case executed.
     Check Karaf Log File Does Not Have Messages    ${ODL_SYSTEM_IP}    Shard.*shard-topology-operational An exception occurred while preCommitting transaction
     [Teardown]    Report_Failure_Due_To_Bug    4794
@@ -141,10 +141,10 @@ OVSDB Connection Manager Suite Setup
     Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
 
 OVSDB Connection Manager Suite Teardown
-    [Documentation]  Cleans up test environment, close existing sessions.
+    [Documentation]    Cleans up test environment, close existing sessions.
     Clean OVSDB Test Environment    ${TOOLS_SYSTEM_IP}
     RequestsLibrary.Delete Request    session    ${CONFIG_TOPO_API}/topology/ovsdb:1/node/ovsdb:%2F%2Fuuid%2F${ovsdb_uuid}%2Fbridge%2F${BRIDGE1}
     RequestsLibrary.Delete Request    session    ${CONFIG_TOPO_API}/topology/ovsdb:1/node/ovsdb:%2F%2Fuuid%2F${ovsdb_uuid}%2Fbridge%2F${BRIDGE2}
     ${resp}    RequestsLibrary.Get Request    session    ${CONFIG_TOPO_API}
     Log    ${resp.content}
-    Delete All Sessions
\ No newline at end of file
+    Delete All Sessions
diff --git a/csit/suites/ovsdb/Southbound_Domain/030__configure_exit_ovsdb_node.robot b/csit/suites/ovsdb/Southbound_Domain/030__configure_exit_ovsdb_node.robot
index 9efeced8bb..53eae40028 100644
--- a/csit/suites/ovsdb/Southbound_Domain/030__configure_exit_ovsdb_node.robot
+++ b/csit/suites/ovsdb/Southbound_Domain/030__configure_exit_ovsdb_node.robot
@@ -150,13 +150,13 @@ Get Operational Topology after Deletion of OVSDB Node
     Wait Until Keyword Succeeds    8s    2s    Check For Elements Not At URI    ${OPERATIONAL_TOPO_API}    ${list}
 
 Check For Bug 4756
-    [Documentation]  bug 4756 has been seen in the OVSDB Southbound suites.  This test case should be one of the last test
+    [Documentation]    bug 4756 has been seen in the OVSDB Southbound suites. This test case should be one of the last test
     ...    case executed.
     Check Karaf Log File Does Not Have Messages    ${ODL_SYSTEM_IP}    SimpleShardDataTreeCohort.*Unexpected failure in validation phase
     [Teardown]    Report_Failure_Due_To_Bug    4756
 
 Check For Bug 4794
-    [Documentation]  bug 4794 has been seen in the OVSDB Southbound suites.  This test case should be one of the last test
+    [Documentation]    bug 4794 has been seen in the OVSDB Southbound suites. This test case should be one of the last test
     ...    case executed.
     Check Karaf Log File Does Not Have Messages    ${ODL_SYSTEM_IP}    Shard.*shard-topology-operational An exception occurred while preCommitting transaction
     [Teardown]    Report_Failure_Due_To_Bug    4794
@@ -167,9 +167,9 @@ Configure Exit OVSDB Node Suite Setup
     Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
 
 Configure Exit OVSDB Node Suite Teardown
-    [Documentation]  Cleans up test environment, close existing sessions.
+    [Documentation]    Cleans up test environment, close existing sessions.
     Clean OVSDB Test Environment    ${TOOLS_SYSTEM_IP}
     RequestsLibrary.Delete Request    session    ${CONFIG_TOPO_API}/topology/ovsdb:1/node/ovsdb:%2F%2F${TOOLS_SYSTEM_IP}:${OVSDB_PORT}
     ${resp}    RequestsLibrary.Get Request    session    ${CONFIG_TOPO_API}
     Log    ${resp.content}
-    Delete All Sessions
\ No newline at end of file
+    Delete All Sessions
diff --git a/csit/suites/ovsdb/Southbound_Domain/040__Vxlan_Extension_Test.robot b/csit/suites/ovsdb/Southbound_Domain/040__Vxlan_Extension_Test.robot
index 0e047916cf..48e23a850a 100644
--- a/csit/suites/ovsdb/Southbound_Domain/040__Vxlan_Extension_Test.robot
+++ b/csit/suites/ovsdb/Southbound_Domain/040__Vxlan_Extension_Test.robot
@@ -91,13 +91,13 @@ Verify that the operational topology is clean
     Wait Until Keyword Succeeds    8s    2s    Check For Elements Not At URI    ${OPERATIONAL_TOPO_API}    ${list}
 
 Check For Bug 4756
-    [Documentation]  bug 4756 has been seen in the OVSDB Southbound suites.  This test case should be one of the last test
+    [Documentation]    bug 4756 has been seen in the OVSDB Southbound suites. This test case should be one of the last test
     ...    case executed.
     Check Karaf Log File Does Not Have Messages    ${ODL_SYSTEM_IP}    SimpleShardDataTreeCohort.*Unexpected failure in validation phase
     [Teardown]    Report_Failure_Due_To_Bug    4756
 
 Check For Bug 4794
-    [Documentation]  bug 4794 has been seen in the OVSDB Southbound suites.  This test case should be one of the last test
+    [Documentation]    bug 4794 has been seen in the OVSDB Southbound suites. This test case should be one of the last test
     ...    case executed.
     Check Karaf Log File Does Not Have Messages    ${ODL_SYSTEM_IP}    Shard.*shard-topology-operational An exception occurred while preCommitting transaction
     [Teardown]    Report_Failure_Due_To_Bug    4794
@@ -108,7 +108,7 @@ Vxlan Extension Test Suite Setup
     Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
 
 Vxlan Extension Test Suite Teardown
-    [Documentation]  Cleans up test environment, close existing sessions.
+    [Documentation]    Cleans up test environment, close existing sessions.
     Clean OVSDB Test Environment    ${TOOLS_SYSTEM_IP}
     Clean OVSDB Test Environment    ${TOOLS_SYSTEM_2_IP}
     RequestsLibrary.Delete Request    session    ${CONFIG_TOPO_API}/topology/ovsdb:1/node/ovsdb:%2F%2F${TOOLS_SYSTEM_IP}:${OVSDB_PORT}
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 86c0225ab7..58dbf13385 100644
--- 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,16 +6,11 @@ Resource          ../../../libraries/VtnMaKeywords.robot
 
 *** Variables ***
 ${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-icmp-code-action":{"code":"9"}}],"index":"2"}]
-
 ${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": "3"}]
-
-${flowfilterDscpdata}   "vtn-flow-filter":[{"condition": "cond_1","vtn-pass-filter": {},"vtn-flow-action": [{"order": "1","vtn-set-inet-dscp-action": {"dscp":"10"}}],"index":"6"}]
-
-${flowfiltervlanpcp}   "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"}},{"order":"3","vtn-set-icmp-code-action":{"code":"1"}},{"order":"4","vtn-set-vlan-pcp-action":{"vlan-pcp":"3"}}],"index":"3"}]
+${flowfilterDscpdata}    "vtn-flow-filter":[{"condition": "cond_1","vtn-pass-filter": {},"vtn-flow-action": [{"order": "1","vtn-set-inet-dscp-action": {"dscp":"10"}}],"index":"6"}]
+${flowfiltervlanpcp}    "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"}},{"order":"3","vtn-set-icmp-code-action":{"code":"1"}},{"order":"4","vtn-set-vlan-pcp-action":{"vlan-pcp":"3"}}],"index":"3"}]
 
 *** Test Cases ***
 Check if switch1 detected
@@ -89,22 +84,22 @@ Add a flowcondition
 Add a flowfilter with inet4src and inet4dst
     [Documentation]    Create a flowfilter with inet4 and Verify ping
     Add a vbrif flowfilter    Tenant1    vBridge1    if1    ${flowfilterInetdata}
-    Wait_Until_Keyword_Succeeds    20s   1s    Mininet Ping Should Succeed    h1    h3
+    Wait_Until_Keyword_Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h3
 
 Add a flowfilter with Icmp code
     [Documentation]    Create a flowfilter with icmp code and Verify ping
     Add a vbrif flowfilter    Tenant1    vBridge1    if1    ${flowfilterIcmpCodedata}
-    Wait_Until_Keyword_Succeeds    20s   1s    Mininet Ping Should Succeed    h1    h3
+    Wait_Until_Keyword_Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h3
 
 Add a flowfilter with tpsrc and tpdst
     [Documentation]    Create a flowfilter with tpsrc and tpdst and Verify ping
     Add a vbrif flowfilter    Tenant1    vBridge1    if1    ${flowfilterTpsrcTpdstdata}
-    Wait_Until_Keyword_Succeeds    20s   1s    Mininet Ping Should Succeed    h1    h3
+    Wait_Until_Keyword_Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h3
 
 Add a flowfilter with dscp
     [Documentation]    Create a flowfilter with dscp and Verify ping
     Add a vbrif flowfilter    Tenant1    vBridge1    if1    ${flowfilterDscpdata}
-    Wait_Until_Keyword_Succeeds    20s   1s    Mininet Ping Should Succeed    h1    h3
+    Wait_Until_Keyword_Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h3
 
 Verify Flow Entry for Inet Flowfilter
     [Documentation]    Verify Flow Entry for Inet Flowfilter
@@ -113,23 +108,23 @@ Verify Flow Entry for Inet Flowfilter
 Add a flowfilter with vlanpcp
     [Documentation]    Create a flowfilter with vlanpcp and Verify ping
     Add a vbrif flowfilter    Tenant1    vBridge1    if1    ${flowfiltervlanpcp}
-    Wait_Until_Keyword_Succeeds    20s   1s    Mininet Ping Should Succeed    h1    h3
+    Wait_Until_Keyword_Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h3
 
 Add a flowfilter_vtn with inet4src and inet4dst
     [Documentation]    Create a vtn_flowfilter with inet4 and Verify ping
     Add a vtn flowfilter    Tenant1    ${flowfilterInetdata}
-    Wait_Until_Keyword_Succeeds    20s   1s    Mininet Ping Should Succeed    h1    h3
+    Wait_Until_Keyword_Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h3
 
 Add a flowfilter_vbr with inet4src and inet4dst
     [Documentation]    Create a vbr_flowfilter with inet4 and Verify ping
     Add a vbr flowfilter    Tenant1    vBridge1    ${flowfilterInetdata}
-    Wait_Until_Keyword_Succeeds    20s   1s    Mininet Ping Should Succeed    h1    h3
+    Wait_Until_Keyword_Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h3
 
 Add a flowfilter with inet4 for drop
     [Documentation]    Create a flowfilter with inet4 for drop action and Verify no pinging
     [Tags]    exclude
     Add a vbrif flowfilter    Tenant1    vBridge1    if1    ${flowfilterInetdropdata}
-    Wait_Until_Keyword_Succeeds    20s   1s    Mininet Ping Should Not Succeed    h1    h3
+    Wait_Until_Keyword_Succeeds    20s    1s    Mininet Ping Should Not Succeed    h1    h3
 
 Delete a flowcondition
     [Documentation]    Delete a flowcondition
diff --git a/csit/suites/vtn/VTN_Mgr_OF10/020__vtn_pathmap_pathpolicy.robot b/csit/suites/vtn/VTN_Mgr_OF10/020__vtn_pathmap_pathpolicy.robot
index 08123f7de8..315a7b2d30 100644
--- a/csit/suites/vtn/VTN_Mgr_OF10/020__vtn_pathmap_pathpolicy.robot
+++ b/csit/suites/vtn/VTN_Mgr_OF10/020__vtn_pathmap_pathpolicy.robot
@@ -6,9 +6,7 @@ Resource          ../../../libraries/VtnMaKeywords.robot
 
 *** Variables ***
 ${pathmapdata}    {"input":{"tenant-name":"Tenant_path","path-map-list":[{"condition":"flowcond_path","policy":"1","index": "1","idle-timeout":"300","hard-timeout":"0"}]}}
-
-${pathpolicydata}    {"input":{"operation":"SET","id": "1","default-cost": "10000","vtn-path-cost": [{"port-desc":"openflow:1,3,s1-eth3","cost":"1000"},{"port-desc":"openflow:4,2,s4-eth2","cost":"1000"},{"port-desc":"openflow:3,3,s3-eth3","cost":"100000"}]}} 
-
+${pathpolicydata}    {"input":{"operation":"SET","id": "1","default-cost": "10000","vtn-path-cost": [{"port-desc":"openflow:1,3,s1-eth3","cost":"1000"},{"port-desc":"openflow:4,2,s4-eth2","cost":"1000"},{"port-desc":"openflow:3,3,s3-eth3","cost":"100000"}]}}
 
 *** Test Cases ***
 Check if switch1 detected
@@ -90,8 +88,8 @@ Delete a pathmap
     Delete a pathmap    Tenant_path
 
 Delete a pathpolicy
-   [Documentation]    Delete a pathpolicy
-   Delete a pathpolicy    ${policy_id}
+    [Documentation]    Delete a pathpolicy
+    Delete a pathpolicy    ${policy_id}
 
 Delete a flowcondition
     [Documentation]    Delete a flowcondition
diff --git a/csit/suites/vtn/VTN_Mgr_OF13/010__vtn_manager_flowfilter.robot b/csit/suites/vtn/VTN_Mgr_OF13/010__vtn_manager_flowfilter.robot
index 77295c63f2..f962503225 100644
--- a/csit/suites/vtn/VTN_Mgr_OF13/010__vtn_manager_flowfilter.robot
+++ b/csit/suites/vtn/VTN_Mgr_OF13/010__vtn_manager_flowfilter.robot
@@ -6,16 +6,11 @@ Resource          ../../../libraries/VtnMaKeywords.robot
 
 *** Variables ***
 ${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-icmp-code-action":{"code":"9"}}],"index":"2"}]
-
 ${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": "3"}]
-
-${flowfilterDscpdata}   "vtn-flow-filter":[{"condition": "cond_1","vtn-pass-filter": {},"vtn-flow-action": [{"order": "1","vtn-set-inet-dscp-action": {"dscp":"10"}}],"index":"6"}]
-
-${flowfiltervlanpcp}   "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"}},{"order":"3","vtn-set-icmp-code-action":{"code":"1"}},{"order":"4","vtn-set-vlan-pcp-action":{"vlan-pcp":"3"}}],"index":"3"}]
+${flowfilterDscpdata}    "vtn-flow-filter":[{"condition": "cond_1","vtn-pass-filter": {},"vtn-flow-action": [{"order": "1","vtn-set-inet-dscp-action": {"dscp":"10"}}],"index":"6"}]
+${flowfiltervlanpcp}    "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"}},{"order":"3","vtn-set-icmp-code-action":{"code":"1"}},{"order":"4","vtn-set-vlan-pcp-action":{"vlan-pcp":"3"}}],"index":"3"}]
 
 *** Test Cases ***
 Check if switch1 detected
@@ -99,22 +94,22 @@ Get flow
 Add a flowfilter with inet4src and inet4dst
     [Documentation]    Create a flowfilter with inet4 and Verify ping
     Add a vbrif flowfilter    Tenant1    vBridge1    if1    ${flowfilterInetdata}
-    Wait_Until_Keyword_Succeeds    20s   1s    Mininet Ping Should Succeed    h1    h3
+    Wait_Until_Keyword_Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h3
 
 Add a flowfilter with Icmp code
     [Documentation]    Create a flowfilter with icmp code and Verify ping
     Add a vbrif flowfilter    Tenant1    vBridge1    if1    ${flowfilterIcmpCodedata}
-    Wait_Until_Keyword_Succeeds    20s   1s    Mininet Ping Should Succeed    h1    h3
+    Wait_Until_Keyword_Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h3
 
 Add a flowfilter with tpsrc and tpdst
     [Documentation]    Create a flowfilter with tpsrc and tpdst and Verify ping
     Add a vbrif flowfilter    Tenant1    vBridge1    if1    ${flowfilterTpsrcTpdstdata}
-    Wait_Until_Keyword_Succeeds    20s   1s    Mininet Ping Should Succeed    h1    h3
+    Wait_Until_Keyword_Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h3
 
 Add a flowfilter with dscp
     [Documentation]    Create a flowfilter with dscp and Verify ping
     Add a vbrif flowfilter    Tenant1    vBridge1    if1    ${flowfilterDscpdata}
-    Wait_Until_Keyword_Succeeds    20s   1s    Mininet Ping Should Succeed    h1    h3
+    Wait_Until_Keyword_Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h3
 
 Verify Flow Entry for Inet Flowfilter
     [Documentation]    Verify Flow Entry for Inet Flowfilter
@@ -123,23 +118,23 @@ Verify Flow Entry for Inet Flowfilter
 Add a flowfilter with vlanpcp
     [Documentation]    Create a flowfilter with vlanpcp and Verify ping
     Add a vbrif flowfilter    Tenant1    vBridge1    if1    ${flowfiltervlanpcp}
-    Wait_Until_Keyword_Succeeds    20s   1s    Mininet Ping Should Succeed    h1    h3
+    Wait_Until_Keyword_Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h3
 
 Add a flowfilter_vtn with inet4src and inet4dst
     [Documentation]    Create a vtn_flowfilter with inet4 and Verify ping
     Add a vtn flowfilter    Tenant1    ${flowfilterInetdata}
-    Wait_Until_Keyword_Succeeds    20s   1s    Mininet Ping Should Succeed    h1    h3
+    Wait_Until_Keyword_Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h3
 
 Add a flowfilter_vbr with inet4src and inet4dst
     [Documentation]    Create a vbr_flowfilter with inet4 and Verify ping
     Add a vbr flowfilter    Tenant1    vBridge1    ${flowfilterInetdata}
-    Wait_Until_Keyword_Succeeds    20s   1s    Mininet Ping Should Succeed    h1    h3
+    Wait_Until_Keyword_Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h3
 
 Add a flowfilter with inet4 for drop
     [Documentation]    Create a flowfilter with inet4 for drop action and Verify no pinging
     [Tags]    exclude
     Add a vbrif flowfilter    Tenant1    vBridge1    if1    ${flowfilterInetdropdata}
-    Wait_Until_Keyword_Succeeds    20s   1s    Mininet Ping Should Not Succeed    h1    h3
+    Wait_Until_Keyword_Succeeds    20s    1s    Mininet Ping Should Not Succeed    h1    h3
 
 Verify Removed Flow Entry For Inet After Drop Action
     [Documentation]    Verify no flows between the hosts after drop
diff --git a/csit/suites/vtn/VTN_Mgr_OF13/020__vtn_pathmap_pathpolicy.robot b/csit/suites/vtn/VTN_Mgr_OF13/020__vtn_pathmap_pathpolicy.robot
index 1598137453..48f4a18085 100644
--- a/csit/suites/vtn/VTN_Mgr_OF13/020__vtn_pathmap_pathpolicy.robot
+++ b/csit/suites/vtn/VTN_Mgr_OF13/020__vtn_pathmap_pathpolicy.robot
@@ -6,9 +6,7 @@ Resource          ../../../libraries/VtnMaKeywords.robot
 
 *** Variables ***
 ${pathmapdata}    {"input":{"tenant-name":"Tenant_path","path-map-list":[{"condition":"flowcond_path","policy":"1","index": "1","idle-timeout":"300","hard-timeout":"0"}]}}
-
-${pathpolicydata}    {"input":{"operation":"SET","id": "1","default-cost": "10000","vtn-path-cost": [{"port-desc":"openflow:1,3,s1-eth3","cost":"1000"},{"port-desc":"openflow:4,2,s4-eth2","cost":"1000"},{"port-desc":"openflow:3,3,s3-eth3","cost":"100000"}]}} 
-
+${pathpolicydata}    {"input":{"operation":"SET","id": "1","default-cost": "10000","vtn-path-cost": [{"port-desc":"openflow:1,3,s1-eth3","cost":"1000"},{"port-desc":"openflow:4,2,s4-eth2","cost":"1000"},{"port-desc":"openflow:3,3,s3-eth3","cost":"100000"}]}}
 
 *** Test Cases ***
 Check if switch1 detected
@@ -88,8 +86,8 @@ Delete a pathmap
     Delete a pathmap    Tenant_path
 
 Delete a pathpolicy
-   [Documentation]    Delete a pathpolicy
-   Delete a pathpolicy    ${policy_id}
+    [Documentation]    Delete a pathpolicy
+    Delete a pathpolicy    ${policy_id}
 
 Delete a flowcondition
     [Documentation]    Delete a flowcondition
-- 
2.36.6