Jean Tourrilhes
5843bdce91
Fixed HP and OVS scripts parsing of command line options to avoid hanging forever in "test_emergency_table"
64 lines
2.0 KiB
Perl
Executable File
64 lines
2.0 KiB
Perl
Executable File
#!/usr/bin/perl -w
|
|
# Jean Tourrilhes - HP-Labs
|
|
|
|
use Getopt::Long;
|
|
|
|
use OF::OFUtil;
|
|
use Test::TestLib;
|
|
|
|
my $mapFile;
|
|
|
|
# The map file is necessary. It assing the real interface to the
|
|
# fictious names used by the test suite.
|
|
# eth1->eth4 are capture interfaces used to send/receive probe packets
|
|
# eth5->eth8 are configured to run the OpenFlow switch
|
|
# Jean II
|
|
|
|
# Process command line options
|
|
# Don't fail on unrecognised options, those failures are tricky
|
|
# to diagnose. For example projects/controller_disconnect sets --emerg
|
|
# Jean II
|
|
Getopt::Long::Configure( 'pass_through' );
|
|
GetOptions( "map=s" => \$mapFile, );
|
|
Getopt::Long::Configure( 'default' );
|
|
|
|
# If not specified on command line, use enviroment variable.
|
|
# Try specific first, then try generic - Jean II
|
|
if ( (! defined($mapFile) ) && (defined($ENV{'OFT_OVS_MAP_ETH'})) ) {
|
|
$mapFile = "$ENV{OFT_OVS_MAP_ETH}";
|
|
}
|
|
if ( (! defined($mapFile) ) && (defined($ENV{'OFT_MAP_ETH'})) ) {
|
|
$mapFile = "$ENV{OFT_MAP_ETH}";
|
|
}
|
|
|
|
# Set up the mappings
|
|
if ( defined($mapFile) ) {
|
|
nftest_process_iface_map($mapFile);
|
|
}
|
|
|
|
# Debug...
|
|
#for ( my $i = 1 ; $i <= 8 ; $i++ ) {
|
|
# my $iface = nftest_get_iface("eth$i");
|
|
# print "iface($i) = $iface\n";
|
|
#}
|
|
|
|
# Start capturing on eth1->eth4
|
|
setup_pcap_interfaces();
|
|
|
|
# Get the directly where Open vSwitch resides
|
|
my $ovs_dir = $ENV{'OFT_OVS_ROOT'};
|
|
my $of_port = get_of_port();
|
|
|
|
# create Open vSwitch openflow switch on four ports eth5->eth9
|
|
`insmod ${ovs_dir}/datapath/linux-2.6/openvswitch_mod.ko`;
|
|
`${ovs_dir}/utilities/ovs-dpctl add-dp dp0`;
|
|
|
|
for ( my $i = 5 ; $i <= 8 ; $i++ ) {
|
|
my $iface = nftest_get_iface("eth$i");
|
|
`${ovs_dir}/utilities/ovs-dpctl add-if dp0 $iface`;
|
|
}
|
|
|
|
# Up to 0.90.6, you would use secchan, after that you need to use ovs-openflowd
|
|
#system("${ovs_dir}/secchan/secchan dp0 tcp:127.0.0.1:${of_port} --listen=ptcp:6634 --fail=closed --inactivity-probe=999999 &");
|
|
system("${ovs_dir}/utilities/ovs-openflowd dp0 tcp:127.0.0.1:${of_port} --listen=ptcp:6634 --fail=closed --inactivity-probe=999999 &");
|