diff options
| author | Kristian Lyngstol <kly@kly.no> | 2016-03-17 21:31:30 +0000 |
|---|---|---|
| committer | Kristian Lyngstol <kly@kly.no> | 2016-03-17 21:31:30 +0000 |
| commit | b7887d4b7181e057d77a5f5d093de0400052bd0b (patch) | |
| tree | 5c5653a19c9469bd2923fd11015cbfe06ef7e2b3 /web/nms.gathering.org | |
| parent | 151f2403dec93d32199afea4ceff9833b8980cf4 (diff) | |
| parent | 8eb1b43ce136e808fbd90aeb11eecd03eaa821d8 (diff) | |
Merge branch 'master' of ssh://github.com/tech-server/tgmanage
Diffstat (limited to 'web/nms.gathering.org')
| -rwxr-xr-x | web/nms.gathering.org/api/private/switch-add | 8 | ||||
| -rwxr-xr-x | web/nms.gathering.org/api/private/switches-management | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/web/nms.gathering.org/api/private/switch-add b/web/nms.gathering.org/api/private/switch-add index 979a1d8..3d7b119 100755 --- a/web/nms.gathering.org/api/private/switch-add +++ b/web/nms.gathering.org/api/private/switch-add @@ -22,7 +22,7 @@ my @dups; my $sth = $nms::web::dbh->prepare("SELECT sysname FROM switches WHERE sysname=?"); -my @fields = ('ip', 'sysname', 'switchtype', 'last_updated', 'locked', 'poll_frequency', 'community', 'lldp_chassis_id', 'secondary_ip', 'subnet4', 'subnet6', 'placement'); +my @fields = ('ip', 'sysname', 'switchtype', 'last_updated', 'locked', 'poll_frequency', 'community', 'lldp_chassis_id', 'secondary_ip', 'subnet4', 'subnet6', 'placement', 'distro', 'secondary_ip'); sub convertplace { @@ -64,6 +64,9 @@ foreach my $tmp2 (@tmp) { if (not defined($switch{'ip'}) and defined($switch{'mgtmt4'})) { $switch{'ip'} = $switch{'mgtmt4'}; } + if (not defined($switch{'secondary_ip'}) and defined($switch{'mgtmt6'})) { + $switch{'secondary_ip'} = $switch{'mgtmt6'}; + } my ($x1,$x2,$y1,$y2); $x1 = $placement{'x1'}; $y1 = $placement{'y1'}; @@ -99,6 +102,9 @@ foreach my $tmp2 (@tmp) { if (not defined($switch{'ip'}) and defined($switch{'mgtmt4'})) { $switch{'ip'} = $switch{'mgtmt4'}; } + if (not defined($switch{'secondary_ip'}) and defined($switch{'mgtmt6'})) { + $switch{'secondary_ip'} = $switch{'mgtmt6'}; + } my @set; map { if (defined($template{$_})) { diff --git a/web/nms.gathering.org/api/private/switches-management b/web/nms.gathering.org/api/private/switches-management index 543d08d..6b5fdcd 100755 --- a/web/nms.gathering.org/api/private/switches-management +++ b/web/nms.gathering.org/api/private/switches-management @@ -12,7 +12,7 @@ use Data::Dumper; $nms::web::cc{'max-age'} = "60"; -my $q2 = $nms::web::dbh->prepare('select sysname,ip,poll_frequency,community,subnet4,subnet6,last_updated from switches '); +my $q2 = $nms::web::dbh->prepare('select sysname,ip,poll_frequency,community,subnet4,subnet6,distro,last_updated from switches '); $q2->execute(); while (my $ref = $q2->fetchrow_hashref()) { |