feat(doc): Add ICX

Signed-off-by: Peter Mikus <pmikus@cisco.com>
Change-Id: I46b2198d94f21b25061f0bd9bed42ca15bc00aa0
(cherry picked from commit 6844308e3c8db8612d572fdb4f39f7eea02867e9)

3 files changed, 57 insertions, 13 deletions

diff --git a/docs/lab/fdio-dc-inventory-vexxhost.md b/docs/lab/fdio-dc-inventory-vexxhost.md
index fe4169e5fa..68b152e5ad 100644
--- a/docs/lab/fdio-dc-inventory-vexxhost.md
+++ b/docs/lab/fdio-dc-inventory-vexxhost.md
@@ -39,12 +39,12 @@
 
 #### Rack YUL1-8 (3016.8)
 name,oper-status,testbed-id,role,model,s/n,mgmt-ip4,ipmi-ip4,rackid,rackunit
-?,up,switch,uplink,?,?,?,?,3016.8,u47,?,?
-s65-t37-sut1,up,t37,3n-icx,SYS-740GP-TNRT,???,10.30.51.75,10.30.50.75,3016.8,u42-u45
-s66-t37-sut2,up,t37,3n-icx,SYS-740GP-TNRT,???,10.30.51.76,10.30.50.76,3016.8,u38-u41
-s67-t37-tg1,up,t37,3n-icx,SYS-740GP-TNRT,???,10.30.51.77,10.30.50.77,3016.8,u34-u37
-s71-t212-sut1,up,t212,2n-icx,SYS-740GP-TNRT,???,10.30.51.81,10.30.50.81,3016.8,u30-u33
-s72-t212-tg1,up,t212,2n-icx,SYS-740GP-TNRT,???,10.30.51.82,10.30.50.82,3016.8,u26-u29
+mtl1-8-lb4m,up,switch,uplink,?,?,?,?,3016.8,u47,?,?
+s65-t37-sut1,up,t37,3n-icx,SYS-740GP-TNRT,C7470KK25P50098,10.30.51.75,10.30.50.75,3016.8,u42-u45
+s66-t37-sut2,up,t37,3n-icx,SYS-740GP-TNRT,C7470KK33P50247,10.30.51.76,10.30.50.76,3016.8,u38-u41
+s67-t37-tg1,up,t37,3n-icx,SYS-740GP-TNRT,C7470KK25P50076,10.30.51.77,10.30.50.77,3016.8,u34-u37
+s71-t212-sut1,up,t212,2n-icx,SYS-740GP-TNRT,C7470KK25P50173,10.30.51.81,10.30.50.81,3016.8,u30-u33
+s72-t212-tg1,up,t212,2n-icx,SYS-740GP-TNRT,C7470KK33P50220,10.30.51.82,10.30.50.82,3016.8,u26-u29
 s73-t213-sut1,up,t213,2n-icx,SYS-740GP-TNRT,???,10.30.51.83,10.30.50.83,3016.8,u22-u25
 s74-t213-tg1,up,t213,2n-icx,SYS-740GP-TNRT,???,10.30.51.84,10.30.50.84,3016.8,u18-u21
 s75-t214-sut1,up,t214,2n-icx,SYS-740GP-TNRT,???,10.30.51.85,10.30.50.85,3016.8,u14-u17
@@ -135,9 +135,5 @@ s38-t29-tg1,up,t29,2n-clx,SYS-7049GP-TRT,C7470KH37A30506,10.32.8.23,10.30.55.23,
 
 Notes:
 
-- softiron-1, softiron-2, softiron-3, decommission request and instructions issued
-  on 16-Sep-2020, per Vexxhost ticket
-  [#FDU-009676 - New arm hardware - 2xThunderX2](https://secure.vexxhost.com/billing/viewticket.php?tid=FDU-009676&c=ncHht136),
-  search for "softiron".
 - UCSC-C240-M4 EoL:
   [End-of-Life Announcement for the Cisco Unified Computing System C-Series](https://www.cisco.com/c/en/us/products/collateral/servers-unified-computing/ucs-c-series-rack-servers/eos-eol-notice-c51-741235.html)
\ No newline at end of file
diff --git a/docs/lab/fdio-dc-physical.yaml b/docs/lab/fdio-dc-physical.yaml
index 81f3b22917..180f336d9d 100644
--- a/docs/lab/fdio-dc-physical.yaml
+++ b/docs/lab/fdio-dc-physical.yaml
@@ -3,6 +3,57 @@
 
 yul1:
   rack:
+    name: yul1-8
+    facility_id: 3016.8
+    tenant: Linux Foundation
+    status: active
+    dimensions:
+      type: 4-post cabinet
+      width: 19 inches
+      height: 48U
+      - unit: 47
+        name: mtl1-8-lb4m
+        oper_status: production
+        device_type: switch
+        serial_number: N/A
+        mgmt_ip4: N/A
+        lom_ip4: N/A
+        lom_type: N/A
+      - unit: 42..45
+        name: s65-t37-sut1
+        oper_status: production
+        device_type: SYS-740GP-TNRT
+        serial_number: C7470KK25P50098
+        mgmt_ip4: 10.30.51.75
+        lom_ip4: 10.30.50.75
+      - unit: 38..41
+        name: s66-t37-sut2
+        oper_status: production
+        device_type: SYS-740GP-TNRT
+        serial_number: C7470KK33P50247
+        mgmt_ip4: 10.30.51.76
+        lom_ip4: 10.30.50.76
+      - unit: 34..37
+        name: s67-t37-tg1
+        oper_status: production
+        device_type: SYS-740GP-TNRT
+        serial_number: C7470KK25P50076
+        mgmt_ip4: 10.30.51.77
+        lom_ip4: 10.30.50.77
+      - unit: 30..33
+        name: s71-t212-sut1
+        oper_status: production
+        device_type: SYS-740GP-TNRT
+        serial_number: C7470KK25P50173
+        mgmt_ip4: 10.30.51.81
+        lom_ip4: 10.30.50.81
+      - unit: 26..29
+        name: s72-t212-tg1
+        oper_status: production
+        device_type: SYS-740GP-TNRT
+        serial_number: C7470KK33P50220
+        mgmt_ip4: 10.30.51.82
+        lom_ip4: 10.30.50.82
     name: yul1-9
     facility_id: 3016.9
     tenant: Linux Foundation
diff --git a/docs/lab/testbeds_sm_icx_hw_bios_cfg.md b/docs/lab/testbeds_sm_icx_hw_bios_cfg.md
index d780a7c082..36eabeb18c 100644
--- a/docs/lab/testbeds_sm_icx_hw_bios_cfg.md
+++ b/docs/lab/testbeds_sm_icx_hw_bios_cfg.md
@@ -1,5 +1,3 @@
-<<<<<<< HEAD   (41b698 feat(pxe): Add ICX)
-=======
 # SuperMicro Icelake Servers - HW and BIOS Configuration
 
 1. [Linux lscpu](#linux-lscpu)
@@ -1247,4 +1245,3 @@ s67-t37-tg1.    10.30.50.77.  1.00.21.  1.1.  F1.00.07. 0D000280.       A5.01.24
 s71-t212-sut1.  10.30.50.81.  1.00.21.  1.1.  F1.00.07. 0D000280.       A5.01.24.  8.30 0x8000a49d 1.2926.0. 2.17.4. 3.10 0x8000ad67 1.3106.0. 1.7.16.
 s72-t212-tg1.   10.30.50.82.  1.00.21.  1.1.  F1.00.07. 0D000280.       A5.01.24.  8.30 0x8000a49d 1.2926.0. 2.17.4. 3.10 0x8000ad67 1.3106.0. 1.7.16.
 ```
->>>>>>> CHANGE (62c4aa feat(ansible): Add ICX)