Update of latest tests.

Change-Id: Ifb04651ff4a3c1ba9aaa725eb9a309278ebc1140
Signed-off-by: Stefan Kobza <skobza@cisco.com>

7 files changed, 12 insertions, 13 deletions

diff --git a/resources/templates/vat/add_ip_neighbor.vat b/resources/templates/vat/add_ip_neighbor.vat
new file mode 100644
index 0000000000..e8587b28ca
--- /dev/null
+++ b/resources/templates/vat/add_ip_neighbor.vat
@@ -0,0 +1 @@
+ip_neighbor_add_del sw_if_index {sw_if_index} dst {ip_address} mac {mac_address}
\ No newline at end of file
diff --git a/resources/templates/vat/add_l2_fib_entry.vat b/resources/templates/vat/add_l2_fib_entry.vat
new file mode 100644
index 0000000000..2920c4b123
--- /dev/null
+++ b/resources/templates/vat/add_l2_fib_entry.vat
@@ -0,0 +1 @@
+l2fib_add_del mac {mac} bd_id {bd} sw_if_index {interface}
diff --git a/resources/templates/vat/l2_bridge_domain.vat b/resources/templates/vat/l2_bridge_domain.vat
index 84bf409944..9c81dbc8e8 100644
--- a/resources/templates/vat/l2_bridge_domain.vat
+++ b/resources/templates/vat/l2_bridge_domain.vat
@@ -1,5 +1,6 @@
+sw_interface_set_flags {interface1} admin-up link-up
+sw_interface_set_flags {interface2} admin-up link-up
 bridge_domain_add_del bd_id 1 flood 1 uu-flood 1 forward 1 learn 1 arp-term 0
 sw_interface_set_l2_bridge {interface1} bd_id 1 shg 0  enable
 sw_interface_set_l2_bridge {interface2} bd_id 1 shg 0  enable
-sw_interface_set_flags {interface1} admin-up link-up
-sw_interface_set_flags {interface2} admin-up link-up
\ No newline at end of file
+exec trace add dpdk-input 100
diff --git a/resources/templates/vat/l2_bridge_domain_gen.vat b/resources/templates/vat/l2_bridge_domain_gen.vat
deleted file mode 100644
index 4e635e29c4..0000000000
--- a/resources/templates/vat/l2_bridge_domain_gen.vat
+++ /dev/null
@@ -1,5 +0,0 @@
-bridge_domain_add_del bd_id 1 flood 1 uu-flood 1 forward 1 learn 1 arp-term 0
-sw_interface_set_l2_bridge TenGigabitEthernet84/0/1 bd_id 1 shg 0  enable
-sw_interface_set_l2_bridge TenGigabitEthernet84/0/0 bd_id 1 shg 0  enable
-sw_interface_set_flags TenGigabitEthernet84/0/1 admin-up link-up
-sw_interface_set_flags TenGigabitEthernet84/0/0 admin-up link-up
\ No newline at end of file
diff --git a/resources/templates/vat/l2_bridge_domain_static.vat b/resources/templates/vat/l2_bridge_domain_static.vat
new file mode 100644
index 0000000000..bb99b2daba
--- /dev/null
+++ b/resources/templates/vat/l2_bridge_domain_static.vat
@@ -0,0 +1,6 @@
+sw_interface_set_flags {interface1} admin-up link-up
+sw_interface_set_flags {interface2} admin-up link-up
+bridge_domain_add_del bd_id {bd_id} flood 1 uu-flood 1 forward 1 learn 0 arp-term 0
+sw_interface_set_l2_bridge {interface1} bd_id {bd_id} shg 0  enable
+sw_interface_set_l2_bridge {interface2} bd_id {bd_id} shg 0  enable
+exec trace add dpdk-input 100
diff --git a/resources/templates/vat/l2_xconnect.vat b/resources/templates/vat/l2_xconnect.vat
new file mode 100644
index 0000000000..3812e9ad1f
--- /dev/null
+++ b/resources/templates/vat/l2_xconnect.vat
@@ -0,0 +1 @@
+sw_interface_set_l2_xconnect rx_sw_if_index {interface1} tx_sw_if_index {interface2}
\ No newline at end of file
diff --git a/resources/templates/vat/l2xconnect.vat b/resources/templates/vat/l2xconnect.vat
deleted file mode 100644
index 8059007f17..0000000000
--- a/resources/templates/vat/l2xconnect.vat
+++ /dev/null
@@ -1,6 +0,0 @@
-exec set interface state TenGigabitEthernet84/0/0 up
-exec set interface state TenGigabitEthernet84/0/1 up
-exec set interface l2 xconnect TenGigabitEthernet84/0/0 TenGigabitEthernet84/0/1
-exec set interface l2 xconnect TenGigabitEthernet84/0/1 TenGigabitEthernet84/0/0
-quit
-