Infra: vpp_device -> Ubuntu 20.04

Signed-off-by: pmikus <pmikus@cisco.com>
Change-Id: If24c385b93e1ba310ea258984c97494b4cab467c

26 files changed, 591 insertions, 106 deletions

diff --git a/GPL/traffic_scripts/send_ip_check_headers.py b/GPL/traffic_scripts/send_ip_check_headers.py
index a384b683e9..40268d99c2 100644
--- a/GPL/traffic_scripts/send_ip_check_headers.py
+++ b/GPL/traffic_scripts/send_ip_check_headers.py
@@ -34,7 +34,7 @@ import ipaddress
 
 from robot.api import logger
 from scapy.layers.inet import IP
-from scapy.layers.inet6 import IPv6, ICMPv6ND_NS
+from scapy.layers.inet6 import IPv6, ICMPv6ND_NS, ICMPv6MLReport2
 from scapy.layers.l2 import Ether, Dot1Q
 from scapy.packet import Raw
 
@@ -125,6 +125,10 @@ def main():
         if ether.haslayer(ICMPv6ND_NS):
             # read another packet in the queue if the current one is ICMPv6ND_NS
             continue
+        elif ether.haslayer(ICMPv6MLReport2):
+            # read another packet in the queue if the current one is
+            # ICMPv6MLReport2
+            continue
         else:
             # otherwise process the current packet
             break
diff --git a/docs/lab/testbed_specifications.md b/docs/lab/testbed_specifications.md
index b52ada8660..365eaddb59 100644
--- a/docs/lab/testbed_specifications.md
+++ b/docs/lab/testbed_specifications.md
@@ -1381,7 +1381,11 @@ Note: Server19 (TG) is shared between testbed33 & testbed34
     - ring3 10GE-ports x710-4p10GE:
         - s1-t11-sut1-c2/p3 to s1-t11-sut1-c4/p3.
     - ring4 10GE-ports x710-4p10GE:
-        - s1-t11-sut1-c2/p3 to s1-t11-sut1-c4/p3.
+        - s1-t11-sut1-c2/p4 to s1-t11-sut1-c4/p4.
+    - ring5 100GE-ports e810-2p100GE:
+        - s1-t11-sut1-c5/p1 to s1-t11-sut1-c6/p1.
+    - ring6 100GE-ports e810-2p100GE:
+        - s1-t11-sut1-c5/p2 to s1-t11-sut1-c6/p2.
 - testbed12:
     - ring1 10GE-ports x710-4p10GE:
         - s2-t12-sut1-c2/p1 to s2-t12-sut1-c4/p1.
@@ -1390,7 +1394,11 @@ Note: Server19 (TG) is shared between testbed33 & testbed34
     - ring3 10GE-ports x710-4p10GE:
         - s2-t12-sut1-c2/p3 to s2-t12-sut1-c4/p3.
     - ring4 10GE-ports x710-4p10GE:
-        - s2-t12-sut1-c2/p3 to s2-t12-sut1-c4/p3.
+        - s2-t12-sut1-c2/p4 to s2-t12-sut1-c4/p4.
+    - ring5 100GE-ports e810-2p100GE:
+        - s2-t12-sut1-c5/p1 to s2-t12-sut1-c6/p1.
+    - ring6 100GE-ports e810-2p100GE:
+        - s2-t12-sut1-c5/p2 to s2-t12-sut1-c6/p2.
 ```
 
 #### 1-Node-ThunderX2 Wiring (1n-tx2) PROD
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml
index 8abe801a45..360ed3727b 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml
@@ -4,7 +4,8 @@
 hostname: "s1-t11-sut1"
 grub:
   hugepagesz: "2M"
-  nr_hugepages: 32768
+  hugepages: 32768
+  iommu: "on"
 inventory_ipmi_hostname: "10.30.50.47"
 cpu_microarchitecture: "skylake"
 
@@ -15,19 +16,17 @@ users:
     password: "$6$FIsbVDQR$5D0wgufOd2FtnmOiRNsGlgg6Loh.0x3dWSj72DSQnqisSyE9DROfgSgA6s0yxDwz4Jd5SRTXiTKuRYuSQ5POI1"
     ssh_key:
       - "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAgObJFDIMmPwQhhkjAynvlbwpM5yeSewyaE7vTLaFf4uFz4vmsE2hFf6B2xXHUGLVwoVfk91UeK7LOGrdDpoDDHzvPZXj5NmZI+WiWax5y2pQZNkcSZws0ENCeEc4hPwc4veJ1JmhokF4Bsmu14HyFMaFUhM8897jtJwsh+9fLA/no0iPGaQqEtRUQhkV+P4jCEPoY0qdRZAzVw/rY4EGAMhsJe3EJmyj63OfrrkG3+hvSLFo5pDxHQr3pZd/c6ukI7xMef48PosAvGCm3oxzb/Gu9PZIGuHLczY+tCnzCkY7MO7E+IWgjXrUAfYwSWz8XmFmA9LLe26DT5jkcK8hGQ== pmikus@cisco.com"
-  - username: testuser
-    groups: [adm, sudo]
-    password: "$6$zpBUdQ4q$P2zKclumvCndWujgP/qQ8eMk3YZk7ESAom04Fqp26hJH2jWkMXEX..jqxzMdDLJKiDaDHIaSkQMVjHzd3cRLs1"
-    ssh_key:
-      - "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAgObJFDIMmPwQhhkjAynvlbwpM5yeSewyaE7vTLaFf4uFz4vmsE2hFf6B2xXHUGLVwoVfk91UeK7LOGrdDpoDDHzvPZXj5NmZI+WiWax5y2pQZNkcSZws0ENCeEc4hPwc4veJ1JmhokF4Bsmu14HyFMaFUhM8897jtJwsh+9fLA/no0iPGaQqEtRUQhkV+P4jCEPoY0qdRZAzVw/rY4EGAMhsJe3EJmyj63OfrrkG3+hvSLFo5pDxHQr3pZd/c6ukI7xMef48PosAvGCm3oxzb/Gu9PZIGuHLczY+tCnzCkY7MO7E+IWgjXrUAfYwSWz8XmFmA9LLe26DT5jkcK8hGQ== pmikus@cisco.com"
+      - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDCG7Shfr7ASXXwpazYDGFzChGl7i4HgY9n81GTwc17B/O19IiJdrxFcBQH19HMuTFtWU4d9bQ6xgzz2pojBN13L3pEsStCHovDlEYbvfRxI2l2hcAAop1j1E4izHAS9IvCoy1AgWqBg6tsfP5mzOwGbSbcdI9ADRKIHgDTVbHg9SqKed27bNOLU0u3/5ra2Oar/tVIW37geEqFV/nHIBZ03Y/mszvXP/t/hP5bgJIGJKkzTjLd1aqEcuGmubW+wTQnVnrhFB87dw91gPj6BVyV0+7Vt1wrvPKqP2sGJhojAMSrBQBySnlrYgEg00bwDgNGFevatfG9+nTId+nhoKBkXya3MjSp4HwrGqGcij3/h7ovlau3/iRhkqlSeqenaNm4zKTAXRTnb60j2WKa6im0zdqJX98anp4mhjE8xHhmmfZV3vRT8mtY4hF/lg79miXFHpWH97bZV6r/D9qj1HWI/laJfOC5MOJdRcLETwtsUNMHeHtVnY3yu0XFYNcl2Xwajtnz3waF7vn1QHvAM9p878+JrO/IEUqEc0yZWVvlhZ7Krx1pS+APoMy8097MYDGFzFTkYSstKLGbgm/S7dEiWuSVxmMUxW7JYO3gHrQ3f1EvAYh2UFdWy76Dzr5II9UpVwOwF+HL/Oy8Sk77bPaK+tn7Kh4Tx7WWE0+EOAgElQ== ayourtch@ayourtch-lnx"
+      - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCXUbbhesOpvPF+KI8nq4TXvEO/Un1aU/ehZ9clCyw9C40xjDkX2BlcX8WeHxFHe7fjFaCd07Vg73rn/3M9uNDnDxvjH1GQ0twvi3iBTO4PkHBBfGF9qnE8MYzno6FvlsVKLuUuPbfm8kbOQ+ZDfdXq6gdtXh0hSYYkqC1heNPCNsqaakkB99Edyle+Ot0V7cpW+Yo2wo98KuX/cgUEhVoA8QnNVE7zaWcjSXBZEteoA4gLpAbV6p67/d6H/2ykHTidBViYTEsHco56tJoA4nTPuAupDOLBcWXgF5TAN6z1aCn2JA1DDfniLakgrZ5oVj2qHhUmbxQAtnKQfHADjqzV jlinkes@jlinkes"
+      - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD0GXoSGDZ95TE/TT3kf4ZS3Tiso0UO3MVhqAqZ/F6LOvLyqnMPfhxPz1XpHsDikxvKgwhZvdBm1dWbKkPsD7jtw0PGphQO8QuEwBd2ZMvxZ4Qg6lNDUl5x3zRO2nkbKpcqnOugGLTtXP+yfw/wfQ2HNFLDP9gE90xegsPT83PmRUntQlhbS3ByHcCSUScC+Y1heZXuoKNyrmUY46lxkKsNfhx8sQKo0YhB21atV/mcAQbAaO2LggmaQYGtWizqPNGWIRsi9W8ZYnKva67c3Pbv/TTfaqmrNCwOXJ8G9oL+/3MlKbl3b5mYlTs2a/e9yVgMNwUZVX7aiHpgPgaVjL6j swdev@BradyBunch-MacMini.local"
 
 # Nomad settings.
 nomad_certificates:
-  - src: "{{ vault_nomad_v1_ca_file }}"
+  - src: "{{ file_nomad_ca_pem }}"
     dest: "{{ nomad_ca_file }}"
-  - src: "{{ vault_nomad_v1_cert_file }}"
+  - src: "{{ file_nomad_client_pem }}"
     dest: "{{ nomad_cert_file }}"
-  - src: "{{ vault_nomad_v1_key_file }}"
+  - src: "{{ file_nomad_client_key_pem }}"
     dest: "{{ nomad_key_file }}"
 nomad_datacenter: "yul1"
 nomad_name: "{{ hostname }}-{{ ansible_architecture }}"
@@ -39,17 +38,14 @@ nomad_options:
   docker.privileged.enabled: true
   docker.volumes.enabled: true
   driver.whitelist: "docker,raw_exec,exec"
-nomad_servers: [ "10.30.51.32:4647", "10.30.51.33:4647" ]
+nomad_retry_servers: [ "10.30.51.30", "10.30.51.32", "10.30.51.33" ]
+nomad_servers: [ "10.30.51.30:4647", "10.30.51.32:4647", "10.30.51.33:4647" ]
 
 # Consul settigs.
 consul_nomad_integration: true
 consul_certificates:
-  - src: "{{ vault_consul_v1_ca_file }}"
+  - src: "{{ file_consul_ca_pem }}"
     dest: "{{ consul_ca_file }}"
-  - src: "{{ vault_consul_v1_cert_file }}"
-    dest: "{{ consul_cert_file }}"
-  - src: "{{ vault_consul_v1_key_file }}"
-    dest: "{{ consul_key_file }}"
 consul_datacenter: "yul1"
 consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ=="
 consul_node_name: "{{ hostname }}"
@@ -65,4 +61,4 @@ docker_daemon:
   dns: [ "172.17.0.1" ]
   dns-opts: []
   dns-search: [ "{{ ansible_hostname }}" ]
-  host: [ "172.17.0.1:/var/run/docker.sock" ]
\ No newline at end of file
+  host: [ "172.17.0.1:/var/run/docker.sock" ]
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml
index f21a4d93b9..7d159eab3d 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml
@@ -4,7 +4,8 @@
 hostname: "s2-t12-sut1"
 grub:
   hugepagesz: "2M"
-  nr_hugepages: 32768
+  hugepages: 32768
+  iommu: "on"
 inventory_ipmi_hostname: "10.30.50.48"
 cpu_microarchitecture: "skylake"
 
@@ -15,19 +16,17 @@ users:
     password: "$6$FIsbVDQR$5D0wgufOd2FtnmOiRNsGlgg6Loh.0x3dWSj72DSQnqisSyE9DROfgSgA6s0yxDwz4Jd5SRTXiTKuRYuSQ5POI1"
     ssh_key:
       - "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAgObJFDIMmPwQhhkjAynvlbwpM5yeSewyaE7vTLaFf4uFz4vmsE2hFf6B2xXHUGLVwoVfk91UeK7LOGrdDpoDDHzvPZXj5NmZI+WiWax5y2pQZNkcSZws0ENCeEc4hPwc4veJ1JmhokF4Bsmu14HyFMaFUhM8897jtJwsh+9fLA/no0iPGaQqEtRUQhkV+P4jCEPoY0qdRZAzVw/rY4EGAMhsJe3EJmyj63OfrrkG3+hvSLFo5pDxHQr3pZd/c6ukI7xMef48PosAvGCm3oxzb/Gu9PZIGuHLczY+tCnzCkY7MO7E+IWgjXrUAfYwSWz8XmFmA9LLe26DT5jkcK8hGQ== pmikus@cisco.com"
-  - username: testuser
-    groups: [adm, sudo]
-    password: "$6$zpBUdQ4q$P2zKclumvCndWujgP/qQ8eMk3YZk7ESAom04Fqp26hJH2jWkMXEX..jqxzMdDLJKiDaDHIaSkQMVjHzd3cRLs1"
-    ssh_key:
-      - "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAgObJFDIMmPwQhhkjAynvlbwpM5yeSewyaE7vTLaFf4uFz4vmsE2hFf6B2xXHUGLVwoVfk91UeK7LOGrdDpoDDHzvPZXj5NmZI+WiWax5y2pQZNkcSZws0ENCeEc4hPwc4veJ1JmhokF4Bsmu14HyFMaFUhM8897jtJwsh+9fLA/no0iPGaQqEtRUQhkV+P4jCEPoY0qdRZAzVw/rY4EGAMhsJe3EJmyj63OfrrkG3+hvSLFo5pDxHQr3pZd/c6ukI7xMef48PosAvGCm3oxzb/Gu9PZIGuHLczY+tCnzCkY7MO7E+IWgjXrUAfYwSWz8XmFmA9LLe26DT5jkcK8hGQ== pmikus@cisco.com"
+      - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDCG7Shfr7ASXXwpazYDGFzChGl7i4HgY9n81GTwc17B/O19IiJdrxFcBQH19HMuTFtWU4d9bQ6xgzz2pojBN13L3pEsStCHovDlEYbvfRxI2l2hcAAop1j1E4izHAS9IvCoy1AgWqBg6tsfP5mzOwGbSbcdI9ADRKIHgDTVbHg9SqKed27bNOLU0u3/5ra2Oar/tVIW37geEqFV/nHIBZ03Y/mszvXP/t/hP5bgJIGJKkzTjLd1aqEcuGmubW+wTQnVnrhFB87dw91gPj6BVyV0+7Vt1wrvPKqP2sGJhojAMSrBQBySnlrYgEg00bwDgNGFevatfG9+nTId+nhoKBkXya3MjSp4HwrGqGcij3/h7ovlau3/iRhkqlSeqenaNm4zKTAXRTnb60j2WKa6im0zdqJX98anp4mhjE8xHhmmfZV3vRT8mtY4hF/lg79miXFHpWH97bZV6r/D9qj1HWI/laJfOC5MOJdRcLETwtsUNMHeHtVnY3yu0XFYNcl2Xwajtnz3waF7vn1QHvAM9p878+JrO/IEUqEc0yZWVvlhZ7Krx1pS+APoMy8097MYDGFzFTkYSstKLGbgm/S7dEiWuSVxmMUxW7JYO3gHrQ3f1EvAYh2UFdWy76Dzr5II9UpVwOwF+HL/Oy8Sk77bPaK+tn7Kh4Tx7WWE0+EOAgElQ== ayourtch@ayourtch-lnx"
+      - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCXUbbhesOpvPF+KI8nq4TXvEO/Un1aU/ehZ9clCyw9C40xjDkX2BlcX8WeHxFHe7fjFaCd07Vg73rn/3M9uNDnDxvjH1GQ0twvi3iBTO4PkHBBfGF9qnE8MYzno6FvlsVKLuUuPbfm8kbOQ+ZDfdXq6gdtXh0hSYYkqC1heNPCNsqaakkB99Edyle+Ot0V7cpW+Yo2wo98KuX/cgUEhVoA8QnNVE7zaWcjSXBZEteoA4gLpAbV6p67/d6H/2ykHTidBViYTEsHco56tJoA4nTPuAupDOLBcWXgF5TAN6z1aCn2JA1DDfniLakgrZ5oVj2qHhUmbxQAtnKQfHADjqzV jlinkes@jlinkes"
+      - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD0GXoSGDZ95TE/TT3kf4ZS3Tiso0UO3MVhqAqZ/F6LOvLyqnMPfhxPz1XpHsDikxvKgwhZvdBm1dWbKkPsD7jtw0PGphQO8QuEwBd2ZMvxZ4Qg6lNDUl5x3zRO2nkbKpcqnOugGLTtXP+yfw/wfQ2HNFLDP9gE90xegsPT83PmRUntQlhbS3ByHcCSUScC+Y1heZXuoKNyrmUY46lxkKsNfhx8sQKo0YhB21atV/mcAQbAaO2LggmaQYGtWizqPNGWIRsi9W8ZYnKva67c3Pbv/TTfaqmrNCwOXJ8G9oL+/3MlKbl3b5mYlTs2a/e9yVgMNwUZVX7aiHpgPgaVjL6j swdev@BradyBunch-MacMini.local"
 
 # Nomad settings.
 nomad_certificates:
-  - src: "{{ vault_nomad_v1_ca_file }}"
+  - src: "{{ file_nomad_ca_pem }}"
     dest: "{{ nomad_ca_file }}"
-  - src: "{{ vault_nomad_v1_cert_file }}"
+  - src: "{{ file_nomad_client_pem }}"
     dest: "{{ nomad_cert_file }}"
-  - src: "{{ vault_nomad_v1_key_file }}"
+  - src: "{{ file_nomad_client_key_pem }}"
     dest: "{{ nomad_key_file }}"
 nomad_datacenter: "yul1"
 nomad_name: "{{ hostname }}-{{ ansible_architecture }}"
@@ -39,17 +38,14 @@ nomad_options:
   docker.privileged.enabled: true
   docker.volumes.enabled: true
   driver.whitelist: "docker,raw_exec,exec"
+nomad_retry_servers: [ "10.30.51.30", "10.30.51.32", "10.30.51.33" ]
 nomad_servers: [ "10.30.51.30:4647", "10.30.51.32:4647", "10.30.51.33:4647" ]
 
 # Consul settigs.
 consul_nomad_integration: true
 consul_certificates:
-  - src: "{{ vault_consul_v1_ca_file }}"
+  - src: "{{ file_consul_ca_pem }}"
     dest: "{{ consul_ca_file }}"
-  - src: "{{ vault_consul_v1_cert_file }}"
-    dest: "{{ consul_cert_file }}"
-  - src: "{{ vault_consul_v1_key_file }}"
-    dest: "{{ consul_key_file }}"
 consul_datacenter: "yul1"
 consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ=="
 consul_node_name: "{{ hostname }}"
@@ -65,4 +61,4 @@ docker_daemon:
   dns: [ "172.17.0.1" ]
   dns-opts: []
   dns-search: [ "{{ ansible_hostname }}" ]
-  host: [ "172.17.0.1:/var/run/docker.sock" ]
\ No newline at end of file
+  host: [ "172.17.0.1:/var/run/docker.sock" ]
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml
index 86cba152c8..5d2eea3372 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml
@@ -1,12 +1,13 @@
 ---
 # file: host_vars/10.30.51.70.yaml
 
-hostname: "s55-t36-sut1"
+hostname: "s55-t13-sut1"
 inventory_ipmi_hostname: "10.30.50.70"
 vfs_data_file: "csit-initialize-vfs-tx2.sh"
 grub:
   hugepagesz: "2M"
-  nr_hugepages: 32768
+  hugepages: 32768
+  iommu: "on"
 cpu_microarchitecture: "thunderx2"
 
 # User management.
@@ -16,21 +17,17 @@ users:
     password: "$6$FIsbVDQR$5D0wgufOd2FtnmOiRNsGlgg6Loh.0x3dWSj72DSQnqisSyE9DROfgSgA6s0yxDwz4Jd5SRTXiTKuRYuSQ5POI1"
     ssh_key:
       - "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAgObJFDIMmPwQhhkjAynvlbwpM5yeSewyaE7vTLaFf4uFz4vmsE2hFf6B2xXHUGLVwoVfk91UeK7LOGrdDpoDDHzvPZXj5NmZI+WiWax5y2pQZNkcSZws0ENCeEc4hPwc4veJ1JmhokF4Bsmu14HyFMaFUhM8897jtJwsh+9fLA/no0iPGaQqEtRUQhkV+P4jCEPoY0qdRZAzVw/rY4EGAMhsJe3EJmyj63OfrrkG3+hvSLFo5pDxHQr3pZd/c6ukI7xMef48PosAvGCm3oxzb/Gu9PZIGuHLczY+tCnzCkY7MO7E+IWgjXrUAfYwSWz8XmFmA9LLe26DT5jkcK8hGQ== pmikus@cisco.com"
+      - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDCG7Shfr7ASXXwpazYDGFzChGl7i4HgY9n81GTwc17B/O19IiJdrxFcBQH19HMuTFtWU4d9bQ6xgzz2pojBN13L3pEsStCHovDlEYbvfRxI2l2hcAAop1j1E4izHAS9IvCoy1AgWqBg6tsfP5mzOwGbSbcdI9ADRKIHgDTVbHg9SqKed27bNOLU0u3/5ra2Oar/tVIW37geEqFV/nHIBZ03Y/mszvXP/t/hP5bgJIGJKkzTjLd1aqEcuGmubW+wTQnVnrhFB87dw91gPj6BVyV0+7Vt1wrvPKqP2sGJhojAMSrBQBySnlrYgEg00bwDgNGFevatfG9+nTId+nhoKBkXya3MjSp4HwrGqGcij3/h7ovlau3/iRhkqlSeqenaNm4zKTAXRTnb60j2WKa6im0zdqJX98anp4mhjE8xHhmmfZV3vRT8mtY4hF/lg79miXFHpWH97bZV6r/D9qj1HWI/laJfOC5MOJdRcLETwtsUNMHeHtVnY3yu0XFYNcl2Xwajtnz3waF7vn1QHvAM9p878+JrO/IEUqEc0yZWVvlhZ7Krx1pS+APoMy8097MYDGFzFTkYSstKLGbgm/S7dEiWuSVxmMUxW7JYO3gHrQ3f1EvAYh2UFdWy76Dzr5II9UpVwOwF+HL/Oy8Sk77bPaK+tn7Kh4Tx7WWE0+EOAgElQ== ayourtch@ayourtch-lnx"
       - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCXUbbhesOpvPF+KI8nq4TXvEO/Un1aU/ehZ9clCyw9C40xjDkX2BlcX8WeHxFHe7fjFaCd07Vg73rn/3M9uNDnDxvjH1GQ0twvi3iBTO4PkHBBfGF9qnE8MYzno6FvlsVKLuUuPbfm8kbOQ+ZDfdXq6gdtXh0hSYYkqC1heNPCNsqaakkB99Edyle+Ot0V7cpW+Yo2wo98KuX/cgUEhVoA8QnNVE7zaWcjSXBZEteoA4gLpAbV6p67/d6H/2ykHTidBViYTEsHco56tJoA4nTPuAupDOLBcWXgF5TAN6z1aCn2JA1DDfniLakgrZ5oVj2qHhUmbxQAtnKQfHADjqzV jlinkes@jlinkes"
-  - username: testuser
-    groups: [adm, sudo]
-    password: "$6$zpBUdQ4q$P2zKclumvCndWujgP/qQ8eMk3YZk7ESAom04Fqp26hJH2jWkMXEX..jqxzMdDLJKiDaDHIaSkQMVjHzd3cRLs1"
-    ssh_key:
-      - "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAgObJFDIMmPwQhhkjAynvlbwpM5yeSewyaE7vTLaFf4uFz4vmsE2hFf6B2xXHUGLVwoVfk91UeK7LOGrdDpoDDHzvPZXj5NmZI+WiWax5y2pQZNkcSZws0ENCeEc4hPwc4veJ1JmhokF4Bsmu14HyFMaFUhM8897jtJwsh+9fLA/no0iPGaQqEtRUQhkV+P4jCEPoY0qdRZAzVw/rY4EGAMhsJe3EJmyj63OfrrkG3+hvSLFo5pDxHQr3pZd/c6ukI7xMef48PosAvGCm3oxzb/Gu9PZIGuHLczY+tCnzCkY7MO7E+IWgjXrUAfYwSWz8XmFmA9LLe26DT5jkcK8hGQ== pmikus@cisco.com"
-      - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCXUbbhesOpvPF+KI8nq4TXvEO/Un1aU/ehZ9clCyw9C40xjDkX2BlcX8WeHxFHe7fjFaCd07Vg73rn/3M9uNDnDxvjH1GQ0twvi3iBTO4PkHBBfGF9qnE8MYzno6FvlsVKLuUuPbfm8kbOQ+ZDfdXq6gdtXh0hSYYkqC1heNPCNsqaakkB99Edyle+Ot0V7cpW+Yo2wo98KuX/cgUEhVoA8QnNVE7zaWcjSXBZEteoA4gLpAbV6p67/d6H/2ykHTidBViYTEsHco56tJoA4nTPuAupDOLBcWXgF5TAN6z1aCn2JA1DDfniLakgrZ5oVj2qHhUmbxQAtnKQfHADjqzV jlinkes@jlinkes"
+      - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD0GXoSGDZ95TE/TT3kf4ZS3Tiso0UO3MVhqAqZ/F6LOvLyqnMPfhxPz1XpHsDikxvKgwhZvdBm1dWbKkPsD7jtw0PGphQO8QuEwBd2ZMvxZ4Qg6lNDUl5x3zRO2nkbKpcqnOugGLTtXP+yfw/wfQ2HNFLDP9gE90xegsPT83PmRUntQlhbS3ByHcCSUScC+Y1heZXuoKNyrmUY46lxkKsNfhx8sQKo0YhB21atV/mcAQbAaO2LggmaQYGtWizqPNGWIRsi9W8ZYnKva67c3Pbv/TTfaqmrNCwOXJ8G9oL+/3MlKbl3b5mYlTs2a/e9yVgMNwUZVX7aiHpgPgaVjL6j swdev@BradyBunch-MacMini.local"
 
 # Nomad settings.
 nomad_certificates:
-  - src: "{{ vault_nomad_v1_ca_file }}"
+  - src: "{{ file_nomad_ca_pem }}"
     dest: "{{ nomad_ca_file }}"
-  - src: "{{ vault_nomad_v1_cert_file }}"
+  - src: "{{ file_nomad_client_pem }}"
     dest: "{{ nomad_cert_file }}"
-  - src: "{{ vault_nomad_v1_key_file }}"
+  - src: "{{ file_nomad_client_key_pem }}"
     dest: "{{ nomad_key_file }}"
 nomad_datacenter: "yul1"
 nomad_name: "{{ hostname }}-{{ ansible_architecture }}"
@@ -48,12 +45,8 @@ nomad_cpu_total_compute: "40000"
 # Consul settigs.
 consul_nomad_integration: true
 consul_certificates:
-  - src: "{{ vault_consul_v1_ca_file }}"
+  - src: "{{ file_consul_ca_pem }}"
     dest: "{{ consul_ca_file }}"
-  - src: "{{ vault_consul_v1_cert_file }}"
-    dest: "{{ consul_cert_file }}"
-  - src: "{{ vault_consul_v1_key_file }}"
-    dest: "{{ consul_key_file }}"
 consul_datacenter: "yul1"
 consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ=="
 consul_node_name: "{{ hostname }}"
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml
index d13ae69fdb..1e8be0a218 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml
@@ -1,12 +1,13 @@
 ---
 # file: host_vars/10.30.51.71.yaml
 
-hostname: "s56-t37-sut1"
+hostname: "s56-t14-sut1"
 inventory_ipmi_hostname: "10.30.50.71"
 vfs_data_file: "csit-initialize-vfs-tx2.sh"
 grub:
   hugepagesz: "2M"
-  nr_hugepages: 32768
+  hugepages: 32768
+  iommu: "on"
 cpu_microarchitecture: "thunderx2"
 
 # User management.
@@ -16,21 +17,17 @@ users:
     password: "$6$FIsbVDQR$5D0wgufOd2FtnmOiRNsGlgg6Loh.0x3dWSj72DSQnqisSyE9DROfgSgA6s0yxDwz4Jd5SRTXiTKuRYuSQ5POI1"
     ssh_key:
       - "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAgObJFDIMmPwQhhkjAynvlbwpM5yeSewyaE7vTLaFf4uFz4vmsE2hFf6B2xXHUGLVwoVfk91UeK7LOGrdDpoDDHzvPZXj5NmZI+WiWax5y2pQZNkcSZws0ENCeEc4hPwc4veJ1JmhokF4Bsmu14HyFMaFUhM8897jtJwsh+9fLA/no0iPGaQqEtRUQhkV+P4jCEPoY0qdRZAzVw/rY4EGAMhsJe3EJmyj63OfrrkG3+hvSLFo5pDxHQr3pZd/c6ukI7xMef48PosAvGCm3oxzb/Gu9PZIGuHLczY+tCnzCkY7MO7E+IWgjXrUAfYwSWz8XmFmA9LLe26DT5jkcK8hGQ== pmikus@cisco.com"
+      - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDCG7Shfr7ASXXwpazYDGFzChGl7i4HgY9n81GTwc17B/O19IiJdrxFcBQH19HMuTFtWU4d9bQ6xgzz2pojBN13L3pEsStCHovDlEYbvfRxI2l2hcAAop1j1E4izHAS9IvCoy1AgWqBg6tsfP5mzOwGbSbcdI9ADRKIHgDTVbHg9SqKed27bNOLU0u3/5ra2Oar/tVIW37geEqFV/nHIBZ03Y/mszvXP/t/hP5bgJIGJKkzTjLd1aqEcuGmubW+wTQnVnrhFB87dw91gPj6BVyV0+7Vt1wrvPKqP2sGJhojAMSrBQBySnlrYgEg00bwDgNGFevatfG9+nTId+nhoKBkXya3MjSp4HwrGqGcij3/h7ovlau3/iRhkqlSeqenaNm4zKTAXRTnb60j2WKa6im0zdqJX98anp4mhjE8xHhmmfZV3vRT8mtY4hF/lg79miXFHpWH97bZV6r/D9qj1HWI/laJfOC5MOJdRcLETwtsUNMHeHtVnY3yu0XFYNcl2Xwajtnz3waF7vn1QHvAM9p878+JrO/IEUqEc0yZWVvlhZ7Krx1pS+APoMy8097MYDGFzFTkYSstKLGbgm/S7dEiWuSVxmMUxW7JYO3gHrQ3f1EvAYh2UFdWy76Dzr5II9UpVwOwF+HL/Oy8Sk77bPaK+tn7Kh4Tx7WWE0+EOAgElQ== ayourtch@ayourtch-lnx"
       - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCXUbbhesOpvPF+KI8nq4TXvEO/Un1aU/ehZ9clCyw9C40xjDkX2BlcX8WeHxFHe7fjFaCd07Vg73rn/3M9uNDnDxvjH1GQ0twvi3iBTO4PkHBBfGF9qnE8MYzno6FvlsVKLuUuPbfm8kbOQ+ZDfdXq6gdtXh0hSYYkqC1heNPCNsqaakkB99Edyle+Ot0V7cpW+Yo2wo98KuX/cgUEhVoA8QnNVE7zaWcjSXBZEteoA4gLpAbV6p67/d6H/2ykHTidBViYTEsHco56tJoA4nTPuAupDOLBcWXgF5TAN6z1aCn2JA1DDfniLakgrZ5oVj2qHhUmbxQAtnKQfHADjqzV jlinkes@jlinkes"
-  - username: testuser
-    groups: [adm, sudo]
-    password: "$6$zpBUdQ4q$P2zKclumvCndWujgP/qQ8eMk3YZk7ESAom04Fqp26hJH2jWkMXEX..jqxzMdDLJKiDaDHIaSkQMVjHzd3cRLs1"
-    ssh_key:
-      - "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAgObJFDIMmPwQhhkjAynvlbwpM5yeSewyaE7vTLaFf4uFz4vmsE2hFf6B2xXHUGLVwoVfk91UeK7LOGrdDpoDDHzvPZXj5NmZI+WiWax5y2pQZNkcSZws0ENCeEc4hPwc4veJ1JmhokF4Bsmu14HyFMaFUhM8897jtJwsh+9fLA/no0iPGaQqEtRUQhkV+P4jCEPoY0qdRZAzVw/rY4EGAMhsJe3EJmyj63OfrrkG3+hvSLFo5pDxHQr3pZd/c6ukI7xMef48PosAvGCm3oxzb/Gu9PZIGuHLczY+tCnzCkY7MO7E+IWgjXrUAfYwSWz8XmFmA9LLe26DT5jkcK8hGQ== pmikus@cisco.com"
-      - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCXUbbhesOpvPF+KI8nq4TXvEO/Un1aU/ehZ9clCyw9C40xjDkX2BlcX8WeHxFHe7fjFaCd07Vg73rn/3M9uNDnDxvjH1GQ0twvi3iBTO4PkHBBfGF9qnE8MYzno6FvlsVKLuUuPbfm8kbOQ+ZDfdXq6gdtXh0hSYYkqC1heNPCNsqaakkB99Edyle+Ot0V7cpW+Yo2wo98KuX/cgUEhVoA8QnNVE7zaWcjSXBZEteoA4gLpAbV6p67/d6H/2ykHTidBViYTEsHco56tJoA4nTPuAupDOLBcWXgF5TAN6z1aCn2JA1DDfniLakgrZ5oVj2qHhUmbxQAtnKQfHADjqzV jlinkes@jlinkes"
+      - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD0GXoSGDZ95TE/TT3kf4ZS3Tiso0UO3MVhqAqZ/F6LOvLyqnMPfhxPz1XpHsDikxvKgwhZvdBm1dWbKkPsD7jtw0PGphQO8QuEwBd2ZMvxZ4Qg6lNDUl5x3zRO2nkbKpcqnOugGLTtXP+yfw/wfQ2HNFLDP9gE90xegsPT83PmRUntQlhbS3ByHcCSUScC+Y1heZXuoKNyrmUY46lxkKsNfhx8sQKo0YhB21atV/mcAQbAaO2LggmaQYGtWizqPNGWIRsi9W8ZYnKva67c3Pbv/TTfaqmrNCwOXJ8G9oL+/3MlKbl3b5mYlTs2a/e9yVgMNwUZVX7aiHpgPgaVjL6j swdev@BradyBunch-MacMini.local"
 
 # Nomad settings.
 nomad_certificates:
-  - src: "{{ vault_nomad_v1_ca_file }}"
+  - src: "{{ file_nomad_ca_pem }}"
     dest: "{{ nomad_ca_file }}"
-  - src: "{{ vault_nomad_v1_cert_file }}"
+  - src: "{{ file_nomad_client_pem }}"
     dest: "{{ nomad_cert_file }}"
-  - src: "{{ vault_nomad_v1_key_file }}"
+  - src: "{{ file_nomad_client_key_pem }}"
     dest: "{{ nomad_key_file }}"
 nomad_datacenter: "yul1"
 nomad_name: "{{ hostname }}-{{ ansible_architecture }}"
@@ -48,12 +45,8 @@ nomad_cpu_total_compute: "40000"
 # Consul settigs.
 consul_nomad_integration: true
 consul_certificates:
-  - src: "{{ vault_consul_v1_ca_file }}"
+  - src: "{{ file_consul_ca_pem }}"
     dest: "{{ consul_ca_file }}"
-  - src: "{{ vault_consul_v1_cert_file }}"
-    dest: "{{ consul_cert_file }}"
-  - src: "{{ vault_consul_v1_key_file }}"
-    dest: "{{ consul_key_file }}"
 consul_datacenter: "yul1"
 consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ=="
 consul_node_name: "{{ hostname }}"
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.25.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.25.yaml
index 8c99bf3cae..ebb3f4c2d2 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.25.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.25.yaml
@@ -19,7 +19,7 @@ sysctl:
   kernel:
     watchdog_cpumask: "0,16,32,48"
   vm:
-    nr_hugepages: 8192
+    nr_hugepages: 65536
     max_map_count: 20000
 
 inventory_ipmi_hostname: "10.30.55.25"
diff --git a/fdio.infra.ansible/roles/vpp_device/defaults/main.yaml b/fdio.infra.ansible/roles/vpp_device/defaults/main.yaml
new file mode 100644
index 0000000000..d001608c7a
--- /dev/null
+++ b/fdio.infra.ansible/roles/vpp_device/defaults/main.yaml
@@ -0,0 +1,6 @@
+---
+# file: roles/vpp_device/defaults/main.yaml
+
+iavf_target_dir: "/opt"
+iavf_version: "4.1.1"
+iavf_url: "https://downloads.sourceforge.net/project/e1000/iavf%20stable/{{ iavf_version }}/iavf-{{ iavf_version }}.tar.gz?ts=gAAAAABgvfs_L6gSH8B09NfEc8fzoooS3M2wyuOxlFEK5EtTstZWFdb2dYcqJZNqiirAT87dbc3GeJJrRst9KfUgS-byAeyaLw%3D%3D&r=https%3A%2F%2Fsourceforge.net%2Fprojects%2Fe1000%2Ffiles%2Fiavf%2520stable%2F{{ iavf_version }}%2Fiavf-{{ iavf_version }}.tar.gz%2Fdownload"
\ No newline at end of file
diff --git a/fdio.infra.ansible/roles/vpp_device/files/csit-initialize-vfs.sh b/fdio.infra.ansible/roles/vpp_device/files/csit-initialize-vfs.sh
index 393e997d65..27b1acb057 100644
--- a/fdio.infra.ansible/roles/vpp_device/files/csit-initialize-vfs.sh
+++ b/fdio.infra.ansible/roles/vpp_device/files/csit-initialize-vfs.sh
@@ -67,7 +67,5 @@ for pci_addr in ${PCI_WHITELIST[@]}; do
                 pci_idx=$(( pci_idx + 1 ))
                 ;;
         esac
-        rmmod i40evf
-        modprobe i40evf
     fi
 done
diff --git a/fdio.infra.ansible/roles/vpp_device/tasks/main.yaml b/fdio.infra.ansible/roles/vpp_device/tasks/main.yaml
index 33b551715f..aa381f60e2 100644
--- a/fdio.infra.ansible/roles/vpp_device/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/vpp_device/tasks/main.yaml
@@ -8,10 +8,12 @@
     line: "{{ item }}"
   with_items:
     - "vfio-pci"
+  when:
+    - cpu_microarchitecture == "thunderx2"
   tags:
     - load-kernel-modules
 
-- name: VPP_device - Disable ipv6 router advertisement
+- name: Disable IPv6 Router Advertisement
   sysctl:
     name: "net.ipv6.conf.default.accept_ra"
     value: "0"
@@ -21,7 +23,7 @@
   tags:
     - set-sysctl
 
-- name: VPP_device - Disable ipv6 router advertisement
+- name: Disable IPv6 Router Advertisement
   sysctl:
     name: "net.ipv6.conf.all.accept_ra"
     value: "0"
@@ -31,45 +33,85 @@
   tags:
     - set-sysctl
 
-- name: VPP_device - Copy csit-initialize-vfs.sh
+- name: Disable IPv6 MLDv1 interval
+  sysctl:
+    name: "net.ipv6.conf.all.mldv1_unsolicited_report_interval=0"
+    value: "0"
+    state: "present"
+    sysctl_file: "/etc/sysctl.d/90-csit.conf"
+    reload: "yes"
+  tags:
+    - set-sysctl
+
+- name: Disable IPv6 MLDv2 interval
+  sysctl:
+    name: "net.ipv6.conf.all.mldv2_unsolicited_report_interval=0"
+    value: "0"
+    state: "present"
+    sysctl_file: "/etc/sysctl.d/90-csit.conf"
+    reload: "yes"
+  tags:
+    - set-sysctl
+
+- name: Disable IPv6 Autoconf
+  sysctl:
+    name: "net.ipv6.conf.all.autoconf=0"
+    value: "0"
+    state: "present"
+    sysctl_file: "/etc/sysctl.d/90-csit.conf"
+    reload: "yes"
+  tags:
+    - set-sysctl
+
+- name: Disable IPv6 MC Forwarding
+  sysctl:
+    name: "net.ipv6.conf.all.mc_forwarding=0"
+    value: "0"
+    state: "present"
+    sysctl_file: "/etc/sysctl.d/90-csit.conf"
+    reload: "yes"
+  tags:
+    - set-sysctl
+
+- name: Copy csit-initialize-vfs.sh
   copy:
    src: "files/csit-initialize-vfs.sh"
    dest: "/usr/local/bin/"
    owner: "root"
    group: "root"
-   mode: "744"
+   mode: 0744
   tags:
     - copy-vf-script
 
-- name: VPP_device - Copy csit-initialize-vfs-data.sh
+- name: Copy csit-initialize-vfs-data.sh
   copy:
    src: "files/{{ vfs_data_file }}"
    dest: "/usr/local/bin/csit-initialize-vfs-data.sh"
    owner: "root"
    group: "root"
-   mode: "744"
+   mode: 0744
   tags: copy-vf-data-script
   when:
     - vfs_data_file is defined
 
-- name: VPP_device - Copy default csit-initialize-vfs-data.sh
+- name: Copy Default csit-initialize-vfs-data.sh
   copy:
    src: "files/csit-initialize-vfs-default.sh"
    dest: "/usr/local/bin/csit-initialize-vfs-data.sh"
    owner: "root"
    group: "root"
-   mode: "744"
+   mode: 0744
   tags: copy-vf-data-script
   when:
     - vfs_data_file is not defined
 
-- name: VPP_device - Start csit-initialize-vfs.service
+- name: Start csit-initialize-vfs.service
   copy:
    src: "files/csit-initialize-vfs.service"
    dest: "/etc/systemd/system/"
    owner: "root"
    group: "root"
-   mode: "644"
+   mode: 0644
   notify:
     - "Start csit-initialize-vfs.service"
   tags:
@@ -77,7 +119,7 @@
 
 - meta: flush_handlers
 
-- name: VPP_device - Set hugepages in GRUB
+- name: Set Hugepages In GRUB
   lineinfile:
     path: "/etc/default/grub"
     state: "present"
@@ -85,8 +127,34 @@
     line: "GRUB_CMDLINE_LINUX=\"{% for key, value in grub.items() %}{% if value %}{{key}}={{value}} {% else %}{{key}} {% endif %}{% endfor %}\""
   notify:
     - "Update GRUB"
-    - "Reboot server"
   tags:
     - set-grub
 
+- name: Download iAVF driver
+  get_url:
+    url: "{{ iavf_url }}"
+    dest: "{{ iavf_target_dir }}/iavf-{{ iavf_version }}.tar.gz"
+    validate_certs: False
+    mode: 0644
+  tags:
+    - install-iavf
+
+- name: Extract iAVF driver
+  unarchive:
+    remote_src: true
+    src: "{{ iavf_target_dir }}/iavf-{{ iavf_version }}.tar.gz"
+    dest: "{{ iavf_target_dir }}/"
+    creates: "{{ iavf_target_dir }}/iavf-{{ iavf_version }}/src/"
+  tags:
+    - install-iavf
+
+- name: Compile iAVF driver
+  command: "make install"
+  args:
+      chdir: "{{ iavf_target_dir }}/iavf-{{ iavf_version }}/src/"
+  notify:
+    - "Reboot server"
+  tags:
+    - install-iavf
+
 - meta: flush_handlers
diff --git a/fdio.infra.ansible/vpp_device.yaml b/fdio.infra.ansible/vpp_device.yaml
index 2ffea31f6b..7e9c66eeb2 100644
--- a/fdio.infra.ansible/vpp_device.yaml
+++ b/fdio.infra.ansible/vpp_device.yaml
@@ -2,7 +2,7 @@
 # file: vpp_device.yaml
 
 - hosts: vpp_device
-  remote_user: testuser
+  remote_user: localadmin
   become: yes
   become_user: root
   gather_facts: false
diff --git a/fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf b/fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf
index d6b03b0ef1..2373104662 100755
--- a/fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf
+++ b/fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf
@@ -80,8 +80,8 @@ dhcp-host=40:8d:5c:e7:b0:aa,10.30.51.66,s51-nomad,infinite # enP2p1s0v0
 dhcp-host=1c:1b:0d:68:7c:b3,10.30.51.67,s49-nomad,infinite # enP2p1s0v0
 dhcp-host=1c:1b:0d:01:d8:dc,10.30.51.68,s50-nomad,infinite # enP2p1s0v0
 dhcp-host=e0:d5:5e:ae:70:26,10.30.51.69,s27-t211-sut1,infinite # eno1
-dhcp-host=b4:2e:99:ab:1d:e8,10.30.51.70,s55-t36-sut1,infinite # eno1
-dhcp-host=b4:2e:99:ab:1d:dc,10.30.51.71,s56-t37-sut1,infinite # eno1
+dhcp-host=b4:2e:99:ab:1d:e8,10.30.51.70,s55-t13-sut1,infinite # eno1
+dhcp-host=b4:2e:99:ab:1d:dc,10.30.51.71,s56-t14-sut1,infinite # eno1
 # Hosts DHCP settings yul1_2 subnet.
 dhcp-host=ac:1f:6b:8b:54:c8,10.32.8.10,s28-t26t35-tg1,infinite # eno1
 dhcp-host=0c:c4:7a:fc:ca:cc,10.32.8.11,s29-t26-sut1,infinite # eno3
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8a:8c:76 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8a:8c:76
new file mode 100644
index 0000000000..cbc8b78dca
--- /dev/null
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8a:8c:76
@@ -0,0 +1,4 @@
+menuentry "Install s1-t11-sut1" {
+    linux    /casper/ubuntu-focal-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:8a:8c:76 url=https://releases.ubuntu.com/20.04.2/ubuntu-20.04.2-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.28:8081/ubuntu_focal_amd64/ac:1f:6b:8a:8c:76/ --- console=ttyS0,115200n8 quiet
+    initrd   /casper/ubuntu-focal-amd64/initrd
+}
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8b:53:96 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8b:53:96
new file mode 100644
index 0000000000..9d1ede930f
--- /dev/null
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8b:53:96
@@ -0,0 +1,4 @@
+menuentry "Install s2-t12-sut1" {
+    linux    /casper/ubuntu-focal-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:8b:53:96 url=https://releases.ubuntu.com/20.04.2/ubuntu-20.04.2-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.28:8081/ubuntu_focal_amd64/ac:1f:6b:8b:53:96/ --- console=ttyS0,115200n8 quiet
+    initrd   /casper/ubuntu-focal-amd64/initrd
+}
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-b4:2e:99:ab:1d:dc b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-b4:2e:99:ab:1d:dc
new file mode 100644
index 0000000000..b3a9b8f2ed
--- /dev/null
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-b4:2e:99:ab:1d:dc
@@ -0,0 +1,4 @@
+menuentry "Install s56-t14-sut1" {
+    linux    /casper/ubuntu-focal-arm64/vmlinuz ip=dhcp interface=b4:2e:99:ab:1d:dc url=http://10.30.51.28:8081/ubuntu_focal_arm64/ubuntu-20.04.2-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.28:8081/ubuntu_focal_arm64/b4:2e:99:ab:1d:dc/ --- console=ttyAMA0,115200n8 quiet
+    initrd   /casper/ubuntu-focal-arm64/initrd
+}
\ No newline at end of file
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-b4:2e:99:ab:1d:e8 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-b4:2e:99:ab:1d:e8
new file mode 100644
index 0000000000..779f65cf59
--- /dev/null
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-b4:2e:99:ab:1d:e8
@@ -0,0 +1,4 @@
+menuentry "Install s55-t13-sut1" {
+    linux    /casper/ubuntu-focal-arm64/vmlinuz ip=dhcp interface=b4:2e:99:ab:1d:e8 url=http://10.30.51.28:8081/ubuntu_focal_arm64/ubuntu-20.04.2-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.28:8081/ubuntu_focal_arm64/b4:2e:99:ab:1d:e8/ --- console=ttyAMA0,115200n8 quiet
+    initrd   /casper/ubuntu-focal-arm64/initrd
+}
\ No newline at end of file
diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/ac:1f:6b:8a:8c:76/meta-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/ac:1f:6b:8a:8c:76/meta-data
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/ac:1f:6b:8a:8c:76/meta-data
diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/ac:1f:6b:8a:8c:76/user-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/ac:1f:6b:8a:8c:76/user-data
new file mode 100644
index 0000000000..c7c1e3ff44
--- /dev/null
+++ b/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/ac:1f:6b:8a:8c:76/user-data
@@ -0,0 +1,120 @@
+#cloud-config
+autoinstall:
+  version: 1
+  apt:
+    geoip: true
+    preserve_sources_list: false
+    primary:
+    - arches: [amd64, i386]
+      uri: http://ca.archive.ubuntu.com/ubuntu
+    - arches: [default]
+      uri: http://ports.ubuntu.com/ubuntu-ports
+  identity:
+    hostname: s1-t11-sut1
+    password: $6$FIsbVDQR$5D0wgufOd2FtnmOiRNsGlgg6Loh.0x3dWSj72DSQnqisSyE9DROfgSgA6s0yxDwz4Jd5SRTXiTKuRYuSQ5POI1
+    realname: localadmin
+    username: localadmin
+  keyboard:
+    layout: us
+    toggle: null
+    variant: ''
+  locale: en_US.UTF-8
+  network:
+    ethernets:
+      eno1:
+        addresses: [ 10.30.51.50/24 ]
+        dhcp4: false
+        gateway4: 10.30.51.1
+        nameservers:
+          addresses: [ 1.1.1.1, 8.8.8.8 ]
+    version: 2
+  packages:
+    - python3
+  refresh-installer:
+    update: no
+  ssh:
+    allow-pw: true
+    authorized-keys: []
+    install-server: true
+  storage:
+    config:
+    - grub_device: false
+      id: disk-sda
+      path: /dev/sda
+      ptable: gpt
+      preserve: false
+      type: disk
+      wipe: superblock-recursive
+    - grub_device: false
+      id: disk-sdb
+      path: /dev/sdb
+      ptable: gpt
+      preserve: false
+      type: disk
+      wipe: superblock-recursive
+    - device: disk-sda
+      grub_device: true
+      id: partition-0
+      flag: boot
+      number: 1
+      preserve: false
+      size: 536870912
+      type: partition
+      wipe: superblock
+    - device: disk-sdb
+      grub_device: true
+      id: partition-1
+      flag: boot
+      number: 1
+      preserve: false
+      size: 536870912
+      type: partition
+      wipe: superblock
+    - id: format-0
+      fstype: fat32
+      preserve: false
+      type: format
+      volume: partition-0
+    - id: format-1
+      fstype: fat32
+      preserve: false
+      type: format
+      volume: partition-1
+    - device: disk-sda
+      flag: ''
+      grub_device: false
+      id: partition-2
+      number: 2
+      preserve: false
+      size: -1
+      type: partition
+      wipe: superblock
+    - device: disk-sdb
+      flag: ''
+      grub_device: false
+      id: partition-3
+      number: 2
+      preserve: false
+      size: -1
+      type: partition
+      wipe: superblock
+    - name: md0
+      raidlevel: raid1
+      devices: [partition-2, partition-3]
+      spare_devices: []
+      preserve: false
+      type: raid
+      id: raid-0
+    - fstype: ext4
+      id: format-2
+      preserve: false
+      type: format
+      volume: raid-0
+    - device: format-2
+      id: mount-1
+      path: /
+      type: mount
+    - device: format-0
+      id: mount-0
+      path: /boot/efi
+      type: mount
\ No newline at end of file
diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/ac:1f:6b:8b:53:96/meta-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/ac:1f:6b:8b:53:96/meta-data
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/ac:1f:6b:8b:53:96/meta-data
diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/ac:1f:6b:8b:53:96/user-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/ac:1f:6b:8b:53:96/user-data
new file mode 100644
index 0000000000..2be2225ad5
--- /dev/null
+++ b/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/ac:1f:6b:8b:53:96/user-data
@@ -0,0 +1,120 @@
+#cloud-config
+autoinstall:
+  version: 1
+  apt:
+    geoip: true
+    preserve_sources_list: false
+    primary:
+    - arches: [amd64, i386]
+      uri: http://ca.archive.ubuntu.com/ubuntu
+    - arches: [default]
+      uri: http://ports.ubuntu.com/ubuntu-ports
+  identity:
+    hostname: s2-t12-sut1
+    password: $6$FIsbVDQR$5D0wgufOd2FtnmOiRNsGlgg6Loh.0x3dWSj72DSQnqisSyE9DROfgSgA6s0yxDwz4Jd5SRTXiTKuRYuSQ5POI1
+    realname: localadmin
+    username: localadmin
+  keyboard:
+    layout: us
+    toggle: null
+    variant: ''
+  locale: en_US.UTF-8
+  network:
+    ethernets:
+      eno1:
+        addresses: [ 10.30.51.51/24 ]
+        dhcp4: false
+        gateway4: 10.30.51.1
+        nameservers:
+          addresses: [ 1.1.1.1, 8.8.8.8 ]
+    version: 2
+  packages:
+    - python3
+  refresh-installer:
+    update: no
+  ssh:
+    allow-pw: true
+    authorized-keys: []
+    install-server: true
+  storage:
+    config:
+    - grub_device: false
+      id: disk-sda
+      path: /dev/sda
+      ptable: gpt
+      preserve: false
+      type: disk
+      wipe: superblock-recursive
+    - grub_device: false
+      id: disk-sdb
+      path: /dev/sdb
+      ptable: gpt
+      preserve: false
+      type: disk
+      wipe: superblock-recursive
+    - device: disk-sda
+      grub_device: true
+      id: partition-0
+      flag: boot
+      number: 1
+      preserve: false
+      size: 536870912
+      type: partition
+      wipe: superblock
+    - device: disk-sdb
+      grub_device: true
+      id: partition-1
+      flag: boot
+      number: 1
+      preserve: false
+      size: 536870912
+      type: partition
+      wipe: superblock
+    - id: format-0
+      fstype: fat32
+      preserve: false
+      type: format
+      volume: partition-0
+    - id: format-1
+      fstype: fat32
+      preserve: false
+      type: format
+      volume: partition-1
+    - device: disk-sda
+      flag: ''
+      grub_device: false
+      id: partition-2
+      number: 2
+      preserve: false
+      size: -1
+      type: partition
+      wipe: superblock
+    - device: disk-sdb
+      flag: ''
+      grub_device: false
+      id: partition-3
+      number: 2
+      preserve: false
+      size: -1
+      type: partition
+      wipe: superblock
+    - name: md0
+      raidlevel: raid1
+      devices: [partition-2, partition-3]
+      spare_devices: []
+      preserve: false
+      type: raid
+      id: raid-0
+    - fstype: ext4
+      id: format-2
+      preserve: false
+      type: format
+      volume: raid-0
+    - device: format-2
+      id: mount-1
+      path: /
+      type: mount
+    - device: format-0
+      id: mount-0
+      path: /boot/efi
+      type: mount
\ No newline at end of file
diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/b4:2e:99:ab:1d:dc/meta-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/b4:2e:99:ab:1d:dc/meta-data
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/b4:2e:99:ab:1d:dc/meta-data
diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/b4:2e:99:ab:1d:dc/user-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/b4:2e:99:ab:1d:dc/user-data
new file mode 100644
index 0000000000..30e0537469
--- /dev/null
+++ b/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/b4:2e:99:ab:1d:dc/user-data
@@ -0,0 +1,83 @@
+#cloud-config
+autoinstall:
+  version: 1
+  apt:
+    geoip: true
+    preserve_sources_list: false
+    primary:
+    - arches: [amd64, i386]
+      uri: http://ca.archive.ubuntu.com/ubuntu
+    - arches: [default]
+      uri: http://ports.ubuntu.com/ubuntu-ports
+  identity:
+    hostname: s56-t14-sut1
+    password: $6$FIsbVDQR$5D0wgufOd2FtnmOiRNsGlgg6Loh.0x3dWSj72DSQnqisSyE9DROfgSgA6s0yxDwz4Jd5SRTXiTKuRYuSQ5POI1
+    realname: localadmin
+    username: localadmin
+  keyboard:
+    layout: us
+    toggle: null
+    variant: ''
+  locale: en_US.UTF-8
+  network:
+    ethernets:
+      eno1:
+        addresses: [ 10.30.51.71/24 ]
+        dhcp4: false
+        gateway4: 10.30.51.1
+        nameservers:
+          addresses: [ 1.1.1.1, 8.8.8.8 ]
+    version: 2
+  packages:
+    - python3
+  refresh-installer:
+    update: no
+  ssh:
+    allow-pw: true
+    authorized-keys: []
+    install-server: true
+  storage:
+    config:
+    - grub_device: false
+      id: disk-sda
+      path: /dev/sda
+      ptable: gpt
+      preserve: false
+      type: disk
+      wipe: superblock-recursive
+    - device: disk-sda
+      grub_device: true
+      id: partition-0
+      flag: boot
+      number: 1
+      preserve: false
+      size: 536870912
+      type: partition
+      wipe: superblock
+    - id: format-0
+      fstype: fat32
+      preserve: false
+      type: format
+      volume: partition-0
+    - device: disk-sda
+      flag: ''
+      grub_device: false
+      id: partition-1
+      number: 2
+      preserve: false
+      size: -1
+      type: partition
+      wipe: superblock
+    - fstype: ext4
+      id: format-1
+      preserve: false
+      type: format
+      volume: partition-1
+    - device: format-1
+      id: mount-1
+      path: /
+      type: mount
+    - device: format-0
+      id: mount-0
+      path: /boot/efi
+      type: mount
\ No newline at end of file
diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/b4:2e:99:ab:1d:e8/meta-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/b4:2e:99:ab:1d:e8/meta-data
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/b4:2e:99:ab:1d:e8/meta-data
diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/b4:2e:99:ab:1d:e8/user-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/b4:2e:99:ab:1d:e8/user-data
new file mode 100644
index 0000000000..20135d98ea
--- /dev/null
+++ b/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/b4:2e:99:ab:1d:e8/user-data
@@ -0,0 +1,83 @@
+#cloud-config
+autoinstall:
+  version: 1
+  apt:
+    geoip: true
+    preserve_sources_list: false
+    primary:
+    - arches: [amd64, i386]
+      uri: http://ca.archive.ubuntu.com/ubuntu
+    - arches: [default]
+      uri: http://ports.ubuntu.com/ubuntu-ports
+  identity:
+    hostname: s55-t13-sut1
+    password: $6$FIsbVDQR$5D0wgufOd2FtnmOiRNsGlgg6Loh.0x3dWSj72DSQnqisSyE9DROfgSgA6s0yxDwz4Jd5SRTXiTKuRYuSQ5POI1
+    realname: localadmin
+    username: localadmin
+  keyboard:
+    layout: us
+    toggle: null
+    variant: ''
+  locale: en_US.UTF-8
+  network:
+    ethernets:
+      eno1:
+        addresses: [ 10.30.51.70/24 ]
+        dhcp4: false
+        gateway4: 10.30.51.1
+        nameservers:
+          addresses: [ 1.1.1.1, 8.8.8.8 ]
+    version: 2
+  packages:
+    - python3
+  refresh-installer:
+    update: no
+  ssh:
+    allow-pw: true
+    authorized-keys: []
+    install-server: true
+  storage:
+    config:
+    - grub_device: false
+      id: disk-sda
+      path: /dev/sda
+      ptable: gpt
+      preserve: false
+      type: disk
+      wipe: superblock-recursive
+    - device: disk-sda
+      grub_device: true
+      id: partition-0
+      flag: boot
+      number: 1
+      preserve: false
+      size: 536870912
+      type: partition
+      wipe: superblock
+    - id: format-0
+      fstype: fat32
+      preserve: false
+      type: format
+      volume: partition-0
+    - device: disk-sda
+      flag: ''
+      grub_device: false
+      id: partition-1
+      number: 2
+      preserve: false
+      size: -1
+      type: partition
+      wipe: superblock
+    - fstype: ext4
+      id: format-1
+      preserve: false
+      type: format
+      volume: partition-1
+    - device: format-1
+      id: mount-1
+      path: /
+      type: mount
+    - device: format-0
+      id: mount-0
+      path: /boot/efi
+      type: mount
\ No newline at end of file
diff --git a/resources/libraries/bash/function/device.sh b/resources/libraries/bash/function/device.sh
index 6816ac823f..868fdb1342 100644
--- a/resources/libraries/bash/function/device.sh
+++ b/resources/libraries/bash/function/device.sh
@@ -263,8 +263,8 @@ function get_available_interfaces () {
             # Add Intel Corporation XL710/X710 Virtual Function to the
             # whitelist.
             pci_id="0x154c"
-            tg_netdev=(enp24)
-            dut1_netdev=(enp59)
+            tg_netdev=(ens1 enp24)
+            dut1_netdev=(ens5 enp59)
             ;;
        "1n_tx2")
             # Add Intel Corporation XL710/X710 Virtual Function to the
@@ -595,6 +595,8 @@ function start_topology_containers () {
     # Mount vfio to be able to bind to see bound interfaces. We cannot use
     # --device=/dev/vfio as this does not see newly bound interfaces.
     dcr_stc_params+="--volume /dev/vfio:/dev/vfio "
+    # Disable manipulation with hugepages by VPP.
+    dcr_stc_params+="--volume /dev/null:/etc/sysctl.d/80-vpp.conf "
     # Mount docker.sock to be able to use docker deamon of the host.
     dcr_stc_params+="--volume /var/run/docker.sock:/var/run/docker.sock "
     # Mount /opt/boot/ where VM kernel and initrd are located.
diff --git a/tests/vpp/device/l2bd/eth2p-avf-dot1qip4-l2bdbasemaclrn-dev.robot b/tests/vpp/device/l2bd/eth2p-avf-ethipv4-l2bdbasemaclrn-dev.robot
index ff9422b8ca..6f2a6568de 100644
--- a/tests/vpp/device/l2bd/eth2p-avf-dot1qip4-l2bdbasemaclrn-dev.robot
+++ b/tests/vpp/device/l2bd/eth2p-avf-ethipv4-l2bdbasemaclrn-dev.robot
@@ -15,29 +15,29 @@
 | Resource | resources/libraries/robot/shared/default.robot
 |
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY
-| ... | NIC_Virtual | ETH | IP4FWD | BASE | DOT1Q | IP4BASE | DRV_AVF
-| ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | avf-dot1qip4-l2bdbasemaclrn
+| ... | NIC_Virtual | ETH | L2BDMACLRN | BASE | DRV_AVF
+| ... | RXQ_SIZE_0 | TXQ_SIZE_0 | EXPECTED_FAILING
+| ... | avf-ethipv4-l2bdbasemaclrn
 |
 | Suite Setup | Setup suite topology interfaces | scapy
-| Suite Teardown | Tear down suite
 | Test Setup | Setup test
 | Test Teardown | Tear down test | packet_trace
 |
 | Test Template | Local Template
 |
-| Documentation | *IPv4 routing with IEEE 802.1Q test cases*
+| Documentation | *L2 bridge-domain test cases*
 |
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with\
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for IPv4 routing. IEEE 802.1Q\
-| ... | tagging is applied on links between TG-DUT1.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with IPv4 routing and\
-| ... | two static IPv4 /30 route entries. DUT1 is tested with ${nic_name}.
-| ... | *[Ver] TG verification:* Test IPv4 packets are sent in one direction \
-| ... | by TG on link to DUT1; on receive TG verifies packets for correctness \
-| ... | and drops as applicable.
-| ... | *[Ref] Applicable standard specifications:* IEEE 802.1q.
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology \
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.\
+| ... | Both apply to all links.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-domain \
+| ... | switching.
+| ... | *[Ver] TG verification:* Test IPv4 packets with IP protocol=61 \
+| ... | are sent in both directions by TG on links to DUT1; on receive TG \
+| ... | verifies packets for correctness and their IPv4 src-addr, \
+| ... | dst-addr and MAC addresses.
+| ... | *[Ref] Applicable standard specifications:* RFC792
 
 *** Variables ***
 | @{plugins_to_enable}= | avf_plugin.so | perfmon_plugin.so
@@ -48,7 +48,7 @@
 | ${nic_txq_size}= | 0
 | ${nic_pfs}= | 2
 | ${nic_vfs}= | 1
-| ${overhead}= | ${4}
+| ${overhead}= | ${0}
 
 *** Keywords ***
 | Local Template
@@ -72,12 +72,11 @@
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
 | | When Initialize layer driver | ${nic_driver}
 | | And Initialize layer interface
-| | And Initialize layer dot1q
 | | And Initialize L2 bridge domain
 | | Then Send IPv4 bidirectionally and verify received packets
 | | ... | ${tg} | ${TG_pf1}[0] | ${TG_pf2}[0]
 
 *** Test Cases ***
-| 68B-avf-dot1qip4-l2bdbasemaclrn-dev
-| | [Tags] | 68B
-| | frame_size=${68} | phy_cores=${0}
+| 64B-avf-ethipv4-l2bdbasemaclrn-dev
+| | [Tags] | 64B
+| | frame_size=${64} | phy_cores=${0}