diff options
| author | Nicolai Tellefsen <niccofyren@gmail.com> | 2016-03-25 01:32:13 +0100 |
|---|---|---|
| committer | Nicolai Tellefsen <niccofyren@gmail.com> | 2016-03-25 01:32:13 +0100 |
| commit | 1daa378e1eeb92c3e838f80de929707ba8ed7c63 (patch) | |
| tree | 4936595a15460dd537ba46cc2c106567deca2ee8 /web/nms.gathering.org/api | |
| parent | 60af50c7b3bb7a818e1e25641fae6d0069759665 (diff) | |
| parent | 7ac4551ed94c1f1393bc69e595a90dbe15bc8f6c (diff) | |
Merge branch 'master' of ssh://github.com/tech-server/tgmanage
Diffstat (limited to 'web/nms.gathering.org/api')
| -rwxr-xr-x | web/nms.gathering.org/api/public/switch-state | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/web/nms.gathering.org/api/public/switch-state b/web/nms.gathering.org/api/public/switch-state index 2fff681..0e28cfd 100755 --- a/web/nms.gathering.org/api/public/switch-state +++ b/web/nms.gathering.org/api/public/switch-state @@ -19,7 +19,7 @@ while ( my $ref = $q->fetchrow_hashref() ) { for my $porti (keys %{$data{'ports'}}) { my %port = %{$data{'ports'}{$porti}}; my $smallport = $porti; - if (not $smallport =~ m/^ae/) { + if (not $smallport =~ m/^ae/ and not $smallport =~ m/^et/) { $smallport =~ s/[0-9-].*$//; } else { $json{'switches'}{$sysname}{ifs}{$smallport}{'ifAlias'} = $port{'ifAlias'}; @@ -59,7 +59,7 @@ while ( my $ref = $q2->fetchrow_hashref() ) { for my $porti (keys %{$data{'ports'}}) { my %port = %{$data{'ports'}{$porti}}; my $smallport = $porti; - if (not $smallport =~ m/^ae/) { + if (not $smallport =~ m/^ae/ and not $smallport =~ m/^et/) { $smallport =~ s/[0-9-].*$//; } else { $json{'then'}{$sysname}{ifs}{$smallport}{'ifAlias'} = $port{'ifAlias'}; |