scripts: Add wlanpros test case script.

And tweak other scripts to make them work better, including taking
a lot of sleeps out of the lf_associate_ap.pl script to speed it up.

lf_associate_ap.pl

@@ -181,7 +181,7 @@ my $usage = qq($0   [--mgr {host-name | IP}]
       [--action {step1,step2,add,del,del_all_phy}]
          # step1: creates <num_stations> stations and L3 connections
          # step2: does bringup test
-         # add: creates virtual radio (optional sta creation using specified virtual radio)
+         # add: creates station on specified radio, or radio if no stations are requested
          # del: Delete the specified port.
          # del_all_phy: Delete all interfaces with the specified parent device.
 
@@ -346,7 +346,6 @@ sub db_exists {
    return 1 if (@match > 0);
 
    print "Warning! Scenario $db_name not found among: ".join(", ", @db_names)."\n";
-   sleep 5;
    return 0;
 }
 
@@ -390,7 +389,6 @@ sub save_db {
    print "Saving database $db_name ...";
    if (db_exists($db_name)==1){
       print "Warning: will over-write database $db_name! ";
-      sleep(1);
    }
    doCmd(fmt_cmd("save", $db_name));
    print "done\n";
@@ -847,8 +845,10 @@ sub awaitStationRemoval {
          print " $sta_name,";
          my $status = $::utils->doAsyncCmd(fmt_cmd("show_port", 1, $::resource, $sta_name));
          $old_sta_count-- if( $status =~ m/Could not find/);
-         #print "$old_sta_count...";
+      }
-         sleep 1;
+      if ($old_sta_count > 0) {
+	#print "$old_sta_count...";
+	sleep 1;
       }
    }
    print " Old stations removed\n";
@@ -866,17 +866,14 @@ sub removeOldCrossConnects {
       doCmd("rm_endp $ep2");
       print " $cx_name ($ep1 - $ep2)...";
    }
-   sleep 1;
    print " done.\n";
 }
 
 sub removeOldStations {
    print "Deleting ports:";
-   sleep 1;
    foreach my $sta_name (reverse sort(keys %::sta_names)) {
       print "...$sta_name ";
       my $status = $::utils->doAsyncCmd(fmt_cmd("show_port", 1, $::resource, $sta_name));
-      sleep 1;
       my $port_id = get_port_id($::resource, $sta_name);
       if($port_id) {
          print "/$port_id";
@@ -899,7 +896,6 @@ sub awaitNewStations {
       my @are_assoc        = ();
       my @not_assoc        = ();
       for my $sta_name (sort(keys(%::sta_names))) {
-         sleep 1;
          my $status     = $::utils->doAsyncCmd(fmt_cmd("show_port", 1, $::resource, $sta_name));
          my %sta_status = get_sta_state(\$status);
          #print " $sta_name ".$sta_status{"assoc"};
@@ -971,14 +967,12 @@ sub evalUnits {
       }
       if ($pref == 0 || $pow == 0) {
          print "Warning: speed coeficients [$pref,$pow] appear suspicious\n";
-         sleep 3;
       }
       my $speed =0 + ($pref * $pow);
       #print ">>>> setting speed to $speed <<<<\n";
       return $speed;
    }
    print "Warning: speed[$val] appears suspicious\n";
-   sleep 3;
    return $val;
 }
 
@@ -1189,7 +1183,7 @@ sub doStep_1 {
    for $sta_name (sort(keys %::sta_names)) {
       # sta, ip, rh, $ip_addr
       print " $sta_name ";
-      new_wifi_station( $sta_name, $::sta_names{$sta_name}, \%results1, $::wifi_mode, 5 );
+      new_wifi_station( $sta_name, $::sta_names{$sta_name}, \%results1, $::wifi_mode, 0);
    }
    print " Created $::num_stations stations\n";
 
@@ -1273,7 +1267,7 @@ sub doStep_2 {
       die("misconfiguration! ") if( ref($sta_name) eq "HASH");
       my $ip = $::sta_names{$sta_name};
       print "$sta_name " unless($::utils->isQuiet());
-      new_wifi_station( $sta_name, $ip, \%results2, $::wifi_mode, 5);
+      new_wifi_station( $sta_name, $ip, \%results2, $::wifi_mode, 0);
 
       # Uncomment to diagnose connection results. The IPs assigned
       # are unlikely to appear instantly, but the mac and entity id
@@ -1329,51 +1323,19 @@ sub doStep_2 {
 
 ## ----- ----- ----- ----- ----- ----- ----- ----- ----- -----
 ##
-##    Create or Delete virtual radio.
+##    Create a station
 ##
 ## ----- ----- ----- ----- ----- ----- ----- ----- ----- -----
 sub doAdd {
-   # create virtual radio
+   # create virtual station
    if ($::num_stations > 0 && defined $::sta_wiphy) {
-      print "Creating virtual radio: $::sta_wiphy with $::num_stations stations.\n" unless($::utils->isQuiet());
       my %results2 = ();
-      new_wifi_radio();
 
       for my $sta_name (sort(keys %::sta_names)) {
 	 die("misconfiguration! ") if( ref($sta_name) eq "HASH");
 	 my $ip = $::sta_names{$sta_name};
 	 new_wifi_station( $sta_name, $ip, \%results2, $::wifi_mode, 0);
       }
-
-      # Wait until the are at least not phantom.
-      my $q;
-      for ($q = 0; $q < 10; $q++) {
-	my $all_done = 1;
-	my @ports = $::utils->getPortListing(1, $::resource);
-	for my $sta_name (sort(keys %::sta_names)) {
-	  my $i;
-	  my $found_it = 0;
-	  for ($i = 0; $i < @ports; $i++) {
-	    my $dev = $ports[$i]->dev();
-	    if ($dev eq $sta_name) {
-	      if (! $ports[$i]->isPhantom()) {
-		$found_it = 1;
-		last;
-	      }
-	    }
-	  }
-	  if (!$found_it) {
-	    print "Station: $sta_name is not found or is phantom.\n";
-	    $all_done = 0;
-	    last;
-	  }
-	}
-	if ($all_done) {
-	  last;
-	}
-	print "Waiting for stations to be created\n";
-	sleep(20);
-      }
    }
    elsif (defined $::sta_wiphy) {
       print "Creating virtual radio: $::sta_wiphy.\n";

lf_firemod.pl

@@ -77,7 +77,7 @@ our @known_tos       = split(',', "DONT-SET,LOWDELAY,THROUGHPUT,RELIABILITY,LOWC
 our $usage = "$0  --action { list_ports | show_port
                             | list_endp | create_endp | create_arm | show_endp | set_endp
                             | do_cmd | start_endp | stop_endp | delete_endp
-                            | create_cx | list_cx | show_cx | delete_cx } ]
+                            | create_cx | list_cx | show_cx | delete_cx | delete_cxe } ]
   [--endp_vals {key,key,key,key}]
       # show_endp output can be narrowed with key-value arguments
       # Examples:
@@ -221,7 +221,7 @@ if ($::do_cmd ne "NA") {
   $::action = "do_cmd";
 }
 our @valid_actions = split(/,/, "show_endp,set_endp,start_endp,stop_endp,delete_endp,create_endp,create_arm,"
-       ."show_port,do_cmd,list_ports,list_endp,create_cx,list_cx,show_cx,delete_cx" );
+       ."show_port,do_cmd,list_ports,list_endp,create_cx,list_cx,show_cx,delete_cx,delete_cxe" );
 
 if (! (grep {$_ eq $::action} @::valid_actions )) {
   die("Invalid action: $::action\n$::usage\n");
@@ -732,6 +732,14 @@ elsif ($::action eq "delete_cx") {
    die("Which cross connect? --cx_name\n$::usage")  if ($::cx_name eq "");
    $::utils->doCmd($::utils->fmt_cmd("rm_cx", $::test_mgr, $::cx_name));
 }
+elsif ($::action eq "delete_cxe") {
+   # require cx_name
+   die("Which test manager?: --test_mgr\n$::usage") if ($::test_mgr eq "");
+   die("Which cross connect? --cx_name\n$::usage")  if ($::cx_name eq "");
+   $::utils->doCmd($::utils->fmt_cmd("rm_cx", $::test_mgr, $::cx_name));
+   $::utils->doCmd($::utils->fmt_cmd("rm_endp", "$::cx_name-A"));
+   $::utils->doCmd($::utils->fmt_cmd("rm_endp", "$::cx_name-B"));
+}
 else {
   die("Unknown action: $::action\n$::usage\n");
 }

lf_portmod.pl

@@ -52,7 +52,7 @@ my $card             = 1;
 my $list_ports       = "";
 my $port_name        = "";
 my $cmd              = "";
-our $quiet            = 0;
+our $quiet            = 1;
 my $load             = "";
 my $amt_resets       = 1;
 my $max_port_name    = 0;
@@ -80,7 +80,7 @@ my $NOT_FOUND        = "-not found-";
 ########################################################################
 
 my $usage = "$0  --port_name {name | number}
---cmd             { reset }
+--cmd             { reset | delete }
 [--manager        { network address of LANforge manager} ]
 [--cli_cmd        { lf-cli-command text } ]
 [--amt_resets     { number (0 means forever) } ]
@@ -487,5 +487,11 @@ if ($cmd eq "reset") {
   }#while
 }
 
+if ($cmd eq "delete") {
+  print("Deleting port: ${shelf_num}.${card}.${port_name}\n");
+  $cli_cmd = "rm_vlan $shelf_num $card $port_name";
+  $utils->doCmd($cli_cmd);
+}
+
 close(CMD_LOG);
 exit(0);

lf_vue_mod.sh

@@ -244,7 +244,9 @@ if [ -z "$resource" ]; then
   exit 1
 fi
 
-cd $SCRIPTDIR
+# Assume we are already in the right directory...doing a cd here breaks
+# running scripts from any other directory. --Ben
+#cd $SCRIPTDIR
 case "$action" in
   list_ports)
     do_firemod --action list_ports

wlanpro_test.pl

@@ -0,0 +1,360 @@
+#!/usr/bin/perl -w
+#
+# Data should be 500 bytes
+# Test rig is one upstream wired system, which will be the manager as well as resource
+# One ct523b as resource2, and a stand-by ct523b as resource3
+# WPA2 PSK encryption
+
+# 3x3 client testing:
+# 20 clients uploading for 30 sec
+# 20 clients downloading 30 sec
+# 40 clients upload + download 1 minute
+# Quiesce and wait 30 seconds
+
+# 2x2:  Same
+# 1x2:  Same
+
+# Mixed mode:  10 3x3, 15 2x2, 15 1x1  (Same data pattern)
+
+# Mixed With interference: Same as mixed mode
+# Assume other test EQ is doing interference?
+
+# Each ct523b has 4 radios.  We will spread stations among them.
+
+use strict;
+use Getopt::Long;
+
+my $pld_size = 500;
+my $ssid = "wlanpro";
+my $psk = "wlanpro_passwd";
+my $radio_3a = "wiphy0";
+my $radio_3b = "wiphy0";
+my $radio_4a = "wiphy1";
+my $radio_4b = "wiphy1";
+my $sta_max = 40;
+my $resource = 2;
+my $speed_dl_tot = 1000000000;
+my $speed_ul_tot = 1000000000;
+my $testcase = -1;
+my $manager = "localhost";
+my $log_name = "wlanpro_log_" . time() . ".txt";
+
+my $endp_type = "lf_udp";
+my $security = "wpa2";
+my $upstream_resource = 1;
+my $upstream_port = "eth1";
+my $multicon = 1;
+my $rest_time = 30;
+my $quiet = "yes";
+my $report_timer = 1000; # 1 second report timer
+
+my $usage = "$0
+  [--pld_size { bytes } ]
+  [--ssid {ssid}]
+  [--passphrase {password}]
+  [--3a {wiphy-radio-3x3-a}]
+  [--3b {wiphy-radio-3x3-b}]
+  [--4a {wiphy-radio-4x4-a}]
+  [--4b {wiphy-radio-4x4-b}]
+  [--resource {resource-number}]
+  [--upstream_resource {resource-number}]
+  [--upstream_port {port}]
+  [--speed_ul_tot {speed-bps}]
+  [--speed_dl_tot {speed-bps}]
+  [--manager {manager-machine IP or hostname}]
+  [--testcase {test-case:  -1 all, 0 setup, 1 case 1 ..}]
+  [--log_name {log-file-name}]
+";
+
+
+GetOptions (
+	    'pld_size=i'     => \$pld_size,
+	    'ssid=s'         => \$ssid,
+	    'passphrase=s'   => \$psk,
+	    '3a=s'           => \$radio_3a,
+	    '3b=s'           => \$radio_3b,
+	    '4a=s'           => \$radio_4a,
+	    '4b=s'           => \$radio_4b,
+	    'resource=i'     => \$resource,
+	    'upstream_resource=i' => \$upstream_resource,
+	    'upstream_port=s' => \$upstream_port,
+	    'speed_ul_tot=s' => \$speed_ul_tot,
+	    'speed_dl_tot=s' => \$speed_dl_tot,
+	    'manager=s'      => \$manager,
+	    'mgr=s'          => \$manager,
+	    'testcase=i'     => \$testcase,
+	    'log_name=s'     => \$log_name,
+	   ) || (print($usage) && exit(1));
+
+my @radios = ($radio_3a, $radio_3b, $radio_4a, $radio_4b);
+my $radio_count = @radios;
+my $i;
+my $cmd;
+
+# Initial setup for test cases, create 40 stations
+my @cxs = ();
+my @stations = ();
+
+open(LOGF, ">$log_name") or die("Could not open log file: $log_name $!\n");
+
+# Set radios to 3x3 mode.
+if ($testcase == -1 || $testcase == 0) {
+  for ($i = 0; $i<$radio_count; $i++) {
+    my $radio = $radios[$i];
+    my $set_cmd = "set_wifi_radio 1 $resource $radio NA NA NA NA NA NA NA NA NA 7";
+    $cmd = "./lf_firemod.pl --mgr $manager --action do_cmd --cmd \"$set_cmd\"";
+    do_cmd($cmd);
+  }
+}
+
+for ($i = 0; $i < $sta_max; $i++) {
+  my $sta_idx = $i + 100;
+  my $radio_idx = $i % $radio_count;
+  my $radio = $radios[$radio_idx];
+  my $sta_name = "sta$sta_idx";
+
+  @stations = (@stations, $sta_name);
+
+  if ($testcase == -1 || $testcase == 0) {
+    $cmd = "./lf_vue_mod.sh --mgr $manager --create_sta --resource $resource --name $sta_name  --radio $radio --security $security --ssid $ssid --passphrase $psk";
+    do_cmd($cmd);
+  }
+  # Create data connection
+  my $cxn = "l3-${sta_name}";
+  my $endpa = "$cxn-A";
+  my $endpb = "$cxn-B";
+  my $pkt_sz ="--min_pkt_sz $pld_size --max_pkt_sz $pld_size";
+  my $gen_args = "--mgr $manager --multicon $multicon $pkt_sz --endp_type $endp_type --action create_endp --report_timer $report_timer";
+
+  if ($testcase == -1 || $testcase == 0) {
+    $cmd = "./lf_firemod.pl --resource $resource $gen_args --endp_name $endpa --speed 0 --port_name $sta_name";
+    do_cmd($cmd);
+
+    $cmd = "./lf_firemod.pl --resource $upstream_resource $gen_args --endp_name $endpb --speed 0 --port_name $upstream_port";
+    do_cmd($cmd);
+
+    $cmd = "./lf_firemod.pl --mgr $manager --action create_cx --cx_name $cxn --cx_endps $endpa,$endpb --report_timer $report_timer";
+    do_cmd($cmd);
+  }
+
+  @cxs = (@cxs, $cxn);
+}
+
+stop_all_my_cx();
+
+if ($testcase == -1 || $testcase == 1) {
+  wait_for_stations();
+  do_test_series();
+}
+
+if ($testcase == -1 || $testcase == 2) {
+  # Test case 2, set stations to 2x2 and re-test
+  for ($i = 0; $i<$radio_count; $i++) {
+    my $radio = $radios[$i];
+    my $set_cmd = "set_wifi_radio 1 $resource $radio NA NA NA NA NA NA NA NA NA 4";
+    $cmd = "./lf_firemod.pl --mgr $manager --action do_cmd --cmd \"$set_cmd\"";
+    do_cmd($cmd);
+  }
+
+  wait_for_stations();
+  do_test_series();
+}
+
+if ($testcase == -1 || $testcase == 3) {
+  # Test case 3, set stations to 1x1 and re-test
+  for ($i = 0; $i<$radio_count; $i++) {
+    my $radio = $radios[$i];
+    my $set_cmd = "set_wifi_radio 1 $resource $radio NA NA NA NA NA NA NA NA NA 1";
+    $cmd = "./lf_firemod.pl --mgr $manager --action do_cmd --cmd \"$set_cmd\"";
+    do_cmd($cmd);
+  }
+
+  wait_for_stations();
+  do_test_series();
+}
+
+
+# Mixed mode test:  10 3x3, 15 2x2, 15 1x1  (Same data pattern)
+if ($testcase == -1 || $testcase == 4 || $testcase == 5) {
+  # Set radio back to full antenna capacity
+  for ($i = 0; $i<$radio_count; $i++) {
+    my $radio = $radios[$i];
+    my $set_cmd = "set_wifi_radio 1 $resource $radio NA NA NA NA NA NA NA NA NA 0";
+    $cmd = "./lf_firemod.pl --mgr $manager --action do_cmd --cmd \"$set_cmd\"";
+    do_cmd($cmd);
+  }
+
+  for ($i = 0; $i<10; $i++) {
+    my $sta_name = $stations[$i];
+    $cmd = "./lf_portmod.pl  --quiet $quiet --manager $manager --card $resource --port_name $sta_name --wifi_mode 8 --set_speed \"v-3 Streams /AC\"";
+    do_cmd($cmd);
+  }
+  for ($i = 10; $i<25; $i++) {
+    my $sta_name = $stations[$i];
+    $cmd = "./lf_portmod.pl --quiet $quiet --manager $manager --card $resource --port_name $sta_name --wifi_mode 8 --set_speed \"v-2 Streams /AC\"";
+    do_cmd($cmd);
+  }
+  for ($i = 25;$ i<40; $i++) {
+    my $sta_name = $stations[$i];
+    $cmd = "./lf_portmod.pl --quiet $quiet --manager $manager --card $resource --port_name $sta_name --wifi_mode 8 --set_speed \"v-1 Stream /AC\"";
+    do_cmd($cmd);
+  }
+
+  if ($testcase == -1 || $testcase == 4) {
+    wait_for_stations();
+    do_test_series();
+  }
+}
+
+if ($testcase == -1 || $testcase == 5) {
+  wait_for_stations();
+  do_test_series();
+}
+
+if ($testcase == 100) {
+  # Cleanup
+  for ($i = 0; $i<@stations; $i++) {
+    my $sta_name = $stations[$i];
+    $cmd = "./lf_portmod.pl  --quiet $quiet --mgr $manager --resource $resource --cmd delete --port_name $sta_name";
+    do_cmd("$cmd\n");
+  }
+
+  for ($i = 0; $i<@cxs; $i++) {
+    my $cxn = $cxs[$i];
+    $cmd = "./lf_firemod.pl --mgr $manager --action delete_cxe --cx_name $cxn";
+    do_cmd($cmd);
+  }
+}
+
+exit 0;
+
+# Wait until all stations are associated and have IP addresses.
+sub wait_for_stations {
+  # Wait until stations are associated, return count
+  my $j;
+  for ($j = 0; $j<60; $j++) {
+    my $all_up = 1;
+    for ($i = 0; $i<@stations; $i++) {
+      my $sta_name = $stations[$i];
+      $cmd = "./lf_portmod.pl  --quiet $quiet --mgr $manager --resource $resource --show_port AP,IP --port_name $sta_name";
+      logp("$cmd\n");
+      my @output = `$cmd`;
+      if ($output[0] =~ "AP: Not-Associated") {
+	logp("Station $sta_name is not associated, waiting...\n");
+	sleep(1);
+	$all_up = 0;
+	last;
+      }
+      if ($output[1] =~ "IP: 0.0.0.0") {
+	logp("Station $sta_name does not have an IP address, waiting...\n");
+	sleep(1);
+	$all_up = 0;
+	last;
+      }
+    }
+
+    if ($all_up) {
+      last;
+    }
+  }
+}
+
+sub do_one_test {
+  my $speed_ul = shift;
+  my $speed_dl = shift;
+  my $cx_cnt = shift;
+  my $sleep_sec = shift;
+
+  # Download for X seconds
+  for ($i = 0; $i<$cx_cnt; $i++) {
+    my $cxn = $cxs[$i];
+    my $endpa = "$cxn-A";
+    my $endpb = "$cxn-B";
+
+    $cmd = "./lf_firemod.pl --mgr $manager --action set_endp --endp_name $endpa --speed $speed_ul";
+    do_cmd($cmd);
+
+    $cmd = "./lf_firemod.pl --mgr $manager --action set_endp --endp_name $endpb --speed $speed_dl";
+    do_cmd($cmd);
+
+    $cmd = "./lf_firemod.pl --mgr $manager --action do_cmd --cmd \"set_cx_state default_tm $cxn RUNNING\"";
+    do_cmd($cmd);
+  }
+
+  logp("Waiting $sleep_sec seconds for test to run, $cx_cnt connections, configured speed, UL: $speed_ul  DL: $speed_dl....\n\n");
+  sleep($sleep_sec);
+
+  logp("Gathering stats for this test run...\n");
+
+  # Gather stats data
+  my $sp;
+  for ($i = 0; $i<$cx_cnt; $i++) {
+    my $cxn = $cxs[$i];
+    $sp = `./lf_portmod.pl --manager $manager --cli_cmd "show_cxe $cxn"`;
+    logf("$sp\n");
+  }
+
+  # Station stats
+  for ($i = 0; $i<@stations; $i++) {
+    my $sta_name = $stations[$i];
+    $sp = `./lf_portmod.pl --manager $manager --cli_cmd "show_port 1 $resource $sta_name"`;
+    logf("$sp\n");
+  }
+
+  # Radio stats
+  for ($i = 0; $i<@radios; $i++) {
+    my $name = $radios[$i];
+    $sp = `./lf_portmod.pl --manager $manager --cli_cmd "show_port 1 $resource $name"`;
+    logf("$sp\n");
+  }
+
+  # Upstream port
+  $sp = `./lf_portmod.pl --manager $manager --cli_cmd "show_port 1 $upstream_resource $upstream_port"`;
+  logf("$sp\n");
+
+  # TODO: Gather specific stats?
+
+  stop_all_my_cx();
+}
+
+sub stop_all_my_cx {
+  my $i;
+
+  for ($i = 0; $i<@cxs; $i++) {
+    my $cxn = $cxs[$i];
+    $cmd = "./lf_firemod.pl --mgr $manager --action do_cmd --cmd \"set_cx_state default_tm $cxn STOPPED\"";
+    do_cmd($cmd);
+  }
+}
+
+sub logf {
+  my $text = shift;
+  print LOGF $text;
+}
+
+sub logp {
+  my $text = shift;
+  print LOGF $text;
+  print $text; # to std-out too
+}
+
+sub do_test_series {
+  # First test case, 20 stations downloading, 3x3 mode.
+  logp("\nDoing download test with 20 stations.\n");
+  do_one_test(0, $speed_dl_tot / 20, 20, 30);
+  # Upload 30 sec
+  logp("\nDoing upload test with 20 stations.\n");
+  do_one_test($speed_ul_tot / 20, 0, 20, 30);
+  # Upload/Download 1 minute sec
+  logp("\nDoing upload/download test with 40 stations.\n");
+  do_one_test($speed_ul_tot / 40, $speed_dl_tot / 40, 40, 60);
+
+  logp("Sleeping $rest_time seconds at end of test series...\n\n");
+  sleep($rest_time);
+}
+
+sub do_cmd {
+  my $cmd = shift;
+  logp("$cmd\n");
+  return system($cmd);
+}