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

regress: Update OVS scripts for OVS 0.9.2+ command line syntax

Browse Source
This commit is contained in:
Jean Tourrilhes authored and Glen Gibb committed 2010-05-03 16:49:38 -07:00
1 parent 5843bdce91
commit 6ad931ab4f
4 files changed
+25 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

regress/bin/of_ovs_setup.pl
+18 -5
View File
@@ -49,15 +49,28 @@ setup_pcap_interfaces();
my $ovs_dir = $ENV{'OFT_OVS_ROOT'};
my $of_port = get_of_port();
# create Open vSwitch openflow switch on four ports eth5->eth9
# Setup the kernel module
`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`;
# Not needed after 0.99.2
#for ( my $i = 5 ; $i <= 8 ; $i++ ) {
# my $iface = nftest_get_iface("eth$i");
# `${ovs_dir}/utilities/ovs-dpctl add-if dp0 $iface`;
#}
# create command line arguments containing all four ports
my $if_string = '';
for ( my $i = 5 ; $i <= 7 ; $i++ ) {
$if_string .= nftest_get_iface("eth$i") . ',';
}
$if_string .= nftest_get_iface("eth8");
# create Open vSwitch openflow switch on four ports eth5->eth9
system("${ovs_dir}/utilities/ovs-openflowd dp0 --ports=${if_string} tcp:127.0.0.1:${of_port} --listen=ptcp:6634 --fail=closed --inactivity-probe=999999 &");
# For 0.99.0, you'll need to manually add ports as above
#system("${ovs_dir}/utilities/ovs-openflowd dp0 tcp:127.0.0.1:${of_port} --listen=ptcp:6634 --fail=closed --inactivity-probe=999999 &");
# 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 &");
regress/bin/of_ovs_user_setup.pl
+1 -1
View File
@@ -57,4 +57,4 @@ for ( my $i = 5 ; $i <= 7 ; $i++ ) {
$if_string .= nftest_get_iface("eth8");
# create userspace Open vSwitch openflow switch on four ports
system("${ovs_dir}/utilities/ovs-openflowd netdev:br0 --ports=${if_string} tcp:127.0.0.1:${of_port} --listen=ptcp:6634 --fail=closed --inactivity-probe=999999 &");
system("${ovs_dir}/utilities/ovs-openflowd netdev\@br0 --ports=${if_string} tcp:127.0.0.1:${of_port} --listen=ptcp:6634 --fail=closed --inactivity-probe=999999 &");
regress/bin/of_ovs_user_test.pl
+3
View File
@@ -33,6 +33,9 @@ push @ARGV, "--root=$ENV{'OFT_ROOT'}", "--common-st-args=ovs_user", "--controlle
# Use a single random port instead of all four
push @ARGV, "--less_ports";
# Don't bother with QoS currently, it's broken...
push @ARGV, "--no_slicing";
# The bother with emergency flow table tests, it's not supported...
push @ARGV, "--no_emerg";
regress/bin/of_ovs_user_veth_test.pl
+3
View File
@@ -35,6 +35,9 @@ push @ARGV, "--root=$ENV{'OFT_ROOT'}", "--common-st-args=ovs_user", "--controlle
# Use a single random port instead of all four
push @ARGV, "--less_ports";
# Don't bother with QoS currently, it's broken...
push @ARGV, "--no_slicing";
# The bother with emergency flow table tests, it's not supported...
push @ARGV, "--no_emerg";