scottk/wlan-lanforge-scripts
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-lanforge-scripts.git synced 2025-11-03 04:07:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Utils: subroutines work better by defining anonymous references at the start

Browse Source
This commit is contained in:
Jed Reynolds
2020-03-03 21:38:36 -08:00
parent 45b4512ba2
commit 9e657cd66d
1 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
LANforge/Utils.pm
View File

@@ -428,8 +428,9 @@ sub sleep_sec {
sub get_eid_map { sub get_eid_map {
my ($self, $resource) = @_; my ($self, $resource) = @_;
my %eid_map = (); my $rh_eid_map = {};
my @ports_lines = split("\n", $self->doAsyncCmd("nc_show_ports 1 $resource ALL")); my @ports_lines = split("\n", $self->doAsyncCmd("nc_show_ports 1 $resource ALL"));
sleep 1;
chomp(@ports_lines); chomp(@ports_lines);
my ($eid, $card, $port, $type, $mac, $dev, $parent, $ip); my ($eid, $card, $port, $type, $mac, $dev, $parent, $ip);
@@ -446,16 +447,15 @@ sub get_eid_map {
# careful about that comma after card! # careful about that comma after card!
# NO EID for Shelf: 1, Card: 1, Port: 2 Type: WIFI-Radio Alias: # NO EID for Shelf: 1, Card: 1, Port: 2 Type: WIFI-Radio Alias:
($card, $port, $type) = $line =~ m/^Shelf: 1, Card: (\d+),\s+Port: (\d+)\s+Type: (\w+)/; ($card, $port, $type) = $line =~ m/^Shelf: 1, Card: (\d+),\s+Port: (\d+)\s+Type: (\w+)/;
if ((defined $card) && ($card ne "") && (defined $port) && ($port ne "")) { if ((defined $card) && ($card ne "") && (defined $port) && ($port ne "") && ($type ne "VRF")) {
$eid = "1.${card}.${port}"; $eid = "1.".$card.".".$port;
my $rh_eid = { my $rh_eid = {
eid => $eid, eid => $eid,
type => $type, type => $type,
parent => undef, parent => undef,
dev => undef, dev => undef,
}; };
$eid_map{$eid} = $rh_eid; $rh_eid_map->{$eid} = $rh_eid;
#print "\nfound eid $eid\n";
} }
#elsif ($line =~ /^Shelf/) { #elsif ($line =~ /^Shelf/) {
# #print "NO EID for $line\n"; # #print "NO EID for $line\n";
@@ -467,28 +467,42 @@ sub get_eid_map {
} }
($mac, $dev) = $line =~ / MAC: ([0-9:a-fA-F]+)\s+DEV: (\S+)/; ($mac, $dev) = $line =~ / MAC: ([0-9:a-fA-F]+)\s+DEV: (\S+)/;
if ((defined $mac) && ($mac ne "")) { if ((defined $mac) && ($mac ne "")) {
#print "$eid MAC: $line\n"; #print "$eid MAC: $line\n";
$eid_map{$eid}->{mac} = $mac; $rh_eid_map->{$eid}->{mac} = $mac;
$eid_map{$eid}->{dev} = $dev; $rh_eid_map->{$eid}->{dev} = $dev;
} }
($parent) = $line =~ / Parent.Peer: (\S+) /; ($parent) = $line =~ / Parent.Peer: (\S+) /;
if ((defined $parent) && ($parent ne "")) { if ((defined $parent) && ($parent ne "")) {
#print "$eid PARENT: $line\n"; #print "$eid PARENT: $line\n";
$eid_map{$eid}->{parent} = $parent; $rh_eid_map->{$eid}->{parent} = $parent;
} }
($ip) = $line =~ m/ IP: *([^ ]+) */; ($ip) = $line =~ m/ IP: *([^ ]+) */;
if ((defined $ip) && ($ip ne "")) { if ((defined $ip) && ($ip ne "")) {
#print "$eid IP: $line\n"; #print "$eid IP: $line\n";
$eid_map{$eid}->{ip} = $ip; $rh_eid_map->{$eid}->{ip} = $ip;
} }
} # foreach } # foreach
#foreach $eid (keys %eid_map) { #foreach $eid (keys %eid_map) {
# print "eid $eid "; # print "eid $eid ";
#} #}
return \%eid_map; return $rh_eid_map;
}
##
##
##
sub find_by_name {
my ($self, $rh_eid_map, $devname) = @_;
while (my ($eid, $rh_rec) = each %{$rh_eid_map}) {
#print "fbn: ".$rh_rec->{dev}."\n";
if ((defined $rh_rec->{dev}) && ($rh_rec->{dev} eq $devname)) {
return $rh_rec;
}
}
return -1;
} }
## ##
@@ -496,15 +510,20 @@ sub get_eid_map {
## EG: $ra_interfaces = $u->ports_on_radio($rh_eid_map, $radio_name); ## EG: $ra_interfaces = $u->ports_on_radio($rh_eid_map, $radio_name);
## ##
sub ports_on_radio { sub ports_on_radio {
my ($self, $rh_eid_map, $radio) = @_; my ($self, $rh_rec2_map, $radio) = @_;
my @interfaces = (); my $ra_ifs = [];
while (my ($eid, $rh_eid) = each %$rh_eid_map) { #print "PARENT IS $radio\n";
if ((defined $rh_eid->{parent}) && ($rh_eid->{parent} eq $radio)) {
push(@interfaces, $rh_eid->{dev}); foreach my $rh_rec2 (values %{$rh_rec2_map}) {
next if (!(defined $rh_rec2->{parent}));
#print "\npor: ".$rh_rec2->{parent}.">".$rh_rec2->{dev}."\n";
if ($rh_rec2->{parent} eq $radio) {
#print $rh_rec2->{dev}."<-".$rh_rec2->{parent}." ";
my $devn = $rh_rec2->{dev};
push(@$ra_ifs, $devn);
} }
} }
return $ra_ifs;
return \@interfaces;
} }
1; # So the require or use succeeds (perl stuff) 1; # So the require or use succeeds (perl stuff)