diff options
| -rw-r--r-- | netlist.txt | 22 | ||||
| -rw-r--r-- | patchlist.txt.crew | 20 | ||||
| -rw-r--r-- | switches.txt.crew | 33 | ||||
| -rwxr-xr-x | tools/make-switch-placements.pl | 5 |
4 files changed, 54 insertions, 26 deletions
diff --git a/netlist.txt b/netlist.txt index caad85a..c6bb174 100644 --- a/netlist.txt +++ b/netlist.txt @@ -20,6 +20,28 @@ 151.216.252.0 24 noc 151.216.253.0 24 noc-server 151.216.254.0 24 tele +# Start av switches.txt.crew +151.216.163.0 26 creative1-1 +151.216.163.64 26 creative2-1 +151.216.163.128 26 creative3-1 +151.216.163.192 26 creative4-1 +151.216.164.0 26 creative4-2 +151.216.164.64 26 creative5-1 +151.216.164.128 26 creative5-2 +151.216.164.192 26 creative6-1 +151.216.165.0 26 creative6-2 +151.216.165.64 26 creative7-1 +151.216.165.128 26 creative7-2 +151.216.165.192 26 creative8-1 +151.216.166.0 26 creative8-2 +151.216.166.64 26 crew1-1 +151.216.166.128 26 crew2-1 +151.216.166.192 26 crew2-2 +151.216.167.0 26 crew3-1 +151.216.167.64 26 crew3-2 +151.216.167.128 26 crew4-1 +151.216.167.192 26 crew4-2 +# Slutt av switches.txt.crew # Start av switches.txt fra planning.cpp 151.216.129.0 26 e1-3 151.216.129.64 26 e1-4 diff --git a/patchlist.txt.crew b/patchlist.txt.crew index 12b12cf..34eafd6 100644 --- a/patchlist.txt.crew +++ b/patchlist.txt.crew @@ -1,15 +1,16 @@ creative1-1 creativegw Gi1/1 Gi1/2 creative2-1 creativegw Gi1/3 Gi1/4 creative3-1 creativegw Gi1/5 Gi1/6 -creative3-2 creativegw Gi1/7 Gi1/8 -creative4-1 creativegw Gi1/9 Gi1/10 -creative4-2 creativegw Gi1/11 Gi1/12 -creative5-1 creativegw Gi1/13 Gi1/14 -creative5-2 creativegw Gi1/15 Gi1/16 -creative6-1 creativegw Gi1/17 Gi1/18 -creative6-2 creativegw Gi1/19 Gi1/20 -creative7-1 creativegw Gi1/21 Gi1/22 -creative7-2 creativegw Gi1/23 Gi1/24 +creative4-1 creativegw Gi1/7 Gi1/8 +creative4-2 creativegw Gi1/9 Gi1/10 +creative5-1 creativegw Gi1/11 Gi1/12 +creative5-2 creativegw Gi1/13 Gi1/14 +creative6-1 creativegw Gi1/15 Gi1/16 +creative6-2 creativegw Gi1/17 Gi1/18 +creative7-1 creativegw Gi1/19 Gi1/20 +creative7-2 creativegw Gi1/21 Gi1/22 +creative8-1 creativegw Gi1/23 Gi1/24 +creative8-2 creativegw Gi1/25 Gi1/26 crew1-1 crewgw Gi1/1 Gi1/2 crew2-1 crewgw Gi1/3 Gi1/4 crew2-2 crewgw Gi1/5 Gi1/6 @@ -17,3 +18,4 @@ crew3-1 crewgw Gi1/7 Gi1/8 crew3-2 crewgw Gi1/9 Gi1/10 crew4-1 crewgw Gi1/11 Gi1/12 crew4-2 crewgw Gi1/13 Gi1/14 +komplett distro0 Gi1/31 Gi1/32 Gi1/33 diff --git a/switches.txt.crew b/switches.txt.crew index 2746674..eedafd8 100644 --- a/switches.txt.crew +++ b/switches.txt.crew @@ -1,19 +1,20 @@ 151.216.163.0 26 creative1-1 151.216.163.64 26 creative2-1 151.216.163.128 26 creative3-1 -151.216.163.192 26 creative3-2 -151.216.164.0 26 creative4-1 -151.216.164.64 26 creative4-2 -151.216.164.128 26 creative5-1 -151.216.164.192 26 creative5-2 -151.216.165.0 26 creative6-1 -151.216.165.64 26 creative6-2 -151.216.165.128 26 creative7-1 -151.216.165.192 26 creative7-2 -151.216.166.0 26 crew1-1 -151.216.166.64 26 crew2-1 -151.216.166.128 26 crew2-2 -151.216.166.192 26 crew3-1 -151.216.167.0 26 crew3-2 -151.216.167.64 26 crew4-1 -151.216.167.128 26 crew4-2 +151.216.163.192 26 creative4-1 +151.216.164.0 26 creative4-2 +151.216.164.64 26 creative5-1 +151.216.164.128 26 creative5-2 +151.216.164.192 26 creative6-1 +151.216.165.0 26 creative6-2 +151.216.165.64 26 creative7-1 +151.216.165.128 26 creative7-2 +151.216.165.192 26 creative8-1 +151.216.166.0 26 creative8-2 +151.216.166.64 26 crew1-1 +151.216.166.128 26 crew2-1 +151.216.166.192 26 crew2-2 +151.216.167.0 26 crew3-1 +151.216.167.64 26 crew3-2 +151.216.167.128 26 crew4-1 +151.216.167.192 26 crew4-2 diff --git a/tools/make-switch-placements.pl b/tools/make-switch-placements.pl index fef1ed9..fe33c73 100755 --- a/tools/make-switch-placements.pl +++ b/tools/make-switch-placements.pl @@ -52,11 +52,14 @@ while (<STDIN>) { } elsif ($name =~ /^creative(\d+)-(\d+)$/) { my ($s, $n) = ($1, $2); $x = 973 + 52 * $n; - $y = int(160 + 22.2 * $s); + $y = int(138 + 22.2 * $s); $xx = $x + 52; $yy = $y + 14; if ($s == 2 && $n == 1) { + $xx += 10; + } + if ($s == 3 && $n == 1) { $xx += 20; } } elsif ($name =~ /^crew(\d+)-(\d+)$/) { |