Merge.

[nms] / web / make-switches.pl

diff --git a/web/make-switches.pl b/web/make-switches.pl
index e1d3fe9b3c4f400bfabc3a7e585317889723a2f6..9283546e2e0cf7023706f752305582c7af6de9e8 100644 (file)
--- a/web/make-switches.pl
+++ b/web/make-switches.pl
@@ -11,9 +11,6 @@ print "SELECT pg_catalog.setval('polls_poll_seq', 1, false);\n";
 open PATCHLIST, "patchlist.txt"
        or die "patchlist.txt: $!";
 
-my $cc = 241;
-my $dd = 0;
-
 my $i = 1;
 while (<PATCHLIST>) {
        chomp;
@@ -46,24 +43,31 @@ while (<PATCHLIST>) {
        my $xx = $x + 12;
        my $yy = $y + (($s > 3) ? 50 : 48);
 
-       $dk = $dd + 7 + ($cc - 241) * 42;
-
-# lasses magic-factor =)
-       $dk += 4;
-       if ($dk > 13) {
-               $dk += 3;
-       }       
+       my ($ip, $range);
+       if ($s == 1) {
+               $ip = "87.76." . ($e) . ".2";
+               $range = "87.76." . ($e) . ".0";
+       } elsif ($s == 2) {
+               $ip = "87.76." . ($e) . ".66";
+               $range = "87.76." . ($e) . ".64";
+       } elsif ($s == 3) {
+               $ip = "87.76." . ($e) . ".130";
+               $range = "87.76." . ($e) . ".128";
+       } elsif ($s == 4) {
+               $ip = "87.76." . ($e + 1) . ".2";
+               $range = "87.76." . ($e + 1) . ".0";
+       } elsif ($s == 5) {
+               $ip = "87.76." . ($e + 1) . ".66";
+               $range = "87.76." . ($e + 1) . ".64";
+       } elsif ($s == 6) {
+               $ip = "87.76." . ($e + 1) . ".130";
+               $range = "87.76." . ($e + 1) . ".128";
+       }
 
-       print "insert into switches (ip, sysname, switchtype) values ('87.76.$cc.$dk', 'e$e-${s}sw', 'es3024');\n";
+       print "insert into switches (ip, sysname, switchtype) values ('$ip', 'e$e-${s}sw', 'es3024');\n";
        print "insert into placements (switch, placement) values ($i, box '(($x,$y),($xx,$yy))');\n";
        print "insert into dhcp (switch, network) values ($i, '87.76.$c.$d/26');\n";
        $i++;
-
-       $dd++;
-       if ($dd == 42) {
-               $cc++;
-               $dd = 0;
-       }
 }
 
 print "end;\n";