Infra: DC move logistics update

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

1 files changed, 91 insertions, 227 deletions

diff --git a/docs/lab/fdio-dc-inventory-vexxhost.md b/docs/lab/fdio-dc-inventory-vexxhost.md
index 0756967215..434a85a1cd 100644
--- a/docs/lab/fdio-dc-inventory-vexxhost.md
+++ b/docs/lab/fdio-dc-inventory-vexxhost.md
@@ -1,132 +1,15 @@
 <!-- MarkdownTOC autolink="true" -->
 
-- [FD.io DC Move Logistics](#fdio-dc-move-logistics)
-  - [DC Naming Change](#dc-naming-change)
-  - [Network Connectivity](#network-connectivity)
-  - [DC Move Sequence](#dc-move-sequence)
-    - [Timeline](#timeline)
-    - [Stage-1 MTL2 1 rack - Preferred](#stage-1-mtl2-1-rack)
-    - [Stage-2 MTL1 4 racks](#stage-2-mtl1-4-racks)
 - [FD.io DC Vexxhost Inventory](#fdio-dc-vexxhost-inventory)
   - [Missing Equipment Inventory](#missing-equipment-inventory)
-  - [MTL2 Inventory 1 rack](#mtl2-inventory-1-rack)
-    - [Rack "R1" 16 servers - FDIO-DONE VH-OPEN](#rack-r1-16-servers---fdio-done-vh-open)
-  - [MTL1 Inventory 4 racks](#mtl1-inventory-4-racks)
-    - [Rack B316 11 servers - FDIO-DONE VH-OPEN](#rack-b316-11-servers---fdio-done-vh-open)
-    - [Rack B425 10 servers - FDIO-DONE VH-OPEN](#rack-b425-10-servers---fdio-done-vh-open)
-    - [Rack B612 12 servers - FDIO-DONE VH-OPEN](#rack-b612-12-servers---fdio-done-vh-open)
-    - [Rack B611 15 servers - FDIO-DONE VH-OPEN](#rack-b611-15-servers---fdio-done-vh-open)
+  - [YUL1 Inventory](#yul1-inventory)
+    - [Rack YUL1-9 (3016.9)](#rack-yul1-10-3016.9)
+    - [Rack YUL1-10 (3016.10)](#rack-yul1-10-3016.10)
+    - [Rack YUL1-11 (3016.11)](#rack-yul1-11-3016.11)
+    - [Rack YUL1-12 (3016.12)](#rack-yul1-12-3016.12)
 
 <!-- /MarkdownTOC -->
 
-## FD.io DC Move Logistics
-
-### DC Naming Change
-
-FYI Inventory of the two DCs in Montreal hosted by Vexxhost on behalf of LFN.
-
-MTL2 = (old name) YUL2
-MTL1 = (old name) YUL1
-
-Inventory info provided in the context of moving both MTL1 and MTL2 DCs and
-consolidating into a single DC location, named YUL1.
-
-### Network Connectivity
-
-- L2VPN connectivity between sites.
-- VLANs are extended using VXLAN, with VXLAN packets carried over Wireguard.
-- No change to IPv4 numbering scheme or addresses required.
-
-### DC Move Sequence
-
-#### Timeline
-
-- Stage-1, done
-- Stage-2, wk?
-- ...
-- Stage-n, wk?
-
-#### Stage-1 MTL2 1 rack - VH-DONE, FDIO_DONE
-
-Rest of 1 rack with 10 servers split into the following testbeds and servers:
-
-- 3 x 2n-clx
-- 1 x 2n-dnv
-- 1 x 2n-zn2
-- 1 x 3n-dnv
-- 4 x Nomad client
-
-#### Stage-2 MTL1
-
-name,oper-status,testbed-id,role,model,s/n,rackid,rackunit,mgmt-ip4,ipmi-ip4,new-rackid,new-rackunit,new-mgmt-ip4,new-ipmi-ip4
-s41-nomad,up,nomad-cluster1,nomad-client,UCSC-C240-M4SX,FCH1950V1FQ,b612,u29-u30,10.30.51.28,10.30.50.28,r?,u?,10.30.51.28,10.30.50.28
-s40-nomad,up,nomad-cluster1,nomad-server,UCSC-C240-M4SX,FCH2013V0HZ,b612,u27-u28,10.30.51.30,10.30.50.30,r?,u?,10.30.51.30,10.30.50.30
-s39-nomad,up,nomad-cluster1,nomad-client,UCSC-C240-M4SX,FCH2013V0J2,b612,u25-u26,10.30.51.29,10.30.50.29,r?,u?,10.30.51.29,10.30.50.29
-s2-t12-sut1,up,t12,1n-skx,SYS-7049GP-TRT,C7470KH06A20119,b425,u33-u36,10.30.51.51,10.30.50.48,r?,u?,10.30.51.51,10.30.50.48
-s56-t37-sut1,up,t37,2n-tx2,ThunderX2-9980,N/A,b611,u16-u17,10.30.51.71,10.30.50.71,r?,u?,10.30.51.71,10.30.50.71
-s53-nomad,up,nomad-cluster1,nomad-client,ThunderX-88XX,N/A,b612,u17,10.30.51.39,10.30.50.39,r?,u?,10.30.51.39,10.30.50.39
-s54-nomad,up,nomad-cluster1,nomad-client,ThunderX-88XX,N/A,b612,u16,10.30.51.40,10.30.50.40,r?,u?,10.30.51.40,10.30.50.40
-
-#### Stage-3 MTL1
-
-name,oper-status,testbed-id,role,model,s/n,rackid,rackunit,mgmt-ip4,ipmi-ip4,new-rackid,new-rackunit,new-mgmt-ip4,new-ipmi-ip4
-s42-nomad,up,nomad-cluster1,nomad-server,UCSC-C240-M3S,FCH1719V18Y,b611,u23-u24,10.30.51.32,10.30.50.32,r?,u?,10.30.51.32,10.30.50.32
-s44-nomad,up,nomad-cluster1,nomad-client,UCSC-C220-M4S,FCH2139V129,b612,u20,10.30.51.34,10.30.50.34,r?,u?,10.30.51.34,10.30.50.34
-s45-nomad,up,nomad-cluster1,nomad-client,UCSC-C220-M4S,FCH2139V166,b612,u19,10.30.51.35,10.30.50.35,r?,u?,10.30.51.35,10.30.50.35
-s1-t11-sut1,up,t11,1n-skx,SYS-7049GP-TRT,C7470KH06A20154,b425,u37-u40,10.30.51.50,10.30.50.47,r?,u?,10.30.51.50,10.30.50.47
-s55-t36-sut1,up,t36,1n-tx2,ThunderX2-9980,N/A,b316,u10-u11,10.30.51.70,10.30.50.70,r?,u?,10.30.51.70,10.30.50.70
-s52-nomad,up,nomad-cluster1,nomad-client,ThunderX-88XX,N/A,b611,u19-u20,10.30.51.65,10.30.50.65,r?,u?,10.30.51.65,10.30.50.65
-s51-nomad,up,nomad-cluster1,nomad-client,ThunderX-88XX,N/A,b611,u19-u20,10.30.51.66,10.30.50.66,r?,u?,10.30.51.66,10.30.50.66
-
-#### Stage-4 MTL1
-
-name,oper-status,testbed-id,role,model,s/n,rackid,rackunit,mgmt-ip4,ipmi-ip4,new-rackid,new-rackunit,new-mgmt-ip4,new-ipmi-ip4
-s43-nomad,up,nomad-cluster1,nomad-server,UCSC-C220-M3L,FCH1726V1M4,b611,u22,10.30.51.33,10.30.50.33,r?,u?,10.30.51.33,10.30.50.33
-s49-nomad,up,nomad-cluster1,nomad-client,ThunderX-88XX,N/A,b611,u19-u20,10.30.51.67,10.30.50.67,r?,u?,10.30.51.67,10.30.50.67
-s50-nomad,up,nomad-cluster1,nomad-client,ThunderX-88XX,N/A,b611,u19-u20,10.30.51.68,10.30.50.68,r?,u?,10.30.51.68,10.30.50.68
-t1-tg1,up,t1,3n-hsw,UCSC-C240-M4SX,FCH1950V1HM,b611,u35-u36,10.30.51.16,10.30.50.16,r?,u?,10.30.51.16,10.30.50.16
-t1-sut1,up,t1,3n-hsw,UCSC-C240-M4SX,FCH1950V1KH,b611,u33-u34,10.30.51.17,10.30.50.17,r?,u?,10.30.51.17,10.30.50.17
-t1-sut2,up,t1,3n-hsw,UCSC-C240-M4SX,FCH1950V1FP,b611,u31-u32,10.30.51.18,10.30.50.18,r?,u?,10.30.51.18,10.30.50.18
-t2-tg1,up,t2,3n-hsw,UCSC-C240-M4SX,FCH1950V1KG,b611,u29-u30,10.30.51.20,10.30.50.20,r?,u?,10.30.51.20,10.30.50.20
-t2-sut1,up,t2,3n-hsw,UCSC-C240-M4SX,FCH1950V1FM,b611,u27-u28,10.30.51.21,10.30.50.21,r?,u?,10.30.51.21,10.30.50.21
-t2-sut2,up,t2,3n-hsw,UCSC-C240-M4SX,FCH1950V1FN,b611,u25-u26,10.30.51.22,10.30.50.22,r?,u?,10.30.51.22,10.30.50.22
-
-#### Stage-5 MTL1
-
-name,oper-status,testbed-id,role,model,s/n,rackid,rackunit,mgmt-ip4,ipmi-ip4,new-rackid,new-rackunit,new-mgmt-ip4,new-ipmi-ip4
-t3-tg1,up,t3,3n-hsw,UCSC-C240-M4SX,FCH1950V1H5,b612,u35-u36,10.30.51.24,10.30.50.24,r?,u?,10.30.51.24,10.30.50.24
-t3-sut1,up,t3,3n-hsw,UCSC-C240-M4SX,FCH1950V1FS,b612,u33-u34,10.30.51.25,10.30.50.25,r?,u?,10.30.51.25,10.30.50.25
-t3-sut2,up,t3,3n-hsw,UCSC-C240-M4SX,FCH1950V1FL,b612,u31-u32,10.30.51.26,10.30.50.26,r?,u?,10.30.51.26,10.30.50.26
-fdio-marvell-dev,up,N/A,dev,ThunderX-88XX,N/A,b612,u18,10.30.51.38,10.30.50.38,r?,u?,10.30.51.38,10.30.50.38
-
-#### Stage-6 MTL1
-
-name,oper-status,testbed-id,role,model,s/n,rackid,rackunit,mgmt-ip4,ipmi-ip4,new-rackid,new-rackunit,new-mgmt-ip4,new-ipmi-ip4
-s3-t21-sut1,up,t21,2n-skx,SYS-7049GP-TRT,C7470KH06A20167,b425,u29-u32,10.30.51.44,10.30.50.41,r?,u?,10.30.51.44,10.30.50.41
-s4-t21-tg1,up,t21,2n-skx,SYS-7049GP-TRT,C7470KH06A20158,b425,u25-u28,10.30.51.45,10.30.50.42,r?,u?,10.30.51.45,10.30.50.42
-s5-t22-sut1,up,t22,2n-skx,SYS-7049GP-TRT,N/A,b425,u21-u24,10.30.51.52,10.30.50.49,r?,u?,10.30.51.52,10.30.50.49
-s6-t22-tg1,up,t22,2n-skx,SYS-7049GP-TRT,N/A,b425,u17-u20,10.30.51.53,10.30.50.50,r?,u?,10.30.51.53,10.30.50.50
-s7-t23-sut1,up,t23,2n-skx,SYS-7049GP-TRT,N/A,b425,u13-u16,10.30.51.54,10.30.50.51,r?,u?,10.30.51.54,10.30.50.51
-s8-t23-tg1,up,t23,2n-skx,SYS-7049GP-TRT,C7470KH06A20035,b425,u9-u12,10.30.51.55,10.30.50.52,r?,u?,10.30.51.55,10.30.50.52
-s9-t24-sut1,up,t24,2n-skx,SYS-7049GP-TRT,C7470KH06A20055,b425,u5-u8,10.30.51.56,10.30.50.53,r?,u?,10.30.51.56,10.30.50.53
-s10-t24-tg1,up,t24,2n-skx,SYS-7049GP-TRT,C7470KH06A20196,b425,u1-u4,10.30.51.57,10.30.50.54,r?,u?,10.30.51.57,10.30.50.54
-
-
-#### Stage-7 MTL1
-
-name,oper-status,testbed-id,role,model,s/n,rackid,rackunit,mgmt-ip4,ipmi-ip4,new-rackid,new-rackunit,new-mgmt-ip4,new-ipmi-ip4
-s11-t31-sut1,up,t31,3n-skx,SYS-7049GP-TRT,C7470KH06A20037,b316,u37-u40,10.30.51.46,10.30.50.43,r?,u?,10.30.51.46,10.30.50.43
-s12-t31-sut2,up,t31,3n-skx,SYS-7049GP-TRT,C7470KH06A20018,b316,u33-u36,10.30.51.47,10.30.50.44,r?,u?,10.30.51.47,10.30.50.44
-s13-t31-tg1,up,t31,3n-skx,SYS-7049GP-TRT,C7470KH06A20043,b316,u29-u32,10.30.51.48,10.30.50.45,r?,u?,10.30.51.48,10.30.50.45
-s14-t32-sut1,up,t31,3n-skx,SYS-7049GP-TRT,C7470KH06A20075,b316,u25-u28,10.30.51.58,10.30.50.55,r?,u?,10.30.51.58,10.30.50.55
-s15-t32-sut2,up,t31,3n-skx,SYS-7049GP-TRT,C7470KH06A20010,b316,u21-u24,10.30.51.59,10.30.50.56,r?,u?,10.30.51.59,10.30.50.56
-s16-t32-tg1,up,t31,3n-skx,SYS-7049GP-TRT,C7470KH06A20047,b316,u17-u20,10.30.51.60,10.30.50.57,r?,u?,10.30.51.60,10.30.50.57
-s19-t33t34-tg1,up,t33t34,3n-tsh/2n-tx2,SYS-7049GP-TRT,C7470KH06A20056,b316,u13-u16,10.30.51.49,10.30.50.46,r?,u?,10.30.51.49,10.30.50.46
-s27-t34-sut1,up,t34,2n-tx2,ThunderX2-9975,K61186073100003,b316,u12,10.30.51.69,10.30.50.69,r?,u?,10.30.51.69,10.30.50.69
-s18-t33-sut2,up,t33,3n-tsh,HUAWEI-TAISHAN-2280,N/A,b316,u8-u9,10.30.51.37,10.30.50.37,r?,u?,10.30.51.37,10.30.50.37
-s17-t33-sut1,up,t33,3n-tsh,HUAWEI-TAISHAN-2280,N/A,b316,u6-u7,10.30.51.36,10.30.50.36,r?,u?,10.30.51.36,10.30.50.36
-
-
 ## FD.io DC Vexxhost Inventory
 
 - for each DC location, per rack .csv table with server inventory
@@ -138,14 +21,10 @@ s17-t33-sut1,up,t33,3n-tsh,HUAWEI-TAISHAN-2280,N/A,b316,u6-u7,10.30.51.36,10.30.
     - role exceptions: decommission, repurpose, spare.
   - model: server model.
   - s/n: serial number.
-  - rackid: current location rack id.
-  - rackunit: current location rack unit id.
   - mgmt-ip4: current management IPv4 address on management VLAN.
   - ipmi-ip4: current IPMI IPv4 address on LOM VLAN.
-  - new-rackid: new location rack id.
-  - new-rackunit: new location rack unit id.
-  - new-mgmt-ip4: new management IPv4 address on management VLAN.
-  - new-ipmi-ip4: new IPMI IPv4 address on LOM VLAN.
+  - rackid: new location rack id.
+  - rackunit: new location rack unit id.
 
 ### Missing Equipment Inventory
 
@@ -154,114 +33,99 @@ s17-t33-sut1,up,t33,3n-tsh,HUAWEI-TAISHAN-2280,N/A,b316,u6-u7,10.30.51.36,10.30.
    - [Wiring: 2-Node-IxiaPS1L47 Servers (2n-ps1)](https://git.fd.io/csit/tree/docs/lab/testbed_specifications.md#n1017)
    - [mgmt-ip4 10.30.51.62 s26-t25-tg1](https://git.fd.io/csit/tree/docs/lab/testbed_specifications.md#n374)
    - [ipmi-ip4 10.30.50.59 s26-t25-tg1](https://git.fd.io/csit/tree/docs/lab/testbed_specifications.md#n281)
-2. Skylake Xeon SUT for TCP/IP host stack tests
-   - [Specification: Server-Type-B8: Purpose - Skylake Xeon SUT for TCP/IP host stack tests](https://git.fd.io/csit/tree/docs/lab/testbed_specifications.md#n573)
-   - [Wiring: 2-Node-IxiaPS1L47 Servers (2n-ps1)](https://git.fd.io/csit/tree/docs/lab/testbed_specifications.md#n1017)
-   - [mgmt-ip4 10.30.51.61 s25-t25-sut1](https://git.fd.io/csit/tree/docs/lab/testbed_specifications.md#n373)
-   - [ipmi-ip4 10.30.50.58 s25-t25-sut1](https://git.fd.io/csit/tree/docs/lab/testbed_specifications.md#n280)
-
-### MTL2 Inventory 1 rack
-
-#### Rack "r3016.12" 16 servers - FDIO-DONE VH-DONE
-
-name,oper-status,testbed-id,role,model,s/n,rackid,rackunit,mgmt-ip4,ipmi-ip4,new-rackid,new-rackunit,new-mgmt-ip4,new-ipmi-ip4
-s61-t210-tg1,up,t210,2n-zn2,AS-1014S-WTRT,C8150LI50NS2689,r1,u40,10.32.8.25,10.30.55.25,r3016.12,u33,10.32.8.25,10.30.55.25
-s60-t210-sut1,up,t210,2n-zn2,AS-1114S-WTRT,N/A,r1,u39,10.32.8.24,10.30.55.24,r3016.12,u32,10.32.8.24,10.30.55.24
-s48-nomad,up,nomad-cluster1,nomad-client,SYS-1029P-WTRT,C1160LI12NM0540,r1,u38,10.32.8.16,10.30.55.16,r3016.12,u31,10.32.8.16,10.30.55.16
-s47-nomad,up,nomad-cluster1,nomad-client,SYS-1029P-WTRT,C1160LI12NM0241,r1,u37,10.32.8.15,10.30.55.15,r3016.12,u30,10.32.8.15,10.30.55.15
-s46-nomad,up,nomad-cluster1,nomad-client,SYS-1029P-WTRT,C1160LI12NM0256,r1,u36,10.32.8.14,10.30.55.14,r3016.12,u29,10.32.8.14,10.30.55.14
-s57-nomad,up,nomad-cluster1,nomad-client,SYS-7049GP-TRT,C7470KH37A30505,r1,u32-u35,10.32.8.17,10.30.55.17,r3016.12,u25-u28,10.32.8.17,10.30.55.17
-s33-t27-sut1,up,t27,2n-clx,SYS-7049GP-TRT,C7470KH37A30567,r1,u28-u31,10.32.8.18,10.30.55.18,r3016.12,u21-u24,10.32.8.18,10.30.55.18
-s34-t27-tg1,up,t27,2n-clx,SYS-7049GP-TRT,C7470KH37A30565,r1,u24-u27,10.32.8.19,10.30.55.19,r3016.12,u17-u20,10.32.8.19,10.30.55.19
-s35-t28-sut1,up,t28,2n-clx,SYS-7049GP-TRT,C7470KH37A30509,r1,u20-u23,10.32.8.20,10.30.55.20,r3016.12,u13-u16,10.32.8.20,10.30.55.20
-s36-t28-tg1,up,t28,2n-clx,SYS-7049GP-TRT,C7470KH37A30511,r1,u16-u19,10.32.8.21,10.30.55.21,r3016.12,u9-u12,10.32.8.21,10.30.55.21
-s37-t29-sut1,up,t29,2n-clx,SYS-7049GP-TRT,C7470KH37A30566,r1,u12-u15,10.32.8.22,10.30.55.22,r3016.12,u5-u8,10.32.8.22,10.30.55.22
-s38-t29-tg1,up,t29,2n-clx,SYS-7049GP-TRT,C7470KH37A30506,r1,u8-u11,10.32.8.23,10.30.55.23,r3016.12,u1-u4,10.32.8.23,10.30.55.23
-s31-t35-sut2/dnv3,up,t35,3n-dnv,SYS-E300-9A,CE300AG39040898,r1,u7,10.32.8.13,10.30.55.13,r3016.12,u40,10.32.8.13,10.30.55.13
-s30-t35-sut1/dnv2,up,t35,3n-dnv,SYS-E300-9A,CE300AG39040866,r1,u6,10.32.8.12,10.30.55.12,r3016.12,u39,10.32.8.12,10.30.55.12
-s29-t26-sut1/dnv1,up,t26,2n-dnv,SYS-E300-9A,CE300AG39040897,r1,u5,10.32.8.11,10.30.55.11,r3016.12,u38,10.32.8.11,10.30.55.11
-s28-t26t35-tg1/super,up,t26t35,2n/3n-dnv,SYS-7049GP-TRT,C7470KH06A20137,r1,u1-u4,10.32.8.10,10.30.55.10,r3016.12,u34-u37,10.32.8.10,10.30.55.10
 
-### MTL1 Inventory 4 racks
+### YUL1 Inventory
+
+#### 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,?,?
+s11-t31-sut1,up,t31,3n-skx,SYS-7049GP-TRT,C7470KH06A20037,10.30.51.46,10.30.50.43,3016.9,u42-u45
+s12-t31-sut2,up,t31,3n-skx,SYS-7049GP-TRT,C7470KH06A20018,10.30.51.47,10.30.50.44,3016.9,u38-u41
+s13-t31-tg1,up,t31,3n-skx,SYS-7049GP-TRT,C7470KH06A20043,10.30.51.48,10.30.50.45,3016.9,u34-u37
+s14-t32-sut1,up,t31,3n-skx,SYS-7049GP-TRT,C7470KH06A20075,10.30.51.58,10.30.50.55,3016.9,u30-u33
+s15-t32-sut2,up,t31,3n-skx,SYS-7049GP-TRT,C7470KH06A20010,10.30.51.59,10.30.50.56,3016.9,u26-u29
+s16-t32-tg1,up,t31,3n-skx,SYS-7049GP-TRT,C7470KH06A20047,10.30.51.60,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-t33t34-tg1,up,t33t34,3n-tsh/2n-tx2,SYS-7049GP-TRT,C7470KH06A20056,10.30.51.49,10.30.50.46,3016.9,u14-u17
+s27-t211-sut1,up,t25,2n-tx2,ThunderX2-9975,K61186073100003,10.30.51.69,10.30.50.69,3016.9,u13
+s18-t33-sut2,up,t33,3n-tsh,HUAWEI-TAISHAN-2280,N/A,10.30.51.37,10.30.50.37,3016.9,u11-u12
+s17-t33-sut1,up,t33,3n-tsh,HUAWEI-TAISHAN-2280,N/A,10.30.51.36,10.30.50.36,3016.9,u9-u10
+
+#### Rack YUL1-10 (3016.10)
+
+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
+s3-t21-sut1,up,t21,2n-skx,SYS-7049GP-TRT,C7470KH06A20167,10.30.51.44,10.30.50.41,3016.10,u34-u37
+s4-t21-tg1,up,t21,2n-skx,SYS-7049GP-TRT,C7470KH06A20158,10.30.51.45,10.30.50.42,3016.10,u30-u33
+s5-t22-sut1,up,t22,2n-skx,SYS-7049GP-TRT,N/A,10.30.51.52,10.30.50.49,3016.10,u26-u29
+s6-t22-tg1,up,t22,2n-skx,SYS-7049GP-TRT,N/A,10.30.51.53,10.30.50.50,3016.10,u22-u25
+s7-t23-sut1,up,t23,2n-skx,SYS-7049GP-TRT,N/A,10.30.51.54,10.30.50.51,3016.10,u18-u21
+s8-t23-tg1,up,t23,2n-skx,SYS-7049GP-TRT,C7470KH06A20035,10.30.51.55,10.30.50.52,3016.10,u14-u17
+s9-t24-sut1,up,t24,2n-skx,SYS-7049GP-TRT,C7470KH06A20055,10.30.51.56,10.30.50.53,3016.10,u10-u13
+s10-t24-tg1,up,t24,2n-skx,SYS-7049GP-TRT,C7470KH06A20196,10.30.51.57,10.30.50.54,3016.10,u6-u9
+s43-nomad,up,nomad-cluster1,nomad-server,UCSC-C220-M3L,FCH1726V1M4,10.30.51.33,10.30.50.33,r3016.10,u5
+
+#### Rack YUL1-11 (3016.11)
+
+name,oper-status,testbed-id,role,model,s/n,mgmt-ip4,ipmi-ip4,rackid,rackunit
+yul1-11-lb6m,up,switch,arm-uplink,?,?,?,?,3016.11,u48
+yul1-11-lf-tor-switch,up,switch,uplink,?,?,?,?,3016.11,u47
+mtl1-6-7050QX-32,up,switch,uplink,?,?,?,?,3016.11,u46
+fdio-marvell-dev,up,N/A,dev,ThunderX-88XX,N/A,10.30.51.38,10.30.50.38,3016.11,u45
+s53-nomad,up,nomad-cluster1,nomad-client,ThunderX-88XX,N/A,10.30.51.39,10.30.50.39,3016.11,u44
+s54-nomad,up,nomad-cluster1,nomad-client,ThunderX-88XX,N/A,10.30.51.40,10.30.50.40,3016.11,u43
+s56-t37-sut1,up,t37,2n-tx2,ThunderX2-9980,N/A,10.30.51.71,10.30.50.71,3016.11,u41-u42
+s41-nomad,up,nomad-cluster1,nomad-client,UCSC-C240-M4SX,FCH1950V1FQ,10.30.51.28,10.30.50.28,3016.11,u39-u40
+s40-nomad,up,nomad-cluster1,nomad-server,UCSC-C240-M4SX,FCH2013V0HZ,10.30.51.30,10.30.50.30,3016.11,u37-u38
+s39-nomad,up,nomad-cluster1,nomad-client,UCSC-C240-M4SX,FCH2013V0J2,10.30.51.29,10.30.50.29,3016.11,u35-u36
+s44-nomad,up,nomad-cluster1,nomad-client,UCSC-C220-M4S,FCH2139V129,10.30.51.34,10.30.50.34,3016.11,u34
+s45-nomad,up,nomad-cluster1,nomad-client,UCSC-C220-M4S,FCH2139V166,10.30.51.35,10.30.50.35,3016.11,u33
+s42-nomad,up,nomad-cluster1,nomad-server,UCSC-C240-M3S,FCH1719V18Y,10.30.51.32,10.30.50.32,3016.11,u31-u32
+t1-tg1,up,t1,3n-hsw,UCSC-C240-M4SX,FCH1950V1HM,10.30.51.16,10.30.50.16,3016.11,u29-u30
+t1-sut1,up,t1,3n-hsw,UCSC-C240-M4SX,FCH1950V1KH,10.30.51.17,10.30.50.17,3016.11,u27-u28
+t1-sut2,up,t1,3n-hsw,UCSC-C240-M4SX,FCH1950V1FP,10.30.51.18,10.30.50.18,3016.11,u25-u26
+t2-tg1,up,t2,3n-hsw,UCSC-C240-M4SX,FCH1950V1KG,10.30.51.20,10.30.50.20,3016.11,u23-u24
+t2-sut1,up,t2,3n-hsw,UCSC-C240-M4SX,FCH1950V1FM,10.30.51.21,10.30.50.21,3016.11,u21-u22
+t2-sut2,up,t2,3n-hsw,UCSC-C240-M4SX,FCH1950V1FN,10.30.51.22,10.30.50.22,3016.11,u19-u20
+t3-tg1,up,t3,3n-hsw,UCSC-C240-M4SX,FCH1950V1H5,10.30.51.24,10.30.50.24,3016.11,u17-u18
+t3-sut1,up,t3,3n-hsw,UCSC-C240-M4SX,FCH1950V1FS,10.30.51.25,10.30.50.25,3016.11,u15-u16
+t3-sut2,up,t3,3n-hsw,UCSC-C240-M4SX,FCH1950V1FL,10.30.51.26,10.30.50.26,3016.11,u13-u14
+s55-t36-sut1,up,t36,1n-tx2,ThunderX2-9980,N/A,10.30.51.70,10.30.50.70,3016.11,u11-u12
+s52-nomad,up,nomad-cluster1,nomad-client,ThunderX-88XX,N/A,10.30.51.65,10.30.50.65,3016.11,u9-u10
+s51-nomad,up,nomad-cluster1,nomad-client,ThunderX-88XX,N/A,10.30.51.66,10.30.50.66,3016.11,u9-u10
+s49-nomad,up,nomad-cluster1,nomad-client,ThunderX-88XX,N/A,10.30.51.67,10.30.50.67,3016.11,u9-u10
+s50-nomad,up,nomad-cluster1,nomad-client,ThunderX-88XX,N/A,10.30.51.68,10.30.50.68,3016.11,u9-u10
+
+#### Rack YUL1-12 (3016.12)
+
+name,oper-status,testbed-id,role,model,s/n,mgmt-ip4,ipmi-ip4,rackid,rackunit
+s31-t35-sut2/dnv3,up,t35,3n-dnv,SYS-E300-9A,CE300AG39040898,10.32.8.13,10.30.55.13,3016.12,u40
+s30-t35-sut1/dnv2,up,t35,3n-dnv,SYS-E300-9A,CE300AG39040866,10.32.8.12,10.30.55.12,3016.12,u39
+s29-t26-sut1/dnv1,up,t26,2n-dnv,SYS-E300-9A,CE300AG39040897,10.32.8.11,10.30.55.11,3016.12,u38
+s28-t26t35-tg1,up,t26t35,2n/3n-dnv,SYS-7049GP-TRT,C7470KH06A20137,10.32.8.10,10.30.55.10,3016.12,u34-u37
+s61-t210-tg1,up,t210,2n-zn2,AS-1014S-WTRT,C8150LI50NS2689,10.32.8.25,10.30.55.25,3016.12,u33
+s60-t210-sut1,up,t210,2n-zn2,AS-1114S-WTRT,N/A,10.32.8.24,10.30.55.24,3016.12,u32
+s48-nomad,up,nomad-cluster1,nomad-client,SYS-1029P-WTRT,C1160LI12NM0540,10.32.8.16,10.30.55.16,3016.12,u31
+s47-nomad,up,nomad-cluster1,nomad-client,SYS-1029P-WTRT,C1160LI12NM0241,10.32.8.15,10.30.55.15,3016.12,u30
+s46-nomad,up,nomad-cluster1,nomad-client,SYS-1029P-WTRT,C1160LI12NM0256,10.32.8.14,10.30.55.14,3016.12,u29
+s57-nomad,up,nomad-cluster1,nomad-client,SYS-7049GP-TRT,C7470KH37A30505,10.32.8.17,10.30.55.17,3016.12,u25-u28
+s33-t27-sut1,up,t27,2n-clx,SYS-7049GP-TRT,C7470KH37A30567,10.32.8.18,10.30.55.18,3016.12,u21-u24
+s34-t27-tg1,up,t27,2n-clx,SYS-7049GP-TRT,C7470KH37A30565,10.32.8.19,10.30.55.19,3016.12,u17-u20
+s35-t28-sut1,up,t28,2n-clx,SYS-7049GP-TRT,C7470KH37A30509,10.32.8.20,10.30.55.20,3016.12,u13-u16
+s36-t28-tg1,up,t28,2n-clx,SYS-7049GP-TRT,C7470KH37A30511,10.32.8.21,10.30.55.21,3016.12,u9-u12
+s37-t29-sut1,up,t29,2n-clx,SYS-7049GP-TRT,C7470KH37A30566,10.32.8.22,10.30.55.22,3016.12,u5-u8
+s38-t29-tg1,up,t29,2n-clx,SYS-7049GP-TRT,C7470KH37A30506,10.32.8.23,10.30.55.23,3016.12,u1-u4
 
-#### Rack B316 11 servers - FDIO-DONE VH-OPEN
-
-name,oper-status,testbed-id,role,model,s/n,rackid,rackunit,mgmt-ip4,ipmi-ip4,new-rackid,new-rackunit,new-mgmt-ip4,new-ipmi-ip4
-s11-t31-sut1,up,t31,3n-skx,SYS-7049GP-TRT,C7470KH06A20037,b316,u37-u40,10.30.51.46,10.30.50.43,r?,u?,10.30.51.46,10.30.50.43
-s12-t31-sut2,up,t31,3n-skx,SYS-7049GP-TRT,C7470KH06A20018,b316,u33-u36,10.30.51.47,10.30.50.44,r?,u?,10.30.51.47,10.30.50.44
-s13-t31-tg1,up,t31,3n-skx,SYS-7049GP-TRT,C7470KH06A20043,b316,u29-u32,10.30.51.48,10.30.50.45,r?,u?,10.30.51.48,10.30.50.45
-s14-t32-sut1,up,t31,3n-skx,SYS-7049GP-TRT,C7470KH06A20075,b316,u25-u28,10.30.51.58,10.30.50.55,r?,u?,10.30.51.58,10.30.50.55
-s15-t32-sut2,up,t31,3n-skx,SYS-7049GP-TRT,C7470KH06A20010,b316,u21-u24,10.30.51.59,10.30.50.56,r?,u?,10.30.51.59,10.30.50.56
-s16-t32-tg1,up,t31,3n-skx,SYS-7049GP-TRT,C7470KH06A20047,b316,u17-u20,10.30.51.60,10.30.50.57,r?,u?,10.30.51.60,10.30.50.57
-s19-t33t34-tg1,up,t33t34,3n-tsh/2n-tx2,SYS-7049GP-TRT,C7470KH06A20056,b316,u13-u16,10.30.51.49,10.30.50.46,r?,u?,10.30.51.49,10.30.50.46
-s27-t34-sut1,up,t34,2n-tx2,ThunderX2-9975,K61186073100003,b316,u12,10.30.51.69,10.30.50.69,r?,u?,10.30.51.69,10.30.50.69
-s55-t36-sut1,up,t36,1n-tx2,ThunderX2-9980,N/A,b316,u10-u11,10.30.51.70,10.30.50.70,r?,u?,10.30.51.70,10.30.50.70
-s18-t33-sut2,up,t33,3n-tsh,HUAWEI-TAISHAN-2280,N/A,b316,u8-u9,10.30.51.37,10.30.50.37,r?,u?,10.30.51.37,10.30.50.37
-s17-t33-sut1,up,t33,3n-tsh,HUAWEI-TAISHAN-2280,N/A,b316,u6-u7,10.30.51.36,10.30.50.36,r?,u?,10.30.51.36,10.30.50.36
-name?,down,testbed?,spare?,SYS-7049GP-TRT,C7470KH06A20022,b316,u2-u5,mgmt?,ipmi?,r?,u?,mgmt?,ipmi?
 
 Todos:
 
 - Rename: s55-t36-sut1 -> s55-t14-sut1  // ubuntu2004 refresh
 
-#### Rack B425 10 servers - FDIO-DONE VH-OPEN
-
-name,oper-status,testbed-id,role,model,s/n,rackid,rackunit,mgmt-ip4,ipmi-ip4,new-rackid,new-rackunit,new-mgmt-ip4,new-ipmi-ip4
-s1-t11-sut1,up,t11,1n-skx,SYS-7049GP-TRT,C7470KH06A20154,b425,u37-u40,10.30.51.50,10.30.50.47,r?,u?,10.30.51.50,10.30.50.47
-s2-t12-sut1,up,t12,1n-skx,SYS-7049GP-TRT,C7470KH06A20119,b425,u33-u36,10.30.51.51,10.30.50.48,r?,u?,10.30.51.51,10.30.50.48
-s3-t21-sut1,up,t21,2n-skx,SYS-7049GP-TRT,C7470KH06A20167,b425,u29-u32,10.30.51.44,10.30.50.41,r?,u?,10.30.51.44,10.30.50.41
-s4-t21-tg1,up,t21,2n-skx,SYS-7049GP-TRT,C7470KH06A20158,b425,u25-u28,10.30.51.45,10.30.50.42,r?,u?,10.30.51.45,10.30.50.42
-s5-t22-sut1,up,t22,2n-skx,SYS-7049GP-TRT,N/A,b425,u21-u24,10.30.51.52,10.30.50.49,r?,u?,10.30.51.52,10.30.50.49
-s6-t22-tg1,up,t22,2n-skx,SYS-7049GP-TRT,N/A,b425,u17-u20,10.30.51.53,10.30.50.50,r?,u?,10.30.51.53,10.30.50.50
-s7-t23-sut1,up,t23,2n-skx,SYS-7049GP-TRT,N/A,b425,u13-u16,10.30.51.54,10.30.50.51,r?,u?,10.30.51.54,10.30.50.51
-s8-t23-tg1,up,t23,2n-skx,SYS-7049GP-TRT,C7470KH06A20035,b425,u9-u12,10.30.51.55,10.30.50.52,r?,u?,10.30.51.55,10.30.50.52
-s9-t24-sut1,up,t24,2n-skx,SYS-7049GP-TRT,C7470KH06A20055,b425,u5-u8,10.30.51.56,10.30.50.53,r?,u?,10.30.51.56,10.30.50.53
-s10-t24-tg1,up,t24,2n-skx,SYS-7049GP-TRT,C7470KH06A20196,b425,u1-u4,10.30.51.57,10.30.50.54,r?,u?,10.30.51.57,10.30.50.54
-
-#### Rack B612 12 servers - FDIO-DONE VH-OPEN
-
-name,oper-status,testbed-id,role,model,s/n,rackid,rackunit,mgmt-ip4,ipmi-ip4,new-rackid,new-rackunit,new-mgmt-ip4,new-ipmi-ip4
-softiron-1,to-be-removed,t-,decommissioned,model?,sn?,b612,u37,10.30.51.12,ipmi?,r?,u?,mgmt?,ipmi?
-t3-tg1,up,t3,3n-hsw,UCSC-C240-M4SX,FCH1950V1H5,b612,u35-u36,10.30.51.24,10.30.50.24,r?,u?,10.30.51.24,10.30.50.24
-t3-sut1,up,t3,3n-hsw,UCSC-C240-M4SX,FCH1950V1FS,b612,u33-u34,10.30.51.25,10.30.50.25,r?,u?,10.30.51.25,10.30.50.25
-t3-sut2,up,t3,3n-hsw,UCSC-C240-M4SX,FCH1950V1FL,b612,u31-u32,10.30.51.26,10.30.50.26,r?,u?,10.30.51.26,10.30.50.26
-s41-nomad,up,nomad-cluster1,nomad-client,UCSC-C240-M4SX,FCH1950V1FQ,b612,u29-u30,10.30.51.28,10.30.50.28,r?,u?,10.30.51.28,10.30.50.28
-s40-nomad,up,nomad-cluster1,nomad-server,UCSC-C240-M4SX,FCH2013V0HZ,b612,u27-u28,10.30.51.30,10.30.50.30,r?,u?,10.30.51.30,10.30.50.30
-s39-nomad,up,nomad-cluster1,nomad-client,UCSC-C240-M4SX,FCH2013V0J2,b612,u25-u26,10.30.51.29,10.30.50.29,r?,u?,10.30.51.29,10.30.50.29
-s44-nomad,up,nomad-cluster1,nomad-client,UCSC-C220-M4S,FCH2139V129,b612,u20,10.30.51.34,10.30.50.34,r?,u?,10.30.51.34,10.30.50.34
-s45-nomad,up,nomad-cluster1,nomad-client,UCSC-C220-M4S,FCH2139V166,b612,u19,10.30.51.35,10.30.50.35,r?,u?,10.30.51.35,10.30.50.35
-fdio-marvell-dev,up,N/A,dev,ThunderX-88XX,N/A,b612,u18,10.30.51.38,10.30.50.38,r?,u?,10.30.51.38,10.30.50.38
-s53-nomad,up,nomad-cluster1,nomad-client,ThunderX-88XX,N/A,b612,u17,10.30.51.39,10.30.50.39,r?,u?,10.30.51.39,10.30.50.39
-s54-nomad,up,nomad-cluster1,nomad-client,ThunderX-88XX,N/A,b612,u16,10.30.51.40,10.30.50.40,r?,u?,10.30.51.40,10.30.50.40
-
-Notes:
-
-- softiron-1, 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".
-
-#### Rack B611 15 servers - FDIO-DONE VH-OPEN
-
-name,oper-status,testbed-id,role,model,s/n,rackid,rackunit,mgmt-ip4,ipmi-ip4,new-rackid,new-rackunit,new-mgmt-ip4,new-ipmi-ip4
-softiron-2,to-be-removed,t-,decommissioned,model?,sn?,b611,u38,10.30.51.13,ipmi?,r?,u?,mgmt?,ipmi?
-softiron-3,to-be-removed,t-,decommissioned,model?,sn?,b611,u37,10.30.51.14,ipmi?,r?,u?,mgmt?,ipmi?
-t1-tg1,up,t1,3n-hsw,UCSC-C240-M4SX,FCH1950V1HM,b611,u35-u36,10.30.51.16,10.30.50.16,r?,u?,10.30.51.16,10.30.50.16
-t1-sut1,up,t1,3n-hsw,UCSC-C240-M4SX,FCH1950V1KH,b611,u33-u34,10.30.51.17,10.30.50.17,r?,u?,10.30.51.17,10.30.50.17
-t1-sut2,up,t1,3n-hsw,UCSC-C240-M4SX,FCH1950V1FP,b611,u31-u32,10.30.51.18,10.30.50.18,r?,u?,10.30.51.18,10.30.50.18
-t2-tg1,up,t2,3n-hsw,UCSC-C240-M4SX,FCH1950V1KG,b611,u29-u30,10.30.51.20,10.30.50.20,r?,u?,10.30.51.20,10.30.50.20
-t2-sut1,up,t2,3n-hsw,UCSC-C240-M4SX,FCH1950V1FM,b611,u27-u28,10.30.51.21,10.30.50.21,r?,u?,10.30.51.21,10.30.50.21
-t2-sut2,up,t2,3n-hsw,UCSC-C240-M4SX,FCH1950V1FN,b611,u25-u26,10.30.51.22,10.30.50.22,r?,u?,10.30.51.22,10.30.50.22
-s42-nomad,up,nomad-cluster1,nomad-server,UCSC-C240-M3S,FCH1719V18Y,b611,u23-u24,10.30.51.32,10.30.50.32,r?,u?,10.30.51.32,10.30.50.32
-s43-nomad,up,nomad-cluster1,nomad-server,UCSC-C220-M3L,FCH1726V1M4,b611,u22,10.30.51.33,10.30.50.33,r?,u?,10.30.51.33,10.30.50.33
-s52-nomad,up,nomad-cluster1,nomad-client,ThunderX-88XX,N/A,b611,u19-u20,10.30.51.65,10.30.50.65,r?,u?,10.30.51.65,10.30.50.65
-s51-nomad,up,nomad-cluster1,nomad-client,ThunderX-88XX,N/A,b611,u19-u20,10.30.51.66,10.30.50.66,r?,u?,10.30.51.66,10.30.50.66
-s49-nomad,up,nomad-cluster1,nomad-client,ThunderX-88XX,N/A,b611,u19-u20,10.30.51.67,10.30.50.67,r?,u?,10.30.51.67,10.30.50.67
-s50-nomad,up,nomad-cluster1,nomad-client,ThunderX-88XX,N/A,b611,u19-u20,10.30.51.68,10.30.50.68,r?,u?,10.30.51.68,10.30.50.68
-s56-t37-sut1,up,t37,2n-tx2,ThunderX2-9980,N/A,b611,u16-u17,10.30.51.71,10.30.50.71,r?,u?,10.30.51.71,10.30.50.71
-
 Notes:
 
-- softiron-2, softiron-3, decommission request and instructions issued
+- 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".
\ No newline at end of file