Mange dager med rot på TG18

4 files changed, 17 insertions, 60 deletions

diff --git a/web/api/public/dhcp b/web/api/public/dhcp
index 0b0bb49..f153a49 100755
--- a/web/api/public/dhcp
+++ b/web/api/public/dhcp
@@ -8,16 +8,16 @@ use warnings;
 use Data::Dumper;
 
 nms::web::setwhen('60m');
-my $q = $nms::web::dbh->prepare('select distinct on (sysname) extract(epoch from date_trunc(\'second\',time)) as time,sysname from dhcp join switches on dhcp.switch = switches.switch where ' . $nms::web::when . ' and switches.deleted = false order by sysname,time desc;');
+my $q = $nms::web::dbh->prepare('select distinct on (name) extract(epoch from date_trunc(\'second\',time)) as time,name from dhcp join networks on dhcp.network = networks.network where ' . $nms::web::when . ' order by name,time desc;');
 $q->execute();
 while ( my $ref = $q->fetchrow_hashref() ) {
-	my $sysname = $ref->{'sysname'};
-	$json{'dhcp'}{$ref->{'sysname'}} = $ref->{'time'};
+	my $sysname = $ref->{'sname'};
+	$json{'dhcp'}{$ref->{'name'}} = $ref->{'time'};
 }
-my $q2 = $nms::web::dbh->prepare("select sysname,count(distinct mac) as clients,count(distinct ip) as addresses,count(mac) as acks from dhcp natural join switches where $nms::web::when and switches.deleted = false group by switches.sysname;");
+my $q2 = $nms::web::dbh->prepare("select name,count(distinct mac) as clients,count(distinct ip) as addresses,count(mac) as acks from dhcp natural join networks where $nms::web::when group by networks.name;");
 $q2->execute();
 while (my $ref = $q2->fetchrow_hashref()) {
-	$nms::web::json{'switches'}{$ref->{sysname}} = $ref;
+	$nms::web::json{'networks'}{$ref->{name}} = $ref;
 }
 
 $nms::web::cc{'max-age'} = "10";
diff --git a/web/api/public/switch-state b/web/api/public/switch-state
index 965e881..19bd771 100755
--- a/web/api/public/switch-state
+++ b/web/api/public/switch-state
@@ -14,9 +14,9 @@ my ($switch, $port) = split(/\//,$target,2);
 my $q;
 
 if (!defined($switch)) {
-	$q = $nms::web::dbh->prepare('select sysname,extract(epoch from date_trunc(\'second\',time)) as time,data from snmp natural join switches where id in (select max(id) from snmp where ' . $nms::web::when . ' and switches.deleted = false group by switch);');
+	$q = $nms::web::dbh->prepare('select sysname,extract(epoch from date_trunc(\'second\',time)) as time,data from snmp natural join switches where id in (select max(id) from snmp where ' . $nms::web::when . ' and switches.deleted = false group by switch) and switches.deleted = false and not switches.tags \?& array[\'switchstateignore\'];');
 } else {
-	$q = $nms::web::dbh->prepare('select sysname,extract(epoch from date_trunc(\'second\',time)) as time,data from snmp natural join switches where id in (select max(id) from snmp where ' . $nms::web::when . 'group by switch) and sysname = ' . $nms::web::dbh->quote($switch) . ' and switches.deleted = false;');
+	$q = $nms::web::dbh->prepare('select sysname,extract(epoch from date_trunc(\'second\',time)) as time,data from snmp natural join switches where id in (select max(id) from snmp where ' . $nms::web::when . 'group by switch) and sysname = ' . $nms::web::dbh->quote($switch) . ' and switches.deleted = false and not switches.tags \?& array[\'switchstateignore\'];');
 }
 
 $q->execute();
@@ -83,9 +83,9 @@ while ( my $ref = $q->fetchrow_hashref() ) {
 nms::web::setwhen('15m','10m');
 my $q2;
 if (!defined($switch)) {
-	$q2 = $nms::web::dbh->prepare('select sysname,extract(epoch from date_trunc(\'second\',time)) as time,data from snmp natural join switches where id in (select max(id) from snmp where ' . $nms::web::when . 'group by switch);');
+	$q2 = $nms::web::dbh->prepare('select sysname,extract(epoch from date_trunc(\'second\',time)) as time,data from snmp natural join switches where id in (select max(id) from snmp where ' . $nms::web::when . ' and switches.deleted = false group by switch) and switches.deleted = false and not switches.tags \?& array[\'switchstateignore\'];');
 } else {
-	$q2 = $nms::web::dbh->prepare('select sysname,extract(epoch from date_trunc(\'second\',time)) as time,data from snmp natural join switches where id in (select max(id) from snmp where ' . $nms::web::when . 'group by switch) and sysname = ' . $nms::web::dbh->quote($switch) . ';');
+	$q2 = $nms::web::dbh->prepare('select sysname,extract(epoch from date_trunc(\'second\',time)) as time,data from snmp natural join switches where id in (select max(id) from snmp where ' . $nms::web::when . 'group by switch) and sysname = ' . $nms::web::dbh->quote($switch) . ' and switches.deleted = false and not switches.tags \?& array[\'switchstateignore\'];');
 }
 
 $q2->execute();
diff --git a/web/api/write/network-update b/web/api/write/network-update
index f6684c5..6344c37 100755
--- a/web/api/write/network-update
+++ b/web/api/write/network-update
@@ -23,51 +23,23 @@ my @dups;
 my $sth = $nms::web::dbh->prepare("SELECT name FROM networks WHERE name=?");
 
 
-my @fields = ('name','last_updated','placement','subnet4','subnet6','gw4','gw6','routing_point','vlan','tags');
-
-sub convertplace
-{
-	my %in = %{$_[0]};
-	my %out = ();
-
-	if (not defined $in{'x1'} and defined($in{'x'})) {
-		$out{'x1'} = int($in{'x'});
-		$out{'y1'} = int($in{'y'});
-		$out{'xx'} = int($in{'x'} + $in{'width'});
-		$out{'yy'} = int($in{'y'} + $in{'height'});
-	} else {
-		return \%in;
-	}
-	return \%out;
-}
+my @fields = ('name','last_updated','subnet4','subnet6','gw4','gw6','routing_point','vlan','tags');
 
 foreach my $tmp2 (@tmp) {
 	my %network = %{$tmp2};
 	my $affected = 0;
 	my %template = ();
 	map { $template{$_} = 'DEFAULT' } @fields;
-	if (not defined($network{'sysname'})) {
+	if (not defined($network{'name'})) {
 		next;
 	}
 
-	$sth->execute( $network{'sysname'});
+	$sth->execute( $network{'name'});
 	while ( my @row = $sth->fetchrow_array ) {
 		$affected += 1;
 	}
 
 	if ($affected == 0) {
-		my %placement;
-		if (not defined ($network{'placement'})) {
-			%placement = guess_placement($network{'sysname'});
-		} else {
-			%placement = %{convertplace($network{'sysname'})};
-		}
-		my ($x1,$x2,$y1,$y2);
-		$x1 = $placement{'x1'};
-		$y1 = $placement{'y1'};
-		$x2 = $placement{'xx'};
-		$y2 = $placement{'yy'};
-		$network{'placement'} = "(($x1,$y1),($x2,$y2))";
 
 		map {
 			if (defined ($template{$_})) {
@@ -76,24 +48,9 @@ foreach my $tmp2 (@tmp) {
 		} keys %network;
 
 
-		$nms::web::dbh->do("INSERT INTO NETWORKS (name, last_updated, placement, subnet4, subnet6, routing_point, gw4, gw6, vlan, tags)  VALUES ($template{'sysname'}, $template{'last_updated'}, $template{'placement'}, $template{'subnet4'}, $template{'subnet6'}, $template{'routing_point'}, $template{'gw4'}, $template{'gw6'}, $template{'vlan'}, $template{'tags'});");
-		push @added, $network{'sysname'};
+		$nms::web::dbh->do("INSERT INTO NETWORKS (name, last_updated, subnet4, subnet6, routing_point, gw4, gw6, vlan, tags)  VALUES ($template{'name'}, $template{'last_updated'}, $template{'subnet4'}, $template{'subnet6'}, $template{'routing_point'}, $template{'gw4'}, $template{'gw6'}, $template{'vlan'}, $template{'tags'});");
+		push @added, $network{'name'};
 	} else {
-		if (defined($network{'placement'})) {
-			my %placement;
-			if ($network{'placement'} eq "reset") {
-				%placement = guess_placement($network{'sysname'});
-			} else {
-				%placement = %{convertplace($network{'placement'})};
-			}
-			my ($x1,$x2,$y1,$y2);
-			$x1 = $placement{'x1'};
-			$y1 = $placement{'y1'};
-			$x2 = $placement{'xx'};
-			$y2 = $placement{'yy'};
-			$network{'placement'} = "(($x1,$y1),($x2,$y2))";
-			push @dups, "not really, but: " . $network{'placement'};
-		}
 		if (defined($network{'tags'})) {
 			$network{'tags'} =~ s/'/"/g;
 		}
@@ -103,8 +60,8 @@ foreach my $tmp2 (@tmp) {
 				push @set, "$_=" . $dbh->quote($network{$_});
 			}
 		} keys %network;
-		$nms::web::dbh->do("UPDATE NETWORKS SET " . join(", ", @set) . "WHERE name=" . $dbh->quote($network{'sysname'}) . ";");
-		push @dups, $network{'sysname'};
+		$nms::web::dbh->do("UPDATE networks SET " . join(", ", @set) . "WHERE name=" . $dbh->quote($network{'name'}) . ";");
+		push @dups, $network{'name'};
 	}
 }
 $json{'networks_addded'} = \@added;
diff --git a/web/api/write/switch-update b/web/api/write/switch-update
index b71548b..bcf69e1 100755
--- a/web/api/write/switch-update
+++ b/web/api/write/switch-update
@@ -23,7 +23,7 @@ my @dups;
 my $sth = $nms::web::dbh->prepare("SELECT sysname FROM switches WHERE sysname=?");
 
 
-my @fields = ( 'community', 'tags', 'distro_name', 'distro_phy_port',  'mgmt_v4_addr', 'mgmt_v4_gw', 'mgmt_v4_netsize', 'mgmt_v6_addr', 'mgmt_v6_gw', 'mgmt_v6_netsize', 'mgmt_vlan', 'placement', 'poll_frequency', 'subnet4', 'subnet6', 'sysname', 'traffic_vlan', 'deleted');
+my @fields = ( 'community', 'tags', 'distro_name', 'distro_phy_port',  'mgmt_v4_addr', 'mgmt_v6_addr', 'mgmt_vlan', 'placement', 'poll_frequency', 'sysname', 'traffic_vlan', 'deleted');
 
 sub convertplace
 {