-| &{tap_settings}= | tap-name=tap_test | mac=08:00:27:c0:5d:37
-| ... | device-instance=${1}
-| &{tap_settings2}= | tap-name=tap_test | mac=08:00:27:60:26:ab
-| ... | device-instance=${2}
+| &{tap_settings}= | host-interface-name=tap_test | mac=08:00:27:c0:5d:37
+| ... | id=${1}
+| &{tap_settings_oper}= | device-name=tap0 | tx-ring-size=${256}
+| ... | rx-ring-size=${256} | host-interface-name=tap_test
+| ... | mac=08:00:27:c0:5d:37 | id=${1}
+| &{tap_settings_vat}= | dev_name=tap0 | mac=08:00:27:c0:5d:37
+| ... | rx_ring_sz=${256} | tx_ring_sz=${256} | id=${1}
+| &{tap_settings2}= | host-interface-name=tap_test | mac=08:00:27:60:26:ab
+| ... | id=${2}
+| &{tap_settings2_oper}= | device-name=tap0 | tx-ring-size=${256}
+| ... | rx-ring-size=${256} | host-interface-name=tap_test
+| ... | mac=08:00:27:60:26:ab | id=${1}
+| &{tap_settings2_vat}= | dev_name=tap0 | mac=08:00:27:60:26:ab
+| ... | rx_ring_sz=${256} | tx_ring_sz=${256} | id=${1}