aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--planning/patchlist.txt139
-rw-r--r--planning/patchlist.txt.distrosort139
-rw-r--r--planning/planning.cpp94
-rw-r--r--planning/switches.txt139
4 files changed, 199 insertions, 312 deletions
diff --git a/planning/patchlist.txt b/planning/patchlist.txt
index 916e88e..3baaf23 100644
--- a/planning/patchlist.txt
+++ b/planning/patchlist.txt
@@ -1,85 +1,54 @@
-e1-1 d2.floor ge-0/0/0 ge-1/0/0 ge-2/0/0
-e1-2 d2.floor ge-0/0/1 ge-1/0/1 ge-2/0/1
-e1-3 d1.floor ge-0/0/0 ge-1/0/0 ge-2/0/0
-e1-4 d1.floor ge-0/0/1 ge-1/0/1 ge-2/0/1
-e3-1 d2.floor ge-0/0/2 ge-1/0/2 ge-2/0/2
-e3-2 d2.floor ge-0/0/3 ge-1/0/3 ge-2/0/3
-e3-3 d1.floor mge-0/0/24 mge-2/0/24 # multirate
-e3-4 d1.floor mge-0/0/25 mge-2/0/25 # multirate
-e5-1 d2.floor ge-0/0/4 ge-1/0/4 ge-2/0/4
-e5-2 d2.floor ge-0/0/5 ge-1/0/5 ge-2/0/5
-e5-3 d1.floor mge-0/0/26 mge-2/0/26 # multirate
-e5-4 d1.floor mge-0/0/27 mge-2/0/27 # multirate
-e7-1 d2.floor ge-0/0/6 ge-1/0/6 ge-2/0/6
-e7-2 d2.floor ge-0/0/7 ge-1/0/7 ge-2/0/7
-e7-3 d1.floor mge-0/0/28 mge-2/0/28 # multirate
-e7-4 d1.floor mge-0/0/29 mge-2/0/29 # multirate
-e9-1 d2.floor ge-0/0/8 ge-1/0/8 ge-2/0/8
-e9-2 d2.floor ge-0/0/9 ge-1/0/9 ge-2/0/9
-e9-3 d1.floor mge-0/0/30 mge-2/0/30 # multirate
-e9-4 d1.floor mge-0/0/31 mge-2/0/31 # multirate
-e11-1 d4.floor ge-0/0/0 ge-1/0/0 ge-2/0/0
-e13-1 d4.floor ge-0/0/1 ge-1/0/1 ge-2/0/1
-e15-1 d4.floor ge-0/0/2 ge-1/0/2 ge-2/0/2
-e17-1 d4.floor ge-0/0/3 ge-1/0/3 ge-2/0/3
-e17-2 d4.floor ge-0/0/4 ge-1/0/4 ge-2/0/4
-e17-3 d3.floor ge-0/0/0 ge-1/0/0 ge-2/0/0
-e17-4 d3.floor ge-0/0/1 ge-1/0/1 ge-2/0/1
-e19-1 d4.floor ge-0/0/5 ge-1/0/5 ge-2/0/5
-e19-2 d4.floor ge-0/0/6 ge-1/0/6 ge-2/0/6
-e19-3 d3.floor ge-0/0/2 ge-1/0/2 ge-2/0/2
-e19-4 d3.floor ge-0/0/3 ge-1/0/3 ge-2/0/3
-e21-1 d4.floor ge-0/0/7 ge-1/0/7 ge-2/0/7
-e21-2 d4.floor ge-0/0/8 ge-1/0/8 ge-2/0/8
-e21-3 d3.floor ge-0/0/4 ge-1/0/4 ge-2/0/4
-e21-4 d3.floor ge-0/0/5 ge-1/0/5 ge-2/0/5
-e23-1 d4.floor ge-0/0/9 ge-1/0/9 ge-2/0/9
-e23-2 d4.floor ge-0/0/10 ge-1/0/10 ge-2/0/10
-e23-3 d3.floor ge-0/0/6 ge-1/0/6 ge-2/0/6
-e23-4 d3.floor ge-0/0/7 ge-1/0/7 ge-2/0/7
-e25-1 d4.floor ge-0/0/11 ge-1/0/11 ge-2/0/11
-e25-2 d4.floor ge-0/0/12 ge-1/0/12 ge-2/0/12
-e25-3 d3.floor ge-0/0/8 ge-1/0/8 ge-2/0/8
-e25-4 d3.floor ge-0/0/9 ge-1/0/9 ge-2/0/9
-e27-1 d4.floor ge-0/0/13 ge-1/0/13 ge-2/0/13
-e27-2 d4.floor ge-0/0/14 ge-1/0/14 ge-2/0/14
-e27-3 d3.floor ge-0/0/10 ge-1/0/10 ge-2/0/10
-e27-4 d3.floor ge-0/0/11 ge-1/0/11 ge-2/0/11
-e29-1 d4.floor ge-0/0/15 ge-1/0/15 ge-2/0/15
-e29-2 d4.floor ge-0/0/16 ge-1/0/16 ge-2/0/16
-e29-3 d3.floor ge-0/0/12 ge-1/0/12 ge-2/0/12
-e29-4 d3.floor ge-0/0/13 ge-1/0/13 ge-2/0/13
-e31-1 d4.floor ge-0/0/17 ge-1/0/17 ge-2/0/17
-e31-2 d4.floor ge-0/0/18 ge-1/0/18 ge-2/0/18
-e31-3 d3.floor ge-0/0/14 ge-1/0/14 ge-2/0/14
-e31-4 d3.floor ge-0/0/15 ge-1/0/15 ge-2/0/15
-e33-1 d6.floor ge-0/0/0 ge-1/0/0 ge-2/0/0
-e33-2 d6.floor ge-0/0/1 ge-1/0/1 ge-2/0/1
-e33-3 d5.floor ge-0/0/0 ge-1/0/0 ge-2/0/0
-e33-4 d5.floor ge-0/0/1 ge-1/0/1 ge-2/0/1
-e35-1 d6.floor ge-0/0/2 ge-1/0/2 ge-2/0/2
-e35-2 d6.floor ge-0/0/3 ge-1/0/3 ge-2/0/3
-e35-3 d5.floor ge-0/0/2 ge-1/0/2 ge-2/0/2
-e35-4 d5.floor ge-0/0/3 ge-1/0/3 ge-2/0/3
-e37-1 d6.floor ge-0/0/4 ge-1/0/4 ge-2/0/4
-e37-2 d6.floor ge-0/0/5 ge-1/0/5 ge-2/0/5
-e37-3 d5.floor ge-0/0/4 ge-1/0/4 ge-2/0/4
-e37-4 d5.floor ge-0/0/5 ge-1/0/5 ge-2/0/5
-e39-1 d6.floor ge-0/0/6 ge-1/0/6 ge-2/0/6
-e39-2 d6.floor ge-0/0/7 ge-1/0/7 ge-2/0/7
-e39-3 d5.floor ge-0/0/6 ge-1/0/6 ge-2/0/6
-e39-4 d5.floor ge-0/0/7 ge-1/0/7 ge-2/0/7
-e41-1 d6.floor ge-0/0/8 ge-1/0/8 ge-2/0/8
-e41-2 d6.floor ge-0/0/9 ge-1/0/9 ge-2/0/9
-e41-3 d5.floor ge-0/0/8 ge-1/0/8 ge-2/0/8
-e41-4 d5.floor ge-0/0/9 ge-1/0/9 ge-2/0/9
-e43-1 d6.floor ge-0/0/10 ge-1/0/10 ge-2/0/10
-e43-2 d6.floor ge-0/0/11 ge-1/0/11 ge-2/0/11
-e43-3 d5.floor ge-0/0/10 ge-1/0/10 ge-2/0/10
-e43-4 d5.floor ge-0/0/11 ge-1/0/11 ge-2/0/11
-e45-1 d6.floor ge-0/0/12 ge-1/0/12 ge-2/0/12
-e45-2 d6.floor ge-0/0/13 ge-1/0/13 ge-2/0/13
-e45-3 d5.floor ge-0/0/12 ge-1/0/12 ge-2/0/12
-e45-4 d5.floor ge-0/0/13 ge-1/0/13 ge-2/0/13
-e47-3 d5.floor ge-0/0/14 ge-1/0/14 ge-2/0/14
-e47-4 d5.floor ge-0/0/15 ge-1/0/15 ge-2/0/15
+e1-1 d1-floor Ethernet1 Ethernet2 Ethernet49
+e1-2 d1-floor Ethernet2 Ethernet3 Ethernet50
+e3-1 d1-floor Ethernet3 Ethernet4 Ethernet51
+e3-2 d1-floor Ethernet4 Ethernet5 Ethernet52
+e5-1 d1-floor Ethernet5 Ethernet6 Ethernet53
+e5-2 d1-floor Ethernet6 Ethernet7 Ethernet54
+e7-1 d1-floor Ethernet7 Ethernet8 Ethernet55
+e7-2 d1-floor Ethernet8 Ethernet9 Ethernet56
+e9-1 d1-floor Ethernet9 Ethernet10 Ethernet57
+e9-2 d1-floor Ethernet10 Ethernet11 Ethernet58
+e11-1 d2-floor Ethernet1 Ethernet2 Ethernet49
+e11-2 d2-floor Ethernet2 Ethernet3 Ethernet50
+e13-1 d2-floor Ethernet3 Ethernet4 Ethernet51
+e13-2 d2-floor Ethernet4 Ethernet5 Ethernet52
+e15-1 d2-floor Ethernet5 Ethernet6 Ethernet53
+e15-2 d2-floor Ethernet6 Ethernet7 Ethernet54
+e17-1 d2-floor Ethernet7 Ethernet8 Ethernet55
+e17-2 d2-floor Ethernet8 Ethernet9 Ethernet56
+e19-1 d2-floor Ethernet9 Ethernet10 Ethernet57
+e19-2 d2-floor Ethernet10 Ethernet11 Ethernet58
+e21-1 d2-floor Ethernet11 Ethernet12 Ethernet59
+e21-2 d2-floor Ethernet12 Ethernet13 Ethernet60
+e23-1 d2-floor Ethernet13 Ethernet14 Ethernet61
+e23-2 d2-floor Ethernet14 Ethernet15 Ethernet62
+e25-1 d2-floor Ethernet15 Ethernet16 Ethernet63
+e25-2 d2-floor Ethernet16 Ethernet17 Ethernet64
+e27-3 d3-floor Ethernet1 Ethernet2 Ethernet49
+e27-4 d3-floor Ethernet2 Ethernet3 Ethernet50
+e27-1 d4-floor Ethernet1 Ethernet2 Ethernet49
+e27-2 d4-floor Ethernet2 Ethernet3 Ethernet50
+e29-3 d3-floor Ethernet3 Ethernet4 Ethernet51
+e29-4 d3-floor Ethernet4 Ethernet5 Ethernet52
+e29-1 d4-floor Ethernet3 Ethernet4 Ethernet51
+e29-2 d4-floor Ethernet4 Ethernet5 Ethernet52
+e31-3 d3-floor Ethernet5 Ethernet6 Ethernet53
+e31-4 d3-floor Ethernet6 Ethernet7 Ethernet54
+e31-1 d4-floor Ethernet5 Ethernet6 Ethernet53
+e31-2 d4-floor Ethernet6 Ethernet7 Ethernet54
+e33-3 d3-floor Ethernet7 Ethernet8 Ethernet55
+e33-4 d3-floor Ethernet8 Ethernet9 Ethernet56
+e33-1 d4-floor Ethernet7 Ethernet8 Ethernet55
+e33-2 d4-floor Ethernet8 Ethernet9 Ethernet56
+e35-1 d4-floor Ethernet9 Ethernet10 Ethernet57
+e35-2 d4-floor Ethernet10 Ethernet11 Ethernet58
+e37-1 d4-floor Ethernet11 Ethernet12 Ethernet59
+e37-2 d4-floor Ethernet12 Ethernet13 Ethernet60
+e39-1 d4-floor Ethernet13 Ethernet14 Ethernet61
+e39-2 d4-floor Ethernet14 Ethernet15 Ethernet62
+e41-1 d4-floor Ethernet15 Ethernet16 Ethernet63
+e41-2 d4-floor Ethernet16 Ethernet17 Ethernet64
+e43-1 d4-floor Ethernet17 Ethernet18 Ethernet65
+e43-2 d4-floor Ethernet18 Ethernet19 Ethernet66
+e45-1 d4-floor Ethernet19 Ethernet20 Ethernet67
+e45-2 d4-floor Ethernet20 Ethernet21 Ethernet68
diff --git a/planning/patchlist.txt.distrosort b/planning/patchlist.txt.distrosort
index d3f1ddf..87fa244 100644
--- a/planning/patchlist.txt.distrosort
+++ b/planning/patchlist.txt.distrosort
@@ -1,85 +1,54 @@
-e1-3 d1.floor ge-0/0/0 ge-1/0/0 ge-2/0/0
-e1-4 d1.floor ge-0/0/1 ge-1/0/1 ge-2/0/1
-e3-3 d1.floor mge-0/0/24 mge-2/0/24 # multirate
-e3-4 d1.floor mge-0/0/25 mge-2/0/25 # multirate
-e5-3 d1.floor mge-0/0/26 mge-2/0/26 # multirate
-e5-4 d1.floor mge-0/0/27 mge-2/0/27 # multirate
-e7-3 d1.floor mge-0/0/28 mge-2/0/28 # multirate
-e7-4 d1.floor mge-0/0/29 mge-2/0/29 # multirate
-e9-3 d1.floor mge-0/0/30 mge-2/0/30 # multirate
-e9-4 d1.floor mge-0/0/31 mge-2/0/31 # multirate
-e1-1 d2.floor ge-0/0/0 ge-1/0/0 ge-2/0/0
-e1-2 d2.floor ge-0/0/1 ge-1/0/1 ge-2/0/1
-e3-1 d2.floor ge-0/0/2 ge-1/0/2 ge-2/0/2
-e3-2 d2.floor ge-0/0/3 ge-1/0/3 ge-2/0/3
-e5-1 d2.floor ge-0/0/4 ge-1/0/4 ge-2/0/4
-e5-2 d2.floor ge-0/0/5 ge-1/0/5 ge-2/0/5
-e7-1 d2.floor ge-0/0/6 ge-1/0/6 ge-2/0/6
-e7-2 d2.floor ge-0/0/7 ge-1/0/7 ge-2/0/7
-e9-1 d2.floor ge-0/0/8 ge-1/0/8 ge-2/0/8
-e9-2 d2.floor ge-0/0/9 ge-1/0/9 ge-2/0/9
-e17-3 d3.floor ge-0/0/0 ge-1/0/0 ge-2/0/0
-e17-4 d3.floor ge-0/0/1 ge-1/0/1 ge-2/0/1
-e19-3 d3.floor ge-0/0/2 ge-1/0/2 ge-2/0/2
-e19-4 d3.floor ge-0/0/3 ge-1/0/3 ge-2/0/3
-e21-3 d3.floor ge-0/0/4 ge-1/0/4 ge-2/0/4
-e21-4 d3.floor ge-0/0/5 ge-1/0/5 ge-2/0/5
-e23-3 d3.floor ge-0/0/6 ge-1/0/6 ge-2/0/6
-e23-4 d3.floor ge-0/0/7 ge-1/0/7 ge-2/0/7
-e25-3 d3.floor ge-0/0/8 ge-1/0/8 ge-2/0/8
-e25-4 d3.floor ge-0/0/9 ge-1/0/9 ge-2/0/9
-e27-3 d3.floor ge-0/0/10 ge-1/0/10 ge-2/0/10
-e27-4 d3.floor ge-0/0/11 ge-1/0/11 ge-2/0/11
-e29-3 d3.floor ge-0/0/12 ge-1/0/12 ge-2/0/12
-e29-4 d3.floor ge-0/0/13 ge-1/0/13 ge-2/0/13
-e31-3 d3.floor ge-0/0/14 ge-1/0/14 ge-2/0/14
-e31-4 d3.floor ge-0/0/15 ge-1/0/15 ge-2/0/15
-e11-1 d4.floor ge-0/0/0 ge-1/0/0 ge-2/0/0
-e13-1 d4.floor ge-0/0/1 ge-1/0/1 ge-2/0/1
-e15-1 d4.floor ge-0/0/2 ge-1/0/2 ge-2/0/2
-e17-1 d4.floor ge-0/0/3 ge-1/0/3 ge-2/0/3
-e17-2 d4.floor ge-0/0/4 ge-1/0/4 ge-2/0/4
-e19-1 d4.floor ge-0/0/5 ge-1/0/5 ge-2/0/5
-e19-2 d4.floor ge-0/0/6 ge-1/0/6 ge-2/0/6
-e21-1 d4.floor ge-0/0/7 ge-1/0/7 ge-2/0/7
-e21-2 d4.floor ge-0/0/8 ge-1/0/8 ge-2/0/8
-e23-1 d4.floor ge-0/0/9 ge-1/0/9 ge-2/0/9
-e23-2 d4.floor ge-0/0/10 ge-1/0/10 ge-2/0/10
-e25-1 d4.floor ge-0/0/11 ge-1/0/11 ge-2/0/11
-e25-2 d4.floor ge-0/0/12 ge-1/0/12 ge-2/0/12
-e27-1 d4.floor ge-0/0/13 ge-1/0/13 ge-2/0/13
-e27-2 d4.floor ge-0/0/14 ge-1/0/14 ge-2/0/14
-e29-1 d4.floor ge-0/0/15 ge-1/0/15 ge-2/0/15
-e29-2 d4.floor ge-0/0/16 ge-1/0/16 ge-2/0/16
-e31-1 d4.floor ge-0/0/17 ge-1/0/17 ge-2/0/17
-e31-2 d4.floor ge-0/0/18 ge-1/0/18 ge-2/0/18
-e33-3 d5.floor ge-0/0/0 ge-1/0/0 ge-2/0/0
-e33-4 d5.floor ge-0/0/1 ge-1/0/1 ge-2/0/1
-e35-3 d5.floor ge-0/0/2 ge-1/0/2 ge-2/0/2
-e35-4 d5.floor ge-0/0/3 ge-1/0/3 ge-2/0/3
-e37-3 d5.floor ge-0/0/4 ge-1/0/4 ge-2/0/4
-e37-4 d5.floor ge-0/0/5 ge-1/0/5 ge-2/0/5
-e39-3 d5.floor ge-0/0/6 ge-1/0/6 ge-2/0/6
-e39-4 d5.floor ge-0/0/7 ge-1/0/7 ge-2/0/7
-e41-3 d5.floor ge-0/0/8 ge-1/0/8 ge-2/0/8
-e41-4 d5.floor ge-0/0/9 ge-1/0/9 ge-2/0/9
-e43-3 d5.floor ge-0/0/10 ge-1/0/10 ge-2/0/10
-e43-4 d5.floor ge-0/0/11 ge-1/0/11 ge-2/0/11
-e45-3 d5.floor ge-0/0/12 ge-1/0/12 ge-2/0/12
-e45-4 d5.floor ge-0/0/13 ge-1/0/13 ge-2/0/13
-e47-3 d5.floor ge-0/0/14 ge-1/0/14 ge-2/0/14
-e47-4 d5.floor ge-0/0/15 ge-1/0/15 ge-2/0/15
-e33-1 d6.floor ge-0/0/0 ge-1/0/0 ge-2/0/0
-e33-2 d6.floor ge-0/0/1 ge-1/0/1 ge-2/0/1
-e35-1 d6.floor ge-0/0/2 ge-1/0/2 ge-2/0/2
-e35-2 d6.floor ge-0/0/3 ge-1/0/3 ge-2/0/3
-e37-1 d6.floor ge-0/0/4 ge-1/0/4 ge-2/0/4
-e37-2 d6.floor ge-0/0/5 ge-1/0/5 ge-2/0/5
-e39-1 d6.floor ge-0/0/6 ge-1/0/6 ge-2/0/6
-e39-2 d6.floor ge-0/0/7 ge-1/0/7 ge-2/0/7
-e41-1 d6.floor ge-0/0/8 ge-1/0/8 ge-2/0/8
-e41-2 d6.floor ge-0/0/9 ge-1/0/9 ge-2/0/9
-e43-1 d6.floor ge-0/0/10 ge-1/0/10 ge-2/0/10
-e43-2 d6.floor ge-0/0/11 ge-1/0/11 ge-2/0/11
-e45-1 d6.floor ge-0/0/12 ge-1/0/12 ge-2/0/12
-e45-2 d6.floor ge-0/0/13 ge-1/0/13 ge-2/0/13
+e1-1 d1-floor Ethernet1 Ethernet2 Ethernet49
+e1-2 d1-floor Ethernet2 Ethernet3 Ethernet50
+e3-1 d1-floor Ethernet3 Ethernet4 Ethernet51
+e3-2 d1-floor Ethernet4 Ethernet5 Ethernet52
+e5-1 d1-floor Ethernet5 Ethernet6 Ethernet53
+e5-2 d1-floor Ethernet6 Ethernet7 Ethernet54
+e7-1 d1-floor Ethernet7 Ethernet8 Ethernet55
+e7-2 d1-floor Ethernet8 Ethernet9 Ethernet56
+e9-1 d1-floor Ethernet9 Ethernet10 Ethernet57
+e9-2 d1-floor Ethernet10 Ethernet11 Ethernet58
+e11-1 d2-floor Ethernet1 Ethernet2 Ethernet49
+e11-2 d2-floor Ethernet2 Ethernet3 Ethernet50
+e13-1 d2-floor Ethernet3 Ethernet4 Ethernet51
+e13-2 d2-floor Ethernet4 Ethernet5 Ethernet52
+e15-1 d2-floor Ethernet5 Ethernet6 Ethernet53
+e15-2 d2-floor Ethernet6 Ethernet7 Ethernet54
+e17-1 d2-floor Ethernet7 Ethernet8 Ethernet55
+e17-2 d2-floor Ethernet8 Ethernet9 Ethernet56
+e19-1 d2-floor Ethernet9 Ethernet10 Ethernet57
+e19-2 d2-floor Ethernet10 Ethernet11 Ethernet58
+e21-1 d2-floor Ethernet11 Ethernet12 Ethernet59
+e21-2 d2-floor Ethernet12 Ethernet13 Ethernet60
+e23-1 d2-floor Ethernet13 Ethernet14 Ethernet61
+e23-2 d2-floor Ethernet14 Ethernet15 Ethernet62
+e25-1 d2-floor Ethernet15 Ethernet16 Ethernet63
+e25-2 d2-floor Ethernet16 Ethernet17 Ethernet64
+e27-3 d3-floor Ethernet1 Ethernet2 Ethernet49
+e27-4 d3-floor Ethernet2 Ethernet3 Ethernet50
+e29-3 d3-floor Ethernet3 Ethernet4 Ethernet51
+e29-4 d3-floor Ethernet4 Ethernet5 Ethernet52
+e31-3 d3-floor Ethernet5 Ethernet6 Ethernet53
+e31-4 d3-floor Ethernet6 Ethernet7 Ethernet54
+e33-3 d3-floor Ethernet7 Ethernet8 Ethernet55
+e33-4 d3-floor Ethernet8 Ethernet9 Ethernet56
+e27-1 d4-floor Ethernet1 Ethernet2 Ethernet49
+e27-2 d4-floor Ethernet2 Ethernet3 Ethernet50
+e29-1 d4-floor Ethernet3 Ethernet4 Ethernet51
+e29-2 d4-floor Ethernet4 Ethernet5 Ethernet52
+e31-1 d4-floor Ethernet5 Ethernet6 Ethernet53
+e31-2 d4-floor Ethernet6 Ethernet7 Ethernet54
+e33-1 d4-floor Ethernet7 Ethernet8 Ethernet55
+e33-2 d4-floor Ethernet8 Ethernet9 Ethernet56
+e35-1 d4-floor Ethernet9 Ethernet10 Ethernet57
+e35-2 d4-floor Ethernet10 Ethernet11 Ethernet58
+e37-1 d4-floor Ethernet11 Ethernet12 Ethernet59
+e37-2 d4-floor Ethernet12 Ethernet13 Ethernet60
+e39-1 d4-floor Ethernet13 Ethernet14 Ethernet61
+e39-2 d4-floor Ethernet14 Ethernet15 Ethernet62
+e41-1 d4-floor Ethernet15 Ethernet16 Ethernet63
+e41-2 d4-floor Ethernet16 Ethernet17 Ethernet64
+e43-1 d4-floor Ethernet17 Ethernet18 Ethernet65
+e43-2 d4-floor Ethernet18 Ethernet19 Ethernet66
+e45-1 d4-floor Ethernet19 Ethernet20 Ethernet67
+e45-2 d4-floor Ethernet20 Ethernet21 Ethernet68
diff --git a/planning/planning.cpp b/planning/planning.cpp
index faa614c..5c1e666 100644
--- a/planning/planning.cpp
+++ b/planning/planning.cpp
@@ -34,10 +34,10 @@
#include <string>
#include <queue>
-#define NUM_DISTRO 6
-#define NUM_ROWS 41
+#define NUM_DISTRO 4
+#define NUM_ROWS 23
#define SWITCHES_PER_ROW 4
-#define PORTS_PER_DISTRO 31
+#define PORTS_PER_DISTRO 32
#define TRUNCATE_METRIC 1
#define EXTENSION_COST 70
@@ -158,9 +158,9 @@ struct VerticalGap {
// After row 20: 4.0m+0.1m slack = 1.7m cost
// After row 29: 3.6m+0.1m slack = 1.3m cost
vector<VerticalGap> vertical_gaps = {
- { 12, 23 },
- { 20, 17 },
- { 29, 13 },
+ { 5, 50 },
+ { 13, 50 },
+ { 29, 50 },
};
class Planner {
@@ -254,6 +254,7 @@ Inventory Planner::find_inventory(Switch from_where, int distro)
inv.num_10m = _INF;
}
+
// distro0-2 shouldn't cross the mid
//if ((distro_placements[distro] >= 0) == (from_where.num >= 2)) {
// inv.horiz_gap_crossings = 0;
@@ -271,10 +272,15 @@ Inventory Planner::find_inventory(Switch from_where, int distro)
//}
// Gap over the scene
- if ((abs(distro_placements[distro]) <= 12) == (from_where.row >= 13)) {
+ if ((abs(distro_placements[distro]) <= 14) == (from_where.row >= 14)) {
inv.vert_chasm_crossings = 1;
}
+ // Gap over the scene
+ if ((abs(distro_placements[distro]) <= 6) == (from_where.row >= 6)) {
+ inv.vert_chasm_crossings = 1;
+ }
+
// Gaps between fire gates
/* TG23: We ignore this firegap.
if ((abs(distro_placements[distro]) <= 20) == (from_where.row >= 21)) {
@@ -332,15 +338,16 @@ void Planner::logprintf(const char *fmt, ...)
string distro_name(unsigned distro)
{
char buf[16];
- sprintf(buf, "d%d.floor", distro+1);
+ sprintf(buf, "d%d-floor", distro+1);
return buf;
}
string port_name(unsigned distro, unsigned portnum)
{
char buf[16];
- int distros[] = { 0, 1, 2 }; // must equal the number of switches in distro-stack
- sprintf(buf, "ge-%u/0/%u", distros[portnum / 48], (portnum % 48));
+ //int distros[] = { 0, 1, 2 }; // must equal the number of switches in distro-stack
+ //sprintf(buf, "ge-%u/0/%u", distros[portnum / 48], (portnum % 48));
+ sprintf(buf, "Ethernet%u", (portnum + 1));
return buf;
}
@@ -349,53 +356,26 @@ void Planner::init_switches()
switches.clear();
for (unsigned i = 1; i <= NUM_ROWS; ++i) {
- // No seats here for TG23
- if (i >= 1 && i <= 8) {
- // switches.push_back(Switch(i,0));
- // switches.push_back(Switch(i,1));
- // switches.push_back(Switch(i,2));
- // switches.push_back(Switch(i,3));
- }
-
- if (i >= 8 && i <= 12) {
- switches.push_back(Switch(i, 0));
- switches.push_back(Switch(i, 1));
- switches.push_back(Switch(i, 2));
- switches.push_back(Switch(i, 3));
- }
-
- // 1 1/2 rader motsatt av scenen.
- if (i >= 18 && i <= 20) {
- switches.push_back(Switch(i, 0));
- //switches.push_back(Switch(i, 1));
- //switches.push_back(Switch(i, 2));
- //switches.push_back(Switch(i, 3));
- }
-
- if (i >= 21 && i <= 28) {
- switches.push_back(Switch(i, 0));
- switches.push_back(Switch(i, 1));
- switches.push_back(Switch(i, 2));
- switches.push_back(Switch(i, 3));
+ // row 1 to 10
+ if (i >= 1 && i <= 5) {
+ switches.push_back(Switch(i,0));
+ switches.push_back(Switch(i,1));
}
-
- if (i >= 30 && i <= 36) {
+ // row 11 to 26
+ if (i >= 6 && i <= 13) {
switches.push_back(Switch(i, 0));
switches.push_back(Switch(i, 1));
- switches.push_back(Switch(i, 2));
- switches.push_back(Switch(i, 3));
}
-
- // No seats here for TG23
- if (i >= 37 && i <= 41) {
- //switches.push_back(Switch(i,0));
- //switches.push_back(Switch(i,1));
- if (i == 37) {
- switches.push_back(Switch(i,2));
- switches.push_back(Switch(i,3));
- }
- }
-
+ // row 27 to 42 - upper
+ if (i >= 14 && i <= 17) {
+ switches.push_back(Switch(i, 2));
+ switches.push_back(Switch(i, 3));
+ }
+ // row 27 to 44 - lower
+ if (i >= 14 && i <= 23) {
+ switches.push_back(Switch(i, 0));
+ switches.push_back(Switch(i, 1));
+ }
}
}
@@ -469,7 +449,7 @@ void Planner::construct_graph(const vector<Switch> &switches, Graph *g)
strcpy(g->source_node.name, "source");
strcpy(g->sink_node.name, "sink");
for (unsigned i = 0; i < NUM_DISTRO; ++i) {
- sprintf(g->distro_nodes[i].name, "s%d.floor", i);
+ sprintf(g->distro_nodes[i].name, "s%d-floor", i);
}
for (unsigned i = 0; i < switches.size(); ++i) {
sprintf(g->switch_nodes[i].name, "switch%d", i);
@@ -710,8 +690,8 @@ int Planner::do_work(int distro_placements[NUM_DISTRO])
switches[i].row * 2 - 1, switches[i].num + 1,
distro_name(distro).c_str(),
port_name(distro, port_num).c_str(),
- port_name(distro, port_num + 48).c_str(),
- port_name(distro, port_num + 96).c_str()
+ port_name(distro, port_num + 1).c_str(),
+ port_name(distro, port_num + 48).c_str()
// if we have 4 switches in a distro-stack
//port_name(distro, port_num + 144).c_str()
);
@@ -761,7 +741,7 @@ int Planner::do_work(int distro_placements[NUM_DISTRO])
for (int i = 0; i < NUM_DISTRO; ++i) {
Edge *e = g.source_node.edges[i];
- logprintf("Remaining ports on d%d.floor: %d\n", i+1, e->capacity - e->flow);
+ logprintf("Remaining ports on d%d-floor: %d\n", i+1, e->capacity - e->flow);
}
return total_cost;
}
diff --git a/planning/switches.txt b/planning/switches.txt
index ec9aea5..f14b931 100644
--- a/planning/switches.txt
+++ b/planning/switches.txt
@@ -1,85 +1,54 @@
-e1-1 88.92.0.0/26 2a06:5844:e:151::/64 151.216.130.34/24 2a06:5841:f:10:2::34/64 1151 d2.floor
-e1-2 88.92.0.64/26 2a06:5844:e:152::/64 151.216.130.35/24 2a06:5841:f:10:2::35/64 1152 d2.floor
-e1-3 88.92.0.128/26 2a06:5844:e:153::/64 151.216.130.2/24 2a06:5841:f:10:1::2/64 1153 d1.floor
-e1-4 88.92.0.192/26 2a06:5844:e:154::/64 151.216.130.3/24 2a06:5841:f:10:1::3/64 1154 d1.floor
-e3-1 88.92.1.0/26 2a06:5844:e:171::/64 151.216.130.36/24 2a06:5841:f:10:2::36/64 1171 d2.floor
-e3-2 88.92.1.64/26 2a06:5844:e:172::/64 151.216.130.37/24 2a06:5841:f:10:2::37/64 1172 d2.floor
-e3-3 88.92.1.128/26 2a06:5844:e:173::/64 151.216.130.4/24 2a06:5841:f:10:1::4/64 1173 d1.floor
-e3-4 88.92.1.192/26 2a06:5844:e:174::/64 151.216.130.5/24 2a06:5841:f:10:1::5/64 1174 d1.floor
-e5-1 88.92.2.0/26 2a06:5844:e:191::/64 151.216.130.38/24 2a06:5841:f:10:2::38/64 1191 d2.floor
-e5-2 88.92.2.64/26 2a06:5844:e:192::/64 151.216.130.39/24 2a06:5841:f:10:2::39/64 1192 d2.floor
-e5-3 88.92.2.128/26 2a06:5844:e:193::/64 151.216.130.6/24 2a06:5841:f:10:1::6/64 1193 d1.floor
-e5-4 88.92.2.192/26 2a06:5844:e:194::/64 151.216.130.7/24 2a06:5841:f:10:1::7/64 1194 d1.floor
-e7-1 88.92.3.0/26 2a06:5844:e:211::/64 151.216.130.40/24 2a06:5841:f:10:2::40/64 1211 d2.floor
-e7-2 88.92.3.64/26 2a06:5844:e:212::/64 151.216.130.41/24 2a06:5841:f:10:2::41/64 1212 d2.floor
-e7-3 88.92.3.128/26 2a06:5844:e:213::/64 151.216.130.8/24 2a06:5841:f:10:1::8/64 1213 d1.floor
-e7-4 88.92.3.192/26 2a06:5844:e:214::/64 151.216.130.9/24 2a06:5841:f:10:1::9/64 1214 d1.floor
-e9-1 88.92.4.0/26 2a06:5844:e:231::/64 151.216.130.42/24 2a06:5841:f:10:2::42/64 1231 d2.floor
-e9-2 88.92.4.64/26 2a06:5844:e:232::/64 151.216.130.43/24 2a06:5841:f:10:2::43/64 1232 d2.floor
-e9-3 88.92.4.128/26 2a06:5844:e:233::/64 151.216.130.10/24 2a06:5841:f:10:1::10/64 1233 d1.floor
-e9-4 88.92.4.192/26 2a06:5844:e:234::/64 151.216.130.11/24 2a06:5841:f:10:1::11/64 1234 d1.floor
-e11-1 88.92.5.0/26 2a06:5844:e:351::/64 151.216.130.98/24 2a06:5841:f:10:4::98/64 1351 d4.floor
-e13-1 88.92.5.64/26 2a06:5844:e:371::/64 151.216.130.99/24 2a06:5841:f:10:4::99/64 1371 d4.floor
-e15-1 88.92.5.128/26 2a06:5844:e:391::/64 151.216.130.100/24 2a06:5841:f:10:4::100/64 1391 d4.floor
-e17-1 88.92.5.192/26 2a06:5844:e:411::/64 151.216.130.101/24 2a06:5841:f:10:4::101/64 1411 d4.floor
-e17-2 88.92.6.0/26 2a06:5844:e:412::/64 151.216.130.102/24 2a06:5841:f:10:4::102/64 1412 d4.floor
-e17-3 88.92.6.64/26 2a06:5844:e:413::/64 151.216.130.66/24 2a06:5841:f:10:3::66/64 1413 d3.floor
-e17-4 88.92.6.128/26 2a06:5844:e:414::/64 151.216.130.67/24 2a06:5841:f:10:3::67/64 1414 d3.floor
-e19-1 88.92.6.192/26 2a06:5844:e:431::/64 151.216.130.103/24 2a06:5841:f:10:4::103/64 1431 d4.floor
-e19-2 88.92.7.0/26 2a06:5844:e:432::/64 151.216.130.104/24 2a06:5841:f:10:4::104/64 1432 d4.floor
-e19-3 88.92.7.64/26 2a06:5844:e:433::/64 151.216.130.68/24 2a06:5841:f:10:3::68/64 1433 d3.floor
-e19-4 88.92.7.128/26 2a06:5844:e:434::/64 151.216.130.69/24 2a06:5841:f:10:3::69/64 1434 d3.floor
-e21-1 88.92.7.192/26 2a06:5844:e:451::/64 151.216.130.105/24 2a06:5841:f:10:4::105/64 1451 d4.floor
-e21-2 88.92.8.0/26 2a06:5844:e:452::/64 151.216.130.106/24 2a06:5841:f:10:4::106/64 1452 d4.floor
-e21-3 88.92.8.64/26 2a06:5844:e:453::/64 151.216.130.70/24 2a06:5841:f:10:3::70/64 1453 d3.floor
-e21-4 88.92.8.128/26 2a06:5844:e:454::/64 151.216.130.71/24 2a06:5841:f:10:3::71/64 1454 d3.floor
-e23-1 88.92.8.192/26 2a06:5844:e:471::/64 151.216.130.107/24 2a06:5841:f:10:4::107/64 1471 d4.floor
-e23-2 88.92.9.0/26 2a06:5844:e:472::/64 151.216.130.108/24 2a06:5841:f:10:4::108/64 1472 d4.floor
-e23-3 88.92.9.64/26 2a06:5844:e:473::/64 151.216.130.72/24 2a06:5841:f:10:3::72/64 1473 d3.floor
-e23-4 88.92.9.128/26 2a06:5844:e:474::/64 151.216.130.73/24 2a06:5841:f:10:3::73/64 1474 d3.floor
-e25-1 88.92.9.192/26 2a06:5844:e:491::/64 151.216.130.109/24 2a06:5841:f:10:4::109/64 1491 d4.floor
-e25-2 88.92.10.0/26 2a06:5844:e:492::/64 151.216.130.110/24 2a06:5841:f:10:4::110/64 1492 d4.floor
-e25-3 88.92.10.64/26 2a06:5844:e:493::/64 151.216.130.74/24 2a06:5841:f:10:3::74/64 1493 d3.floor
-e25-4 88.92.10.128/26 2a06:5844:e:494::/64 151.216.130.75/24 2a06:5841:f:10:3::75/64 1494 d3.floor
-e27-1 88.92.10.192/26 2a06:5844:e:511::/64 151.216.130.111/24 2a06:5841:f:10:4::111/64 1511 d4.floor
-e27-2 88.92.11.0/26 2a06:5844:e:512::/64 151.216.130.112/24 2a06:5841:f:10:4::112/64 1512 d4.floor
-e27-3 88.92.11.64/26 2a06:5844:e:513::/64 151.216.130.76/24 2a06:5841:f:10:3::76/64 1513 d3.floor
-e27-4 88.92.11.128/26 2a06:5844:e:514::/64 151.216.130.77/24 2a06:5841:f:10:3::77/64 1514 d3.floor
-e29-1 88.92.11.192/26 2a06:5844:e:531::/64 151.216.130.113/24 2a06:5841:f:10:4::113/64 1531 d4.floor
-e29-2 88.92.12.0/26 2a06:5844:e:532::/64 151.216.130.114/24 2a06:5841:f:10:4::114/64 1532 d4.floor
-e29-3 88.92.12.64/26 2a06:5844:e:533::/64 151.216.130.78/24 2a06:5841:f:10:3::78/64 1533 d3.floor
-e29-4 88.92.12.128/26 2a06:5844:e:534::/64 151.216.130.79/24 2a06:5841:f:10:3::79/64 1534 d3.floor
-e31-1 88.92.12.192/26 2a06:5844:e:551::/64 151.216.130.115/24 2a06:5841:f:10:4::115/64 1551 d4.floor
-e31-2 88.92.13.0/26 2a06:5844:e:552::/64 151.216.130.116/24 2a06:5841:f:10:4::116/64 1552 d4.floor
-e31-3 88.92.13.64/26 2a06:5844:e:553::/64 151.216.130.80/24 2a06:5841:f:10:3::80/64 1553 d3.floor
-e31-4 88.92.13.128/26 2a06:5844:e:554::/64 151.216.130.81/24 2a06:5841:f:10:3::81/64 1554 d3.floor
-e33-1 88.92.13.192/26 2a06:5844:e:591::/64 151.216.130.162/24 2a06:5841:f:10:6::162/64 1591 d6.floor
-e33-2 88.92.14.0/26 2a06:5844:e:592::/64 151.216.130.163/24 2a06:5841:f:10:6::163/64 1592 d6.floor
-e33-3 88.92.14.64/26 2a06:5844:e:593::/64 151.216.130.130/24 2a06:5841:f:10:5::130/64 1593 d5.floor
-e33-4 88.92.14.128/26 2a06:5844:e:594::/64 151.216.130.131/24 2a06:5841:f:10:5::131/64 1594 d5.floor
-e35-1 88.92.14.192/26 2a06:5844:e:611::/64 151.216.130.164/24 2a06:5841:f:10:6::164/64 1611 d6.floor
-e35-2 88.92.15.0/26 2a06:5844:e:612::/64 151.216.130.165/24 2a06:5841:f:10:6::165/64 1612 d6.floor
-e35-3 88.92.15.64/26 2a06:5844:e:613::/64 151.216.130.132/24 2a06:5841:f:10:5::132/64 1613 d5.floor
-e35-4 88.92.15.128/26 2a06:5844:e:614::/64 151.216.130.133/24 2a06:5841:f:10:5::133/64 1614 d5.floor
-e37-1 88.92.15.192/26 2a06:5844:e:631::/64 151.216.130.166/24 2a06:5841:f:10:6::166/64 1631 d6.floor
-e37-2 88.92.16.0/26 2a06:5844:e:632::/64 151.216.130.167/24 2a06:5841:f:10:6::167/64 1632 d6.floor
-e37-3 88.92.16.64/26 2a06:5844:e:633::/64 151.216.130.134/24 2a06:5841:f:10:5::134/64 1633 d5.floor
-e37-4 88.92.16.128/26 2a06:5844:e:634::/64 151.216.130.135/24 2a06:5841:f:10:5::135/64 1634 d5.floor
-e39-1 88.92.16.192/26 2a06:5844:e:651::/64 151.216.130.168/24 2a06:5841:f:10:6::168/64 1651 d6.floor
-e39-2 88.92.17.0/26 2a06:5844:e:652::/64 151.216.130.169/24 2a06:5841:f:10:6::169/64 1652 d6.floor
-e39-3 88.92.17.64/26 2a06:5844:e:653::/64 151.216.130.136/24 2a06:5841:f:10:5::136/64 1653 d5.floor
-e39-4 88.92.17.128/26 2a06:5844:e:654::/64 151.216.130.137/24 2a06:5841:f:10:5::137/64 1654 d5.floor
-e41-1 88.92.17.192/26 2a06:5844:e:671::/64 151.216.130.170/24 2a06:5841:f:10:6::170/64 1671 d6.floor
-e41-2 88.92.18.0/26 2a06:5844:e:672::/64 151.216.130.171/24 2a06:5841:f:10:6::171/64 1672 d6.floor
-e41-3 88.92.18.64/26 2a06:5844:e:673::/64 151.216.130.138/24 2a06:5841:f:10:5::138/64 1673 d5.floor
-e41-4 88.92.18.128/26 2a06:5844:e:674::/64 151.216.130.139/24 2a06:5841:f:10:5::139/64 1674 d5.floor
-e43-1 88.92.18.192/26 2a06:5844:e:691::/64 151.216.130.172/24 2a06:5841:f:10:6::172/64 1691 d6.floor
-e43-2 88.92.19.0/26 2a06:5844:e:692::/64 151.216.130.173/24 2a06:5841:f:10:6::173/64 1692 d6.floor
-e43-3 88.92.19.64/26 2a06:5844:e:693::/64 151.216.130.140/24 2a06:5841:f:10:5::140/64 1693 d5.floor
-e43-4 88.92.19.128/26 2a06:5844:e:694::/64 151.216.130.141/24 2a06:5841:f:10:5::141/64 1694 d5.floor
-e45-1 88.92.19.192/26 2a06:5844:e:711::/64 151.216.130.174/24 2a06:5841:f:10:6::174/64 1711 d6.floor
-e45-2 88.92.20.0/26 2a06:5844:e:712::/64 151.216.130.175/24 2a06:5841:f:10:6::175/64 1712 d6.floor
-e45-3 88.92.20.64/26 2a06:5844:e:713::/64 151.216.130.142/24 2a06:5841:f:10:5::142/64 1713 d5.floor
-e45-4 88.92.20.128/26 2a06:5844:e:714::/64 151.216.130.143/24 2a06:5841:f:10:5::143/64 1714 d5.floor
-e47-3 88.92.20.192/26 2a06:5844:e:733::/64 151.216.130.144/24 2a06:5841:f:10:5::144/64 1733 d5.floor
-e47-4 88.92.21.0/26 2a06:5844:e:734::/64 151.216.130.145/24 2a06:5841:f:10:5::145/64 1734 d5.floor
+e1-1 88.92.0.0/26 2a06:5844:e:11::/64 151.216.130.2/24 2a06:5841:f:10:1::2/64 1011 d1-floor
+e1-2 88.92.0.64/26 2a06:5844:e:12::/64 151.216.130.3/24 2a06:5841:f:10:1::3/64 1012 d1-floor
+e3-1 88.92.0.128/26 2a06:5844:e:31::/64 151.216.130.4/24 2a06:5841:f:10:1::4/64 1031 d1-floor
+e3-2 88.92.0.192/26 2a06:5844:e:32::/64 151.216.130.5/24 2a06:5841:f:10:1::5/64 1032 d1-floor
+e5-1 88.92.1.0/26 2a06:5844:e:51::/64 151.216.130.6/24 2a06:5841:f:10:1::6/64 1051 d1-floor
+e5-2 88.92.1.64/26 2a06:5844:e:52::/64 151.216.130.7/24 2a06:5841:f:10:1::7/64 1052 d1-floor
+e7-1 88.92.1.128/26 2a06:5844:e:71::/64 151.216.130.8/24 2a06:5841:f:10:1::8/64 1071 d1-floor
+e7-2 88.92.1.192/26 2a06:5844:e:72::/64 151.216.130.9/24 2a06:5841:f:10:1::9/64 1072 d1-floor
+e9-1 88.92.2.0/26 2a06:5844:e:91::/64 151.216.130.10/24 2a06:5841:f:10:1::10/64 1091 d1-floor
+e9-2 88.92.2.64/26 2a06:5844:e:92::/64 151.216.130.11/24 2a06:5841:f:10:1::11/64 1092 d1-floor
+e11-1 88.92.2.128/26 2a06:5844:e:111::/64 151.216.130.34/24 2a06:5841:f:10:2::34/64 1111 d2-floor
+e11-2 88.92.2.192/26 2a06:5844:e:112::/64 151.216.130.35/24 2a06:5841:f:10:2::35/64 1112 d2-floor
+e13-1 88.92.3.0/26 2a06:5844:e:131::/64 151.216.130.36/24 2a06:5841:f:10:2::36/64 1131 d2-floor
+e13-2 88.92.3.64/26 2a06:5844:e:132::/64 151.216.130.37/24 2a06:5841:f:10:2::37/64 1132 d2-floor
+e15-1 88.92.3.128/26 2a06:5844:e:151::/64 151.216.130.38/24 2a06:5841:f:10:2::38/64 1151 d2-floor
+e15-2 88.92.3.192/26 2a06:5844:e:152::/64 151.216.130.39/24 2a06:5841:f:10:2::39/64 1152 d2-floor
+e17-1 88.92.4.0/26 2a06:5844:e:171::/64 151.216.130.40/24 2a06:5841:f:10:2::40/64 1171 d2-floor
+e17-2 88.92.4.64/26 2a06:5844:e:172::/64 151.216.130.41/24 2a06:5841:f:10:2::41/64 1172 d2-floor
+e19-1 88.92.4.128/26 2a06:5844:e:191::/64 151.216.130.42/24 2a06:5841:f:10:2::42/64 1191 d2-floor
+e19-2 88.92.4.192/26 2a06:5844:e:192::/64 151.216.130.43/24 2a06:5841:f:10:2::43/64 1192 d2-floor
+e21-1 88.92.5.0/26 2a06:5844:e:211::/64 151.216.130.44/24 2a06:5841:f:10:2::44/64 1211 d2-floor
+e21-2 88.92.5.64/26 2a06:5844:e:212::/64 151.216.130.45/24 2a06:5841:f:10:2::45/64 1212 d2-floor
+e23-1 88.92.5.128/26 2a06:5844:e:231::/64 151.216.130.46/24 2a06:5841:f:10:2::46/64 1231 d2-floor
+e23-2 88.92.5.192/26 2a06:5844:e:232::/64 151.216.130.47/24 2a06:5841:f:10:2::47/64 1232 d2-floor
+e25-1 88.92.6.0/26 2a06:5844:e:251::/64 151.216.130.48/24 2a06:5841:f:10:2::48/64 1251 d2-floor
+e25-2 88.92.6.64/26 2a06:5844:e:252::/64 151.216.130.49/24 2a06:5841:f:10:2::49/64 1252 d2-floor
+e27-3 88.92.6.128/26 2a06:5844:e:273::/64 151.216.130.66/24 2a06:5841:f:10:3::66/64 1273 d3-floor
+e27-4 88.92.6.192/26 2a06:5844:e:274::/64 151.216.130.67/24 2a06:5841:f:10:3::67/64 1274 d3-floor
+e27-1 88.92.7.0/26 2a06:5844:e:271::/64 151.216.130.98/24 2a06:5841:f:10:4::98/64 1271 d4-floor
+e27-2 88.92.7.64/26 2a06:5844:e:272::/64 151.216.130.99/24 2a06:5841:f:10:4::99/64 1272 d4-floor
+e29-3 88.92.7.128/26 2a06:5844:e:293::/64 151.216.130.68/24 2a06:5841:f:10:3::68/64 1293 d3-floor
+e29-4 88.92.7.192/26 2a06:5844:e:294::/64 151.216.130.69/24 2a06:5841:f:10:3::69/64 1294 d3-floor
+e29-1 88.92.8.0/26 2a06:5844:e:291::/64 151.216.130.100/24 2a06:5841:f:10:4::100/64 1291 d4-floor
+e29-2 88.92.8.64/26 2a06:5844:e:292::/64 151.216.130.101/24 2a06:5841:f:10:4::101/64 1292 d4-floor
+e31-3 88.92.8.128/26 2a06:5844:e:313::/64 151.216.130.70/24 2a06:5841:f:10:3::70/64 1313 d3-floor
+e31-4 88.92.8.192/26 2a06:5844:e:314::/64 151.216.130.71/24 2a06:5841:f:10:3::71/64 1314 d3-floor
+e31-1 88.92.9.0/26 2a06:5844:e:311::/64 151.216.130.102/24 2a06:5841:f:10:4::102/64 1311 d4-floor
+e31-2 88.92.9.64/26 2a06:5844:e:312::/64 151.216.130.103/24 2a06:5841:f:10:4::103/64 1312 d4-floor
+e33-3 88.92.9.128/26 2a06:5844:e:333::/64 151.216.130.72/24 2a06:5841:f:10:3::72/64 1333 d3-floor
+e33-4 88.92.9.192/26 2a06:5844:e:334::/64 151.216.130.73/24 2a06:5841:f:10:3::73/64 1334 d3-floor
+e33-1 88.92.10.0/26 2a06:5844:e:331::/64 151.216.130.104/24 2a06:5841:f:10:4::104/64 1331 d4-floor
+e33-2 88.92.10.64/26 2a06:5844:e:332::/64 151.216.130.105/24 2a06:5841:f:10:4::105/64 1332 d4-floor
+e35-1 88.92.10.128/26 2a06:5844:e:351::/64 151.216.130.106/24 2a06:5841:f:10:4::106/64 1351 d4-floor
+e35-2 88.92.10.192/26 2a06:5844:e:352::/64 151.216.130.107/24 2a06:5841:f:10:4::107/64 1352 d4-floor
+e37-1 88.92.11.0/26 2a06:5844:e:371::/64 151.216.130.108/24 2a06:5841:f:10:4::108/64 1371 d4-floor
+e37-2 88.92.11.64/26 2a06:5844:e:372::/64 151.216.130.109/24 2a06:5841:f:10:4::109/64 1372 d4-floor
+e39-1 88.92.11.128/26 2a06:5844:e:391::/64 151.216.130.110/24 2a06:5841:f:10:4::110/64 1391 d4-floor
+e39-2 88.92.11.192/26 2a06:5844:e:392::/64 151.216.130.111/24 2a06:5841:f:10:4::111/64 1392 d4-floor
+e41-1 88.92.12.0/26 2a06:5844:e:411::/64 151.216.130.112/24 2a06:5841:f:10:4::112/64 1411 d4-floor
+e41-2 88.92.12.64/26 2a06:5844:e:412::/64 151.216.130.113/24 2a06:5841:f:10:4::113/64 1412 d4-floor
+e43-1 88.92.12.128/26 2a06:5844:e:431::/64 151.216.130.114/24 2a06:5841:f:10:4::114/64 1431 d4-floor
+e43-2 88.92.12.192/26 2a06:5844:e:432::/64 151.216.130.115/24 2a06:5841:f:10:4::115/64 1432 d4-floor
+e45-1 88.92.13.0/26 2a06:5844:e:451::/64 151.216.130.116/24 2a06:5841:f:10:4::116/64 1451 d4-floor
+e45-2 88.92.13.64/26 2a06:5844:e:452::/64 151.216.130.117/24 2a06:5841:f:10:4::117/64 1452 d4-floor
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 09:54:48 +0000