aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroot <root@frank.tg14.gathering.org>2014-04-17 13:05:23 +0200
committerroot <root@frank.tg14.gathering.org>2014-04-17 13:05:23 +0200
commitaeb2b20fd863f9f93c815ea0cde06ee12ea1a14a (patch)
tree499b28fb46831623b5821934948c7706d46eca9d
parent6e7806dfe2bf62b8f97383cf7ddccb5505b1b3d9 (diff)
More netlists for TG14.
-rwxr-xr-xclients/lldpdiscover.pl4
-rw-r--r--netlist.txt4
-rw-r--r--patchlist.txt.crew2
-rw-r--r--switches.txt.crew2
4 files changed, 11 insertions, 1 deletions
diff --git a/clients/lldpdiscover.pl b/clients/lldpdiscover.pl
index 581f2d8..f72314e 100755
--- a/clients/lldpdiscover.pl
+++ b/clients/lldpdiscover.pl
@@ -37,7 +37,7 @@ while (my $ref = $snmpq->fetchrow_hashref) {
}
# First, find all machines that lack an LLDP chassis ID.
-my $q = $dbh->prepare("SELECT switch, ip, community FROM switches WHERE lldp_chassis_id IS NULL AND ip <> '127.0.0.1' AND switchtype <> 'dlink3100'");
+my $q = $dbh->prepare("SELECT switch, ip, community FROM switches WHERE lldp_chassis_id IS NULL AND ip <> '127.0.0.1'");
$q->execute;
while (my $ref = $q->fetchrow_hashref) {
@@ -55,6 +55,7 @@ while (my $ref = $q->fetchrow_hashref) {
$dbh->rollback;
}
}
+$dbh->commit;
# Now ask all switches for their LLDP neighbor table.
$q = $dbh->prepare("SELECT ip, sysname, community FROM switches WHERE lldp_chassis_id IS NOT NULL AND ip <> '127.0.0.1' AND switchtype <> 'dlink3100'");
@@ -69,6 +70,7 @@ while (my $ref = $q->fetchrow_hashref) {
mylog("ERROR: $@ (during poll of $ip)");
$dbh->rollback;
}
+ $dbh->commit;
}
$dbh->disconnect;
diff --git a/netlist.txt b/netlist.txt
index bda3bc9..62fc8b8 100644
--- a/netlist.txt
+++ b/netlist.txt
@@ -1,5 +1,7 @@
151.216.177.0 25 komplett
151.216.183.0 24 lounge
+151.216.185.0 25 flanke
+151.216.185.128 25 planke
151.216.192.0 19 tg14-wlan
151.216.224.0 24 logistikk
151.216.225.0 24 hoa
@@ -27,6 +29,8 @@
151.216.245.160 27 apenett06
151.216.245.192 27 apekatt
151.216.250.0 24 bordell
+151.216.251.0 25 forsvarlig
+151.216.251.128 25 event-studio
151.216.252.0 24 noc
151.216.253.0 24 noc-server
151.216.254.0 24 tele
diff --git a/patchlist.txt.crew b/patchlist.txt.crew
index 3cf113b..721dad3 100644
--- a/patchlist.txt.crew
+++ b/patchlist.txt.crew
@@ -15,3 +15,5 @@ crew1-1 crewgw Gi1/1 Gi1/2 Gi1/3
crew2-1 crewgw Gi1/4 Gi1/5 Gi1/6
crew3-1 crewgw Gi1/7 Gi1/8 Gi1/9
crew4-1 crewgw Gi1/10 Gi1/11 Gi1/12
+flanke logistikkgw Gi1/47
+planke logistikkgw Gi1/45
diff --git a/switches.txt.crew b/switches.txt.crew
index a6df6a0..7de846a 100644
--- a/switches.txt.crew
+++ b/switches.txt.crew
@@ -15,3 +15,5 @@
151.216.166.128 26 crew2-1
151.216.166.192 26 crew3-1
151.216.167.0 26 crew4-1
+151.216.185.0 25 flanke
+151.216.185.128 25 planke