From bb862773d69bc5997bd1628a3f0505827e7cfe5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20Lyngst=C3=B8l?= <kly@kly.no>
Date: Mon, 10 Apr 2017 14:06:23 +0200
Subject: TG17 stuff ?

---
 web/api/public/distro-tree       | 25 +++++++++++++++++++++++++
 web/api/public/switch-state      | 22 ++++++++++++++++++++--
 web/api/read/distro-tree         | 25 -------------------------
 web/api/read/switches-management |  4 ++--
 4 files changed, 47 insertions(+), 29 deletions(-)
 create mode 100755 web/api/public/distro-tree
 delete mode 100755 web/api/read/distro-tree

(limited to 'web/api')

diff --git a/web/api/public/distro-tree b/web/api/public/distro-tree
new file mode 100755
index 0000000..5d93e1b
--- /dev/null
+++ b/web/api/public/distro-tree
@@ -0,0 +1,25 @@
+#! /usr/bin/perl
+# vim:ts=8:sw=8
+
+use CGI qw(fatalsToBrowser);
+use DBI;
+use lib '/opt/gondul/include';
+use nms;
+use nms::web;
+use strict;
+use warnings;
+use Data::Dumper;
+
+$nms::web::cc{'max-age'} = "20";
+
+my $q2 = $nms::web::dbh->prepare('select sysname,distro_phy_port,distro_name from switches where placement is not null and distro_name is not null and distro_phy_port is not null');
+
+$q2->execute();
+while (my $ref = $q2->fetchrow_hashref()) {
+	my $sysname = $ref->{'sysname'};
+	my $phy = $ref->{'distro_phy_port'};
+	my $distro = $ref->{'distro_name'};
+	$nms::web::json{'distro-tree'}{$distro}{$phy} = $sysname;
+}
+
+finalize_output();
diff --git a/web/api/public/switch-state b/web/api/public/switch-state
index 8e98205..36dfeaf 100755
--- a/web/api/public/switch-state
+++ b/web/api/public/switch-state
@@ -40,7 +40,7 @@ while ( my $ref = $q->fetchrow_hashref() ) {
 			$json{'switches'}{$sysname}{ifs}{$smallport}{'ifAlias'} = $port{'ifAlias'};
 		}
 		if ($data{'ports'}{$porti}{'ifType'} ne "propVirtual" and
-		    $data{'ports'}{$porti}{'ifAlias'} =~ m/trunk/i) {
+		    $data{'ports'}{$porti}{'ifAlias'} =~ m/LAG member/i) {
 			$json{'switches'}{$sysname}{'uplinks'}{'ifHCInOctets'} += $port{'ifHCInOctets'};
 			$json{'switches'}{$sysname}{'uplinks'}{'ifHCOutOctets'} += $port{'ifHCOutOctets'};
 			if ($port{'ifOperStatus'} eq "up") {
@@ -48,6 +48,15 @@ while ( my $ref = $q->fetchrow_hashref() ) {
 			}
 			$json{'switches'}{$sysname}{'uplinks'}{'total'} += 1;
 		}
+		if ($data{'ports'}{$porti}{'ifType'} ne "propVirtual" and
+		    $data{'ports'}{$porti}{'ifAlias'} =~ m/Clients/i) {
+			$json{'switches'}{$sysname}{'clients'}{'ifHCInOctets'} += $port{'ifHCInOctets'};
+			$json{'switches'}{$sysname}{'clients'}{'ifHCOutOctets'} += $port{'ifHCOutOctets'};
+			if ($port{'ifOperStatus'} eq "up") {
+				$json{'switches'}{$sysname}{'clients'}{'live'} += 1;
+			}
+			$json{'switches'}{$sysname}{'clients'}{'total'} += 1;
+		}
 		$json{'switches'}{$sysname}{ifs}{$smallport}{'ifHCInOctets'} += $port{'ifHCInOctets'} || 0;
 		$json{'switches'}{$sysname}{ifs}{$smallport}{'ifHCOutOctets'} += $port{'ifHCOutOctets'} || 0;
 		$json{'switches'}{$sysname}{totals}{'ifHCInOctets'} += $port{'ifHCInOctets'} || 0;
@@ -91,7 +100,7 @@ while ( my $ref = $q2->fetchrow_hashref() ) {
 			$json{'then'}{$sysname}{ifs}{$smallport}{'ifAlias'} = $port{'ifAlias'};
 		}
 		if ($data{'ports'}{$porti}{'ifType'} ne "propVirtual" and
-		    $data{'ports'}{$porti}{'ifAlias'} =~ m/trunk/i) {
+		    $data{'ports'}{$porti}{'ifAlias'} =~ m/LAG member/i) {
 			$json{'then'}{$sysname}{'uplinks'}{'ifHCInOctets'} += $port{'ifHCInOctets'};
 			$json{'then'}{$sysname}{'uplinks'}{'ifHCOutOctets'} += $port{'ifHCOutOctets'};
 			if ($port{'ifOperStatus'} eq "up") {
@@ -99,6 +108,15 @@ while ( my $ref = $q2->fetchrow_hashref() ) {
 			}
 			$json{'then'}{$sysname}{'uplinks'}{'total'} += 1;
 		}
+		if ($data{'ports'}{$porti}{'ifType'} ne "propVirtual" and
+		    $data{'ports'}{$porti}{'ifAlias'} =~ m/Clients/i) {
+			$json{'then'}{$sysname}{'clients'}{'ifHCInOctets'} += $port{'ifHCInOctets'};
+			$json{'then'}{$sysname}{'clients'}{'ifHCOutOctets'} += $port{'ifHCOutOctets'};
+			if ($port{'ifOperStatus'} eq "up") {
+				$json{'then'}{$sysname}{'clients'}{'live'} += 1;
+			}
+			$json{'then'}{$sysname}{'clients'}{'total'} += 1;
+		}
 
 		$json{'then'}{$sysname}{ifs}{$smallport}{'ifHCInOctets'} += $port{'ifHCInOctets'} || 0;
 		$json{'then'}{$sysname}{ifs}{$smallport}{'ifHCOutOctets'} += $port{'ifHCOutOctets'} || 0;
diff --git a/web/api/read/distro-tree b/web/api/read/distro-tree
deleted file mode 100755
index 5d93e1b..0000000
--- a/web/api/read/distro-tree
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /usr/bin/perl
-# vim:ts=8:sw=8
-
-use CGI qw(fatalsToBrowser);
-use DBI;
-use lib '/opt/gondul/include';
-use nms;
-use nms::web;
-use strict;
-use warnings;
-use Data::Dumper;
-
-$nms::web::cc{'max-age'} = "20";
-
-my $q2 = $nms::web::dbh->prepare('select sysname,distro_phy_port,distro_name from switches where placement is not null and distro_name is not null and distro_phy_port is not null');
-
-$q2->execute();
-while (my $ref = $q2->fetchrow_hashref()) {
-	my $sysname = $ref->{'sysname'};
-	my $phy = $ref->{'distro_phy_port'};
-	my $distro = $ref->{'distro_name'};
-	$nms::web::json{'distro-tree'}{$distro}{$phy} = $sysname;
-}
-
-finalize_output();
diff --git a/web/api/read/switches-management b/web/api/read/switches-management
index 425262e..9d8bc53 100755
--- a/web/api/read/switches-management
+++ b/web/api/read/switches-management
@@ -20,9 +20,9 @@ $nms::web::cc{'max-age'} = "5";
 $nms::web::cc{'stale-while-revalidate'} = "30";
 
 if (!defined($switch)) {
-	$q2 = $nms::web::dbh->prepare('select sysname,mgmt_v4_addr,subnet4,subnet6,mgmt_v6_addr,mgmt_v4_gw,mgmt_v6_gw,mgmt_vlan,traffic_vlan,poll_frequency,last_updated,distro_name,distro_phy_port,community from switches where placement is not null');
+	$q2 = $nms::web::dbh->prepare('select sysname,host(mgmt_v4_addr) as mgmt_v4_addr,subnet4,subnet6,host(mgmt_v6_addr) as mgmt_v6_addr,host(mgmt_v4_gw) as mgmt_v4_gw,host(mgmt_v6_gw) as mgmt_v6_gw,mgmt_vlan,traffic_vlan,poll_frequency,last_updated,distro_name,distro_phy_port,community from switches where placement is not null');
 } else {
-	$q2 = $nms::web::dbh->prepare('select sysname,mgmt_v4_addr,subnet4,subnet6,mgmt_v6_addr,mgmt_v4_gw,mgmt_v6_gw,mgmt_vlan,traffic_vlan,poll_frequency,last_updated,distro_name,distro_phy_port,community from switches where placement is not null and sysname = ' . $nms::web::dbh->quote($switch) . ';');
+	$q2 = $nms::web::dbh->prepare('select sysname,host(mgmt_v4_addr) as mgmt_v4_addr,subnet4,subnet6,host(mgmt_v6_addr) as mgmt_v6_addr,host(mgmt_v4_gw) as mgmt_v4_gw,host(mgmt_v6_gw) as mgmt_v6_gw,mgmt_vlan,traffic_vlan,poll_frequency,last_updated,distro_name,distro_phy_port,community from switches where placement is not null and sysname = ' . $nms::web::dbh->quote($switch) . ';');
 }
 
 $q2->execute();
-- 
cgit v1.2.3