8 files changed, 80 insertions, 2 deletions
diff --git a/resources/templates/vm/vpp_chain_ip4.exec b/resources/templates/vm/vppip4_2vhostvr1024.exec
index 3c5f076b5d..00fed3b5ea 100644
--- a/resources/templates/vm/vpp_chain_ip4.exec
+++ b/resources/templates/vm/vppip4_2vhostvr1024.exec
@@ -15,4 +15,6 @@ set ip neighbor static GigabitEthernet0/7/0 1.1.2.2 $vif2_mac
 ip route add 10.0.0.0/8 via 1.1.1.2
 ip route add 20.0.0.0/8 via 1.1.2.2
 
+show logging
+
 show version
diff --git a/resources/templates/vm/vppip4_2virtiovr1024.exec b/resources/templates/vm/vppip4_2virtiovr1024.exec
new file mode 100644
index 0000000000..c72a0ff960
--- /dev/null
+++ b/resources/templates/vm/vppip4_2virtiovr1024.exec
@@ -0,0 +1,22 @@
+set logging class virtio level debug
+
+create interface virtio 0000:00:06.0
+create interface virtio 0000:00:07.0
+
+set interface state virtio-0/0/6/0 up
+set interface state virtio-0/0/7/0 up
+
+set interface mac address virtio-0/0/6/0 $mac1
+set interface ip address virtio-0/0/6/0 1.1.1.1/24
+set interface mac address virtio-0/0/7/0 $mac2
+set interface ip address virtio-0/0/7/0 1.1.2.1/24
+
+set ip neighbor static virtio-0/0/6/0 1.1.1.2 $vif1_mac
+set ip neighbor static virtio-0/0/7/0 1.1.2.2 $vif2_mac
+
+ip route add 10.0.0.0/8 via 1.1.1.2
+ip route add 20.0.0.0/8 via 1.1.2.2
+
+show logging
+
+show version
diff --git a/resources/templates/vm/vpp_chain_ip4_noarp.exec b/resources/templates/vm/vppip4noarp_2vhostvr1024.exec
index 80e9cd8643..4069ec1668 100644
--- a/resources/templates/vm/vpp_chain_ip4_noarp.exec
+++ b/resources/templates/vm/vppip4noarp_2vhostvr1024.exec
@@ -7,4 +7,6 @@ set interface state GigabitEthernet0/7/0 up
 ip route add 10.0.0.0/8 via 1.1.1.2 GigabitEthernet0/6/0
 ip route add 20.0.0.0/8 via 1.1.2.2 GigabitEthernet0/7/0
 
+show logging
+
 show version
diff --git a/resources/templates/vm/vppip4noarp_2virtiovr1024.exec b/resources/templates/vm/vppip4noarp_2virtiovr1024.exec
new file mode 100644
index 0000000000..932106afb0
--- /dev/null
+++ b/resources/templates/vm/vppip4noarp_2virtiovr1024.exec
@@ -0,0 +1,17 @@
+set logging class virtio level debug
+
+create interface virtio 0000:00:06.0
+create interface virtio 0000:00:07.0
+
+set interface state virtio-0/0/6/0 up
+set interface state virtio-0/0/7/0 up
+
+set interface ip address virtio-0/0/6/0 1.1.1.1/30
+set interface ip address virtio-0/0/7/0 1.1.2.1/30
+
+ip route add 10.0.0.0/8 via 1.1.1.2 virtio-0/0/6/0
+ip route add 20.0.0.0/8 via 1.1.2.2 virtio-0/0/7/0
+
+show logging
+
+show version
diff --git a/resources/templates/vm/vpp_chain_ip6.exec b/resources/templates/vm/vppip6_2vhostvr1024.exec
index d2ac499d09..8545d77761 100644
--- a/resources/templates/vm/vpp_chain_ip6.exec
+++ b/resources/templates/vm/vppip6_2vhostvr1024.exec
@@ -7,4 +7,6 @@ set interface state GigabitEthernet0/7/0 up
 ip route add 2001:1::/64 via 1:1::2 GigabitEthernet0/6/0
 ip route add 2001:2::/64 via 1:2::2 GigabitEthernet0/7/0
 
+show logging
+
 show version
diff --git a/resources/templates/vm/vppip6_2virtiovr1024.exec b/resources/templates/vm/vppip6_2virtiovr1024.exec
new file mode 100644
index 0000000000..fd31d40f56
--- /dev/null
+++ b/resources/templates/vm/vppip6_2virtiovr1024.exec
@@ -0,0 +1,17 @@
+set logging class virtio level debug
+
+create interface virtio 0000:00:06.0
+create interface virtio 0000:00:07.0
+
+set interface state virtio-0/0/6/0 up
+set interface state virtio-0/0/7/0 up
+
+set interface ip address virtio-0/0/6/0 1:1::1/64
+set interface ip address virtio-0/0/7/0 1:2::1/64
+
+ip route add 2001:1::/64 via 1:1::2 virtio-0/0/6/0 up
+ip route add 2001:2::/64 via 1:2::2 virtio-0/0/7/0 up
+
+show logging
+
+show version
diff --git a/resources/templates/vm/vpp_chain_l2xc.exec b/resources/templates/vm/vppl2xc_2vhostvr1024.exec
index 705cc89488..cb54a48c36 100644
--- a/resources/templates/vm/vpp_chain_l2xc.exec
+++ b/resources/templates/vm/vppl2xc_2vhostvr1024.exec
@@ -1,7 +1,9 @@
-set int state GigabitEthernet0/6/0 up
-set int state GigabitEthernet0/7/0 up
+set interface state GigabitEthernet0/6/0 up
+set interface state GigabitEthernet0/7/0 up
 
 set interface l2 xconnect GigabitEthernet0/6/0 GigabitEthernet0/7/0
 set interface l2 xconnect GigabitEthernet0/7/0 GigabitEthernet0/6/0
 
+show logging
+
 show version
diff --git a/resources/templates/vm/vppl2xc_2virtiovr1024.exec b/resources/templates/vm/vppl2xc_2virtiovr1024.exec
new file mode 100644
index 0000000000..f4c89d25d1
--- /dev/null
+++ b/resources/templates/vm/vppl2xc_2virtiovr1024.exec
@@ -0,0 +1,14 @@
+set logging class virtio level debug
+
+create interface virtio 0000:00:06.0
+create interface virtio 0000:00:07.0
+
+set interface state virtio-0/0/6/0 up
+set interface state virtio-0/0/7/0 up
+
+set interface l2 xconnect virtio-0/0/6/0 virtio-0/0/7/0
+set interface l2 xconnect virtio-0/0/7/0 virtio-0/0/6/0
+
+show logging
+
+show version