feat(infra): Infrastructure refresh part 2

Signed-off-by: pmikus <peter.mikus@protonmail.ch>
Change-Id: Id7fd8c6c7db6f502aa36ac30957b286a3a764fb0
(cherry picked from commit dd1bd11cd669e741ebba63fa89d13aff19a8d8fa)

2 files changed, 4 insertions, 56 deletions

diff --git a/docs/lab/fdio-dc-physical.md b/docs/lab/fdio-dc-physical.md
index 3923bb09d9..701c47e523 100644
--- a/docs/lab/fdio-dc-physical.md
+++ b/docs/lab/fdio-dc-physical.md
@@ -55,12 +55,6 @@ 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,?,?
-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-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
@@ -74,12 +68,6 @@ 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
 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
@@ -98,10 +86,6 @@ s21-nomad,up,nomad-cluster1,nomad-client,UCSC-C240-M4SX,FCH2013V0J2,10.30.51.21,
 s78-t38-sut1,up,t38,3n-icx,SYS-740GP-TNRT,C7470KL03P50450,10.30.51.78,10.30.50.78,3016.11,u31-u34
 s79-t38-sut2,up,t38,3n-icx,SYS-740GP-TNRT,C7470KL07P50297,10.30.51.79,10.30.50.79,3016.11,u27-u30
 s80-t38-tg1,up,t38,3n-icx,SYS-740GP-TNRT,C7470KL03P50454,10.30.51.80,10.30.50.80,3016.11,u23-u26
-s16-nomad,up,nomad-cluster1,nomad-client,UCSC-C240-M4SX,FCH1950V1FN,10.30.51.16,10.30.50.16,3016.11,u19-u20
-s17-nomad,up,nomad-cluster1,nomad-client,UCSC-C240-M4SX,FCH1950V1H5,10.30.51.17,10.30.50.17,3016.11,u17-u18
-s18-nomad,up,nomad-cluster1,nomad-client,UCSC-C240-M4SX,FCH1950V1FS,10.30.51.18,10.30.50.18,3016.11,u15-u16
-s19-nomad,up,nomad-cluster1,nomad-client,UCSC-C240-M4SX,FCH1950V1FL,10.30.51.19,10.30.50.19,3016.11,u13-u14
 s55-t13-sut1,up,t13,1n-tx2,ThunderX2-9980,N/A,10.30.51.70,10.30.50.70,3016.11,u11-u12
 s62-t34-sut1,up,t34,3n-alt,WIWYNN,04000059N0SC,10.30.51.72,10.30.50.72,3016.11,u9-u10
 s63-t34-sut2,up,t34,3n-alt,WIWYNN,0390003EN0SC,10.30.51.73,10.30.50.73,3016.11,u7-u8
diff --git a/docs/lab/testbed_specifications.md b/docs/lab/testbed_specifications.md
index 8b40248ddd..e13b5444fc 100644
--- a/docs/lab/testbed_specifications.md
+++ b/docs/lab/testbed_specifications.md
@@ -248,10 +248,6 @@ Name         | Comment
 10.30.50.13  | LF Reserved
 10.30.50.14  | LF Reserved
 10.30.50.15  | LF Reserved
-10.30.50.16  | s16-nomad
-10.30.50.17  | s17-nomad
-10.30.50.18  | s18-nomad
-10.30.50.19  | s19-nomad
 10.30.50.20  | s20-nomad
 10.30.50.21  | s21-nomad
 10.30.50.22  | s22-nomad
@@ -259,26 +255,14 @@ Name         | Comment
 10.30.50.24  | s24-nomad
 10.30.50.25  | s25-nomad
 10.30.50.26  | s26-nomad
+10.30.50.27  | s27-nomad
+10.30.50.28  | s28-nomad
 10.30.50.36  | s17-t33-sut1
 10.30.50.37  | s18-t33-sut2
 10.30.50.38  | fdio-marvell-dev
-10.30.50.41  | s3-t21-sut1
-10.30.50.42  | s4-t21-tg1
-10.30.50.43  | s11-t31-sut1
-10.30.50.44  | s12-t31-sut2
-10.30.50.45  | s13-t31-tg1
 10.30.50.46  | s19-t33t211-tg1
 10.30.50.47  | s1-t11-sut1
 10.30.50.48  | s2-t12-sut1
-10.30.50.49  | s5-t22-sut1
-10.30.50.50  | s6-t22-tg1
-10.30.50.51  | s7-t23-sut1
-10.30.50.52  | s8-t23-tg1
-10.30.50.53  | s9-t24-sut1
-10.30.50.54  | s10-t24-tg1
-10.30.50.55  | s14-t32-sut1
-10.30.50.56  | s15-t32-sut2
-10.30.50.57  | s16-t32-tg1
 10.30.50.58  | s25-t25-sut1
 10.30.50.59  | s26-t25-tg1
 10.30.50.69  | s27-t211-sut1
@@ -338,10 +322,6 @@ Name         | Comment
 10.30.51.7   | LF Reserved
 10.30.51.8   | LF Reserved
 10.30.51.15  | LF Reserved
-10.30.51.16  | s16-nomad
-10.30.51.17  | s17-nomad
-10.30.51.18  | s18-nomad
-10.30.51.19  | s19-nomad
 10.30.51.20  | s20-nomad
 10.30.51.21  | s21-nomad
 10.30.51.22  | s22-nomad
@@ -349,26 +329,14 @@ Name         | Comment
 10.30.51.24  | s24-nomad
 10.30.51.25  | s25-nomad
 10.30.51.26  | s26-nomad
+10.30.51.27  | s27-nomad
+10.30.51.28  | s28-nomad
 10.30.51.36  | s17-t33-sut1
 10.30.51.37  | s18-t33-sut2
 10.30.51.38  | fdio-marvell-dev
-10.30.51.44  | s3-t21-sut1
-10.30.51.45  | s4-t21-tg1
-10.30.51.46  | s11-t31-sut1
-10.30.51.47  | s12-t31-sut2
-10.30.51.48  | s13-t31-tg1
 10.30.51.49  | s19-t33t211-tg1
 10.30.51.50  | s1-t11-sut1
 10.30.51.51  | s2-t12-sut1
-10.30.51.52  | s5-t22-sut1
-10.30.51.53  | s6-t22-tg1
-10.30.51.54  | s7-t23-sut1
-10.30.51.55  | s8-t23-tg1
-10.30.51.56  | s9-t24-sut1
-10.30.51.57  | s10-t24-tg1
-10.30.51.58  | s14-t32-sut1
-10.30.51.59  | s15-t32-sut2
-10.30.51.60  | s16-t32-tg1
 10.30.51.61  | s25-t25-sut1
 10.30.51.62  | s26-t25-tg1
 10.30.51.69  | s27-t211-sut1
@@ -400,10 +368,6 @@ Name         | Comment
 10.30.51.255 | Broadcast
 10.32.8.0    | network
 10.32.8.1    | Router
-10.32.8.10   | s28-t26t35-tg1
-10.32.8.11   | s29-t26-sut1
-10.32.8.12   | s30-t35-sut1
-10.32.8.13   | s31-t35-sut2
 10.32.8.18   | s33-t27-sut1
 10.32.8.19   | s34-t27-tg1
 10.32.8.20   | s35-t28-sut1