Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[READY] Reallocate switches #779

Merged
merged 2 commits into from
Sep 22, 2024
Merged

[READY] Reallocate switches #779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0323bd3
renamed switches
kylerisse Sep 22, 2024
2ec2754
no longer valiate noise level field in switchtypes
kylerisse Sep 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion facts/test_datasources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def test_switchtypes_tsv():
ds.isvalidip,
ds.isvalidtype,
ds.isvalidhierarchy,
ds.isvalidnoiselevel,
ds.isuntested,
ds.isvalidmodel,
ds.isvalidmac
]
Expand Down
107 changes: 52 additions & 55 deletions switch-configuration/config/switchtypes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,58 +15,55 @@
// ... Switch chain order from .1 (e.g. C.2 is plugged into C.1 level, C.3 is plugged into C.2 level, etc.)
// .9 = Stub (No subordinate switches) regardless of next level up switch
//Name Num MgtVL IPv6 Type Hierarchy Noiselevel Model Mgmt MAC
Rm101-102 1 503 2001:470:f026:503::200:1 cfRoom I.9 Quiet ex4200-48p 2c:6b:f5:39:e9:7f
NW-IDF 2 103 2001:470:f026:103::200:2 exIDF F.1 Loud ex4200-48p 00:26:88:60:79:7f
NE-IDF 3 103 2001:470:f026:103::200:3 exIDF C.1 Loud ex4200-48p 00:26:88:6e:ba:ff
BallroomC 4 103 2001:470:f026:103::200:4 exRoom C.9 Normal ex4200-48p 00:26:88:7d:fb:7f
//Deceased 5 - - Deceased Z.9 - ex4200-48p 00:26:88:6e:aa:ff
ExpoIDF 6 103 2001:470:f026:103::200:6 exIDF X.1 Loud ex4200-48p 00:26:88:7d:d3:7f
BallroomF 7 103 2001:470:f026:103::200:7 exRoom F.9 Normal ex4200-48p 00:26:88:6e:b6:ff
Rm103 8 503 2001:470:f026:503::200:8 cfRoom I.9 Quiet ex4200-48p 00:26:88:7d:dd:ff
BallroomG 9 103 2001:470:f026:103::200:9 exRoom F.9 Normal ex4200-48p 00:26:88:6e:a1:7f
MassFlash 10 503 2001:470:f026:503::200:10 MassFlash Z.9 Loud ex4200-48p 2c:6b:f5:39:cb:ff
BallroomH 11 103 2001:470:f026:103::200:11 exRoom F.9 Normal ex4200-48p 00:26:88:60:71:7f
BallroomA 12 103 2001:470:f026:103::200:12 exRoom C.9 Normal ex4200-48p b0:c6:9a:dc:4d:ff
BallroomB 13 103 2001:470:f026:103::200:13 exRoom C.9 Normal ex4200-48p 00:26:88:7a:8f:ff
AVSwitch 14 503 2001:470:f026:503::200:14 cfAV I.9 Normal ex4200-48p 00:26:88:7d:e5:ff
SpareI 15 103 2001:470:f026:103::200:15 exRoom Z.9 ?? ex4200-48p b0:c6:9a:db:b5:7f
Expo-Catwalk 16 103 2001:470:f026:103::200:16 Catwalk W.1 ?? ex4200-48p 00:26:88:7e:3e:7f
Rm209-210 17 503 2001:470:f026:503::200:17 cfRoom I.9 Normal ex4200-48p 00:26:88:6e:a6:ff
ExpoA1 18 103 2001:470:f026:103::200:18 Booth W.9 Loud ex4200-48p 78:fe:3d:d2:85:7f
Rm211 19 503 2001:470:f026:503::200:19 cfRoom I.9 Normal ex4200-48p 00:26:88:6e:b3:ff
Rm104 20 503 2001:470:f026:503::200:20 cfRoom I.9 Quiet ex4200-48p 2c:6b:f5:39:7e:7f
NOC 21 503 2001:470:f026:503::200:21 cfNOC I.2 Normal ex4200-48p 00:26:88:7e:25:ff
ExpoB1 22 103 2001:470:f026:103::200:22 Booth W.9 Loud ex4200-48p 00:26:88:6e:bd:ff
//CTF1 23 504 2001:470:f026:504::200:23 cfCTF Z.4 Normal ex4200-48p b0:c6:9a:6c:0d:7f
ExpoC1 24 103 2001:470:f026:103::200:24 Booth W.9 Loud ex4200-48p 00:26:88:6e:c2:ff
Rm106 25 503 2001:470:f026:503::200:25 cfRoom I.9 Quiet ex4200-48p 00:26:88:60:bc:ff
//CTF2 26 504 2001:470:f026:504::200:26 cfCTF Z.5 Normal ex4200-48p 00:26:88:7f:27:7f
//CTF3 27 504 2001:470:f026:504::200:27 cfCTF Z.6 Normal ex4200-48p 2c:21:72:95:e2:7f
ExpoA2 28 103 2001:470:f026:103::200:28 Booth W.9 Loud ex4200-48p 00:26:88:6e:c6:ff
ExpoB2 29 103 2001:470:f026:103::200:29 Booth W.9 Loud ex4200-48p 28:c0:da:33:38:7f
//CTF4 30 504 2001:470:f026:504::200:30 cfCTF Z.7 Normal ex4200-48p 00:26:88:7e:36:7f
Rm107 31 503 2001:470:f026:503::200:31 cfRoom I.9 Quiet ex4200-48p 00:26:88:7d:f5:ff
SpareH 32 103 2001:470:f026:103::200:32 exRoom Z.9 Normal ex4200-48p 00:26:88:7a:76:ff
ExpoC2 33 103 2001:470:f026:103::200:33 Booth W.9 Normal ex4200-48p 00:26:88:7d:f8:7f
ExpoA3 34 103 2001:470:f026:103::200:34 Booth W.9 Loud ex4200-48p 00:26:88:6f:1e:7f
ExpoB3 35 103 2001:470:f026:103::200:35 Booth W.9 Loud ex4200-48p 00:19:e2:56:23:3f
ExpoC3 36 103 2001:470:f026:103::200:36 Booth W.9 Normal ex4200-48p 2c:6b:f5:39:cf:ff
Rm214 37 503 2001:470:f026:503::200:37 cfRoom I.9 Quiet ex4200-48p 2c:6b:f5:37:cd:7f
ExpoD1 38 103 2001:470:f026:103::200:38 Booth W.9 Normal ex4200-48p 00:26:88:7e:1b:ff
ExpoD2 39 103 2001:470:f026:103::200:39 Booth W.9 Normal ex4200-48p 00:26:88:70:d6:7f
Rm105 40 503 2001:470:f026:503::200:40 cfRoom I.9 Quiet ex4200-48p b0:c6:9a:64:85:ff
SpareJ 41 103 2001:470:f026:103::200:41 Booth Z.9 Normal ex4200-48p 00:26:88:70:bb:7f
ExpoA5 42 103 2001:470:f026:103::200:42 Booth Z.9 Normal ex4200-48p 00:26:88:60:40:7f
ExpoB5 43 103 2001:470:f026:103::200:43 Booth Z.9 Normal ex4200-48p 00:26:88:7d:1b:ff
ExpoC5 44 103 2001:470:f026:103::200:44 Booth Z.9 Loud ex4200-48p 00:26:88:7c:41:7f
ExpoAW 45 103 2001:470:f026:103::200:45 Booth W.9 Normal ex4200-48p 00:26:88:6e:b1:ff
//CTF5 46 504 2001:470:f026:504::200:46 cfCTF Z.8 Loud ex4200-48p 00:26:88:7f:0e:7f
//CTF6 47 504 2001:470:f026:504::200:47 cfCTF Z.9 Normal ex4200-48p 00:26:88:6e:9f:ff
ConfIDF 48 503 2001:470:f026:503::200:48 cfIDF I.9 ?? ex4200-48p 84:18:88:ac:d7:7f
SpareB 49 103 2001:470:f026:103::200:49 cfRoom Z.9 ?? ex4200-48p 84:18:88:ab:df:ff
BallroomDE 50 103 2001:470:f026:103::200:50 exRoom F.9 ?? ex4200-48p 84:18:88:ad:4e:ff
SpareD 51 103 2001:470:f026:103::200:51 cfRoom Z.9 ?? ex4200-24t 2c:6b:f5:91:46:3f
SpareE 52 103 2001:470:f026:103::200:52 cfRoom Z.9 ?? ex4200-24t 28:c0:da:31:71:ff
SpareF 53 103 2001:470:f026:103::200:53 cfRoom Z.9 ?? ex4200-24t 2c:6b:f5:83:5c:ff
//ConfIDF 54 503 2001:470:f026:503::200:54 cfIDF I.9 Loud ex4200-48px ec:3e:f7:50:58:ff
RegDesk 55 103 2001:470:f026:103::200:55 registration X.9 Normal ex4200-48px f4:a7:39:c8:ef:7f
NOC 1 503 2001:470:f026:503::200:1 cfNOC I.2 Quiet ex4200-48p 2c:6b:f5:39:e9:7f
ConfIDF 2 503 2001:470:f026:503::200:2 cfIDF I.9 Loud ex4200-48p 00:26:88:60:79:7f
NW-IDF 3 103 2001:470:f026:103::200:3 exIDF F.1 Loud ex4200-48p 00:26:88:6e:ba:ff
NE-IDF 4 103 2001:470:f026:103::200:4 exIDF C.1 Normal ex4200-48p 00:26:88:7d:fb:7f
ExpoIDF 5 103 2001:470:f026:103::200:5 exIDF X.1 - ex4200-48p 00:26:88:6e:aa:ff
Expo-Catwalk 6 103 2001:470:f026:103::200:6 Catwalk W.1 Loud ex4200-48p 00:26:88:7d:d3:7f
MassFlash 7 503 2001:470:f026:503::200:7 MassFlash Z.9 Normal ex4200-48p 00:26:88:6e:b6:ff
AVSwitch 8 503 2001:470:f026:503::200:8 cfAV I.9 Quiet ex4200-48p 00:26:88:7d:dd:ff
Rm209-210 9 503 2001:470:f026:503::200:9 cfRoom I.9 Normal ex4200-48p 00:26:88:6e:a1:7f
Rm211 10 503 2001:470:f026:503::200:10 cfRoom I.9 Loud ex4200-48p 2c:6b:f5:39:cb:ff
Rm214 11 503 2001:470:f026:503::200:11 cfRoom I.9 Normal ex4200-48p 00:26:88:60:71:7f
Rm101-102 12 503 2001:470:f026:503::200:12 cfRoom I.9 Normal ex4200-48p b0:c6:9a:dc:4d:ff
Rm103 13 503 2001:470:f026:503::200:13 cfRoom I.9 Normal ex4200-48p 00:26:88:7a:8f:ff
Rm104 14 503 2001:470:f026:503::200:14 cfRoom I.9 Normal ex4200-48p 00:26:88:7d:e5:ff
Rm105 15 503 2001:470:f026:503::200:15 cfRoom I.9 ?? ex4200-48p b0:c6:9a:db:b5:7f
Rm106 16 503 2001:470:f026:503::200:16 cfRoom I.9 ?? ex4200-48p 00:26:88:7e:3e:7f
Rm107 17 503 2001:470:f026:503::200:17 cfRoom I.9 Normal ex4200-48p 00:26:88:6e:a6:ff
SpareA 18 504 2001:470:f026:504::200:18 cfCTF Z.4 Loud ex4200-48p 78:fe:3d:d2:85:7f
SpareB 19 504 2001:470:f026:504::200:19 cfCTF Z.5 Normal ex4200-48p 00:26:88:6e:b3:ff
SpareC 20 504 2001:470:f026:504::200:20 cfCTF Z.6 Quiet ex4200-48p 2c:6b:f5:39:7e:7f
SpareD 21 504 2001:470:f026:504::200:21 cfCTF Z.7 Normal ex4200-48p 00:26:88:7e:25:ff
SpareE 22 504 2001:470:f026:504::200:22 cfCTF Z.8 Loud ex4200-48p 00:26:88:6e:bd:ff
SpareF 23 504 2001:470:f026:504::200:23 cfCTF Z.9 Normal ex4200-48p b0:c6:9a:6c:0d:7f
ExpoAW 24 103 2001:470:f026:103::200:24 Booth W.9 Loud ex4200-48p 00:26:88:6e:c2:ff
ExpoA1 25 103 2001:470:f026:103::200:25 Booth W.9 Quiet ex4200-48p 00:26:88:60:bc:ff
ExpoA2 26 103 2001:470:f026:103::200:26 Booth W.9 Normal ex4200-48p 00:26:88:7f:27:7f
ExpoA3 27 103 2001:470:f026:103::200:27 Booth W.9 Normal ex4200-48p 2c:21:72:95:e2:7f
ExpoA4 28 103 2001:470:f026:103::200:28 Booth Z.9 Loud ex4200-48p 00:26:88:6e:c6:ff
ExpoA5 29 103 2001:470:f026:103::200:29 Booth Z.9 Loud ex4200-48p 28:c0:da:33:38:7f
ExpoB1 30 103 2001:470:f026:103::200:30 Booth W.9 Normal ex4200-48p 00:26:88:7e:36:7f
ExpoB2 31 103 2001:470:f026:103::200:31 Booth W.9 Quiet ex4200-48p 00:26:88:7d:f5:ff
ExpoB3 32 103 2001:470:f026:103::200:32 Booth W.9 Normal ex4200-48p 00:26:88:7a:76:ff
ExpoB4 33 503 2001:470:f026:503::200:33 cfIDF I.9 Normal ex4200-48p 00:26:88:7d:f8:7f
ExpoB5 34 103 2001:470:f026:103::200:34 Booth Z.9 Loud ex4200-48p 00:26:88:6f:1e:7f
ExpoC1 35 103 2001:470:f026:103::200:35 Booth W.9 Loud ex4200-48p 00:19:e2:56:23:3f
ExpoC2 36 103 2001:470:f026:103::200:36 Booth W.9 Normal ex4200-48p 2c:6b:f5:39:cf:ff
ExpoC3 37 103 2001:470:f026:103::200:37 Booth W.9 Quiet ex4200-48p 2c:6b:f5:37:cd:7f
ExpoC4 38 103 2001:470:f026:103::200:38 Booth W.9 Normal ex4200-48p 00:26:88:7e:1b:ff
ExpoC5 39 103 2001:470:f026:103::200:39 Booth Z.9 Normal ex4200-48p 00:26:88:70:d6:7f
BallroomA 40 103 2001:470:f026:103::200:40 exRoom C.9 Quiet ex4200-48p b0:c6:9a:64:85:ff
BallroomB 41 103 2001:470:f026:103::200:41 exRoom C.9 Normal ex4200-48p 00:26:88:70:bb:7f
BallroomC 42 103 2001:470:f026:103::200:42 exRoom C.9 Normal ex4200-48p 00:26:88:60:40:7f
BallroomDE 43 103 2001:470:f026:103::200:43 exRoom F.9 Normal ex4200-48p 00:26:88:7d:1b:ff
BallroomF 44 103 2001:470:f026:103::200:44 exRoom F.9 Loud ex4200-48p 00:26:88:7c:41:7f
BallroomG 45 103 2001:470:f026:103::200:45 exRoom F.9 Normal ex4200-48p 00:26:88:6e:b1:ff
BallroomH 46 103 2001:470:f026:103::200:46 exRoom F.9 Loud ex4200-48p 00:26:88:7f:0e:7f
SpareG 47 103 2001:470:f026:103::200:47 cfRoom Z.9 Normal ex4200-48p 00:26:88:6e:9f:ff
SpareH 48 103 2001:470:f026:103::200:48 exRoom Z.9 ?? ex4200-48p 84:18:88:ac:d7:7f
SpareI 49 103 2001:470:f026:103::200:49 exRoom Z.9 ?? ex4200-48p 84:18:88:ab:df:ff
SpareJ 50 103 2001:470:f026:103::200:50 Booth W.9 ?? ex4200-48p 84:18:88:ad:4e:ff
SpareK 51 103 2001:470:f026:103::200:51 Booth Z.9 Loud ex4200-48px ec:3e:f7:50:58:ff
RegDesk 52 103 2001:470:f026:103::200:52 registration X.9 Normal ex4200-48px f4:a7:39:c8:ef:7f
Loading