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

port_test now correctly balances station names and vsta aliases

Browse Source
This commit is contained in:
Jed Reynolds
2018-09-13 18:52:21 -07:00
parent e0930f7506
commit e774089dfc
1 changed files with 35 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
json/port_test.pl
View File

@@ -71,7 +71,7 @@ my @destroy_me = ();
for my $rh_alias_link (@$ra_alias_links) { for my $rh_alias_link (@$ra_alias_links) {
push(@destroy_me, $rh_alias_link) push(@destroy_me, $rh_alias_link)
if (($rh_alias_link->{'uri'} =~m{^/port/1/[3]/}) if (($rh_alias_link->{'uri'} =~m{^/port/1/[3]/})
&& ($rh_alias_link->{'alias'} =~m{^sta})); && ($rh_alias_link->{'alias'} =~m{^v*sta}));
push(@radios, $rh_alias_link) push(@radios, $rh_alias_link)
if (($rh_alias_link->{'uri'} =~m{^/port/1/[3]/}) if (($rh_alias_link->{'uri'} =~m{^/port/1/[3]/})
&& ($rh_alias_link->{'alias'} =~m{^wiphy})); && ($rh_alias_link->{'alias'} =~m{^wiphy}));
@@ -92,8 +92,7 @@ for my $rh_target (@destroy_me) {
}; };
logg(" $alias"); logg(" $alias");
my $rh_response = json_post("/cli-json/rm_vlan", $rh_data); my $rh_response = json_post("/cli-json/rm_vlan", $rh_data);
usleep (15000); usleep (25000);
#sleep (5);
} }
my $rh_update = { my $rh_update = {
'shelf'=>1, 'resource'=>'all', 'port'=>'all', 'flags'=>'0x1' 'shelf'=>1, 'resource'=>'all', 'port'=>'all', 'flags'=>'0x1'
@@ -102,7 +101,7 @@ logg(" updating ");
my $rh_response = json_post("/cli-json/nc_show_ports", $rh_update); my $rh_response = json_post("/cli-json/nc_show_ports", $rh_update);
# this really should poll for ports to wait for them to disappear # this really should poll for ports to wait for them to disappear
sleep 2; sleep 3;
my @new_stations = (); my @new_stations = ();
logg("\nCreating new stations on these: "); logg("\nCreating new stations on these: ");
@@ -114,11 +113,13 @@ my $range;
my $num_sta = 129; my $num_sta = 129;
my $radio_num; my $radio_num;
my $radio_counter = 0; my $radio_counter = 0;
# add_sta + ht20 -ht40 -ht80 -create_admin_down
# flags=142609408&mode=8
for $rh_radio (@radios) { for $rh_radio (@radios) {
$radio_name = $rh_radio->{'alias'}; $radio_name = $rh_radio->{'alias'};
my @hunks = split(/[\/]/, $rh_radio->{'uri'}); my @hunks = split(/[\/]/, $rh_radio->{'uri'});
($radio_num) = $radio_name =~ /wiphy(\d+)/; ($radio_num) = $radio_name =~ /wiphy(\d+)/;
next if ($radio_num < 2);
$resource = $hunks[3]; $resource = $hunks[3];
$range = ($resource * 1000) + ($radio_num * 100); $range = ($resource * 1000) + ($radio_num * 100);
logg("\n/cli-json/add_sta = "); logg("\n/cli-json/add_sta = ");
@@ -129,61 +130,67 @@ for $rh_radio (@radios) {
'resource'=>$resource, 'resource'=>$resource,
'radio'=>$radio_name, 'radio'=>$radio_name,
'sta_name'=>'sta'.$radio_counter, 'sta_name'=>'sta'.$radio_counter,
'alias'=>'vsta'.$i, #'alias'=>'vsta'.$i, # deprecated, use set_port_alias
'flags'=>68862086144, # has port-down set #'flags'=>68862086144, # has port-down set
'flags'=>142609408,
'ssid'=>'idtest-1200-wpa2', 'ssid'=>'idtest-1200-wpa2',
'key'=>'idtest-1200-wpa2', 'key'=>'idtest-1200-wpa2',
'mac'=>'xx:xx:xx:xx:*:xx', 'mac'=>'xx:xx:xx:xx:*:xx',
'mode'=>0, 'mode'=>0,
'rate'=>'DEFAULT', 'rate'=>'DEFAULT'
'suppress_postexec'=>'true' #'suppress_postexec'=>'true' # suppress_postexec now defaults to true
}; };
#print Dumper($rh_data); #print Dumper($rh_data);
logg("1/$resource/$radio_name -> sta$radio_counter"); logg("1/$resource/$radio_name -> sta$radio_counter");
my $rh_response = json_post("/cli-json/add_sta", $rh_data); my $rh_response = json_post("/cli-json/add_sta", $rh_data);
print Dumper($rh_response) usleep(25000);
if ( defined $rh_response->{"Resource"}
&& defined $rh_response->{"Resource"}->{"warnings"});
print Dumper($rh_response)
if ( defined $rh_response->{"errors"}
|| defined $rh_response->{"error_list"});
usleep(10000);
$radio_counter +=1; $radio_counter +=1;
} }
} }
logg(" updating "); logg(" updating ");
$rh_response = json_post("/cli-json/nc_show_ports", $rh_update); $rh_response = json_post("/cli-json/nc_show_ports", $rh_update);
sleep 2; sleep 2;
$radio_counter = 0;
for $rh_radio (@radios) { for $rh_radio (@radios) {
$radio_name = $rh_radio->{'alias'}; $radio_name = $rh_radio->{'alias'};
my @hunks = split(/[\/]/, $rh_radio->{'uri'}); my @hunks = split(/[\/]/, $rh_radio->{'uri'});
($radio_num) = $radio_name =~ /wiphy(\d+)/; ($radio_num) = $radio_name =~ /wiphy(\d+)/;
next if ($radio_num < 2);
$resource = $hunks[3]; $resource = $hunks[3];
$range = ($resource * 1000) + ($radio_num * 100); $range = ($resource * 10000) + ($radio_num * 1000);
$radio_counter = 0;
# set_port - port up, enable dhcp
# current_flags=2147483648&interest=16386
for (my $i = $range; $i < ($range+$num_sta); $i++) { for (my $i = $range; $i < ($range+$num_sta); $i++) {
print "sta$radio_counter = vsta$i [ $range .. ".($range+$num_sta)."] 1/$resource/$radio_num $radio_name \n";
my $rh_data = { my $rh_data = {
'shelf'=>1,
'resource'=>$resource,
'port'=>'sta'.$radio_counter,
'alias'=>'vsta'.$i
};
$rh_response = json_post("/cli-json/set_port", $rh_data);
usleep(10000);
# set port up + dhcp
$rh_data = {
'shelf'=>1, 'shelf'=>1,
'resource'=>$resource, 'resource'=>$resource,
'port'=>'sta'.$radio_counter, 'port'=>'sta'.$radio_counter,
'cmd_flags'=>0, 'cmd_flags'=>0,
'current_flags'=>2147483648, 'current_flags'=>2147483648,
'suppress_postexec'=>'true', #'suppress_postexec'=>'true',
'interest'=>16386 'interest'=>16386
}; };
# TODO: create JsonUtils::set_dhcp($eid, $alias, $on_off) # TODO: create JsonUtils::set_dhcp($eid, $alias, $on_off)
my $rh_response = json_post("/cli-json/set_port", $rh_data); my $rh_response = json_post("/cli-json/set_port", $rh_data);
#print Dumper($rh_response);
$radio_counter+=1; $radio_counter+=1;
usleep(21000); usleep(10000);
} }
} }
logg(" updating "); logg(" updating ");
$rh_response = json_post("/cli-json/nc_show_ports", $rh_update); $rh_response = json_post("/cli-json/nc_show_ports", $rh_update);
sleep 1; sleep 2;
for $uri (@$ra_links) { for $uri (@$ra_links) {
$uri =~ s{/resource}{/port}g; $uri =~ s{/resource}{/port}g;
$uri .= "/list" $uri .= "/list"
@@ -213,6 +220,7 @@ for my $port_uri (@links2) {
"interest" => 8388610 "interest" => 8388610
); );
my $rh_response = json_post($set_port, \%post); my $rh_response = json_post($set_port, \%post);
usleep(10000);
} }
logg(" updating "); logg(" updating ");
$rh_response = json_post("/cli-json/nc_show_ports", $rh_update); $rh_response = json_post("/cli-json/nc_show_ports", $rh_update);
@@ -236,8 +244,8 @@ for my $port_uri (@links2) {
"interest" => 8388610 "interest" => 8388610
); );
my $rh_response = json_post($set_port, \%post); my $rh_response = json_post($set_port, \%post);
usleep(10000);
} }
logg(" updating "); logg(" updating ");
$rh_response = json_post("/cli-json/nc_show_ports", $rh_update); $rh_response = json_post("/cli-json/nc_show_ports", $rh_update);
#
#