Skip to content

Commit b926d2b

Browse files
owendelongowendelong
authored
[READY] - nixos-modules.routers.*: enable lldp for ifaces and reinstate vlan104 (#1108)
2 parents d28c073 + 1a410bb commit b926d2b

File tree

4 files changed

+87
-70
lines changed

4 files changed

+87
-70
lines changed

‎nix/nixos-modules/routers/border.nix‎

Lines changed: 54 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -64,31 +64,45 @@ in
6464
enable = true;
6565

6666
netdevs = {
67-
"20-bridge901" = {
67+
# exInfra
68+
"25-bridge103" = {
69+
netdevConfig = {
70+
Kind = "bridge";
71+
Name = "bridge103";
72+
};
73+
};
74+
"25-vlan103" = {
75+
netdevConfig = {
76+
Kind = "vlan";
77+
Name = "vlan103";
78+
};
79+
vlanConfig.Id = 103;
80+
};
81+
"25-bridge901" = {
6882
netdevConfig = {
6983
Kind = "bridge";
7084
Name = "bridge901";
7185
};
7286
};
73-
"20-vlan901" = {
87+
"25-vlan901" = {
7488
netdevConfig = {
7589
Kind = "vlan";
7690
Name = "vlan901";
7791
};
7892
vlanConfig.Id = 901;
7993
};
80-
"25-bridge902" = {
94+
"25-bridge104" = {
8195
netdevConfig = {
8296
Kind = "bridge";
83-
Name = "bridge902";
97+
Name = "bridge104";
8498
};
8599
};
86-
"25-vlan902" = {
100+
"25-vlan104" = {
87101
netdevConfig = {
88102
Kind = "vlan";
89-
Name = "vlan902";
103+
Name = "vlan104";
90104
};
91-
vlanConfig.Id = 902;
105+
vlanConfig.Id = 104;
92106
};
93107
};
94108
networks = mkMerge [
@@ -98,6 +112,8 @@ in
98112
matchConfig.Name = cfg.frrConferenceInterface;
99113
networkConfig = {
100114
LinkLocalAddressing = "no";
115+
LLDP = true;
116+
EmitLLDP = true;
101117
};
102118
vlan = [
103119
"vlan901"
@@ -107,9 +123,26 @@ in
107123
matchConfig.Name = cfg.frrExpoInterface;
108124
networkConfig = {
109125
LinkLocalAddressing = "no";
126+
LLDP = true;
127+
EmitLLDP = true;
110128
};
111129
vlan = [
112-
"vlan902"
130+
"vlan103"
131+
"vlan104"
132+
];
133+
};
134+
"40-vlan103" = {
135+
matchConfig.Name = "vlan103";
136+
networkConfig = {
137+
Bridge = "bridge103";
138+
};
139+
};
140+
"50-bridge103" = {
141+
matchConfig.Name = "bridge103";
142+
enable = true;
143+
address = [
144+
"10.0.3.2/24"
145+
"2001:470:f026:103::2/64"
113146
];
114147
};
115148
"40-vlan901" = {
@@ -118,10 +151,10 @@ in
118151
Bridge = "bridge901";
119152
};
120153
};
121-
"40-vlan902" = {
122-
matchConfig.Name = "vlan902";
154+
"40-vlan104" = {
155+
matchConfig.Name = "vlan104";
123156
networkConfig = {
124-
Bridge = "bridge902";
157+
Bridge = "bridge104";
125158
};
126159
};
127160
"50-bridge901" = {
@@ -132,12 +165,12 @@ in
132165
"2001:470:f026:901::1/64"
133166
];
134167
};
135-
"50-bridge902" = {
136-
matchConfig.Name = "bridge902";
168+
"50-bridge104" = {
169+
matchConfig.Name = "bridge104";
137170
networkConfig.DHCP = false;
138171
address = [
139-
"172.20.2.1/24"
140-
"2001:470:f026:902::1/64"
172+
"172.20.4.1/24"
173+
"2001:470:f026:104::1/64"
141174
];
142175
};
143176
}
@@ -159,7 +192,11 @@ in
159192
(mkIf cfg.staticWANEnable {
160193
"10-${cfg.WANInterface}" = {
161194
matchConfig.Name = cfg.WANInterface;
162-
networkConfig.DHCP = false;
195+
networkConfig = {
196+
DHCP = false;
197+
LLDP = true;
198+
EmitLLDP = true;
199+
};
163200
address = [
164201
"172.16.1.1/24"
165202
];
@@ -194,8 +231,8 @@ in
194231
services.frr.enable = true;
195232
services.frr.router-id = "172.20.1.1";
196233
services.frr.broadcast-interface = [
234+
"bridge104" # expo
197235
"bridge901" # cf
198-
"bridge902" # expo
199236
];
200237
# service.frr.passive-interface add 103 and 104 later
201238
};

‎nix/nixos-modules/routers/conference.nix‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,8 @@ in
234234
};
235235
networkConfig = {
236236
LinkLocalAddressing = "no";
237+
LLDP = true;
238+
EmitLLDP = true;
237239
};
238240
# tag vlan on this link
239241
vlan = [
@@ -368,6 +370,8 @@ in
368370
matchConfig.Name = cfg.frrBorderInterface;
369371
networkConfig = {
370372
LinkLocalAddressing = "no";
373+
LLDP = true;
374+
EmitLLDP = true;
371375
};
372376
vlan = [
373377
"vlan901"
@@ -377,6 +381,8 @@ in
377381
matchConfig.Name = cfg.frrExpoInterface;
378382
networkConfig = {
379383
LinkLocalAddressing = "no";
384+
LLDP = true;
385+
EmitLLDP = true;
380386
};
381387
vlan = [
382388
"vlan903"

‎nix/nixos-modules/routers/expo.nix‎

Lines changed: 19 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ in
6868
"101"
6969
"102"
7070
"103"
71-
"104"
7271
"105"
7372
"107"
7473
"110"
@@ -134,9 +133,7 @@ in
134133
};
135134
vlanConfig.Id = 103;
136135
};
137-
# exMDF
138-
# TODO: Talk to owen to see if still needed
139-
# goes to ExpoB1
136+
# exMDF (conf building router vlan)
140137
"25-bridge104" = {
141138
netdevConfig = {
142139
Kind = "bridge";
@@ -192,26 +189,13 @@ in
192189
};
193190
vlanConfig.Id = 110;
194191
};
195-
"25-bridge902" = {
196-
netdevConfig = {
197-
Kind = "bridge";
198-
Name = "bridge902";
199-
};
200-
};
201-
"25-vlan902" = {
202-
netdevConfig = {
203-
Kind = "vlan";
204-
Name = "vlan902";
205-
};
206-
vlanConfig.Id = 902;
207-
};
208-
"20-bridge903" = {
192+
"25-bridge903" = {
209193
netdevConfig = {
210194
Kind = "bridge";
211195
Name = "bridge903";
212196
};
213197
};
214-
"20-vlan903" = {
198+
"25-vlan903" = {
215199
netdevConfig = {
216200
Kind = "vlan";
217201
Name = "vlan903";
@@ -230,14 +214,15 @@ in
230214
};
231215
networkConfig = {
232216
LinkLocalAddressing = "no";
217+
LLDP = true;
218+
EmitLLDP = true;
233219
};
234220
# tag vlan on this link
235221
vlan = [
236222
"vlan100"
237223
"vlan101"
238224
"vlan102"
239225
"vlan103"
240-
"vlan104"
241226
"vlan105"
242227
"vlan107"
243228
"vlan110"
@@ -251,15 +236,20 @@ in
251236
matchConfig.Name = cfg.frrBorderInterface;
252237
networkConfig = {
253238
LinkLocalAddressing = "no";
239+
LLDP = true;
240+
EmitLLDP = true;
254241
};
255242
vlan = [
256-
"vlan902"
243+
"vlan103"
244+
"vlan104"
257245
];
258246
};
259247
"30-${cfg.frrConferenceInterface}" = {
260248
matchConfig.Name = cfg.frrConferenceInterface;
261249
networkConfig = {
262250
LinkLocalAddressing = "no";
251+
LLDP = true;
252+
EmitLLDP = true;
263253
};
264254
vlan = [
265255
"vlan903"
@@ -330,9 +320,13 @@ in
330320
"50-bridge104" = {
331321
matchConfig.Name = "bridge104";
332322
enable = true;
323+
networkConfig.DHCP = false;
333324
address = [
334-
"10.0.4.2/24"
335-
"2001:470:f026:104::1/64"
325+
"172.20.4.3/24"
326+
"2001:470:f026:104::3/64"
327+
];
328+
routes = [
329+
{ Gateway = "172.20.4.1"; }
336330
];
337331
};
338332
"40-vlan105" = {
@@ -376,24 +370,6 @@ in
376370
"2001:470:f026:110::1/64"
377371
];
378372
};
379-
"40-vlan902" = {
380-
matchConfig.Name = "vlan902";
381-
networkConfig = {
382-
Bridge = "bridge902";
383-
};
384-
};
385-
"50-bridge902" = {
386-
matchConfig.Name = "bridge902";
387-
networkConfig.DHCP = false;
388-
address = [
389-
"172.20.2.3/24"
390-
"2001:470:f026:902::3/64"
391-
];
392-
linkConfig.RequiredForOnline = "routable";
393-
routes = [
394-
{ Gateway = "172.20.2.1"; }
395-
];
396-
};
397373
"40-vlan903" = {
398374
matchConfig.Name = "vlan903";
399375
networkConfig = {
@@ -415,9 +391,9 @@ in
415391

416392
scale-network = {
417393
services.frr.enable = true;
418-
services.frr.router-id = "172.20.2.3";
394+
services.frr.router-id = "172.20.4.3";
419395
services.frr.broadcast-interface = [
420-
"bridge902" # border
396+
"bridge104" # border
421397
"bridge903" # conf
422398
];
423399
services.frr.passive-interface = [
@@ -440,7 +416,6 @@ in
440416
"bridge100"
441417
"bridge101"
442418
"bridge102"
443-
"bridge104"
444419
"bridge110"
445420
];
446421
upstreamInterfaces = [ "bridge103" ];
@@ -457,7 +432,6 @@ in
457432
"2001:470:f026:100::1%%bridge100"
458433
"2001:470:f026:101::1%%bridge101"
459434
"2001:470:f026:102::1%%bridge102"
460-
"2001:470:f026:104::1%%bridge104"
461435
"2001:470:f026:107::1%%bridge107"
462436
"2001:470:f026:110::1%%bridge110"
463437
];

‎nix/package-sets/scale-nixos-tests/routers.nix‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@
142142
# border can ping both routers
143143
border.succeed("ping -c 5 172.20.1.2")
144144
border.succeed("ping -c 5 2001:470:f026:901::2")
145-
border.succeed("ping -c 5 172.20.2.3")
146-
border.succeed("ping -c 5 2001:470:f026:902::3")
145+
border.succeed("ping -c 5 172.20.4.3")
146+
border.succeed("ping -c 5 2001:470:f026:104::3")
147147
148148
# conference can ping both routers
149149
conference.succeed("ping -c 5 172.20.1.1")
@@ -152,8 +152,8 @@
152152
conference.succeed("ping -c 5 2001:470:f026:903::3")
153153
154154
# expo can ping both routers
155-
expo.succeed("ping -c 5 172.20.2.1")
156-
expo.succeed("ping -c 5 2001:470:f026:902::1")
155+
expo.succeed("ping -c 5 172.20.4.1")
156+
expo.succeed("ping -c 5 2001:470:f026:104::1")
157157
expo.succeed("ping -c 5 172.20.3.2")
158158
expo.succeed("ping -c 5 2001:470:f026:903::2")
159159
@@ -171,10 +171,10 @@
171171
border.wait_until_succeeds("ping -c 5 2001:470:f026:903::3", timeout=60)
172172
173173
# conference can reach border-expo link
174-
conference.wait_until_succeeds("ping -c 5 172.20.2.1", timeout=60)
175-
conference.wait_until_succeeds("ping -c 5 2001:470:f026:902::1", timeout=60)
176-
conference.wait_until_succeeds("ping -c 5 172.20.2.3", timeout=60)
177-
conference.wait_until_succeeds("ping -c 5 2001:470:f026:902::3", timeout=60)
174+
conference.wait_until_succeeds("ping -c 5 172.20.4.1", timeout=60)
175+
conference.wait_until_succeeds("ping -c 5 2001:470:f026:104::1", timeout=60)
176+
conference.wait_until_succeeds("ping -c 5 172.20.4.3", timeout=60)
177+
conference.wait_until_succeeds("ping -c 5 2001:470:f026:104::3", timeout=60)
178178
179179
# expo can reach conference-border link
180180
expo.wait_until_succeeds("ping -c 5 172.20.1.1", timeout=60)

0 commit comments

Comments
 (0)