Correctly space expected_status
[integration/test.git] / csit / libraries / VtnMaKeywords.robot
index e5fdc0c61e5c27f3a359befb1cbd6af9d331a126..03b5020d400c1fff086fc176632e37166fe2e163 100644 (file)
@@ -1,48 +1,99 @@
 *** Settings ***
-Library           SSHLibrary
-Library           String
-Library           DateTime
-Library           Collections
-Library           json
-Library           RequestsLibrary
-Variables         ../variables/Variables.py
-Resource          ./Utils.robot
+Library         SSHLibrary
+Library         String
+Library         DateTime
+Library         Collections
+Library         json
+Library         RequestsLibrary
+Variables       ../variables/Variables.py
+Variables       ../variables/vtn/Modules.py
+Resource        ./Utils.robot
+Resource        ./KarafKeywords.robot
+Resource        ./MininetKeywords.robot
+Resource        ./TemplatedRequests.robot
+Resource        DataModels.robot
+
 
 *** Variables ***
-${vlan_topo_10}    sudo mn --controller=remote,ip=${CONTROLLER} --custom vlan_vtn_test.py --topo vlantopo
-${vlan_topo_13}    sudo mn --controller=remote,ip=${CONTROLLER} --custom vlan_vtn_test.py --topo vlantopo --switch ovsk,protocols=OpenFlow13
-${VERSION_VTN}    controller/nb/v2/vtn/version
-${VTN_INVENTORY}    restconf/operational/vtn-inventory:vtn-nodes
-${DUMPFLOWS_OF10}    dpctl dump-flows -O OpenFlow10
-${DUMPFLOWS_OF13}    dpctl dump-flows -O OpenFlow13
-${index}          7
-@{FLOWELMENTS}    nw_src=10.0.0.1    nw_dst=10.0.0.3    actions=drop
-@{BRIDGE1_DATAFLOW}    "reason":"PORTMAPPED"    "virtual-node-path":{"bridge-name":"vBridge1","tenant-name":"Tenant1","interface-name":"if2"}
-@{BRIDGE2_DATAFLOW}    "reason":"PORTMAPPED"    "virtual-node-path":{"bridge-name":"vBridge2","tenant-name":"Tenant1","interface-name":"if3"}
-${vlanmap_bridge1}    200
-${vlanmap_bridge2}    300
-@{VLANMAP_BRIDGE1_DATAFLOW}    "reason":"VLANMAPPED"    "virtual-node-path":{"bridge-name":"vBridge1_vlan","tenant-name":"Tenant1","vlan-map-id":"ANY.200"}
-@{VLANMAP_BRIDGE2_DATAFLOW}    "reason":"VLANMAPPED"    "virtual-node-path":{"bridge-name":"vBridge2_vlan","tenant-name":"Tenant1","vlan-map-id":"ANY.300"}
-${in_port}        1
-${out_before_pathpolicy}    output:2
-${out_after_pathpolicy}    output:3
-${flowcond_restconfigdata}    {"input":{"operation":"SET","present":"false","name":"cond_1","vtn-flow-match":[{"vtn-ether-match":{"destination-address":"ba:bd:0f:e3:a8:c8","ether-type":"2048","source-address":"ca:9e:58:0c:1e:f0","vlan-id": "1"},"vtn-inet-match":{"source-network":"10.0.0.1/32","protocol":1,"destination-network":"10.0.0.2/32"},"index":"1"}]}}
+${vlan_topo}                    --custom vlan_vtn_test.py --topo vlantopo
+${VERSION_VTN}                  controller/nb/v2/vtn/version
+${VTN_INVENTORY}                restconf/operational/vtn-inventory:vtn-nodes
+${ENTITY_OWNERS}                restconf/operational/entity-owners:entity-owners
+${DUMPFLOWS_OF10}               dpctl dump-flows -OOpenFlow10
+${DUMPFLOWS_OF13}               dpctl dump-flows -OOpenFlow13
+${FF_DUMPFLOWS_OF10}            sh ovs-ofctl dump-flows -OOpenFlow10 s3
+${FF_DUMPFLOWS_OF13}            sh ovs-ofctl dump-flows -OOpenFlow13 s3
+${DROP_DUMPFLOWS_OF10}          sh ovs-ofctl dump-flows -OOpenFlow10 s2
+${DROP_DUMPFLOWS_OF13}          sh ovs-ofctl dump-flows -OOpenFlow13 s2
+${DROP_OUT_DUMPFLOWS_OF10}      sh ovs-ofctl dump-flows -OOpenFlow10 s3
+${DROP_OUT_DUMPFLOWS_OF13}      sh ovs-ofctl dump-flows -OOpenFlow13 s3
+${FF_OUT_DUMPFLOWS_OF10}        sh ovs-ofctl dump-flows -OOpenFlow10 s2
+${FF_OUT_DUMPFLOWS_OF13}        sh ovs-ofctl dump-flows -OOpenFlow13 s2
+${index}                        7
+@{inet_actions}                 mod_nw_src:192.0.0.1    mod_nw_dst:192.0.0.2
+@{BRIDGE1_DATAFLOW}
+...                             "reason":"PORTMAPPED"
+...                             "tenant-name":"Tenant1"
+...                             "bridge-name":"vBridge1"
+...                             "interface-name":"if2"
+@{BRIDGE2_DATAFLOW}
+...                             "reason":"PORTMAPPED"
+...                             "tenant-name":"Tenant1"
+...                             "bridge-name":"vBridge2"
+...                             "interface-name":"if3"
+${vlanmap_bridge1}              200
+${vlanmap_bridge2}              300
+@{VLANMAP_BRIDGE1_DATAFLOW}     "reason":"VLANMAPPED"    "tenant-name":"Tenant1"    "bridge-name":"vBridge1_vlan"
+@{VLANMAP_BRIDGE2_DATAFLOW}     "reason":"VLANMAPPED"    "tenant-name":"Tenant1"    "bridge-name":"vBridge2_vlan"
+${out_before_pathpolicy}        output:2
+${out_after_pathpolicy}         output:3
+${pathpolicy_topo}              --custom topo-3sw-2host_multipath.py --topo pathpolicytopo
+@{PATHMAP_ATTR}                 "index":"1"    "condition":"flowcond_path"    "policy":"1"
+${policy_id}                    1
+${in_port}                      1
+${filter_index}                 1
+@{inet_action}                  set_field:192.0.0.1->ip_src    set_field:192.0.0.2->ip_dst
+${dscp_action}                  set_field:32->ip_dscp
+${dscp_be_action}               set_field:32->nw_tos_shifted
+${dscp_flow}                    mod_nw_tos:128
+@{icmp_action}                  mod_tp_dst:1    mod_tp_src:3
+${drop_action}                  actions=drop
+${vlanpcp_action}               mod_vlan_pcp:6
+${vlanpcp_actions}              set_field:6->vlan_pcp
+${dlsrc_action}                 mod_dl_src:00:00:00:00:00:11
+${dlsrc_actions}                set_field:00:00:00:00:00:11->eth_src
+@{PATHPOLICY_ATTR}              "id":1    "port-desc":"openflow:4,2,s4-eth2"
+${custom}                       ${CURDIR}/${CREATE_PATHPOLICY_TOPOLOGY_FILE_PATH}
+
 
 *** Keywords ***
 Start SuiteVtnMa
-    [Documentation]    Start VTN Manager Rest Config Api Test Suite
-    Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+    [Documentation]    Start VTN Manager Rest Config Api Test Suite, and enabling karaf loglevel as TRACE for VTN.
+    #Issue Command On Karaf Console    log:set TRACE org.opendaylight.vtn
+    ${vtn_mgr_id}=    SSHLibrary.Open Connection    ${ODL_SYSTEM_IP}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=30s
+    Set Suite Variable    ${vtn_mgr_id}
+    SSHLibrary.Login_With_Public_Key    ${ODL_SYSTEM_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
+    SSHLibrary.Execute Command
+    ...    sudo sed -i "$ i log4j.logger.org.opendaylight.vtn = TRACE" ${WORKSPACE}/${BUNDLEFOLDER}/etc/org.ops4j.pax.logging.cfg
+    Create Session
+    ...    session
+    ...    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}
+    ...    auth=${AUTH}
+    ...    headers=${HEADERS_YANG_JSON}
     BuiltIn.Wait_Until_Keyword_Succeeds    30    3    Fetch vtn list
-    Start Suite
+    Start Mininet
 
 Start SuiteVtnMaTest
     [Documentation]    Start VTN Manager Test Suite
-    Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+    Create Session
+    ...    session
+    ...    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}
+    ...    auth=${AUTH}
+    ...    headers=${HEADERS_YANG_JSON}
 
 Stop SuiteVtnMa
     [Documentation]    Stop VTN Manager Test Suite
     Delete All Sessions
-    Stop Suite
 
 Stop SuiteVtnMaTest
     [Documentation]    Stop VTN Manager Test Suite
@@ -54,237 +105,416 @@ Fetch vtn list
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Fetch vtn switch inventory
-    [Arguments]    ${sw_name}
     [Documentation]    Check if Switch is detected.
-    ${resp}=    RequestsLibrary.Get Request    session    restconf/operational/vtn-inventory:vtn-nodes/vtn-node/${sw_name}
+    [Arguments]    ${sw_name}
+    ${resp}=    RequestsLibrary.Get Request
+    ...    session
+    ...    restconf/operational/vtn-inventory:vtn-nodes/vtn-node/${sw_name}
     Should Be Equal As Strings    ${resp.status_code}    200
 
+Collect Debug Info
+    [Documentation]    Check if Switch is detected.
+    write    ${DUMPFLOWS_OF10}
+    ${result}=    Read Until    mininet>
+    write    ${DUMPFLOWS_OF13}
+    ${result}=    Read Until    mininet>
+    Get Model Dump    ${ODL_SYSTEM_IP}    ${vtn_data_models}
+
+Add a Topology wait
+    [Documentation]    Add a topology wait to complete all Inter-switch link connection of switches
+    [Arguments]    ${topo_wait}
+    ${resp}=    RequestsLibrary.Put Request
+    ...    session
+    ...    restconf/config/vtn-config:vtn-config
+    ...    data={"vtn-config": {"topology-wait":${topo_wait}, "host-tracking": "true"}}
+    Should Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}
+
 Add a Vtn
-    [Arguments]    ${vtn_name}
     [Documentation]    Create a vtn with specified parameters.
-    ${resp}=    RequestsLibrary.Post Request    session    restconf/operations/vtn:update-vtn    data={"input": {"tenant-name":${vtn_name}, "update-mode": "CREATE","operation": "SET", "description": "creating vtn", "idle-timeout":300, "hard-timeout":0}}
+    [Arguments]    ${vtn_name}
+    ${resp}=    RequestsLibrary.Post Request
+    ...    session
+    ...    restconf/operations/vtn:update-vtn
+    ...    data={"input": {"tenant-name":${vtn_name}, "update-mode": "CREATE","operation": "SET", "description": "creating vtn", "idle-timeout":300, "hard-timeout":0}}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Add a vBridge
-    [Arguments]    ${vtn_name}    ${vbr_name}
     [Documentation]    Create a vBridge in a VTN
-    ${resp}=    RequestsLibrary.Post Request    session    restconf/operations/vtn-vbridge:update-vbridge    data={"input": {"update-mode": "CREATE","operation":"SET", "tenant-name":${vtn_name}, "bridge-name":${vbr_name}, "description": "vbrdige created"}}
+    [Arguments]    ${vtn_name}    ${vbr_name}
+    ${resp}=    RequestsLibrary.Post Request
+    ...    session
+    ...    restconf/operations/vtn-vbridge:update-vbridge
+    ...    data={"input": {"update-mode": "CREATE","operation":"SET", "tenant-name":${vtn_name}, "bridge-name":${vbr_name}, "description": "vbrdige created"}}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Add a interface
-    [Arguments]    ${vtn_name}    ${vbr_name}    ${interface_name}
     [Documentation]    Create a interface into a vBridge of a VTN
-    ${resp}=    RequestsLibrary.Post Request    session    restconf/operations/vtn-vinterface:update-vinterface    data={"input": {"update-mode":"CREATE","operation":"SET", "tenant-name":${vtn_name}, "bridge-name":${vbr_name}, "description": "vbrdige interfacecreated", "enabled":"true", "interface-name": ${interface_name}}}
+    [Arguments]    ${vtn_name}    ${vbr_name}    ${interface_name}
+    ${resp}=    RequestsLibrary.Post Request
+    ...    session
+    ...    restconf/operations/vtn-vinterface:update-vinterface
+    ...    data={"input": {"update-mode":"CREATE","operation":"SET", "tenant-name":${vtn_name}, "bridge-name":${vbr_name}, "description": "vbrdige interfacecreated", "enabled":"true", "interface-name": ${interface_name}}}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Add a portmap
-    [Arguments]    ${vtn_name}    ${vbr_name}    ${interface_name}    ${node_id}    ${port_id}
     [Documentation]    Create a portmap for a interface of a vbridge
-    ${resp}=    RequestsLibrary.Post Request    session    restconf/operations/vtn-port-map:set-port-map    data={"input": { "tenant-name":${vtn_name}, "bridge-name":${vbr_name}, "interface-name": ${interface_name}, "node":"${node_id}", "port-name":"${port_id}"}}
+    [Arguments]    ${vtn_name}    ${vbr_name}    ${interface_name}    ${node_id}    ${port_id}
+    ${resp}=    RequestsLibrary.Post Request
+    ...    session
+    ...    restconf/operations/vtn-port-map:set-port-map
+    ...    data={"input": { "tenant-name":${vtn_name}, "bridge-name":${vbr_name}, "interface-name": ${interface_name}, "node":"${node_id}", "port-name":"${port_id}"}}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Delete a Vtn
-    [Arguments]    ${vtn_name}
     [Documentation]    Delete a vtn with specified parameters.
-    ${resp}=    RequestsLibrary.Post Request    session    restconf/operations/vtn:remove-vtn    data={"input": {"tenant-name":${vtn_name}}}
+    [Arguments]    ${vtn_name}
+    ${resp}=    RequestsLibrary.Post Request
+    ...    session
+    ...    restconf/operations/vtn:remove-vtn
+    ...    data={"input": {"tenant-name":${vtn_name}}}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Add a vlanmap
-    [Arguments]    ${vtn_name}    ${vbr_name}    ${vlan_id}
     [Documentation]    Create a vlanmap
-    ${resp}=    RequestsLibrary.Post Request    session    restconf/operations/vtn-vlan-map:add-vlan-map    data={"input": {"tenant-name":${vtn_name},"bridge-name":${vbr_name},"vlan-id":${vlan_id}}}
+    [Arguments]    ${vtn_name}    ${vbr_name}    ${vlan_id}
+    ${resp}=    RequestsLibrary.Post Request
+    ...    session
+    ...    restconf/operations/vtn-vlan-map:add-vlan-map
+    ...    data={"input": {"tenant-name":${vtn_name},"bridge-name":${vbr_name},"vlan-id":${vlan_id}}}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Verify Data Flows
-    [Arguments]    ${vtn_name}    ${vBridge_name}
     [Documentation]    Verify the reason and physical data flows for the specified vtn and vbridge
-    ${resp}=    RequestsLibrary.Get Request    session    restconf/operational/vtn-flow-impl:vtn-flows/vtn-flow-table/${vtn_name}
-    Run Keyword If    '${vBridge_name}' == 'vBridge1'    DataFlowsForBridge    ${resp}    @{BRIDGE1_DATAFLOW}
-    ...    ELSE IF    '${vBridge_name}' == 'vBridge2'    DataFlowsForBridge    ${resp}    @{BRIDGE2_DATAFLOW}
-    ...    ELSE IF    '${vBridge_name}' == 'vBridge1_vlan'    DataFlowsForBridge    ${resp}    @{VLANMAP_BRIDGE1_DATAFLOW}
-    ...    ELSE    DataFlowsForBridge    ${resp}    @{VLANMAP_BRIDGE2_DATAFLOW}
+    [Arguments]    ${vtn_name}    ${vBridge_name}
+    ${resp}=    RequestsLibrary.Post Request
+    ...    session
+    ...    restconf/operations/vtn-flow:get-data-flow
+    ...    data={"input":{"tenant-name":"${vtn_name}","mode":"UPDATESTATS"}}
+    IF    '${vBridge_name}' == 'vBridge1'
+        DataFlowsForBridge    ${resp}    @{BRIDGE1_DATAFLOW}
+    ELSE IF    '${vBridge_name}' == 'vBridge2'
+        DataFlowsForBridge    ${resp}    @{BRIDGE2_DATAFLOW}
+    ELSE IF    '${vBridge_name}' == 'vBridge1_vlan'
+        DataFlowsForBridge    ${resp}    @{VLANMAP_BRIDGE1_DATAFLOW}
+    ELSE
+        DataFlowsForBridge    ${resp}    @{VLANMAP_BRIDGE2_DATAFLOW}
+    END
+
+Start PathSuiteVtnMaTest
+    [Documentation]    Start VTN Manager Test Suite and Mininet
+    Start SuiteVtnMaTest
+    MininetKeywords.Start Mininet Single Controller
+    ...    ${TOOLS_SYSTEM_IP}
+    ...    ${ODL_SYSTEM_IP}
+    ...    ${pathpolicy_topo}
+    ...    ${custom}
+    ...    ofversion=13
+
+Start PathSuiteVtnMaTestOF10
+    [Documentation]    Start VTN Manager Test Suite and Mininet in Open Flow 10 Specification
+    Start SuiteVtnMaTest
+    MininetKeywords.Start Mininet Single Controller
+    ...    ${TOOLS_SYSTEM_IP}
+    ...    ${ODL_SYSTEM_IP}
+    ...    ${pathpolicy_topo}
+    ...    ${custom}
+    ...    ofversion=10
+
+Stop PathSuiteVtnMaTest
+    [Documentation]    Cleanup/Shutdown work at the completion of all tests.
+    Delete All Sessions
+    MininetKeywords.Stop Mininet And Exit
 
 DataFlowsForBridge
-    [Arguments]    ${resp}    @{BRIDGE_DATAFLOW}
     [Documentation]    Verify whether the required attributes exists.
-    : FOR    ${dataflowElement}    IN    @{BRIDGE_DATAFLOW}
-    \    should Contain    ${resp.content}    ${dataflowElement}
+    [Arguments]    ${resp}    @{BRIDGE_DATAFLOW}
+    FOR    ${dataflowElement}    IN    @{BRIDGE_DATAFLOW}
+        should Contain    ${resp.text}    ${dataflowElement}
+    END
 
 Add a pathmap
-    [Arguments]    ${pathmap_data}
     [Documentation]    Create a pathmap for a vtn
-    ${resp}=    RequestsLibrary.Post Request    session    restconf/operations/vtn-path-map:set-path-map    data=${pathmap_data}
+    [Arguments]    ${pathmap_data}
+    ${resp}=    RequestsLibrary.Post Request
+    ...    session
+    ...    restconf/operations/vtn-path-map:set-path-map
+    ...    data=${pathmap_data}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Get a pathmap
     [Documentation]    Get a pathmap for a vtn.
     ${resp}=    RequestsLibrary.Get Request    session    restconf/operational/vtn-path-map:global-path-maps
-    : FOR    ${pathElement}    IN    @{PATHMAP_ATTR}
-    \    should Contain    ${resp.content}    ${pathElement}
+    FOR    ${pathElement}    IN    @{PATHMAP_ATTR}
+        should Contain    ${resp.text}    ${pathElement}
+    END
 
 Add a pathpolicy
-    [Arguments]    ${pathpolicy_data}
     [Documentation]    Create a pathpolicy for a vtn
-    ${resp}=    RequestsLibrary.Post Request    session    restconf/operations/vtn-path-policy:set-path-policy    data=${pathpolicy_data}
+    [Arguments]    ${pathpolicy_data}
+    ${resp}=    RequestsLibrary.Post Request
+    ...    session
+    ...    restconf/operations/vtn-path-policy:set-path-policy
+    ...    data=${pathpolicy_data}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Get a pathpolicy
-    [Arguments]    ${pathpolicy_id}
     [Documentation]    Get a pathpolicy for a vtn.
-    ${resp}=    RequestsLibrary.Get Request    session    restconf/operational/vtn-path-policy:vtn-path-policies/vtn-path-policy/${pathpolicy_id}
-    : FOR    ${pathpolicyElement}    IN    @{PATHPOLICY_ATTR}
-    \    should Contain    ${resp.content}    ${pathpolicyElement}
+    [Arguments]    ${pathpolicy_id}
+    ${resp}=    RequestsLibrary.Get Request
+    ...    session
+    ...    restconf/operational/vtn-path-policy:vtn-path-policies/vtn-path-policy/${pathpolicy_id}
+    FOR    ${pathpolicyElement}    IN    @{PATHPOLICY_ATTR}
+        should Contain    ${resp.text}    ${pathpolicyElement}
+    END
+
+Delete a pathmap
+    [Documentation]    Remove a pathmap for a vtn
+    [Arguments]    ${tenant_path}
+    ${resp}=    RequestsLibrary.Post Request
+    ...    session
+    ...    restconf/operations/vtn-path-map:remove-path-map
+    ...    data={"input":{"tenant-name":"${tenant_path}","map-index":["${policy_id}"]}}
+    Should Be Equal As Strings    ${resp.status_code}    200
 
 Delete a pathpolicy
-    [Arguments]    ${path_id}
     [Documentation]    Delete a pathpolicy for a vtn
-    ${resp}=    RequestsLibrary.Post Request    session    restconf/operations/vtn-path-policy:remove-path-policy    data={"input": {"id": "${path_id}"}}
+    [Arguments]    ${policy_id}
+    ${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
 
 Verify flowEntryPathPolicy
-    [Arguments]    ${of_version}    ${port}    ${output}
     [Documentation]    Checking Flows on switch S1 and switch S3 after applying path policy
+    [Arguments]    ${of_version}    ${port}    ${output}
     ${DUMPFLOWS}=    Set Variable If    "${of_version}"=="OF10"    ${DUMPFLOWS_OF10}    ${DUMPFLOWS_OF13}
     write    ${DUMPFLOWS}
-    ${result}    Read Until    mininet>
+    ${result}=    Read Until    mininet>
     Should Contain    ${result}    in_port=${port}    actions=${output}
 
 Add a macmap
-    [Arguments]    ${vtn_name}    ${vBridge_name}    ${macmap_data}
     [Documentation]    Create a macmap for a vbridge
-    ${resp}=    RequestsLibrary.Post Request    session    restconf/operations/vtn-mac-map:set-mac-map    data={"input": { "allowed-hosts": ["${macmap_data}"], "tenant-name":${vtn_name}, "bridge-name": ${vBridge_name}}}    }
+    [Arguments]    ${vtn_name}    ${vBridge_name}    ${src_add}    ${dst_add}
+    ${resp}=    RequestsLibrary.Post Request
+    ...    session
+    ...    restconf/operations/vtn-mac-map:set-mac-map
+    ...    data={"input":{"operation":"SET","allowed-hosts":["${dst_add}@0","${src_add}@0"],"tenant-name":"${vtn_name}","bridge-name":"${vBridge_name}"}}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Get DynamicMacAddress
-    [Arguments]    ${h}
     [Documentation]    Get Dynamic mac address of Host
+    [Arguments]    ${h}
     write    ${h} ifconfig -a | grep HWaddr
-    ${source}    Read Until    mininet>
+    ${source}=    Read Until    mininet>
     ${HWaddress}=    Split String    ${source}    ${SPACE}
     ${sourceHWaddr}=    Get from List    ${HWaddress}    ${index}
     ${sourceHWaddress}=    Convert To Lowercase    ${sourceHWaddr}
-    Return From Keyword    ${sourceHWaddress}    # Also [Return] would work here.
+    RETURN    ${sourceHWaddress}    # Also [Return] would work here.
 
 Mininet Ping Should Succeed
-    [Arguments]    ${host1}    ${host2}
     [Documentation]    Ping hosts to check connectivity
+    [Arguments]    ${host1}    ${host2}
     Write    ${host1} ping -c 1 ${host2}
-    ${result}    Read Until    mininet>
+    ${result}=    Read Until    mininet>
     Should Contain    ${result}    64 bytes
 
 Mininet Ping Should Not Succeed
-    [Arguments]    ${host1}    ${host2}
     [Documentation]    Ping hosts when there is no connectivity and check hosts is unreachable
+    [Arguments]    ${host1}    ${host2}
     Write    ${host1} ping -c 3 ${host2}
-    ${result}    Read Until    mininet>
+    ${result}=    Read Until    mininet>
     Should Not Contain    ${result}    64 bytes
 
 Start vlan_topo
-    [Arguments]    ${OF}
     [Documentation]    Create custom topology for vlan functionality
-    Clean Mininet System
-    ${mininet_conn_id1}=    Open Connection    ${MININET}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=30s
-    Set Suite Variable    ${mininet_conn_id1}
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
-    Execute Command    sudo ovs-vsctl set-manager ptcp:6644
-    Put File    ${CURDIR}/${CREATE_VLAN_TOPOLOGY_FILE_PATH}
-    Run Keyword If    '${OF}' == 'OF13'    Write    ${vlan_topo_13}
-    ...    ELSE IF    '${OF}' == 'OF10'    Write    ${vlan_topo_10}
-    ${result}    Read Until    mininet>
+    [Arguments]    ${OF}
+    Install Package On Ubuntu System    vlan
+    IF    '${OF}' == 'OF13'
+        MininetKeywords.Start Mininet Single Controller
+        ...    ${TOOLS_SYSTEM_IP}
+        ...    ${ODL_SYSTEM_IP}
+        ...    ${vlan_topo}
+        ...    ${CURDIR}/${CREATE_VLAN_TOPOLOGY_FILE_PATH}
+        ...    ofversion=13
+    ELSE IF    '${OF}' == 'OF10'
+        MininetKeywords.Start Mininet Single Controller
+        ...    ${TOOLS_SYSTEM_IP}
+        ...    ${ODL_SYSTEM_IP}
+        ...    ${vlan_topo}
+        ...    ${CURDIR}/${CREATE_VLAN_TOPOLOGY_FILE_PATH}
+        ...    ofversion=10
+    END
 
 Get flow
-    [Arguments]    ${vtn_name}
     [Documentation]    Get data flow.
-    ${resp}=    RequestsLibrary.Get Request    session    restconf/operational/vtn-flow-impl:vtn-flows/vtn-flow-table/${vtn_name}
+    [Arguments]    ${vtn_name}
+    ${resp}=    RequestsLibrary.Get Request
+    ...    session
+    ...    restconf/operational/vtn-flow-impl:vtn-flows/vtn-flow-table/${vtn_name}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Remove a portmap
-    [Arguments]    ${vtn_name}    ${vBridge_name}    ${interface_name}
     [Documentation]    Remove a portmap for a interface of a vbridge
-    ${resp}=    RequestsLibrary.Post Request    session    restconf/operations/vtn-port-map:remove-port-map    data={"input": {"tenant-name":${vtn_name},"bridge-name":${vBridge_name},"interface-name":${interface_name}}}
+    [Arguments]    ${vtn_name}    ${vBridge_name}    ${interface_name}
+    ${resp}=    RequestsLibrary.Post Request
+    ...    session
+    ...    restconf/operations/vtn-port-map:remove-port-map
+    ...    data={"input": {"tenant-name":${vtn_name},"bridge-name":${vBridge_name},"interface-name":${interface_name}}}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Verify FlowMacAddress
-    [Arguments]    ${host1}    ${host2}    ${OF_VERSION}
     [Documentation]    Verify the source and destination mac address.
-    Run Keyword If    '${OF_VERSION}' == 'OF10'    Verify Flows On OpenFlow    ${host1}    ${host2}    ${DUMPFLOWS_OF10}
-    ...    ELSE    VerifyFlowsOnOpenFlow    ${host1}    ${host2}    ${DUMPFLOWS_OF13}
+    [Arguments]    ${host1}    ${host2}    ${OF_VERSION}
+    IF    '${OF_VERSION}' == 'OF10'
+        Verify Flows On OpenFlow    ${host1}    ${host2}    ${FF_DUMPFLOWS_OF10}
+    ELSE
+        VerifyFlowsOnOpenFlow    ${host1}    ${host2}    ${FF_DUMPFLOWS_OF13}
+    END
 
 Verify Flows On OpenFlow
-    [Arguments]    ${host1}    ${host2}    ${DUMPFLOWS}
     [Documentation]    Verify the mac addresses on the specified open flow.
+    [Arguments]    ${host1}    ${host2}    ${DUMPFLOWS}
     ${booleanValue}=    Run Keyword And Return Status    Verify macaddress    ${host1}    ${host2}    ${DUMPFLOWS}
     Should Be Equal As Strings    ${booleanValue}    True
 
 Verify RemovedFlowMacAddress
-    [Arguments]    ${host1}    ${host2}    ${OF_VERSION}
     [Documentation]    Verify the removed source and destination mac address.
-    Run Keyword If    '${OF_VERSION}' == 'OF10'    Verify Removed Flows On OpenFlow    ${host1}    ${host2}    ${DUMPFLOWS_OF10}
-    ...    ELSE    VerifyRemovedFlowsOnOpenFlow    ${host1}    ${host2}    ${DUMPFLOWS_OF13}
+    [Arguments]    ${host1}    ${host2}    ${OF_VERSION}
+    IF    '${OF_VERSION}' == 'OF10'
+        Verify Removed Flows On OpenFlow    ${host1}    ${host2}    ${FF_DUMPFLOWS_OF10}
+    ELSE
+        Verify Removed Flows On OpenFlow    ${host1}    ${host2}    ${FF_DUMPFLOWS_OF13}
+    END
 
 Verify Removed Flows On OpenFlow
-    [Arguments]    ${host1}    ${host2}    ${DUMPFLOWS}
     [Documentation]    Verify the removed mac addresses on the specified open flow.
+    [Arguments]    ${host1}    ${host2}    ${DUMPFLOWS}
     ${booleanValue}=    Run Keyword And Return Status    Verify macaddress    ${host1}    ${host2}    ${DUMPFLOWS}
     Should Not Be Equal As Strings    ${booleanValue}    True
 
 Verify macaddress
-    [Arguments]    ${host1}    ${host2}    ${DUMPFLOWS}
     [Documentation]    Verify the source and destination mac address after ping in the dumpflows
+    [Arguments]    ${host1}    ${host2}    ${DUMPFLOWS}
     write    ${host1} ifconfig -a | grep HWaddr
-    ${sourcemacaddr}    Read Until    mininet>
+    ${sourcemacaddr}=    Read Until    mininet>
     ${macaddress}=    Split String    ${sourcemacaddr}    ${SPACE}
     ${sourcemacaddr}=    Get from List    ${macaddress}    ${index}
     ${sourcemacaddress}=    Convert To Lowercase    ${sourcemacaddr}
     write    ${host2} ifconfig -a | grep HWaddr
-    ${destmacaddr}    Read Until    mininet>
+    ${destmacaddr}=    Read Until    mininet>
     ${macaddress}=    Split String    ${destmacaddr}    ${SPACE}
     ${destmacaddr}=    Get from List    ${macaddress}    ${index}
     ${destmacaddress}=    Convert To Lowercase    ${destmacaddr}
     write    ${DUMPFLOWS}
-    ${result}    Read Until    mininet>
+    ${result}=    Read Until    mininet>
     Should Contain    ${result}    ${sourcemacaddress}
     Should Contain    ${result}    ${destmacaddress}
 
+Verify flowactions
+    [Documentation]    Verify the flowfilter actions after ping in the dumpflows
+    [Arguments]    ${actions}    ${DUMPFLOWS}
+    write    ${DUMPFLOWS}
+    ${result}=    Read Until    mininet>
+    Should Contain    ${result}    ${actions}
+
 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=${vtnflowfilter_data}
+    [Arguments]    ${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
+
+Remove a vtn flowfilter
+    [Documentation]    Delete a vtn flowfilter
+    [Arguments]    ${vtn_name}    ${filter_index}
+    ${resp}=    RequestsLibrary.Post Request
+    ...    session
+    ...    restconf/operations/vtn-flow-filter:remove-flow-filter
+    ...    data={"input": {"indices": ["${filter_index}"], "tenant-name": "${vtn_name}"}}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Add a vbr flowfilter
-    [Arguments]    ${vtn_name}    ${vBridge_name}    ${vbrflowfilter_data}
     [Documentation]    Create a flowfilter for a vbr
-    ${resp}=    RequestsLibrary.Post Request    session    restconf/operations/vtn-flow-filter:set-flow-filter    data=${vbrflowfilter_data}
+    [Arguments]    ${vtn_name}    ${vBridge_name}    ${vbrflowfilter_data}
+    ${resp}=    RequestsLibrary.Post Request
+    ...    session
+    ...    restconf/operations/vtn-flow-filter:set-flow-filter
+    ...    data={"input": {"tenant-name": "${vtn_name}", "bridge-name": "${vBridge_name}", ${vbrflowfilter_data}}}
+    Should Be Equal As Strings    ${resp.status_code}    200
+
+Remove a vbr flowfilter
+    [Documentation]    Delete a vbr flowfilter
+    [Arguments]    ${vtn_name}    ${vBridge_name}    ${filter_index}
+    ${resp}=    RequestsLibrary.Post Request
+    ...    session
+    ...    restconf/operations/vtn-flow-filter:remove-flow-filter
+    ...    data={"input": {"indices": ["${filter_index}"], "tenant-name": "${vtn_name}","bridge-name": "${vBridge_name}"}}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 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=${vbrif_flowfilter_data}
+    [Arguments]    ${vtn_name}    ${vBridge_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
+
+Remove a vbrif flowfilter
+    [Documentation]    Delete a vbrif flowfilter
+    [Arguments]    ${vtn_name}    ${vBridge_name}    ${interface_name}    ${filter_index}
+    ${resp}=    RequestsLibrary.Post Request
+    ...    session
+    ...    restconf/operations/vtn-flow-filter:remove-flow-filter
+    ...    data={"input": {"indices": ["${filter_index}"], "tenant-name": "${vtn_name}","bridge-name": "${vBridge_name}","interface-name": "${interface_name}"}}
     Should Be Equal As Strings    ${resp.status_code}    200
 
-Verify Flow Entry for Inet Flowfilter
+Add a vlan portmap
+    [Documentation]    Create a portmap for a interface of a vbridge
+    [Arguments]    ${vtn_name}    ${vbr_name}    ${interface_name}    ${id}    ${node_id}    ${port_id}
+    ${resp}=    RequestsLibrary.Post Request
+    ...    session
+    ...    restconf/operations/vtn-port-map:set-port-map
+    ...    data={"input": { "tenant-name":${vtn_name}, "bridge-name":${vbr_name}, "interface-name": ${interface_name}, "vlan-id": ${id}, "node":"${node_id}", "port-name":"${port_id}"}}
+    Should Be Equal As Strings    ${resp.status_code}    200
+
+Verify Flow Entries for Flowfilter
     [Documentation]    Verify switch flow entry using flowfilter for a vtn
-    ${booleanValue}=    Run Keyword And Return Status    Verify Actions on Flow Entry
-    Should Not Be Equal As Strings    ${booleanValue}    True
+    [Arguments]    ${dumpflows}    @{flowfilter_actions}
+    ${booleanValue}=    Run Keyword And Return Status
+    ...    Verify Actions on Flow Entry
+    ...    ${dumpflows}
+    ...    @{flowfilter_actions}
+    Should Be Equal As Strings    ${booleanValue}    True
 
 Verify Removed Flow Entry for Inet Drop Flowfilter
     [Documentation]    Verify removed switch flow entry using flowfilter drop for a vtn
-    ${booleanValue}=    Run Keyword And Return Status    Verify Actions on Flow Entry
+    [Arguments]    ${dumpflows}    @{flowfilter_actions}
+    ${booleanValue}=    Run Keyword And Return Status
+    ...    Verify Actions on Flow Entry
+    ...    ${dumpflows}
+    ...    @{flowfilter_actions}
     Should Be Equal As Strings    ${booleanValue}    True
 
 Verify Actions on Flow Entry
     [Documentation]    check flow action elements by giving dumpflows in mininet
-    write    ${DUMPFLOWS_OF13}
-    ${result}    Read Until    mininet>
-    : FOR    ${flowElement}    IN    @{FLOWELMENTS}
-    \    should Contain    ${result}    ${flowElement}
+    [Arguments]    ${dumpflows}    @{flowfilter_actions}
+    write    ${dumpflows}
+    ${result}=    Read Until    mininet>
+    FOR    ${flowElement}    IN    @{flowfilter_actions}
+        should Contain    ${result}    ${flowElement}
+    END
 
 Add a flowcondition
-    [Arguments]    ${flowcond_name}
     [Documentation]    Create a flowcondition using Restconfig Api
-    ${resp}=    RequestsLibrary.Post Request    session    restconf/operations/vtn-flow-condition:set-flow-condition    data={"input":{"operation":"SET","present":"false","name":"${flowcond_name}", "vtn-flow-match":[{"vtn-ether-match":{"destination-address":"ba:bd:0f:e3:a8:c8","ether-type":"2048","source-address":"ca:9e:58:0c:1e:f0","vlan-id": "1"},"vtn-inet-match":{"source-network":"10.0.0.1/32","protocol":1,"destination-network":"10.0.0.2/32"},"index":"1"}]}}
+    [Arguments]    ${flowcond_name}    ${flowconditiondata}
+    ${resp}=    RequestsLibrary.Post Request
+    ...    session
+    ...    restconf/operations/vtn-flow-condition:set-flow-condition
+    ...    data={"input":{"operation":"SET","present":"false","name":"${flowcond_name}",${flowconditiondata}}}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Get flowconditions
@@ -293,15 +523,23 @@ Get flowconditions
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Get flowcondition
+    [Documentation]    Retrieve the flowcondition by name and to check the removed flowcondition we added "retrieve" argument to differentiate the status code,
+    ...    since after removing flowcondition name the status will be different compare to status code when the flowcondition name is present.
     [Arguments]    ${flowcond_name}    ${retrieve}
-    [Documentation]    Retrieve the flowcondition by name and to check the removed flowcondition added "retrieve" argument to differentiate the status code, since
-    ...    after removing flowcondition name the status will be different compare to status code when the flowcondition name is present.
-    ${resp}=    RequestsLibrary.Get Request    session    restconf/operational/vtn-flow-condition:vtn-flow-conditions/vtn-flow-condition/${flowcond_name}
-    Run Keyword If    '${retrieve}' == 'retrieve'    Should Be Equal As Strings    ${resp.status_code}    200
-    ...    ELSE    Should Not Be Equal As Strings    ${resp.status_code}    200
+    ${resp}=    RequestsLibrary.Get Request
+    ...    session
+    ...    restconf/operational/vtn-flow-condition:vtn-flow-conditions/vtn-flow-condition/${flowcond_name}
+    IF    '${retrieve}' == 'retrieve'
+        Should Be Equal As Strings    ${resp.status_code}    200
+    ELSE
+        Should Not Be Equal As Strings    ${resp.status_code}    200
+    END
 
 Remove flowcondition
-    [Arguments]    ${flowcond_name}
     [Documentation]    Remove the flowcondition by name
-    ${resp}=    RequestsLibrary.Post Request    session    restconf/operations/vtn-flow-condition:remove-flow-condition    {"input": {"name": "${flowcond_name}"}}
+    [Arguments]    ${flowcond_name}
+    ${resp}=    RequestsLibrary.Post Request
+    ...    session
+    ...    restconf/operations/vtn-flow-condition:remove-flow-condition
+    ...    data={"input":{"name":"${flowcond_name}"}}
     Should Be Equal As Strings    ${resp.status_code}    200