From: root <root@sysrq>
Date: Tue, 3 Apr 2007 16:56:25 +0000 (+0200)
Subject: More changes for TG07.
X-Git-Url: https://git.sesse.net/?p=nms;a=commitdiff_plain;h=b11cda49056ea814b9754f9d20de8cdcad76a053

More changes for TG07.
---

diff --git a/make-all-config.sh b/make-all-config.sh
index 4321b56..276a4d4 100755
--- a/make-all-config.sh
+++ b/make-all-config.sh
@@ -12,3 +12,6 @@ scp mbd-ports *-config sesse@f1:/tftpboot/portcfg/
 
 # regenerate the mbd netlist
 (echo '# Autogenerated. Do not touch!' ; echo "package Config;"; echo 'our @networks = (' ; cut -d" " -f1-2 switches.txt | perl -e 'while (<>) { chomp; my ($net,$mask) = split / /; print "\t\"$net/$mask\",\n"; }' ; echo ');' ; echo '1;')  > mbd/nets.pl 
+
+perl web/make-switches.pl > switches.sql
+scp switches.sql root@space:
diff --git a/web/bg07.png b/web/bg07.png
index 7b65a60..c5c3960 100644
Binary files a/web/bg07.png and b/web/bg07.png differ
diff --git a/web/make-switches.pl b/web/make-switches.pl
index a728ec2..2829ed7 100644
--- a/web/make-switches.pl
+++ b/web/make-switches.pl
@@ -1,5 +1,6 @@
 #! /usr/bin/perl
 
+print "begin;\n";
 print "delete from temppoll;\n";
 print "delete from placements;\n";
 print "delete from dhcp;\n";
@@ -7,79 +8,62 @@ print "delete from switches;\n";
 print "SELECT pg_catalog.setval('switches_switch_seq', 1, false);\n";
 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;
-for $e (1..73) {
-	next if ($e % 2 == 0);
-
-	for $s (1..6) {
-		next if ($s <  4 && $e < 5);
-		next if ($s >= 4 && $e > 72);
-
-		next if ($e >= 69 && ($s == 1 || $s == 6));
-	
-		my $x = int(285 + $e * 9.45);
-		my $y;
-
-		$x += 7 if ($e >= 19);
-		$x += 14 if ($e >= 35);
-		$x += 9 if ($e >= 51);
-		$x += 9 if ($e >= 68 && $s < 4);
-		
-		my ($c, $d);
-		if ($s <= 3) {
-			$c = $e;
-			$d = ($s - 1) * 64;
-
-			$y = 470 - $s * 48;
-		} else {
-			$c = $e + 1;
-			$d = ($s - 4) * 64;
-			
-			$y = 450 - $s * 48 - ($s - 3) * 2;
-		}
-
-		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;
-		}	
-
-		print "insert into switches (ip, sysname, switchtype) values ('81.162.$cc.$dk', '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, '81.162.$c.$d/26');\n";
-		$i++;
-
-		$dd++;
-		if ($dd == 42) {
-			$cc++;
-			$dd = 0;
-		}
+while (<PATCHLIST>) {
+	chomp;
+	my ($name, $distro, $port) = split / /;
+
+	$name =~ /e(\d+)-(\d+)/;
+	my ($e, $s) = ($1, $2);
+
+	my $x = int(202 + $e * 8.25);
+	my $y;
+
+	$x += 7 if ($e >= 19);
+	$x += 14 if ($e >= 35);
+	$x += 9 if ($e >= 51);
+	$x += 9 if ($e >= 68 && $s < 4);
+
+	my ($c, $d);
+	if ($s <= 3) {
+		$c = $e;
+		$d = ($s - 1) * 64;
+
+		$y = 470 - $s * 48;
+	} else {
+		$c = $e + 1;
+		$d = ($s - 4) * 64;
+
+		$y = 400 - $s * 48 - ($s - 3) * 2;
 	}
-}
 
-my @k = qw(
-           81.162.212.0/24|81.162.212.1|game|es3024|((1100,200),(1125,225))
-           81.162.250.0/24|81.162.250.1|noc|es3024|((630,520),(680,550))
-           81.162.252.0/24|81.162.252.1|presse|es3024|((560,520),(610,550))
-           81.162.203.0/24|81.162.203.1|info-desk|es3024|((270,350),(305,385))
-           81.162.213.0/24|81.162.213.1|logistics|es3024|((800,75),(900,100))
-           81.162.213.0/24|81.162.213.1|logistics|es3024|((800,75),(900,100))
-           81.162.200.0/24|81.162.200.1|vision|es3024|((170,240),(200,270))
-           81.162.202.0/24|81.162.202.1|vision-sponsor|es3024|((220,150),(250,180))
-	  );
-	   
-for my $x (@k) {
-	my ($net,$mip,$sysname,$switchtype,$box) = split /\|/, $x;
-	print "insert into switches (ip, sysname, switchtype) values ('$mip', '$sysname', '$switchtype');\n";
-	print "insert into placements (switch, placement) values ($i, box '$box');\n";
-	print "insert into dhcp (switch, network) values ($i, '$net');\n";
+	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;
+	}	
+
+	print "insert into switches (ip, sysname, switchtype) values ('87.76.$cc.$dk', '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";