feat(infra): IPAM update ahead of SPR

Signed-off-by: pmikus <peter.mikus@protonmail.ch>
Change-Id: I18ab8244001ab6d40328a86044faa8f5bf52cae9

74 files changed, 391 insertions, 981 deletions

diff --git a/docs/lab/fdio-dc-physical.md b/docs/lab/fdio-dc-physical.md
index 60a168f0a5..5a2f9e2a17 100644
--- a/docs/lab/fdio-dc-physical.md
+++ b/docs/lab/fdio-dc-physical.md
@@ -55,6 +55,12 @@ s88-t215-tg1,up,t215,2n-icx,SYS-740GP-TNRT,C7470KL07P50301,10.30.51.88,10.30.50.
 #### Rack YUL1-9 (3016.9)
 name,oper-status,testbed-id,role,model,s/n,mgmt-ip4,ipmi-ip4,rackid,rackunit
 mtl1-5-lb4m,up,switch,uplink,?,?,?,?,3016.9,u47,?,?
+s52-t21-sut1,up,t21,2n-spr,SYS-741GE-TNRT,???,10.30.51.52,10.30.50.52,3016.9,u42-u45
+s53-t21-tg1,up,t21,2n-spr,SYS-741GE-TNRT,???,10.30.51.53,10.30.50.53,3016.9,u38-u41
+s54-t22-sut1,up,t22,2n-spr,SYS-741GE-TNRT,???,10.30.51.54,10.30.50.54,3016.9,u34-u37
+s55-t22-tg1,up,t22,2n-spr,SYS-741GE-TNRT,???,10.30.51.55,10.30.50.55,3016.9,u30-u33
+s56-t23-sut1,up,t23,2n-spr,SYS-741GE-TNRT,???,10.30.51.56,10.30.50.56,3016.9,u26-u29
+s57-t23-tg1,up,t23,2n-spr,SYS-741GE-TNRT,???,10.30.51.57,10.30.50.57,3016.9,u22-u25
 s25-t25-sut1,down,t25,2n-p1,SYS-7049GP-TRT,C7470KH06A20022,10.30.51.61,10.30.50.58,3016.9,u18-u21
 s19-t33t211-tg1,up,t33t211,3n-tsh/2n-tx2,SYS-7049GP-TRT,C7470KH06A20056,10.30.51.49,10.30.50.46,3016.9,u14-u17
 s27-t211-sut1,up,t211,2n-tx2,ThunderX2-9975,K61186073100003,10.30.51.69,10.30.50.69,3016.9,u13
@@ -68,6 +74,8 @@ name,oper-status,testbed-id,role,model,s/n,mgmt-ip4,ipmi-ip4,rackid,rackunit
 yul1-10-lb4m,up,switch,uplink,?,?,?,?,3016.10,u47,?,?
 s2-t12-sut1,up,t12,1n-skx,SYS-7049GP-TRT,C7470KH06A20119,10.30.51.51,10.30.50.48,3016.10,u42-u45
 s1-t11-sut1,up,t11,1n-skx,SYS-7049GP-TRT,C7470KH06A20154,10.30.51.50,10.30.50.47,3016.10,u38-u41
+s58-t24-sut1,up,t24,2n-spr,SYS-741GE-TNRT,???,10.30.51.58,10.30.50.58,3016.10,u34-u37
+s59-t24-tg1,up,t24,2n-spr,SYS-741GE-TNRT,???,10.30.51.59,10.30.50.59,3016.10,u30-u33
 s93-t39-sut1,up,t39,3n-snr,?,?,10.30.51.93,10.30.50.93,3016.10,u10-u13
 s94-t39-sut2,up,t39,3n-snr,?,?,10.30.51.94,10.30.50.94,3016.10,u6-u9
 s89-t39t310-tg1,up,t39,3n-snr,?,?,10.30.51.89,10.30.50.89,3016.10,u2-u5
diff --git a/docs/lab/fdio-dc-physical.yaml b/docs/lab/fdio-dc-physical.yaml
index 97efe26af4..b5940bde4d 100644
--- a/docs/lab/fdio-dc-physical.yaml
+++ b/docs/lab/fdio-dc-physical.yaml
@@ -112,6 +112,48 @@ yul1:
         mgmt_ip4: N/A
         lom_ip4: N/A
         lom_type: N/A
+      - unit: 42..45
+        name: s52-t21-sut1
+        oper_status: production
+        device_type: SYS-741GE-TNRT
+        serial_number: ?
+        mgmt_ip4: 10.30.51.52
+        lom_ip4: 10.30.50.52
+      - unit: 38..41
+        name: s53-t21-tg1
+        oper_status: production
+        device_type: SYS-741GE-TNRT
+        serial_number: ?
+        mgmt_ip4: 10.30.51.53
+        lom_ip4: 10.30.50.53
+      - unit: 34..37
+        name: s54-t22-sut1
+        oper_status: production
+        device_type: SYS-741GE-TNRT
+        serial_number: ?
+        mgmt_ip4: 10.30.51.54
+        lom_ip4: 10.30.50.54
+      - unit: 30..33
+        name: s55-t22-tg1
+        oper_status: production
+        device_type: SYS-741GE-TNRT
+        serial_number: ?
+        mgmt_ip4: 10.30.51.55
+        lom_ip4: 10.30.50.55
+      - unit: 26..29
+        name: s56-t23-sut1
+        oper_status: production
+        device_type: SYS-741GE-TNRT
+        serial_number: ?
+        mgmt_ip4: 10.30.51.56
+        lom_ip4: 10.30.50.56
+      - unit: 22..25
+        name: s57-t23-tg1
+        oper_status: production
+        device_type: SYS-741GE-TNRT
+        serial_number: ?
+        mgmt_ip4: 10.30.51.57
+        lom_ip4: 10.30.50.57
       - unit: 18..21
         name: s25-t25-sut1
         oper_status: stage
@@ -178,6 +220,20 @@ yul1:
         serial_number: C7470KH06A20154
         mgmt_ip4: 10.30.51.50
         lom_ip4: 10.30.50.47
+      - unit: 34..37
+        name: s58-t24-sut1
+        oper_status: production
+        device_type: SYS-741GE-TNRT
+        serial_number: ?
+        mgmt_ip4: 10.30.51.58
+        lom_ip4: 10.30.50.58
+      - unit: 30..33
+        name: s59-t24-tg1
+        oper_status: production
+        device_type: SYS-741GE-TNRT
+        serial_number: ?
+        mgmt_ip4: 10.30.51.59
+        lom_ip4: 10.30.50.59
       - unit: 10..13
         name: s93-t39-sut1
         oper_status: production
diff --git a/fdio.infra.ansible/inventories/lf_inventory/group_vars/all.yaml b/fdio.infra.ansible/inventories/lf_inventory/group_vars/all.yaml
index 0756621eef..719ef32625 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/group_vars/all.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/group_vars/all.yaml
@@ -1,5 +1,2 @@
 ---
 # file: lf_inventory/group_vars/all.yaml
-
-# Ansible interpreter (for PIP)
-ansible_python_interpreter: "/usr/bin/python3"
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.52.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.52.yaml
new file mode 100644
index 0000000000..c430ad2cbd
--- /dev/null
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.52.yaml
@@ -0,0 +1,33 @@
+---
+# file: host_vars/10.30.51.52.yaml
+
+hostname: "s52-t21-sut1"
+grub:
+  audit: "0"
+  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
+  isolcpus: "1-31,33-63,65-95,97-127"
+  mce: "off"
+  nmi_watchdog: "0"
+  nohz_full: "1-31,33-63,65-95,97-127"
+  nosoftlockup: true
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
+  rcu_nocbs: "1-31,33-63,65-95,97-127"
+  tsc: "reliable"
+sysctl:
+  kernel:
+    watchdog_cpumask: "0,32,64,96"
+  vm:
+    nr_hugepages: 32768
+    max_map_count: 20000
+
+inventory_ipmi_hostname: "10.30.50.52"
+cpu_microarchitecture: "sapphirerapids"
+
+intel_700_matrix: "dpdk22.07"
+intel_800_matrix: "dpdk22.07"
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.53.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.53.yaml
new file mode 100644
index 0000000000..f461bee612
--- /dev/null
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.53.yaml
@@ -0,0 +1,33 @@
+---
+# file: host_vars/10.30.51.53.yaml
+
+hostname: "s53-t21-tg1"
+grub:
+  audit: "0"
+  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
+  isolcpus: "1-31,33-63,65-95,97-127"
+  mce: "off"
+  nmi_watchdog: "0"
+  nohz_full: "1-31,33-63,65-95,97-127"
+  nosoftlockup: true
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
+  rcu_nocbs: "1-31,33-63,65-95,97-127"
+  tsc: "reliable"
+sysctl:
+  kernel:
+    watchdog_cpumask: "0,32,64,96"
+  vm:
+    nr_hugepages: 32768
+    max_map_count: 20000
+
+inventory_ipmi_hostname: "10.30.50.53"
+cpu_microarchitecture: "sapphirerapids"
+
+intel_700_matrix: "dpdk22.07"
+intel_800_matrix: "dpdk22.07"
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.54.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.54.yaml
new file mode 100644
index 0000000000..74ca6520a5
--- /dev/null
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.54.yaml
@@ -0,0 +1,33 @@
+---
+# file: host_vars/10.30.51.54.yaml
+
+hostname: "s54-t22-sut1"
+grub:
+  audit: "0"
+  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
+  isolcpus: "1-31,33-63,65-95,97-127"
+  mce: "off"
+  nmi_watchdog: "0"
+  nohz_full: "1-31,33-63,65-95,97-127"
+  nosoftlockup: true
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
+  rcu_nocbs: "1-31,33-63,65-95,97-127"
+  tsc: "reliable"
+sysctl:
+  kernel:
+    watchdog_cpumask: "0,32,64,96"
+  vm:
+    nr_hugepages: 32768
+    max_map_count: 20000
+
+inventory_ipmi_hostname: "10.30.50.54"
+cpu_microarchitecture: "sapphirerapids"
+
+intel_700_matrix: "dpdk22.07"
+intel_800_matrix: "dpdk22.07"
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.55.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.55.yaml
new file mode 100644
index 0000000000..69d7807781
--- /dev/null
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.55.yaml
@@ -0,0 +1,33 @@
+---
+# file: host_vars/10.30.51.55.yaml
+
+hostname: "s55-t22-tg1"
+grub:
+  audit: "0"
+  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
+  isolcpus: "1-31,33-63,65-95,97-127"
+  mce: "off"
+  nmi_watchdog: "0"
+  nohz_full: "1-31,33-63,65-95,97-127"
+  nosoftlockup: true
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
+  rcu_nocbs: "1-31,33-63,65-95,97-127"
+  tsc: "reliable"
+sysctl:
+  kernel:
+    watchdog_cpumask: "0,32,64,96"
+  vm:
+    nr_hugepages: 32768
+    max_map_count: 20000
+
+inventory_ipmi_hostname: "10.30.50.55"
+cpu_microarchitecture: "sapphirerapids"
+
+intel_700_matrix: "dpdk22.07"
+intel_800_matrix: "dpdk22.07"
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.56.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.56.yaml
new file mode 100644
index 0000000000..f609e47418
--- /dev/null
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.56.yaml
@@ -0,0 +1,33 @@
+---
+# file: host_vars/10.30.51.56.yaml
+
+hostname: "s56-t23-sut1"
+grub:
+  audit: "0"
+  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
+  isolcpus: "1-31,33-63,65-95,97-127"
+  mce: "off"
+  nmi_watchdog: "0"
+  nohz_full: "1-31,33-63,65-95,97-127"
+  nosoftlockup: true
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
+  rcu_nocbs: "1-31,33-63,65-95,97-127"
+  tsc: "reliable"
+sysctl:
+  kernel:
+    watchdog_cpumask: "0,32,64,96"
+  vm:
+    nr_hugepages: 32768
+    max_map_count: 20000
+
+inventory_ipmi_hostname: "10.30.50.56"
+cpu_microarchitecture: "sapphirerapids"
+
+intel_700_matrix: "dpdk22.07"
+intel_800_matrix: "dpdk22.07"
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.57.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.57.yaml
new file mode 100644
index 0000000000..ae8f1f2024
--- /dev/null
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.57.yaml
@@ -0,0 +1,33 @@
+---
+# file: host_vars/10.30.51.57.yaml
+
+hostname: "s57-t23-tg1"
+grub:
+  audit: "0"
+  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
+  isolcpus: "1-31,33-63,65-95,97-127"
+  mce: "off"
+  nmi_watchdog: "0"
+  nohz_full: "1-31,33-63,65-95,97-127"
+  nosoftlockup: true
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
+  rcu_nocbs: "1-31,33-63,65-95,97-127"
+  tsc: "reliable"
+sysctl:
+  kernel:
+    watchdog_cpumask: "0,32,64,96"
+  vm:
+    nr_hugepages: 32768
+    max_map_count: 20000
+
+inventory_ipmi_hostname: "10.30.50.57"
+cpu_microarchitecture: "sapphirerapids"
+
+intel_700_matrix: "dpdk22.07"
+intel_800_matrix: "dpdk22.07"
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.58.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.58.yaml
new file mode 100644
index 0000000000..2dcc9a715d
--- /dev/null
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.58.yaml
@@ -0,0 +1,33 @@
+---
+# file: host_vars/10.30.51.58.yaml
+
+hostname: "s58-t24-sut1"
+grub:
+  audit: "0"
+  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
+  isolcpus: "1-31,33-63,65-95,97-127"
+  mce: "off"
+  nmi_watchdog: "0"
+  nohz_full: "1-31,33-63,65-95,97-127"
+  nosoftlockup: true
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
+  rcu_nocbs: "1-31,33-63,65-95,97-127"
+  tsc: "reliable"
+sysctl:
+  kernel:
+    watchdog_cpumask: "0,32,64,96"
+  vm:
+    nr_hugepages: 32768
+    max_map_count: 20000
+
+inventory_ipmi_hostname: "10.30.50.58"
+cpu_microarchitecture: "sapphirerapids"
+
+intel_700_matrix: "dpdk22.07"
+intel_800_matrix: "dpdk22.07"
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.59.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.59.yaml
new file mode 100644
index 0000000000..fbab486295
--- /dev/null
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.59.yaml
@@ -0,0 +1,33 @@
+---
+# file: host_vars/10.30.51.59.yaml
+
+hostname: "s59-t24-tg1"
+grub:
+  audit: "0"
+  default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
+  isolcpus: "1-31,33-63,65-95,97-127"
+  mce: "off"
+  nmi_watchdog: "0"
+  nohz_full: "1-31,33-63,65-95,97-127"
+  nosoftlockup: true
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
+  rcu_nocbs: "1-31,33-63,65-95,97-127"
+  tsc: "reliable"
+sysctl:
+  kernel:
+    watchdog_cpumask: "0,32,64,96"
+  vm:
+    nr_hugepages: 32768
+    max_map_count: 20000
+
+inventory_ipmi_hostname: "10.30.50.59"
+cpu_microarchitecture: "sapphirerapids"
+
+intel_700_matrix: "dpdk22.07"
+intel_800_matrix: "dpdk22.07"
diff --git a/fdio.infra.ansible/inventories/lf_inventory/hosts b/fdio.infra.ansible/inventories/lf_inventory/hosts
index 6b057da670..b43fdad227 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/hosts
+++ b/fdio.infra.ansible/inventories/lf_inventory/hosts
@@ -3,6 +3,10 @@ all:
     tg:
       hosts:
         10.30.51.49: #s19-t33t211-tg1 - skylake
+        10.30.51.53: #s53-t21-tg1 - sapphirerapids
+        10.30.51.55: #s55-t22-tg1 - sapphirerapids
+        10.30.51.57: #s57-t23-tg1 - sapphirerapids
+        10.30.51.59: #s59-t24-tg1 - sapphirerapids
         10.30.51.74: #s64-t34-tg1 - icelake
         10.30.51.77: #s67-t37-tg1 - icelake
         10.30.51.80: #s80-t38-tg1 - icelake
@@ -19,6 +23,10 @@ all:
       hosts:
         10.30.51.36: #s17-t33-sut1 - taishan
         10.30.51.37: #s18-t33-sut2 - taishan
+        10.30.51.52: #s52-t21-sut1 - sapphirerapids
+        10.30.51.54: #s54-t22-sut1 - sapphirerapids
+        10.30.51.56: #s56-t23-sut1 - sapphirerapids
+        10.30.51.58: #s58-t24-sut1 - sapphirerapids
         10.30.51.72: #s62-t34-sut1 - altra
         10.30.51.73: #s63-t34-sut2 - altra
         10.30.51.75: #s65-t37-sut1 - icelake
diff --git a/fdio.infra.ansible/inventories/sample_inventory/group_vars/all.yaml b/fdio.infra.ansible/inventories/sample_inventory/group_vars/all.yaml
index f9938d20da..3a5ab66d8b 100644
--- a/fdio.infra.ansible/inventories/sample_inventory/group_vars/all.yaml
+++ b/fdio.infra.ansible/inventories/sample_inventory/group_vars/all.yaml
@@ -1,5 +1,2 @@
 ---
 # file: sample_inventory/group_vars/all.yaml
-
-# Ansible interpreter (for PIP)
-ansible_python_interpreter: "python3"
diff --git a/fdio.infra.ansible/inventories/vagrant_inventory/group_vars/vagrant.yml b/fdio.infra.ansible/inventories/vagrant_inventory/group_vars/vagrant.yml
index c17eae8fb4..af44a3354d 100644
--- a/fdio.infra.ansible/inventories/vagrant_inventory/group_vars/vagrant.yml
+++ b/fdio.infra.ansible/inventories/vagrant_inventory/group_vars/vagrant.yml
@@ -1,5 +1,2 @@
 ---
 # file: vagrant_inventory/group_vars/all.yaml
-
-# Ansible interpreter (for PIP)
-ansible_python_interpreter: "/usr/bin/python3"
diff --git a/fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf b/fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf
index 527f20cb8b..058067a07c 100755
--- a/fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf
+++ b/fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf
@@ -25,13 +25,13 @@ dhcp-authoritative
 dhcp-broadcast
 
 # DHCP ranges for yul1_1.
-dhcp-range=yul1_1,10.30.51.16,10.30.51.92,255.255.255.0,infinite
+dhcp-range=yul1_1,10.30.51.16,10.30.51.94,255.255.255.0,infinite
 dhcp-option=yul1_1,option:router,10.30.51.1
 dhcp-option=yul1_1,option:dns-server,1.1.1.1
 dhcp-option=yul1_1,option:dns-server,8.8.8.8
 
 # DHCP ranges for yul1_2.
-dhcp-range=yul1_2,10.32.8.10,10.32.8.25,255.255.255.0,infinite
+dhcp-range=yul1_2,10.32.8.18,10.32.8.25,255.255.255.0,infinite
 dhcp-option=yul1_2,option:router,10.32.8.1
 dhcp-option=yul1_2,option:dns-server,1.1.1.1
 dhcp-option=yul1_2,option:dns-server,8.8.8.8
@@ -49,6 +49,14 @@ dhcp-host=40:8d:5c:e7:b2:6e,10.30.51.38,fdio-marvell-dev,infinite # enP2p1s0v0
 dhcp-host=ac:1f:6b:8b:53:60,10.30.51.49,s19-t33t211-tg1,infinite # eno1
 dhcp-host=ac:1f:6b:8a:8c:76,10.30.51.50,s1-t11-sut1,infinite # eno1
 dhcp-host=ac:1f:6b:8b:53:96,10.30.51.51,s2-t12-sut1,infinite # eno1
+dhcp-host=?????????????????,10.30.51.52,s52-t21-sut1,infinite # eno1
+dhcp-host=?????????????????,10.30.51.53,s53-t21-tg1,infinite # eno1
+dhcp-host=?????????????????,10.30.51.54,s54-t22-sut1,infinite # eno1
+dhcp-host=?????????????????,10.30.51.55,s55-t22-tg1,infinite # eno1
+dhcp-host=?????????????????,10.30.51.56,s56-t23-sut1,infinite # eno1
+dhcp-host=?????????????????,10.30.51.57,s57-t23-tg1,infinite # eno1
+dhcp-host=?????????????????,10.30.51.58,s58-t24-sut1,infinite # eno1
+dhcp-host=?????????????????,10.30.51.59,s59-t24-tg1,infinite # eno1
 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-t13-sut1,infinite # enp8s0f0
 dhcp-host=b4:2e:99:ab:1d:dc,10.30.51.71,s56-t14-sut1,infinite # enp8s0f0
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-00:fe:c8:e5:68:32 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-00:fe:c8:e5:68:32
deleted file mode 100644
index 6b93032c6d..0000000000
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-00:fe:c8:e5:68:32
+++ /dev/null
@@ -1,4 +0,0 @@
-menuentry "Install t1-sut1" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=00:fe:c8:e5:68:32 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/00:fe:c8:e5:68:32/ --- console=ttyS0,115200n8 quiet
-    initrd   /casper/ubuntu-jammy-amd64/initrd
-}
\ No newline at end of file
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-00:fe:c8:e5:68:e0 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-00:fe:c8:e5:68:e0
deleted file mode 100644
index 162482c9bf..0000000000
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-00:fe:c8:e5:68:e0
+++ /dev/null
@@ -1,4 +0,0 @@
-menuentry "Install t2-sut1" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=00:fe:c8:e5:68:e0 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/00:fe:c8:e5:68:e0/ --- console=ttyS0,115200n8 quiet
-    initrd   /casper/ubuntu-jammy-amd64/initrd
-}
\ No newline at end of file
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-00:fe:c8:e5:6a:72 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-00:fe:c8:e5:6a:72
deleted file mode 100644
index 840ce63ba4..0000000000
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-00:fe:c8:e5:6a:72
+++ /dev/null
@@ -1,4 +0,0 @@
-menuentry "Install t2-tg1" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=00:fe:c8:e5:6a:72 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/00:fe:c8:e5:6a:72/ --- console=ttyS0,115200n8 quiet
-    initrd   /casper/ubuntu-jammy-amd64/initrd
-}
\ No newline at end of file
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-00:fe:c8:e5:6c:76 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-00:fe:c8:e5:6c:76
deleted file mode 100644
index 80ccea41ed..0000000000
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-00:fe:c8:e5:6c:76
+++ /dev/null
@@ -1,4 +0,0 @@
-menuentry "Install t1-tg1" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=00:fe:c8:e5:6c:76 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/00:fe:c8:e5:6c:76/ --- console=ttyS0,115200n8 quiet
-    initrd   /casper/ubuntu-jammy-amd64/initrd
-}
\ No newline at end of file
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-38:0e:4d:9c:4b:0c b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-38:0e:4d:9c:4b:0c
deleted file mode 100644
index a54e350290..0000000000
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-38:0e:4d:9c:4b:0c
+++ /dev/null
@@ -1,4 +0,0 @@
-menuentry "Install s45-nomad" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=38:0e:4d:9c:4b:0c url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/38:0e:4d:9c:4b:0c/ --- console=ttyS0,115200n8 quiet
-    initrd   /casper/ubuntu-jammy-amd64/initrd
-}
\ No newline at end of file
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-38:0e:4d:9c:85:7a b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-38:0e:4d:9c:85:7a
deleted file mode 100644
index 0567d00777..0000000000
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-38:0e:4d:9c:85:7a
+++ /dev/null
@@ -1,4 +0,0 @@
-menuentry "Install s42-nomad" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=38:0e:4d:9c:85:7a url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/38:0e:4d:9c:85:7a/ --- console=ttyS0,115200n8 quiet
-    initrd   /casper/ubuntu-jammy-amd64/initrd
-}
\ No newline at end of file
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:43:a3:ba b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:43:a3:ba
index 4a27f50be4..eec7893f35 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:43:a3:ba
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:43:a3:ba
@@ -1,4 +1,4 @@
 menuentry "Install s60-t210-sut1" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=3c:ec:ef:43:a3:ba url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/3c:ec:ef:43:a3:ba/ --- console=ttyS0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=3c:ec:ef:43:a3:ba url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/3c:ec:ef:43:a3:ba/ --- console=ttyS0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-amd64/initrd
 }
\ No newline at end of file
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:46:34:e8 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:46:34:e8
index 1104dee99e..0941582e44 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:46:34:e8
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:46:34:e8
@@ -1,4 +1,4 @@
 menuentry "Install s61-t210-tg1" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=3c:ec:ef:46:34:e8 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/3c:ec:ef:46:34:e8/ --- console=ttyS0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=3c:ec:ef:46:34:e8 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/3c:ec:ef:46:34:e8/ --- console=ttyS0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-amd64/initrd
 }
\ No newline at end of file
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:b9:7f:12 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:b9:7f:12
index ce5e2f0ca4..6e5779cb48 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:b9:7f:12
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:b9:7f:12
@@ -1,4 +1,4 @@
 menuentry "Install s72-t212-tg1" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=3c:ec:ef:b9:7f:12 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/3c:ec:ef:b9:7f:12/ --- console=ttyS0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=3c:ec:ef:b9:7f:12 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/3c:ec:ef:b9:7f:12/ --- console=ttyS0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-amd64/initrd
 }
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:b9:a6:80 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:b9:a6:80
index 7d4fb4ead6..7820bcc66a 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:b9:a6:80
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:b9:a6:80
@@ -1,4 +1,4 @@
 menuentry "Install s66-t37-sut2" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=3c:ec:ef:b9:a6:80 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/3c:ec:ef:b9:a6:80/ --- console=ttyS0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=3c:ec:ef:b9:a6:80 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/3c:ec:ef:b9:a6:80/ --- console=ttyS0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-amd64/initrd
 }
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:b9:a6:92 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:b9:a6:92
index 16a9b116e0..dc3b19309e 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:b9:a6:92
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:b9:a6:92
@@ -1,4 +1,4 @@
 menuentry "Install s85-t214-sut1" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=3c:ec:ef:b9:a6:92 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/3c:ec:ef:b9:a6:92/ --- console=ttyS0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=3c:ec:ef:b9:a6:92 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/3c:ec:ef:b9:a6:92/ --- console=ttyS0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-amd64/initrd
 }
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:b9:a6:ba b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:b9:a6:ba
index c6fe587180..68790aa057 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:b9:a6:ba
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:b9:a6:ba
@@ -1,4 +1,4 @@
 menuentry "Install s65-t37-sut1" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=3c:ec:ef:b9:a6:ba url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/3c:ec:ef:b9:a6:ba/ --- console=ttyS0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=3c:ec:ef:b9:a6:ba url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/3c:ec:ef:b9:a6:ba/ --- console=ttyS0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-amd64/initrd
 }
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:b9:a6:c6 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:b9:a6:c6
index 489e58c7d0..1c78fcc806 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:b9:a6:c6
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:b9:a6:c6
@@ -1,4 +1,4 @@
 menuentry "Install s67-t37-tg1" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=3c:ec:ef:b9:a6:c6 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/3c:ec:ef:b9:a6:c6/ --- console=ttyS0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=3c:ec:ef:b9:a6:c6 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/3c:ec:ef:b9:a6:c6/ --- console=ttyS0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-amd64/initrd
 }
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:b9:a6:ca b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:b9:a6:ca
index 2c512f7c3e..bc524fa856 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:b9:a6:ca
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:b9:a6:ca
@@ -1,4 +1,4 @@
 menuentry "Install s71-t212-sut1" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=3c:ec:ef:b9:a6:ca url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/3c:ec:ef:b9:a6:ca/ --- console=ttyS0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=3c:ec:ef:b9:a6:ca url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/3c:ec:ef:b9:a6:ca/ --- console=ttyS0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-amd64/initrd
 }
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:b9:cc:44 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:b9:cc:44
index 2830de70f5..0da7b32d76 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:b9:cc:44
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:b9:cc:44
@@ -1,4 +1,4 @@
 menuentry "Install s89-t39t310-tg1" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=3c:ec:ef:b9:cc:44 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/3c:ec:ef:b9:cc:44/ --- console=ttyS0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=3c:ec:ef:b9:cc:44 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/3c:ec:ef:b9:cc:44/ --- console=ttyS0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-amd64/initrd
 }
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:b9:cc:56 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:b9:cc:56
index 695f531e97..b609dadc42 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:b9:cc:56
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:b9:cc:56
@@ -1,4 +1,4 @@
 menuentry "Install s64-t34-tg1" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=3c:ec:ef:b9:cc:56 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/3c:ec:ef:b9:cc:56/ --- console=ttyS0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=3c:ec:ef:b9:cc:56 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/3c:ec:ef:b9:cc:56/ --- console=ttyS0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-amd64/initrd
 }
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:bc:92:26 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:bc:92:26
index eea4137c89..3c02d68d27 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:bc:92:26
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:bc:92:26
@@ -1,4 +1,4 @@
 menuentry "Install s84-t213-tg1" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=3c:ec:ef:bc:92:26 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/3c:ec:ef:bc:92:26/ --- console=ttyS0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=3c:ec:ef:bc:92:26 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/3c:ec:ef:bc:92:26/ --- console=ttyS0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-amd64/initrd
 }
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:bc:92:b2 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:bc:92:b2
index 8803d19d87..9a7b66bcee 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:bc:92:b2
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:bc:92:b2
@@ -1,4 +1,4 @@
 menuentry "Install s80-t38-tg1" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=3c:ec:ef:bc:92:b2 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/3c:ec:ef:bc:92:b2/ --- console=ttyS0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=3c:ec:ef:bc:92:b2 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/3c:ec:ef:bc:92:b2/ --- console=ttyS0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-amd64/initrd
 }
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:bc:92:e4 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:bc:92:e4
index 8cdc7a6604..45c51abd54 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:bc:92:e4
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:bc:92:e4
@@ -1,4 +1,4 @@
 menuentry "Install s86-t214-tg1" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=3c:ec:ef:bc:92:e4 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/3c:ec:ef:bc:92:e4/ --- console=ttyS0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=3c:ec:ef:bc:92:e4 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/3c:ec:ef:bc:92:e4/ --- console=ttyS0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-amd64/initrd
 }
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:bc:92:e8 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:bc:92:e8
index 43272034e4..1fb0698469 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:bc:92:e8
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:bc:92:e8
@@ -1,4 +1,4 @@
 menuentry "Install s87-t215-sut1" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=3c:ec:ef:bc:92:e8 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/3c:ec:ef:bc:92:e8/ --- console=ttyS0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=3c:ec:ef:bc:92:e8 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/3c:ec:ef:bc:92:e8/ --- console=ttyS0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-amd64/initrd
 }
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:bc:a0:d4 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:bc:a0:d4
index 345c5b273d..b6d5309e30 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:bc:a0:d4
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:bc:a0:d4
@@ -1,4 +1,4 @@
 menuentry "Install s79-t38-sut2" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=3c:ec:ef:bc:a0:d4 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/3c:ec:ef:bc:a0:d4/ --- console=ttyS0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=3c:ec:ef:bc:a0:d4 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/3c:ec:ef:bc:a0:d4/ --- console=ttyS0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-amd64/initrd
 }
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:bc:a0:ec b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:bc:a0:ec
index d2ad32495a..f03b1820c2 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:bc:a0:ec
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:bc:a0:ec
@@ -1,4 +1,4 @@
 menuentry "Install s78-t38-sut1" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=3c:ec:ef:bc:a0:ec url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/3c:ec:ef:bc:a0:ec/ --- console=ttyS0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=3c:ec:ef:bc:a0:ec url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/3c:ec:ef:bc:a0:ec/ --- console=ttyS0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-amd64/initrd
 }
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:bc:a1:ac b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:bc:a1:ac
index 419ad0b579..51a73e93bc 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:bc:a1:ac
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:bc:a1:ac
@@ -1,4 +1,4 @@
 menuentry "Install s88-t215-tg1" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=3c:ec:ef:bc:a1:ac url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/3c:ec:ef:bc:a1:ac/ --- console=ttyS0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=3c:ec:ef:bc:a1:ac url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/3c:ec:ef:bc:a1:ac/ --- console=ttyS0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-amd64/initrd
 }
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:bc:a1:ea b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:bc:a1:ea
index 26a81d5e77..20c2acdaf1 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:bc:a1:ea
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:bc:a1:ea
@@ -1,4 +1,4 @@
 menuentry "Install s83-t213-sut1" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=3c:ec:ef:bc:a1:ea url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/3c:ec:ef:bc:a1:ea/ --- console=ttyS0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=3c:ec:ef:bc:a1:ea url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/3c:ec:ef:bc:a1:ea/ --- console=ttyS0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-amd64/initrd
 }
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-40:8d:5c:e7:b2:6e b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-40:8d:5c:e7:b2:6e
index f26e92b535..2f769ff64a 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-40:8d:5c:e7:b2:6e
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-40:8d:5c:e7:b2:6e
@@ -1,4 +1,4 @@
 menuentry "Install fdio-marvell-dev" {
-    linux    /casper/ubuntu-jammy-arm64/vmlinuz ip=dhcp interface=40:8d:5c:e7:b2:6e url=http://10.30.51.20:8081/ubuntu_jammy_arm64/ubuntu-22.04.1-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_arm64/40:8d:5c:e7:b2:6e/ --- console=ttyAMA0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-arm64/vmlinuz ip=dhcp interface=40:8d:5c:e7:b2:6e url=http://10.30.51.20:8081/ubuntu_jammy_arm64/ubuntu-22.04.1-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_arm64/40:8d:5c:e7:b2:6e/ --- console=ttyAMA0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-arm64/initrd
 }
\ No newline at end of file
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-4c:00:82:ae:5a:f8 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-4c:00:82:ae:5a:f8
deleted file mode 100644
index b00f2b7231..0000000000
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-4c:00:82:ae:5a:f8
+++ /dev/null
@@ -1,4 +0,0 @@
-menuentry "Install s43-nomad" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=4c:00:82:ae:5a:f8 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/4c:00:82:ae:5a:f8/ --- console=ttyS0,115200n8 quiet
-    initrd   /casper/ubuntu-jammy-amd64/initrd
-}
\ No newline at end of file
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-6c:41:6a:1f:39:26 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-6c:41:6a:1f:39:26
deleted file mode 100644
index 0ef7ebbbd3..0000000000
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-6c:41:6a:1f:39:26
+++ /dev/null
@@ -1,4 +0,0 @@
-menuentry "Install s42-nomad" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=6c:41:6a:1f:39:26 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/6c:41:6a:1f:39:26/ --- console=ttyS0,115200n8 quiet
-    initrd   /casper/ubuntu-jammy-amd64/initrd
-}
\ No newline at end of file
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-90:e2:ba:49:db:b4 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-90:e2:ba:49:db:b4
index a0859827da..f026fde208 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-90:e2:ba:49:db:b4
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-90:e2:ba:49:db:b4
@@ -1,4 +1,4 @@
 menuentry "Install s63-t34-sut2" {
-    linux    /casper/ubuntu-jammy-arm64/vmlinuz ip=dhcp interface=90:e2:ba:49:db:b4 url=http://10.30.51.20:8081/ubuntu_jammy_arm64/ubuntu-22.04.1-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_arm64/90:e2:ba:49:db:b4/ --- console=ttyAMA0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-arm64/vmlinuz ip=dhcp interface=90:e2:ba:49:db:b4 url=http://10.30.51.24:8081/ubuntu_jammy_arm64/ubuntu-22.04.1-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_arm64/90:e2:ba:49:db:b4/ --- console=ttyAMA0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-arm64/initrd
 }
\ No newline at end of file
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-90:e2:ba:55:be:32 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-90:e2:ba:55:be:32
index 6772361e00..bef6ab5c46 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-90:e2:ba:55:be:32
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-90:e2:ba:55:be:32
@@ -1,4 +1,4 @@
 menuentry "Install s62-t34-sut1" {
-    linux    /casper/ubuntu-jammy-arm64/vmlinuz ip=dhcp interface=90:e2:ba:55:be:32 url=http://10.30.51.20:8081/ubuntu_jammy_arm64/ubuntu-22.04.1-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_arm64/90:e2:ba:55:be:32/ --- console=ttyAMA0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-arm64/vmlinuz ip=dhcp interface=90:e2:ba:55:be:32 url=http://10.30.51.24:8081/ubuntu_jammy_arm64/ubuntu-22.04.1-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_arm64/90:e2:ba:55:be:32/ --- console=ttyAMA0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-arm64/initrd
 }
\ No newline at end of file
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-a0:a3:3b:c1:12:fa b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-a0:a3:3b:c1:12:fa
index 5d038bd42c..94716b157a 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-a0:a3:3b:c1:12:fa
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-a0:a3:3b:c1:12:fa
@@ -1,4 +1,4 @@
 menuentry "Install s18-t33-sut2" {
-    linux    /casper/ubuntu-jammy-arm64/vmlinuz ip=dhcp interface=a0:a3:3b:c1:12:fa url=http://10.30.51.20:8081/ubuntu_jammy_arm64/ubuntu-22.04.1-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_arm64/a0:a3:3b:c1:12:fa/ --- console=ttyAMA0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-arm64/vmlinuz ip=dhcp interface=a0:a3:3b:c1:12:fa url=http://10.30.51.24:8081/ubuntu_jammy_arm64/ubuntu-22.04.1-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_arm64/a0:a3:3b:c1:12:fa/ --- console=ttyAMA0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-arm64/initrd
 }
\ No newline at end of file
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-a0:a3:3b:c1:14:28 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-a0:a3:3b:c1:14:28
index e0ba34750f..c25fb59bf6 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-a0:a3:3b:c1:14:28
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-a0:a3:3b:c1:14:28
@@ -1,4 +1,4 @@
 menuentry "Install s17-t33-sut1" {
-    linux    /casper/ubuntu-jammy-arm64/vmlinuz ip=dhcp interface=a0:a3:3b:c1:14:28 url=http://10.30.51.20:8081/ubuntu_jammy_arm64/ubuntu-22.04.1-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_arm64/a0:a3:3b:c1:14:28/ --- console=ttyAMA0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-arm64/vmlinuz ip=dhcp interface=a0:a3:3b:c1:14:28 url=http://10.30.51.24:8081/ubuntu_jammy_arm64/ubuntu-22.04.1-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_arm64/a0:a3:3b:c1:14:28/ --- console=ttyAMA0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-arm64/initrd
 }
\ No newline at end of file
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-a4:bf:01:55:ac:39 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-a4:bf:01:55:ac:39
index 9a98683a60..7632e5b28a 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-a4:bf:01:55:ac:39
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-a4:bf:01:55:ac:39
@@ -1,4 +1,4 @@
 menuentry "Install s93-t39-sut1" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=a4:bf:01:55:ac:39 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/a4:bf:01:55:ac:39/ --- console=ttyS0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=a4:bf:01:55:ac:39 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/a4:bf:01:55:ac:39/ --- console=ttyS0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-amd64/initrd
 }
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-a4:bf:01:55:af:5e b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-a4:bf:01:55:af:5e
index 5bbf34c637..abf5cd4c69 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-a4:bf:01:55:af:5e
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-a4:bf:01:55:af:5e
@@ -1,4 +1,4 @@
 menuentry "Install s94-t39-sut2" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=a4:bf:01:55:af:5e url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/a4:bf:01:55:af:5e/ --- console=ttyS0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=a4:bf:01:55:af:5e url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/a4:bf:01:55:af:5e/ --- console=ttyS0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-amd64/initrd
 }
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:5a:6a:b4 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:5a:6a:b4
index 07e179c9bf..60e28f987b 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:5a:6a:b4
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:5a:6a:b4
@@ -1,4 +1,4 @@
 menuentry "Install s24-nomad" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:5a:6a:b4 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/ac:1f:6b:5a:6a:b4/ --- console=ttyS0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:5a:6a:b4 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/ac:1f:6b:5a:6a:b4/ --- console=ttyS0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-amd64/initrd
 }
\ No newline at end of file
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:5a:6a:d4 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:5a:6a:d4
index d7bbf218e3..2a7e51aa57 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:5a:6a:d4
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:5a:6a:d4
@@ -1,4 +1,4 @@
 menuentry "Install s23-nomad" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:5a:6a:d4 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/ac:1f:6b:5a:6a:d4/ --- console=ttyS0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:5a:6a:d4 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/ac:1f:6b:5a:6a:d4/ --- console=ttyS0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-amd64/initrd
 }
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:5a:6b:08 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:5a:6b:08
index e9bc3de9a6..ead9363ee4 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:5a:6b:08
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:5a:6b:08
@@ -1,4 +1,4 @@
 menuentry "Install s25-nomad" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:5a:6b:08 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/ac:1f:6b:5a:6b:08/ --- console=ttyS0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:5a:6b:08 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/ac:1f:6b:5a:6b:08/ --- console=ttyS0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-amd64/initrd
 }
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
index 02c63ed786..22fd401178 100644
--- 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
@@ -1,4 +1,4 @@
 menuentry "Install s1-t11-sut1" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:8a:8c:76 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/ac:1f:6b:8a:8c:76/ --- console=ttyS0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:8a:8c:76 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/ac:1f:6b:8a:8c:76/ --- console=ttyS0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-amd64/initrd
 }
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8a:8d:0a b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8a:8d:0a
index ffad82c274..b5fcc09c2a 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8a:8d:0a
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8a:8d:0a
@@ -1,4 +1,4 @@
 menuentry "Install s28-nomad" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:8a:8d:0a url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/ac:1f:6b:8a:8d:0a/ --- console=ttyS0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:8a:8d:0a url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/ac:1f:6b:8a:8d:0a/ --- console=ttyS0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-amd64/initrd
 }
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8b:53:60 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8b:53:60
index 034f2b68b3..d9f43c4e82 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8b:53:60
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8b:53:60
@@ -1,4 +1,4 @@
 menuentry "Install s19-t33t211-tg1" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:8b:53:60 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/ac:1f:6b:8b:53:60/ --- console=ttyS0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:8b:53:60 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/ac:1f:6b:8b:53:60/ --- console=ttyS0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-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
index 427e1fae35..b6c9dc018a 100644
--- 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
@@ -1,4 +1,4 @@
 menuentry "Install s2-t12-sut1" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:8b:53:96 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/ac:1f:6b:8b:53:96/ --- console=ttyS0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:8b:53:96 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/ac:1f:6b:8b:53:96/ --- console=ttyS0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-amd64/initrd
 }
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8b:55:d8 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8b:55:d8
index dc83576bc2..a91d1efcb5 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8b:55:d8
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8b:55:d8
@@ -1,4 +1,4 @@
 menuentry "Install s27-nomad" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:8b:55:d8 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/ac:1f:6b:8b:55:d8/ --- console=ttyS0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:8b:55:d8 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/ac:1f:6b:8b:55:d8/ --- console=ttyS0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-amd64/initrd
 }
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:ac:d7:56 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:ac:d7:56
index a88c592e2c..63a2ba3822 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:ac:d7:56
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:ac:d7:56
@@ -1,4 +1,4 @@
 menuentry "Install s36-t28-tg1" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:ac:d7:56 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/ac:1f:6b:ac:d7:56/ --- console=ttyS0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:ac:d7:56 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/ac:1f:6b:ac:d7:56/ --- console=ttyS0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-amd64/initrd
 }
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:ac:d7:76 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:ac:d7:76
index 84e99e4cae..4f5ea25dbd 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:ac:d7:76
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:ac:d7:76
@@ -1,4 +1,4 @@
 menuentry "Install s38-t29-tg1" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:ac:d7:76 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/ac:1f:6b:ac:d7:76/ --- console=ttyS0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:ac:d7:76 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/ac:1f:6b:ac:d7:76/ --- console=ttyS0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-amd64/initrd
 }
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:ac:d7:8c b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:ac:d7:8c
index a792453a1d..b5f87a87fb 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:ac:d7:8c
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:ac:d7:8c
@@ -1,4 +1,4 @@
 menuentry "Install s34-t27-tg1" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:ac:d7:8c url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/ac:1f:6b:ac:d7:8c/ --- console=ttyS0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:ac:d7:8c url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/ac:1f:6b:ac:d7:8c/ --- console=ttyS0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-amd64/initrd
 }
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:ac:d7:ba b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:ac:d7:ba
index ea9d0e6a92..d14f3a0c5b 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:ac:d7:ba
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:ac:d7:ba
@@ -1,4 +1,4 @@
 menuentry "Install s37-t29-sut1" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:ac:d7:ba url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/ac:1f:6b:ac:d7:ba/ --- console=ttyS0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:ac:d7:ba url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/ac:1f:6b:ac:d7:ba/ --- console=ttyS0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-amd64/initrd
 }
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:ac:d7:c0 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:ac:d7:c0
index 58b0837914..89406d8614 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:ac:d7:c0
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:ac:d7:c0
@@ -1,4 +1,4 @@
 menuentry "Install s35-t28-sut1" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:ac:d7:c0 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/ac:1f:6b:ac:d7:c0/ --- console=ttyS0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:ac:d7:c0 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/ac:1f:6b:ac:d7:c0/ --- console=ttyS0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-amd64/initrd
 }
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:ac:d7:d6 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:ac:d7:d6
index 2d6f7d4f7a..24fe62a501 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:ac:d7:d6
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:ac:d7:d6
@@ -1,4 +1,4 @@
 menuentry "Install s33-t27-sut1" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:ac:d7:d6 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/ac:1f:6b:ac:d7:d6/ --- console=ttyS0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:ac:d7:d6 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/ac:1f:6b:ac:d7:d6/ --- console=ttyS0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-amd64/initrd
 }
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:ac:d9:2e b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:ac:d9:2e
index acab72e697..f41e7749c0 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:ac:d9:2e
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:ac:d9:2e
@@ -1,4 +1,4 @@
 menuentry "Install s26-nomad" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:ac:d9:2e url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/ac:1f:6b:ac:d9:2e/ --- console=ttyS0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:ac:d9:2e url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/ac:1f:6b:ac:d9:2e/ --- console=ttyS0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-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
index 91c67171aa..8215906965 100644
--- 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
@@ -1,4 +1,4 @@
 menuentry "Install s56-t14-sut1" {
-    linux    /casper/ubuntu-jammy-arm64/vmlinuz ip=dhcp interface=b4:2e:99:ab:1d:dc url=http://10.30.51.20:8081/ubuntu_jammy_arm64/ubuntu-20.04.4-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_arm64/b4:2e:99:ab:1d:dc/ --- console=ttyAMA0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-arm64/vmlinuz ip=dhcp interface=b4:2e:99:ab:1d:dc url=http://10.30.51.24:8081/ubuntu_jammy_arm64/ubuntu-22.04.1-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_arm64/b4:2e:99:ab:1d:dc/ --- console=ttyAMA0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-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
index e6fac905e4..5e26197062 100644
--- 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
@@ -1,4 +1,4 @@
 menuentry "Install s55-t13-sut1" {
-    linux    /casper/ubuntu-jammy-arm64/vmlinuz ip=dhcp interface=b4:2e:99:ab:1d:e8 url=http://10.30.51.20:8081/ubuntu_jammy_arm64/ubuntu-20.04.4-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_arm64/b4:2e:99:ab:1d:e8/ --- console=ttyAMA0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-arm64/vmlinuz ip=dhcp interface=b4:2e:99:ab:1d:e8 url=http://10.30.51.24:8081/ubuntu_jammy_arm64/ubuntu-20.04.4-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_arm64/b4:2e:99:ab:1d:e8/ --- console=ttyAMA0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-arm64/initrd
 }
\ No newline at end of file
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-cc:46:d6:17:e0:58 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-cc:46:d6:17:e0:58
deleted file mode 100644
index 29ee48e525..0000000000
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-cc:46:d6:17:e0:58
+++ /dev/null
@@ -1,4 +0,0 @@
-menuentry "Install t1-sut2" {
-    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=cc:46:d6:17:e0:58 url=https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_amd64/cc:46:d6:17:e0:58/ --- console=ttyS0,115200n8 quiet
-    initrd   /casper/ubuntu-jammy-amd64/initrd
-}
\ No newline at end of file
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-d8:5e:d3:02:b1:9f b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-d8:5e:d3:02:b1:9f
index 4765cdc863..da7d0e422e 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-d8:5e:d3:02:b1:9f
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-d8:5e:d3:02:b1:9f
@@ -1,4 +1,4 @@
 menuentry "Install s92-nomad" {
-    linux    /casper/ubuntu-jammy-arm64/vmlinuz ip=dhcp interface=d8:5e:d3:02:b1:9f url=http://10.30.51.20:8081/ubuntu_jammy_arm64/ubuntu-22.04.1-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_arm64/d8:5e:d3:02:b1:9f/ --- console=ttyAMA0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-arm64/vmlinuz ip=dhcp interface=d8:5e:d3:02:b1:9f url=http://10.30.51.24:8081/ubuntu_jammy_arm64/ubuntu-22.04.1-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_arm64/d8:5e:d3:02:b1:9f/ --- console=ttyAMA0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-arm64/initrd
 }
\ No newline at end of file
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-d8:5e:d3:02:b1:bb b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-d8:5e:d3:02:b1:bb
index bcf6577bbe..52fe44c826 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-d8:5e:d3:02:b1:bb
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-d8:5e:d3:02:b1:bb
@@ -1,4 +1,4 @@
 menuentry "Install s91-nomad" {
-    linux    /casper/ubuntu-jammy-arm64/vmlinuz ip=dhcp interface=d8:5e:d3:02:b1:bb url=http://10.30.51.20:8081/ubuntu_jammy_arm64/ubuntu-22.04.1-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_arm64/d8:5e:d3:02:b1:bb/ --- console=ttyAMA0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-arm64/vmlinuz ip=dhcp interface=d8:5e:d3:02:b1:bb url=http://10.30.51.24:8081/ubuntu_jammy_arm64/ubuntu-22.04.1-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_arm64/d8:5e:d3:02:b1:bb/ --- console=ttyAMA0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-arm64/initrd
 }
\ No newline at end of file
diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-e0:d5:5e:ae:70:26 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-e0:d5:5e:ae:70:26
index 2717bd74aa..fe2f4caef5 100644
--- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-e0:d5:5e:ae:70:26
+++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-e0:d5:5e:ae:70:26
@@ -1,4 +1,4 @@
 menuentry "Install s27-t211-sut1" {
-    linux    /casper/ubuntu-jammy-arm64/vmlinuz ip=dhcp interface=e0:d5:5e:ae:70:26 url=http://10.30.51.20:8081/ubuntu_jammy_arm64/ubuntu-20.04.4-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_arm64/e0:d5:5e:ae:70:26/ --- console=ttyAMA0,115200n8 quiet
+    linux    /casper/ubuntu-jammy-arm64/vmlinuz ip=dhcp interface=e0:d5:5e:ae:70:26 url=http://10.30.51.24:8081/ubuntu_jammy_arm64/ubuntu-20.04.4-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_arm64/e0:d5:5e:ae:70:26/ --- console=ttyAMA0,115200n8 quiet
     initrd   /casper/ubuntu-jammy-arm64/initrd
 }
\ No newline at end of file
diff --git a/topologies/disabled/lf_2n_skx_testbed21.yaml b/topologies/disabled/lf_2n_skx_testbed21.yaml
deleted file mode 100644
index 86a5f3fe24..0000000000
--- a/topologies/disabled/lf_2n_skx_testbed21.yaml
+++ /dev/null
@@ -1,155 +0,0 @@
----
-metadata:
-  version: 0.1
-  schema:
-    - resources/topology_schemas/2_node_topology.sch.yaml
-    - resources/topology_schemas/topology.sch.yaml
-  tags: [hw, 2-node]
-
-nodes:
-  TG:
-    type: TG
-    subtype: TREX
-    host: "10.30.51.45"
-    arch: x86_64
-    port: 22
-    username: testuser
-    password: Csit1234
-    interfaces:
-      port1:
-        # s4-t21-tg1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ab:70"
-        pci_address: "0000:18:00.0"
-        ip4_address: "172.16.10.2"
-        driver: i40e
-        link: link1
-        model: Intel-X710
-      port2:
-        # s4-t21-tg1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ab:71"
-        pci_address: "0000:18:00.1"
-        ip4_address: "172.16.20.2"
-        driver: i40e
-        link: link2
-        model: Intel-X710
-      port3:
-        # s4-t21-tg1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ab:72"
-        pci_address: "0000:18:00.2"
-        ip4_address: "172.16.30.2"
-        driver: i40e
-        link: link3
-        model: Intel-X710
-      port4:
-        # s4-t21-tg1-c2/p4 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ab:73"
-        pci_address: "0000:18:00.3"
-        ip4_address: "172.16.40.2"
-        driver: i40e
-        link: link4
-        model: Intel-X710
-      port5:
-        # s4-t21-tg1-c4/p1 - 25GE port1 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:fa:38"
-        pci_address: "0000:3b:00.0"
-        ip4_address: "172.16.50.2"
-        driver: i40e
-        link: link5
-        model: Intel-XXV710
-      port6:
-        # s4-t21-tg1-c4/p2 - 25GE port2 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:fa:39"
-        pci_address: "0000:3b:00.1"
-        ip4_address: "172.16.60.2"
-        driver: i40e
-        link: link6
-        model: Intel-XXV710
-      port7:
-        # s4-t21-tg1-c10/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:b1:98"
-        pci_address: "0000:d8:00.0"
-        ip4_address: "172.16.70.2"
-        driver: i40e
-        link: link7
-        model: Intel-X710
-      port8:
-        # s4-t21-tg1-c10/p2 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:b1:99"
-        pci_address: "0000:d8:00.1"
-        ip4_address: "172.16.70.1"
-        driver: i40e
-        link: link7
-        model: Intel-X710
-      port9:
-        # s4-t21-tg1-c10/p3 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:b1:9a"
-        pci_address: "0000:d8:00.2"
-        ip4_address: "172.16.80.2"
-        driver: i40e
-        link: link8
-        model: Intel-X710
-      port10:
-        # s4-t21-tg1-c10/p4 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:b1:9b"
-        pci_address: "0000:d8:00.3"
-        ip4_address: "172.16.80.1"
-        driver: i40e
-        link: link8
-        model: Intel-X710
-  DUT1:
-    type: DUT
-    host: "10.30.51.44"
-    arch: x86_64
-    port: 22
-    username: testuser
-    password: Csit1234
-    uio_driver: vfio-pci
-    interfaces:
-      port1:
-        # s3-t21-sut1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ad:88"
-        pci_address: "0000:18:00.0"
-        ip4_address: "172.16.10.1"
-        driver: i40e
-        link: link1
-        model: Intel-X710
-      port2:
-        # s3-t21-sut1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ad:89"
-        pci_address: "0000:18:00.1"
-        ip4_address: "172.16.20.1"
-        driver: i40e
-        link: link2
-        model: Intel-X710
-      port3:
-        # s3-t21-sut1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ad:8a"
-        pci_address: "0000:18:00.2"
-        ip4_address: "172.16.30.1"
-        driver: i40e
-        link: link3
-        model: Intel-X710
-      port4:
-        # s3-t21-sut1-c2/p4 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ad:8b"
-        pci_address: "0000:18:00.3"
-        ip4_address: "172.16.40.1"
-        driver: i40e
-        link: link4
-        model: Intel-X710
-      port5:
-        # s3-t21-sut1-c4/p1 - 25GE port1 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:f9:60"
-        pci_address: "0000:3b:00.0"
-        ip4_address: "172.16.50.1"
-        driver: i40e
-        link: link5
-        model: Intel-XXV710
-      port6:
-        # s3-t21-sut1-c4/p2 - 25GE port2 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:f9:61"
-        pci_address: "0000:3b:00.1"
-        ip4_address: "172.16.60.1"
-        driver: i40e
-        link: link6
-        model: Intel-XXV710
diff --git a/topologies/disabled/lf_2n_skx_testbed22.yaml b/topologies/disabled/lf_2n_skx_testbed22.yaml
deleted file mode 100644
index ee25175946..0000000000
--- a/topologies/disabled/lf_2n_skx_testbed22.yaml
+++ /dev/null
@@ -1,155 +0,0 @@
----
-metadata:
-  version: 0.1
-  schema:
-    - resources/topology_schemas/2_node_topology.sch.yaml
-    - resources/topology_schemas/topology.sch.yaml
-  tags: [hw, 2-node]
-
-nodes:
-  TG:
-    type: TG
-    subtype: TREX
-    host: "10.30.51.53"
-    arch: x86_64
-    port: 22
-    username: testuser
-    password: Csit1234
-    interfaces:
-      port1:
-        # s6-t22-tg1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ab:98"
-        pci_address: "0000:18:00.0"
-        ip4_address: "172.16.10.2"
-        driver: i40e
-        link: link1
-        model: Intel-X710
-      port2:
-        # s6-t22-tg1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ab:99"
-        pci_address: "0000:18:00.1"
-        ip4_address: "172.16.20.2"
-        driver: i40e
-        link: link2
-        model: Intel-X710
-      port3:
-        # s6-t22-tg1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ab:9a"
-        pci_address: "0000:18:00.2"
-        ip4_address: "172.16.30.2"
-        driver: i40e
-        link: link3
-        model: Intel-X710
-      port4:
-        # s6-t22-tg1-c2/p4 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ab:9b"
-        pci_address: "0000:18:00.3"
-        ip4_address: "172.16.40.2"
-        driver: i40e
-        link: link4
-        model: Intel-X710
-      port5:
-        # s6-t22-tg1-c4/p1 - 25GE port1 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:f8:60"
-        pci_address: "0000:3b:00.0"
-        ip4_address: "172.16.50.2"
-        driver: i40e
-        link: link5
-        model: Intel-XXV710
-      port6:
-        # s6-t22-tg1-c4/p2 - 25GE port2 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:f8:61"
-        pci_address: "0000:3b:00.1"
-        ip4_address: "172.16.60.2"
-        driver: i40e
-        link: link6
-        model: Intel-XXV710
-      port7:
-        # s6-t22-tg1-c10/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ab:98"
-        pci_address: "0000:d8:00.0"
-        ip4_address: "172.16.70.2"
-        driver: i40e
-        link: link7
-        model: Intel-X710
-      port8:
-        # s6-t22-tg1-c10/p2 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ab:99"
-        pci_address: "0000:d8:00.1"
-        ip4_address: "172.16.70.1"
-        driver: i40e
-        link: link7
-        model: Intel-X710
-      port9:
-        # s6-t22-tg1-c10/p3 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ab:9a"
-        pci_address: "0000:d8:00.2"
-        ip4_address: "172.16.80.2"
-        driver: i40e
-        link: link8
-        model: Intel-X710
-      port10:
-        # s6-t22-tg1-c10/p4 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ab:9b"
-        pci_address: "0000:d8:00.3"
-        ip4_address: "172.16.80.1"
-        driver: i40e
-        link: link8
-        model: Intel-X710
-  DUT1:
-    type: DUT
-    host: "10.30.51.52"
-    arch: x86_64
-    port: 22
-    username: testuser
-    password: Csit1234
-    uio_driver: vfio-pci
-    interfaces:
-      port1:
-        # s5-t22-sut1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:af:a8"
-        pci_address: "0000:18:00.0"
-        ip4_address: "172.16.10.1"
-        driver: i40e
-        link: link1
-        model: Intel-X710
-      port2:
-        # s5-t22-sut1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:af:a9"
-        pci_address: "0000:18:00.1"
-        ip4_address: "172.16.20.1"
-        driver: i40e
-        link: link2
-        model: Intel-X710
-      port3:
-        # s5-t22-sut1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:af:aa"
-        pci_address: "0000:18:00.2"
-        ip4_address: "172.16.30.1"
-        driver: i40e
-        link: link3
-        model: Intel-X710
-      port4:
-        # s5-t22-sut1-c2/p4 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:af:ab"
-        pci_address: "0000:18:00.3"
-        ip4_address: "172.16.40.1"
-        driver: i40e
-        link: link4
-        model: Intel-X710
-      port5:
-        # s5-t22-sut1-c4/p1 - 25GE port1 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:f9:54"
-        pci_address: "0000:3b:00.0"
-        ip4_address: "172.16.50.1"
-        driver: i40e
-        link: link5
-        model: Intel-XXV710
-      port6:
-        # s5-t22-sut1-c4/p2 - 25GE port2 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:f9:55"
-        pci_address: "0000:3b:00.1"
-        ip4_address: "172.16.60.1"
-        driver: i40e
-        link: link6
-        model: Intel-XXV710
diff --git a/topologies/disabled/lf_2n_skx_testbed23.yaml b/topologies/disabled/lf_2n_skx_testbed23.yaml
deleted file mode 100644
index cb08cddf7d..0000000000
--- a/topologies/disabled/lf_2n_skx_testbed23.yaml
+++ /dev/null
@@ -1,155 +0,0 @@
----
-metadata:
-  version: 0.1
-  schema:
-    - resources/topology_schemas/2_node_topology.sch.yaml
-    - resources/topology_schemas/topology.sch.yaml
-  tags: [hw, 2-node]
-
-nodes:
-  TG:
-    type: TG
-    subtype: TREX
-    host: "10.30.51.55"
-    arch: x86_64
-    port: 22
-    username: testuser
-    password: Csit1234
-    interfaces:
-      port1:
-        # s8-t23-tg1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:b1:38"
-        pci_address: "0000:18:00.0"
-        ip4_address: "172.16.10.2"
-        driver: i40e
-        link: link1
-        model: Intel-X710
-      port2:
-        # s8-t23-tg1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:b1:39"
-        pci_address: "0000:18:00.1"
-        ip4_address: "172.16.20.2"
-        driver: i40e
-        link: link2
-        model: Intel-X710
-      port3:
-        # s8-t23-tg1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:b1:3a"
-        pci_address: "0000:18:00.2"
-        ip4_address: "172.16.30.2"
-        driver: i40e
-        link: link3
-        model: Intel-X710
-      port4:
-        # s8-t23-tg1-c2/p4 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:b1:3b"
-        pci_address: "0000:18:00.3"
-        ip4_address: "172.16.40.2"
-        driver: i40e
-        link: link4
-        model: Intel-X710
-      port5:
-        # s8-t23-tg1-c4/p1 - 25GE port1 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:f9:88"
-        pci_address: "0000:3b:00.0"
-        ip4_address: "172.16.50.2"
-        driver: i40e
-        link: link5
-        model: Intel-XXV710
-      port6:
-        # s8-t23-tg1-c4/p2 - 25GE port2 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:f9:89"
-        pci_address: "0000:3b:00.1"
-        ip4_address: "172.16.60.2"
-        driver: i40e
-        link: link6
-        model: Intel-XXV710
-      port7:
-        # s8-t23-tg1-c10/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ab:20"
-        pci_address: "0000:d8:00.0"
-        ip4_address: "172.16.70.2"
-        driver: i40e
-        link: link7
-        model: Intel-X710
-      port8:
-        # s8-t23-tg1-c10/p2 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ab:21"
-        pci_address: "0000:d8:00.1"
-        ip4_address: "172.16.70.1"
-        driver: i40e
-        link: link7
-        model: Intel-X710
-      port9:
-        # s8-t23-tg1-c10/p3 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ab:22"
-        pci_address: "0000:d8:00.2"
-        ip4_address: "172.16.80.2"
-        driver: i40e
-        link: link8
-        model: Intel-X710
-      port10:
-        # s8-t23-tg1-c10/p4 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ab:23"
-        pci_address: "0000:d8:00.3"
-        ip4_address: "172.16.80.1"
-        driver: i40e
-        link: link8
-        model: Intel-X710
-  DUT1:
-    type: DUT
-    host: "10.30.51.54"
-    arch: x86_64
-    port: 22
-    username: testuser
-    password: Csit1234
-    uio_driver: vfio-pci
-    interfaces:
-      port1:
-        # s7-t23-sut1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ae:30"
-        pci_address: "0000:18:00.0"
-        ip4_address: "172.16.10.1"
-        driver: i40e
-        link: link1
-        model: Intel-X710
-      port2:
-        # s7-t23-sut1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ae:31"
-        pci_address: "0000:18:00.1"
-        ip4_address: "172.16.20.1"
-        driver: i40e
-        link: link2
-        model: Intel-X710
-      port3:
-        # s7-t23-sut1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ae:32"
-        pci_address: "0000:18:00.2"
-        ip4_address: "172.16.30.1"
-        driver: i40e
-        link: link3
-        model: Intel-X710
-      port4:
-        # s7-t23-sut1-c2/p4 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ae:33"
-        pci_address: "0000:18:00.3"
-        ip4_address: "172.16.40.1"
-        driver: i40e
-        link: link4
-        model: Intel-X710
-      port5:
-        # s7-t23-sut1-c4/p1 - 25GE port1 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:f9:00"
-        pci_address: "0000:3b:00.0"
-        ip4_address: "172.16.50.1"
-        driver: i40e
-        link: link5
-        model: Intel-XXV710
-      port6:
-        # s7-t23-sut1-c4/p2 - 25GE port2 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:f9:01"
-        pci_address: "0000:3b:00.1"
-        ip4_address: "172.16.60.1"
-        driver: i40e
-        link: link6
-        model: Intel-XXV710
diff --git a/topologies/disabled/lf_3n_skx_testbed31.yaml b/topologies/disabled/lf_3n_skx_testbed31.yaml
deleted file mode 100644
index 6cb33b6ce0..0000000000
--- a/topologies/disabled/lf_3n_skx_testbed31.yaml
+++ /dev/null
@@ -1,212 +0,0 @@
----
-metadata:
-  version: 0.1
-  schema:
-    - resources/topology_schemas/3_node_topology.sch.yaml
-    - resources/topology_schemas/topology.sch.yaml
-  tags: [hw, 3-node]
-
-nodes:
-  TG:
-    type: TG
-    subtype: TREX
-    host: "10.30.51.48"
-    arch: x86_64
-    port: 22
-    username: testuser
-    password: Csit1234
-    interfaces:
-      port1:
-        # s13-t31-tg1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:af:58"
-        pci_address: "0000:18:00.0"
-        ip4_address: "172.16.10.2"
-        driver: i40e
-        link: link1
-        model: Intel-X710
-      port2:
-        # s13-t31-tg1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:af:59"
-        pci_address: "0000:18:00.1"
-        ip4_address: "172.16.20.2"
-        driver: i40e
-        link: link2
-        model: Intel-X710
-      port3:
-        # s13-t31-tg1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:af:5a"
-        pci_address: "0000:18:00.2"
-        ip4_address: "172.16.30.2"
-        driver: i40e
-        link: link3
-        model: Intel-X710
-      port4:
-        # s13-t31-tg1-c2/p4 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:af:5b"
-        pci_address: "0000:18:00.3"
-        ip4_address: "172.16.40.2"
-        driver: i40e
-        link: link4
-        model: Intel-X710
-      port5:
-        # s13-t31-tg1-c4/p1 - 25GE port1 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:f9:40"
-        pci_address: "0000:3b:00.0"
-        ip4_address: "172.16.50.2"
-        driver: i40e
-        link: link5
-        model: Intel-XXV710
-      port6:
-        # s13-t31-tg1-c4/p2 - 25GE port2 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:f9:41"
-        pci_address: "0000:3b:00.1"
-        ip4_address: "172.16.60.2"
-        driver: i40e
-        link: link6
-        model: Intel-XXV710
-      port7:
-        # s13-t31-tg1-c10/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ad:30"
-        pci_address: "0000:d8:00.0"
-        ip4_address: "172.16.70.2"
-        driver: i40e
-        link: link7
-        model: Intel-X710
-      port8:
-        # s13-t31-tg1-c10/p2 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ad:31"
-        pci_address: "0000:d8:00.1"
-        ip4_address: "172.16.70.1"
-        driver: i40e
-        link: link7
-        model: Intel-X710
-      port9:
-        # s13-t31-tg1-c10/p3 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ad:32"
-        pci_address: "0000:d8:00.2"
-        ip4_address: "172.16.80.2"
-        driver: i40e
-        link: link8
-        model: Intel-X710
-      port10:
-        # s13-t31-tg1-c10/p4 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ad:33"
-        pci_address: "0000:d8:00.3"
-        ip4_address: "172.16.80.1"
-        driver: i40e
-        link: link8
-        model: Intel-X710
-  DUT1:
-    type: DUT
-    host: "10.30.51.46"
-    arch: x86_64
-    port: 22
-    username: testuser
-    password: Csit1234
-    uio_driver: vfio-pci
-    interfaces:
-      port1:
-        # s11-t31-sut1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:af:38"
-        pci_address: "0000:18:00.0"
-        ip4_address: "172.16.10.1"
-        driver: i40e
-        link: link1
-        model: Intel-X710
-      port2:
-        # s11-t31-sut1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:af:39"
-        pci_address: "0000:18:00.1"
-        ip4_address: "172.16.120.1"
-        driver: i40e
-        link: link21
-        model: Intel-X710
-      port3:
-        # s11-t31-sut1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:af:3a"
-        pci_address: "0000:18:00.2"
-        ip4_address: "172.16.30.1"
-        driver: i40e
-        link: link3
-        model: Intel-X710
-      port4:
-        # s11-t31-sut1-c2/p4 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:af:3b"
-        pci_address: "0000:18:00.3"
-        ip4_address: "172.16.140.1"
-        driver: i40e
-        link: link22
-        model: Intel-X710
-      port5:
-        # s11-t31-sut1-c4/p1 - 25GE port1 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:f9:34"
-        pci_address: "0000:3b:00.0"
-        ip4_address: "172.16.50.1"
-        driver: i40e
-        link: link5
-        model: Intel-XXV710
-      port6:
-        # s11-t31-sut1-c4/p2 - 25GE port2 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:f9:35"
-        pci_address: "0000:3b:00.1"
-        ip4_address: "172.16.160.1"
-        driver: i40e
-        link: link23
-        model: Intel-XXV710
-  DUT2:
-    type: DUT
-    host: "10.30.51.47"
-    arch: x86_64
-    port: 22
-    username: testuser
-    password: Csit1234
-    uio_driver: vfio-pci
-    interfaces:
-      port1:
-        # s12-t31-sut1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:aa:a8"
-        pci_address: "0000:18:00.0"
-        ip4_address: "172.16.20.1"
-        driver: i40e
-        link: link2
-        model: Intel-X710
-      port2:
-        # s12-t31-sut1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:aa:a9"
-        pci_address: "0000:18:00.1"
-        ip4_address: "172.16.120.2"
-        driver: i40e
-        link: link21
-        model: Intel-X710
-      port3:
-        # s12-t31-sut1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:aa:aa"
-        pci_address: "0000:18:00.2"
-        ip4_address: "172.16.40.1"
-        driver: i40e
-        link: link4
-        model: Intel-X710
-      port4:
-        # s12-t31-sut1-c2/p4 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:aa:ab"
-        pci_address: "0000:18:00.3"
-        ip4_address: "172.16.140.2"
-        driver: i40e
-        link: link22
-        model: Intel-X710
-      port5:
-        # s12-t31-sut1-c4/p1 - 25GE port1 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:f9:3c"
-        pci_address: "0000:3b:00.0"
-        ip4_address: "172.16.60.1"
-        driver: i40e
-        link: link6
-        model: Intel-XXV710
-      port6:
-        # s12-t31-sut1-c4/p2 - 25GE port2 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:f9:3d"
-        pci_address: "0000:3b:00.1"
-        ip4_address: "172.16.160.2"
-        driver: i40e
-        link: link23
-        model: Intel-XXV710
diff --git a/topologies/disabled/lf_3n_skx_testbed32.yaml b/topologies/disabled/lf_3n_skx_testbed32.yaml
deleted file mode 100644
index 206b469b90..0000000000
--- a/topologies/disabled/lf_3n_skx_testbed32.yaml
+++ /dev/null
@@ -1,212 +0,0 @@
----
-metadata:
-  version: 0.1
-  schema:
-    - resources/topology_schemas/3_node_topology.sch.yaml
-    - resources/topology_schemas/topology.sch.yaml
-  tags: [hw, 3-node]
-
-nodes:
-  TG:
-    type: TG
-    subtype: TREX
-    host: "10.30.51.60"
-    arch: x86_64
-    port: 22
-    username: testuser
-    password: Csit1234
-    interfaces:
-      port1:
-        # s13-t31-tg1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:af:08"
-        pci_address: "0000:18:00.0"
-        ip4_address: "172.16.10.2"
-        driver: i40e
-        link: link1
-        model: Intel-X710
-      port2:
-        # s13-t31-tg1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:af:09"
-        pci_address: "0000:18:00.1"
-        ip4_address: "172.16.20.2"
-        driver: i40e
-        link: link2
-        model: Intel-X710
-      port3:
-        # s13-t31-tg1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:af:0a"
-        pci_address: "0000:18:00.2"
-        ip4_address: "172.16.30.2"
-        driver: i40e
-        link: link3
-        model: Intel-X710
-      port4:
-        # s13-t31-tg1-c2/p4 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:af:0b"
-        pci_address: "0000:18:00.3"
-        ip4_address: "172.16.40.2"
-        driver: i40e
-        link: link4
-        model: Intel-X710
-      port5:
-        # s13-t31-tg1-c4/p1 - 25GE port1 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:fa:1c"
-        pci_address: "0000:3b:00.0"
-        ip4_address: "172.16.50.2"
-        driver: i40e
-        link: link5
-        model: Intel-XXV710
-      port6:
-        # s13-t31-tg1-c4/p2 - 25GE port2 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:fa:1d"
-        pci_address: "0000:3b:00.1"
-        ip4_address: "172.16.60.2"
-        driver: i40e
-        link: link6
-        model: Intel-XXV710
-      port7:
-        # s13-t31-tg1-c10/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ab:e0"
-        pci_address: "0000:d8:00.0"
-        ip4_address: "172.16.70.2"
-        driver: i40e
-        link: link7
-        model: Intel-X710
-      port8:
-        # s13-t31-tg1-c10/p2 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ab:e1"
-        pci_address: "0000:d8:00.1"
-        ip4_address: "172.16.70.1"
-        driver: i40e
-        link: link7
-        model: Intel-X710
-      port9:
-        # s13-t31-tg1-c10/p3 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ab:e2"
-        pci_address: "0000:d8:00.2"
-        ip4_address: "172.16.80.2"
-        driver: i40e
-        link: link8
-        model: Intel-X710
-      port10:
-        # s13-t31-tg1-c10/p4 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ab:e3"
-        pci_address: "0000:d8:00.3"
-        ip4_address: "172.16.80.1"
-        driver: i40e
-        link: link8
-        model: Intel-X710
-  DUT1:
-    type: DUT
-    host: "10.30.51.58"
-    arch: x86_64
-    port: 22
-    username: testuser
-    password: Csit1234
-    uio_driver: vfio-pci
-    interfaces:
-      port1:
-        # s14-t32-sut1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ae:60"
-        pci_address: "0000:18:00.0"
-        ip4_address: "172.16.10.1"
-        driver: i40e
-        link: link1
-        model: Intel-X710
-      port2:
-        # s14-t32-sut1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ae:61"
-        pci_address: "0000:18:00.1"
-        ip4_address: "172.16.120.1"
-        driver: i40e
-        link: link21
-        model: Intel-X710
-      port3:
-        # s14-t32-sut1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ae:62"
-        pci_address: "0000:18:00.2"
-        ip4_address: "172.16.30.1"
-        driver: i40e
-        link: link3
-        model: Intel-X710
-      port4:
-        # s14-t32-sut1-c2/p4 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ae:63"
-        pci_address: "0000:18:00.3"
-        ip4_address: "172.16.140.1"
-        driver: i40e
-        link: link22
-        model: Intel-X710
-      port5:
-        # s14-t32-sut1-c4/p1 - 25GE port1 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:f9:38"
-        pci_address: "0000:3b:00.0"
-        ip4_address: "172.16.50.1"
-        driver: i40e
-        link: link5
-        model: Intel-XXV710
-      port6:
-        # s14-t32-sut1-c4/p2 - 25GE port2 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:f9:39"
-        pci_address: "0000:3b:00.1"
-        ip4_address: "172.16.160.1"
-        driver: i40e
-        link: link23
-        model: Intel-XXV710
-  DUT2:
-    type: DUT
-    host: "10.30.51.59"
-    arch: x86_64
-    port: 22
-    username: testuser
-    password: Csit1234
-    uio_driver: vfio-pci
-    interfaces:
-      port1:
-        # s15-t32-sut1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ae:c0"
-        pci_address: "0000:18:00.0"
-        ip4_address: "172.16.20.1"
-        driver: i40e
-        link: link2
-        model: Intel-X710
-      port2:
-        # s15-t32-sut1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ae:c1"
-        pci_address: "0000:18:00.1"
-        ip4_address: "172.16.120.2"
-        driver: i40e
-        link: link21
-        model: Intel-X710
-      port3:
-        # s15-t32-sut1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ae:c2"
-        pci_address: "0000:18:00.2"
-        ip4_address: "172.16.40.1"
-        driver: i40e
-        link: link4
-        model: Intel-X710
-      port4:
-        # s15-t32-sut1-c2/p4 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:a8:ae:c3"
-        pci_address: "0000:18:00.3"
-        ip4_address: "172.16.140.2"
-        driver: i40e
-        link: link22
-        model: Intel-X710
-      port5:
-        # s15-t32-sut1-c4/p1 - 25GE port1 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:f8:fc"
-        pci_address: "0000:3b:00.0"
-        ip4_address: "172.16.60.1"
-        driver: i40e
-        link: link6
-        model: Intel-XXV710
-      port6:
-        # s15-t32-sut1-c4/p2 - 25GE port2 on Intel NIC xxv710 2p25GE.
-        mac_address: "3c:fd:fe:bd:f8:fd"
-        pci_address: "0000:3b:00.1"
-        ip4_address: "172.16.160.2"
-        driver: i40e
-        link: link23
-        model: Intel-XXV710