SunnyQjm/openflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

regress: improve handling of --controller cmd line arg

Browse Source 
Change submitted by: Jean Tourrilhes <jt@hpl.hp.com>
This commit is contained in:
Glen Gibb
2010-03-04 17:04:36 -08:00
parent ad4e98a1bd
commit 9bcf899001
2 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
regress/lib/Perl5/OF/OFUtil.pm
+2 -1
View File
@@ -454,7 +454,8 @@ sub run_learning_switch_test {
# Assume fully qualified string :
# tcp:<controller>:<port>
# Jean II
($proto, $host, $port) = split(/:/,$options{'controller'});
($controller, $failover) = split(/,/,$options{'controller'});
($proto, $host, $port) = split(/:/,$controller);
# Check for string missing the protocol - Jean II
if ( ! defined ($port) ) {
die "Invalid controller string $options{'controller'}"
regress/projects/black_box/regress/test_failover_startup/run.pl
+19 -11
View File
@@ -18,22 +18,30 @@
use strict;
use OF::Includes;
use Getopt::Long;
my $test="Failover test 1 (startup failover)";
# If no controllers specified, use default
if (not @ARGV =~ "--controller") {
push( @ARGV, "--controller=" . nftest_default_controllers() );
}
my $controllers;
# Replace --controller=foo,bar with --controller=bar so that
# run_black_box_test() will use bar's port rather than foo's
for (my $i = 0; $i < @ARGV; $i++) {
if ($ARGV[$i] =~ /controller=[^,]*,([^\s]+)/ ) {
print "failover_startup: got controller $1\n";
$ARGV[$i] = "--controller=$1";
}
# Remove '--controller' from the option list... - Jean II
Getopt::Long::Configure( 'pass_through' );
unless (
GetOptions(
"controller=s" => \$controllers
) )
{
# If no controllers specified, use default
$controllers = nftest_default_controllers();
}
Getopt::Long::Configure( 'default' );
# Get controller
my @controller_array = split(/,/, $controllers);
my $failover_controller = @controller_array[1];
# Push back a controller string
push( @ARGV, "--controller=$failover_controller" );
print "$test: Calling run_black_box_test with @ARGV\n";