scottk/wlan-lanforge-scripts
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-lanforge-scripts.git synced 2025-10-31 10:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

lf_associate: adds timings to avoid creating redundant EIDs between add_vsta and set_port: manager cannot drain request queue fast enough

Browse Source
This commit is contained in:
Jed Reynolds
2020-01-13 12:26:18 -08:00
parent a5cac378bb
commit b371a8a649
1 changed files with 42 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
lf_associate_ap.pl
View File

@@ -46,6 +46,29 @@ use Getopt::Long;
no warnings 'portable'; # Support for 64-bit ints required no warnings 'portable'; # Support for 64-bit ints required
use Socket; use Socket;
our $binsleep = 0;
if ( -x "/bin/sleep" || -x "/usr/bin/sleep") {
$::binsleep = 1;
}
sub altsleep {
my ($time) = @_;
if ($::binsleep) {
`sleep $time`;
}
elsif ( $time < 1) {
sleep(1);
}
elsif (int($time) != $time) {
$time += 1.0;
$time = int($time);
sleep($time);
}
else {
sleep($time);
}
}
# Un-buffer output # Un-buffer output
$| = 1; $| = 1;
use Cwd qw(getcwd); use Cwd qw(getcwd);
@@ -786,6 +809,7 @@ sub new_wifi_station {
$::utils->doCmd($sta1_cmd); $::utils->doCmd($sta1_cmd);
$sta1_cmd = fmt_port_cmd($resource, $sta_name, $ip_addr, $mac_addr); $sta1_cmd = fmt_port_cmd($resource, $sta_name, $ip_addr, $mac_addr);
$::utils->doCmd($sta1_cmd); $::utils->doCmd($sta1_cmd);
#$::utils->doAsyncCmd($::utils->fmt_cmd("nc_show_port", 1, $::resource, $sta_name));
if ($::admin_down_on_add) { if ($::admin_down_on_add) {
my $cur_flags = 0x1; # port down my $cur_flags = 0x1; # port down
my $ist_flags = 0x800000; # port down my $ist_flags = 0x800000; # port down
@@ -920,6 +944,11 @@ sub removeOldStations {
$::utils->doCmd($::utils->fmt_cmd("rm_vlan", 1, $::resource, $sta_name)); $::utils->doCmd($::utils->fmt_cmd("rm_vlan", 1, $::resource, $sta_name));
} }
} }
sleep(1);
# force a refresh on them so phantom doesn't show
foreach my $sta_name (reverse sort(keys %::sta_names)) {
my $status = $::utils->doAsyncCmd($::utils->fmt_cmd("nc_show_port", 1, $::resource, $sta_name));
}
print " done.\n"; print " done.\n";
} }
@@ -1216,12 +1245,25 @@ sub doStep_1 {
# create stations # create stations
print " Creating new stations: "; print " Creating new stations: ";
my $i = 0;
for $sta_name (sort(keys %::sta_names)) { for $sta_name (sort(keys %::sta_names)) {
# sta, ip, rh, $ip_addr # sta, ip, rh, $ip_addr
print " $sta_name "; print " $sta_name ";
new_wifi_station( $sta_name, $::sta_names{$sta_name}, \%results1, $::wifi_mode, 0); new_wifi_station( $sta_name, $::sta_names{$sta_name}, \%results1, $::wifi_mode, 0);
altsleep(0.12);
altsleep(0.6) if (($i % 5) == 0);
$i++;
} }
sleep(1);
#print "**************************************************\n";
foreach my $sta_name (sort(keys %::sta_names)) {
my $status = $::utils->doAsyncCmd($::utils->fmt_cmd("nc_show_port", 1, $::resource, $sta_name));
}
sleep(1);
#print "**************************************************\n";
print " Created $::num_stations stations\n"; print " Created $::num_stations stations\n";
sleep(1);
my $new_sta_count = keys %results1; my $new_sta_count = keys %results1;
my $found_stations = 0; my $found_stations = 0;