-${vlan_topo_10} sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --custom vlan_vtn_test.py --topo vlantopo
-${vlan_topo_13} sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --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 -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_13} sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --custom topo-3sw-2host_multipath.py --topo pathpolicytopo --switch ovsk,protocols=OpenFlow13
-${pathpolicy_topo_10} sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --custom topo-3sw-2host_multipath.py --topo pathpolicytopo --switch ovsk,protocols=OpenFlow10
-@{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->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
-@{PATHPOLICY_ATTR} "id":1 "port-desc":"openflow:4,2,s4-eth2"
-${custom} ${CURDIR}/${CREATE_PATHPOLICY_TOPOLOGY_FILE_PATH}
+${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}
+