X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Fovs-vsctl.at;h=440bf1ae9d8f8ca4464fde19862bd7d83225442a;hb=28c5588e8e1a8d091c5d2275232c35f2968a97fa;hp=7488e3dd6d38723f9926ee964c7284c2ba0592f3;hpb=0a140468ddcff3f767a3069fe3303c7ae000a855;p=sliver-openvswitch.git diff --git a/tests/ovs-vsctl.at b/tests/ovs-vsctl.at index 7488e3dd6..440bf1ae9 100644 --- a/tests/ovs-vsctl.at +++ b/tests/ovs-vsctl.at @@ -4,7 +4,7 @@ dnl Creates an empty database in the current directory and then starts dnl an ovsdb-server on it for ovs-vsctl to connect to. m4_define([OVS_VSCTL_SETUP], [OVSDB_INIT([db]) - AT_CHECK([ovsdb-server --detach --pidfile=$PWD/pid --remote=punix:socket --unixctl=$PWD/unixctl db >/dev/null 2>&1], [0], [ignore], [ignore])]) + AT_CHECK([ovsdb-server --detach --no-chdir --pidfile="`pwd`"/pid --remote=punix:socket --unixctl="`pwd`"/unixctl db >/dev/null 2>&1], [0], [ignore], [ignore])]) dnl OVS_VSCTL_CLEANUP dnl @@ -15,17 +15,17 @@ dnl RUN_OVS_VSCTL(COMMAND, ...) dnl dnl Executes each ovs-vsctl COMMAND. m4_define([RUN_OVS_VSCTL], - [m4_foreach([command], [$@], [ovs-vsctl --timeout=5 --no-wait -vreconnect:ANY:emer --db=unix:socket -- command + [m4_foreach([command], [$@], [ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket command ])]) m4_define([RUN_OVS_VSCTL_ONELINE], - [m4_foreach([command], [$@], [ovs-vsctl --timeout=5 --no-wait -vreconnect:ANY:emer --db=unix:socket --oneline -- command + [m4_foreach([command], [$@], [ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline -- command ])]) dnl RUN_OVS_VSCTL_TOGETHER(COMMAND, ...) dnl dnl Executes each ovs-vsctl COMMAND in a single run of ovs-vsctl. m4_define([RUN_OVS_VSCTL_TOGETHER], - [ovs-vsctl --timeout=5 --no-wait -vreconnect:ANY:emer --db=unix:socket --oneline dnl + [ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket --oneline dnl m4_foreach([command], [$@], [ -- command])]) dnl CHECK_BRIDGES([BRIDGE, PARENT, VLAN], ...) @@ -73,7 +73,7 @@ m4_define([CHECK_BRIDGES], dnl Check that each bridge exists according to br-exists and that dnl a bridge that should not exist does not. - m4_foreach([brinfo], [$@], + m4_foreach([brinfo], [$@], [AT_CHECK([RUN_OVS_VSCTL([br-exists m4_car(brinfo)])], [0], [], [], [OVS_VSCTL_CLEANUP])]) AT_CHECK([RUN_OVS_VSCTL([br-exists nonexistent])], [2], [], [], @@ -111,7 +111,7 @@ m4_define([CHECK_PORTS], ], [OVS_VSCTL_CLEANUP]) m4_foreach( - [port], m4_cdr($@), + [port], m4_cdr($@), [AT_CHECK([RUN_OVS_VSCTL([[port-to-br] port])], [0], [$1 ], [], [OVS_VSCTL_CLEANUP])])]) @@ -134,11 +134,45 @@ m4_define([CHECK_IFACES], ], [OVS_VSCTL_CLEANUP]) m4_foreach( - [iface], m4_cdr($@), + [iface], m4_cdr($@), [AT_CHECK([RUN_OVS_VSCTL([[iface-to-br] iface])], [0], [$1 ], [], [OVS_VSCTL_CLEANUP])])]) +dnl ---------------------------------------------------------------------- +AT_BANNER([ovs-vsctl unit tests]) + +AT_SETUP([ovs-vsctl connection retry]) +OVS_RUNDIR=$PWD; export OVS_RUNDIR + +dnl Without --retry, there should be no retry for active connections. +AT_CHECK([ovs-vsctl --db=unix:foo --timeout=10 -vreconnect:emer -- init], + [1], [], [stderr]) +AT_CHECK([[sed 's/([^()]*)/(...reason...)/' stderr]], [0], + [ovs-vsctl: unix:foo: database connection failed (...reason...) +]) + +dnl With --retry, we should retry for active connections. +AT_CHECK( + [ovs-vsctl --db=unix:foo --timeout=1 --retry -vreconnect:emer -vPATTERN:console:'%c|%p|%m' -- init + echo $? > status], + [0], [], [stderr]) +AT_CHECK([grep -c 'terminating with signal' stderr], [0], [1 +]) +AT_CHECK([kill -l `cat status`], [0], [ALRM +]) + +dnl Without --retry, we should retry for passive connections. +AT_CHECK( + [ovs-vsctl --db=punix:foo --timeout=1 -vreconnect:emer -vPATTERN:console:'%c|%p|%m' -- init + echo $? > status], + [0], [], [stderr]) +AT_CHECK([grep -c 'terminating with signal' stderr], [0], [1 +]) +AT_CHECK([kill -l `cat status`], [0], [ALRM +]) +AT_CLEANUP + dnl ---------------------------------------------------------------------- AT_BANNER([ovs-vsctl unit tests -- real bridges]) @@ -190,6 +224,26 @@ CHECK_IFACES([b]) OVS_VSCTL_CLEANUP AT_CLEANUP +AT_SETUP([add-br a, del-br a, add-br a]) +AT_KEYWORDS([ovs-vsctl]) +OVS_VSCTL_SETUP +AT_CHECK([RUN_OVS_VSCTL_TOGETHER( + [add-br a], + [del-br a], + [add-br a], + [set Interface a other_config:key=value], + [get Interface a other_config:key])], [0], [ + + + +value +], [], [OVS_VSCTL_CLEANUP]) +CHECK_BRIDGES([a, a, 0]) +CHECK_PORTS([a]) +CHECK_IFACES([a]) +OVS_VSCTL_CLEANUP +AT_CLEANUP + AT_SETUP([add-br a, add-port a a1, add-port a a2]) AT_KEYWORDS([ovs-vsctl]) OVS_VSCTL_SETUP @@ -208,7 +262,7 @@ AT_SETUP([add-br a, add-port a a1, add-port a a1]) AT_KEYWORDS([ovs-vsctl]) OVS_VSCTL_SETUP AT_CHECK([RUN_OVS_VSCTL( - [add-br a], + [add-br a], [add-port a a1])], [0], [], [], [OVS_VSCTL_CLEANUP]) AT_CHECK([RUN_OVS_VSCTL([add-port a a1])], [1], [], [ovs-vsctl: cannot create a port named a1 because a port named a1 already exists on bridge a @@ -220,8 +274,8 @@ AT_SETUP([add-br a b, add-port a a1, add-port b b1, del-br a]) AT_KEYWORDS([ovs-vsctl]) OVS_VSCTL_SETUP AT_CHECK([RUN_OVS_VSCTL_TOGETHER( - [add-br a], - [add-br b], + [add-br a], + [add-br b], [add-port a a1], [add-port b b1], [--if-exists del-port b b2], @@ -242,11 +296,11 @@ AT_SETUP([add-br a, add-bond a bond0 a1 a2 a3]) AT_KEYWORDS([ovs-vsctl]) OVS_VSCTL_SETUP AT_CHECK([RUN_OVS_VSCTL( - [add-br a], + [add-br a], [add-bond a bond0 a1 a2 a3])], [0], [], [], [OVS_VSCTL_CLEANUP]) AT_CHECK([RUN_OVS_VSCTL([--may-exist add-bond a bond0 a3 a1 a2])], [0], [], [], [OVS_VSCTL_CLEANUP]) -AT_CHECK([RUN_OVS_VSCTL([--may-exist add-bond a bond0 a2 a1])], [1], [], +AT_CHECK([RUN_OVS_VSCTL([--may-exist add-bond a bond0 a2 a1])], [1], [], [ovs-vsctl: "--may-exist add-bond a bond0 a2 a1" but bond0 actually has interface(s) a1, a2, a3 ], [OVS_VSCTL_CLEANUP]) @@ -260,8 +314,8 @@ AT_SETUP([add-br a b, add-port a a1, add-port b b1, del-port a a1]) AT_KEYWORDS([ovs-vsctl]) OVS_VSCTL_SETUP AT_CHECK([RUN_OVS_VSCTL( - [add-br a], - [add-br b], + [add-br a], + [add-br b], [add-port a a1 tag=9], [get port a1 tag], [--may-exist add-port b b1], @@ -269,7 +323,13 @@ AT_CHECK([RUN_OVS_VSCTL( ], [], [OVS_VSCTL_CLEANUP]) AT_CHECK([RUN_OVS_VSCTL([--may-exist add-port b b1])], [0], [], [], [OVS_VSCTL_CLEANUP]) -AT_CHECK([RUN_OVS_VSCTL([--may-exist add-port a b1])], [1], [], +AT_CHECK([RUN_OVS_VSCTL([del-port a])], [1], [], + [ovs-vsctl: cannot delete port a because it is the local port for bridge a (deleting this port requires deleting the entire bridge) +], + [OVS_VSCTL_CLEANUP]) +AT_CHECK([RUN_OVS_VSCTL([--if-exists del-port a])], [0], [], [], + [OVS_VSCTL_CLEANUP]) +AT_CHECK([RUN_OVS_VSCTL([--may-exist add-port a b1])], [1], [], [ovs-vsctl: "--may-exist add-port a b1" but b1 is actually attached to bridge b ], [OVS_VSCTL_CLEANUP]) @@ -285,7 +345,7 @@ AT_SETUP([add-br a, add-bond a bond0 a1 a2 a3, del-port bond0]) AT_KEYWORDS([ovs-vsctl]) OVS_VSCTL_SETUP AT_CHECK([RUN_OVS_VSCTL_TOGETHER( - [add-br a], + [add-br a], [add-bond a bond0 a1 a2 a3 tag=9], [get Port bond0 tag], [del-port bond0])], [0], [ @@ -302,7 +362,7 @@ AT_SETUP([external IDs]) AT_KEYWORDS([ovs-vsctl]) OVS_VSCTL_SETUP AT_CHECK([RUN_OVS_VSCTL_ONELINE( - [add-br a], + [add-br a], [add-port a a1], [add-bond a bond0 a2 a3], [br-set-external-id a key0 value0], @@ -358,7 +418,7 @@ AT_SETUP([controllers]) AT_KEYWORDS([controller ovs-vsctl]) OVS_VSCTL_SETUP AT_CHECK([RUN_OVS_VSCTL_TOGETHER( - [add-br br0], + [add-br br0], [get-controller br0], [set-controller br0 tcp:4.5.6.7], @@ -381,8 +441,7 @@ OVS_VSCTL_CLEANUP AT_CLEANUP dnl ---------------------------------------------------------------------- -AT_BANNER([ovs-vsctl unit tests -- fake bridges]) - +dnl OVS_VSCTL_SETUP_SIMPLE_FAKE_CONF([VLAN]) m4_define([OVS_VSCTL_SETUP_SIMPLE_FAKE_CONF], [AT_CHECK( [RUN_OVS_VSCTL( @@ -390,36 +449,56 @@ m4_define([OVS_VSCTL_SETUP_SIMPLE_FAKE_CONF], [--may-exist add-br xenbr0], [add-port xenbr0 eth0], [--may-exist add-port xenbr0 eth0], - [add-br xapi1 xenbr0 9], - [--may-exist add-br xapi1 xenbr0 9], - [add-port xapi1 eth0.9])], + [add-br xapi1 xenbr0 $1], + [--may-exist add-br xapi1 xenbr0 $1], + [add-port xapi1 eth0.$1])], [0], [], [], [OVS_VSCTL_CLEANUP])]) -AT_SETUP([simple fake bridge]) +dnl OVS_VSCTL_FAKE_BRIDGE_TESTS([VLAN]) +m4_define([OVS_VSCTL_FAKE_BRIDGE_TESTS], [ +AT_BANNER([ovs-vsctl unit tests -- fake bridges (VLAN $1)]) + +AT_SETUP([simple fake bridge (VLAN $1)]) AT_KEYWORDS([ovs-vsctl fake-bridge]) OVS_VSCTL_SETUP -OVS_VSCTL_SETUP_SIMPLE_FAKE_CONF +OVS_VSCTL_SETUP_SIMPLE_FAKE_CONF([$1]) AT_CHECK([RUN_OVS_VSCTL([--may-exist add-br xapi1])], [1], [], - [ovs-vsctl: "--may-exist add-br xapi1" but xapi1 is a VLAN bridge for VLAN 9 + [ovs-vsctl: "--may-exist add-br xapi1" but xapi1 is a VLAN bridge for VLAN $1 ], [OVS_VSCTL_CLEANUP]) -AT_CHECK([RUN_OVS_VSCTL([--may-exist add-br xapi1 xxx 9])], [1], [], - [ovs-vsctl: "--may-exist add-br xapi1 xxx 9" but xapi1 has the wrong parent xenbr0 +AT_CHECK([RUN_OVS_VSCTL([--may-exist add-br xapi1 xxx $1])], [1], [], + [ovs-vsctl: "--may-exist add-br xapi1 xxx $1" but xapi1 has the wrong parent xenbr0 ], [OVS_VSCTL_CLEANUP]) AT_CHECK([RUN_OVS_VSCTL([--may-exist add-br xapi1 xenbr0 10])], [1], [], - [ovs-vsctl: "--may-exist add-br xapi1 xenbr0 10" but xapi1 is a VLAN bridge for the wrong VLAN 9 + [ovs-vsctl: "--may-exist add-br xapi1 xenbr0 10" but xapi1 is a VLAN bridge for the wrong VLAN $1 ], [OVS_VSCTL_CLEANUP]) -CHECK_BRIDGES([xapi1, xenbr0, 9], [xenbr0, xenbr0, 0]) +CHECK_BRIDGES([xapi1, xenbr0, $1], [xenbr0, xenbr0, 0]) CHECK_PORTS([xenbr0], [eth0]) CHECK_IFACES([xenbr0], [eth0]) -CHECK_PORTS([xapi1], [eth0.9]) -CHECK_IFACES([xapi1], [eth0.9]) +CHECK_PORTS([xapi1], [eth0.$1]) +CHECK_IFACES([xapi1], [eth0.$1]) +OVS_VSCTL_CLEANUP +AT_CLEANUP + +AT_SETUP([list bridges -- real and fake (VLAN $1)]) +AT_KEYWORDS([ovs-vsctl fake-bridge]) +OVS_VSCTL_SETUP +OVS_VSCTL_SETUP_SIMPLE_FAKE_CONF([$1]) +AT_CHECK([RUN_OVS_VSCTL_ONELINE([-- list-br])], [0], + [xapi1\nxenbr0 +], [], [OVS_VSCTL_CLEANUP]) +AT_CHECK([RUN_OVS_VSCTL_ONELINE([-- --real list-br])], [0], + [xenbr0 +], [], [OVS_VSCTL_CLEANUP]) +AT_CHECK([RUN_OVS_VSCTL_ONELINE([-- --fake list-br])], [0], + [xapi1 +], [], [OVS_VSCTL_CLEANUP]) OVS_VSCTL_CLEANUP AT_CLEANUP -AT_SETUP([simple fake bridge + del-br fake bridge]) +AT_SETUP([simple fake bridge + del-br fake bridge (VLAN $1)]) AT_KEYWORDS([ovs-vsctl fake-bridge]) OVS_VSCTL_SETUP -OVS_VSCTL_SETUP_SIMPLE_FAKE_CONF +OVS_VSCTL_SETUP_SIMPLE_FAKE_CONF([$1]) AT_CHECK([RUN_OVS_VSCTL([del-br xapi1])], [0], [], [], [OVS_VSCTL_CLEANUP]) CHECK_BRIDGES([xenbr0, xenbr0, 0]) CHECK_PORTS([xenbr0], [eth0]) @@ -427,19 +506,19 @@ CHECK_IFACES([xenbr0], [eth0]) OVS_VSCTL_CLEANUP AT_CLEANUP -AT_SETUP([simple fake bridge + del-br real bridge]) +AT_SETUP([simple fake bridge + del-br real bridge (VLAN $1)]) AT_KEYWORDS([ovs-vsctl fake-bridge]) OVS_VSCTL_SETUP -OVS_VSCTL_SETUP_SIMPLE_FAKE_CONF +OVS_VSCTL_SETUP_SIMPLE_FAKE_CONF([$1]) AT_CHECK([RUN_OVS_VSCTL([del-br xenbr0])], [0], [], [], [OVS_VSCTL_CLEANUP]) CHECK_BRIDGES OVS_VSCTL_CLEANUP AT_CLEANUP -AT_SETUP([simple fake bridge + external IDs]) +AT_SETUP([simple fake bridge + external IDs (VLAN $1)]) AT_KEYWORDS([ovs-vsctl fake-bridge]) OVS_VSCTL_SETUP -OVS_VSCTL_SETUP_SIMPLE_FAKE_CONF +OVS_VSCTL_SETUP_SIMPLE_FAKE_CONF([$1]) AT_CHECK([RUN_OVS_VSCTL_TOGETHER( [br-set-external-id xenbr0 key0 value0], [br-set-external-id xapi1 key1 value1], @@ -453,27 +532,32 @@ value0 key1=value1 value1 ], [], [OVS_VSCTL_CLEANUP]) -CHECK_BRIDGES([xapi1, xenbr0, 9], [xenbr0, xenbr0, 0]) +CHECK_BRIDGES([xapi1, xenbr0, $1], [xenbr0, xenbr0, 0]) CHECK_PORTS([xenbr0], [eth0]) CHECK_IFACES([xenbr0], [eth0]) -CHECK_PORTS([xapi1], [eth0.9]) -CHECK_IFACES([xapi1], [eth0.9]) +CHECK_PORTS([xapi1], [eth0.$1]) +CHECK_IFACES([xapi1], [eth0.$1]) OVS_VSCTL_CLEANUP AT_CLEANUP +]) # OVS_VSCTL_FAKE_BRIDGE_TESTS + +OVS_VSCTL_FAKE_BRIDGE_TESTS([9]) +OVS_VSCTL_FAKE_BRIDGE_TESTS([0]) +dnl OVS_VSCTL_SETUP_BOND_FAKE_CONF([VLAN]) m4_define([OVS_VSCTL_SETUP_BOND_FAKE_CONF], [AT_CHECK( [RUN_OVS_VSCTL( [add-br xapi1], [add-bond xapi1 bond0 eth0 eth1], - [add-br xapi2 xapi1 11], - [add-port xapi2 bond0.11])], + [add-br xapi2 xapi1 $1], + [add-port xapi2 bond0.$1])], [0], [], [], [OVS_VSCTL_CLEANUP])]) AT_SETUP([fake bridge on bond]) AT_KEYWORDS([ovs-vsctl fake-bridge]) OVS_VSCTL_SETUP -OVS_VSCTL_SETUP_BOND_FAKE_CONF +OVS_VSCTL_SETUP_BOND_FAKE_CONF([11]) CHECK_BRIDGES([xapi1, xapi1, 0], [xapi2, xapi1, 11]) CHECK_PORTS([xapi1], [bond0]) CHECK_IFACES([xapi1], [eth0], [eth1]) @@ -485,7 +569,7 @@ AT_CLEANUP AT_SETUP([fake bridge on bond + del-br fake bridge]) AT_KEYWORDS([ovs-vsctl fake-bridge]) OVS_VSCTL_SETUP -OVS_VSCTL_SETUP_BOND_FAKE_CONF +OVS_VSCTL_SETUP_BOND_FAKE_CONF([11]) AT_CHECK([RUN_OVS_VSCTL_ONELINE([del-br xapi2])], [0], [ ], [], [OVS_VSCTL_CLEANUP]) CHECK_BRIDGES([xapi1, xapi1, 0]) @@ -497,7 +581,7 @@ AT_CLEANUP AT_SETUP([fake bridge on bond + del-br real bridge]) AT_KEYWORDS([ovs-vsctl fake-bridge]) OVS_VSCTL_SETUP -OVS_VSCTL_SETUP_BOND_FAKE_CONF +OVS_VSCTL_SETUP_BOND_FAKE_CONF([11]) AT_CHECK([RUN_OVS_VSCTL([del-br xapi1])]) CHECK_BRIDGES OVS_VSCTL_CLEANUP @@ -535,14 +619,17 @@ AT_BANNER([ovs-vsctl unit tests -- database commands]) AT_SETUP([database commands -- positive checks]) AT_KEYWORDS([ovs-vsctl]) OVS_VSCTL_SETUP -AT_CHECK([RUN_OVS_VSCTL([create b name=br0])], +AT_CHECK( + [RUN_OVS_VSCTL_TOGETHER([--id=@br0 create bridge name=br0], + [set o . bridges=@br0])], [0], [stdout], [], [OVS_VSCTL_CLEANUP]) cp stdout out1 -AT_CHECK([RUN_OVS_VSCTL([list b], [get b br0 _uuid])], +AT_CHECK([RUN_OVS_VSCTL([list bridge], [get bridge br0 _uuid])], [0], [stdout], [], [OVS_VSCTL_CLEANUP]) cp stdout out2 -AT_CHECK([perl $srcdir/uuidfilt.pl out1 out2], [0], +AT_CHECK([${PERL} $srcdir/uuidfilt.pl out1 out2], [0], [[<0> + _uuid : <0> controller : [] datapath_id : [] @@ -550,33 +637,40 @@ datapath_type : "" external_ids : {} fail_mode : [] flood_vlans : [] +flow_tables : {} +ipfix : [] mirrors : [] name : "br0" netflow : [] other_config : {} ports : [] +protocols : [] sflow : [] +status : {} +stp_enable : false <0> ]], [ignore], [test ! -e pid || kill `cat pid`]) AT_CHECK( - [RUN_OVS_VSCTL([--columns=fail_mode,name,datapath_type list b])], + [RUN_OVS_VSCTL([--columns=fail_mode,name,datapath_type list bridge])], [0], [[fail_mode : [] name : "br0" datapath_type : "" ]], [ignore], [test ! -e pid || kill `cat pid`]) AT_CHECK( - [RUN_OVS_VSCTL([--columns=fail_mode,name,datapath_type find b])], + [RUN_OVS_VSCTL([--columns=fail_mode,name,datapath_type find bridge])], [0], [[fail_mode : [] name : "br0" datapath_type : "" ]], [ignore], [test ! -e pid || kill `cat pid`]) -AT_CHECK([RUN_OVS_VSCTL([create b name=br1 datapath_type="foo"], - [create b name=br2 external-ids:bar=quux])], +AT_CHECK([ + RUN_OVS_VSCTL_TOGETHER([--id=@br1 create bridge name=br1 datapath_type="foo"], + [--id=@br2 create bridge name=br2 external-ids:bar=quux], + [add o . bridges @br1 @br2])], [0], [stdout], [], [OVS_VSCTL_CLEANUP]) AT_CHECK( - [RUN_OVS_VSCTL([--columns=name find b datapath_type!=foo])], [0], [stdout], + [RUN_OVS_VSCTL([--columns=name find bridge datapath_type!=foo])], [0], [stdout], [ignore], [test ! -e pid || kill `cat pid`]) AT_CHECK([sed -n '/./p' stdout | sort], [0], [[name : "br0" @@ -588,29 +682,42 @@ AT_CHECK( 'other_config:datapath_id="0123456789ab"' \ 'other_config:hwaddr="00:11:22:33:44:55"' \ 'external-ids={"uuids"="9c45f225-a7cf-439d-976d-83db6271fda1"}' -- \ - add bridge br0 external_ids '"roles"="local; remote; cloud"'])], + add bridge br0 external_ids '"roles"="local; remote; cloud"'])], [0], [], [], [OVS_VSCTL_CLEANUP]) -AT_CHECK([RUN_OVS_VSCTL_ONELINE([get bridge br0 other_config external-ids])], +AT_CHECK([RUN_OVS_VSCTL_ONELINE([get bridge br0 other_config external-ids])], [0], [{datapath_id="0123456789ab", hwaddr="00:11:22:33:44:55"}\n{roles="local; remote; cloud", uuids="9c45f225-a7cf-439d-976d-83db6271fda1"} ], [], [OVS_VSCTL_CLEANUP]) -AT_CHECK([RUN_OVS_VSCTL([get bridge br0 other_config:hwaddr -- --if-exists get bridge br0 other-config:nonexistent])], +AT_CHECK([RUN_OVS_VSCTL([get bridge br0 other_config:hwaddr -- --if-exists get bridge br0 other-config:nonexistent])], [0], ["00:11:22:33:44:55" ], [], [OVS_VSCTL_CLEANUP]) -AT_CHECK([RUN_OVS_VSCTL([remove br br0 other_config hwaddr 'datapath_id=""' -- get br br0 other_config])], +AT_CHECK([RUN_OVS_VSCTL([remove bridge br0 other_config hwaddr 'datapath_id=""' -- get bridge br0 other_config])], [0], [{datapath_id="0123456789ab"} ], [], [OVS_VSCTL_CLEANUP]) -AT_CHECK([RUN_OVS_VSCTL([remove br br0 other_config 'datapath_id="0123456789ab"' -- get br br0 other_config])], +AT_CHECK([RUN_OVS_VSCTL([remove bridge br0 other_config 'datapath_id="0123456789ab"' -- get bridge br0 other_config])], [0], [{} ], [], [OVS_VSCTL_CLEANUP]) -AT_CHECK([RUN_OVS_VSCTL([clear br br0 external-ids -- get br br0 external_ids])], +AT_CHECK([RUN_OVS_VSCTL([clear bridge br0 external-ids -- get bridge br0 external_ids])], [0], [{} ], [], [OVS_VSCTL_CLEANUP]) -AT_CHECK([RUN_OVS_VSCTL_TOGETHER([destroy b br0], - [destroy b br1], - [destroy b br2])], +AT_CHECK([RUN_OVS_VSCTL_TOGETHER([destroy bridge br0], + [destroy bridge br1], + [destroy bridge br2], + [clear o . bridges])], [0], [stdout], [], [OVS_VSCTL_CLEANUP]) -AT_CHECK([RUN_OVS_VSCTL([list b])], +AT_CHECK([RUN_OVS_VSCTL([list bridge])], + [0], [], [], [OVS_VSCTL_CLEANUP]) +AT_CHECK([RUN_OVS_VSCTL([--if-exists get bridge x datapath_id])], + [0], [], [], [OVS_VSCTL_CLEANUP]) +AT_CHECK([RUN_OVS_VSCTL([--if-exists list bridge x])], + [0], [], [], [OVS_VSCTL_CLEANUP]) +AT_CHECK([RUN_OVS_VSCTL([--if-exists set controller x connection_mode=standalone])], + [0], [], [], [OVS_VSCTL_CLEANUP]) +AT_CHECK( + [RUN_OVS_VSCTL([--if-exists remove netflow x targets '"1.2.3.4:567"'])], + [0], [], [], [OVS_VSCTL_CLEANUP]) +AT_CHECK( + [RUN_OVS_VSCTL([--if-exists clear netflow x targets])], [0], [], [], [OVS_VSCTL_CLEANUP]) OVS_VSCTL_CLEANUP AT_CLEANUP @@ -618,19 +725,33 @@ AT_CLEANUP AT_SETUP([database commands -- negative checks]) AT_KEYWORDS([ovs-vsctl]) OVS_VSCTL_SETUP -AT_CHECK([RUN_OVS_VSCTL([create b name=br0])], + +AT_CHECK([ovs-vsctl --may-exist], + [1], [ignore], [ovs-vsctl: missing command name (use --help for help) +], [OVS_VSCTL_CLEANUP]) +AT_CHECK([ovs-vsctl --may-exist --], + [1], [ignore], [ovs-vsctl: missing command name (use --help for help) +], [OVS_VSCTL_CLEANUP]) +AT_CHECK([ovs-vsctl -- --may-exist], + [1], [ignore], [ovs-vsctl: missing command name (use --help for help) +], [OVS_VSCTL_CLEANUP]) + +AT_CHECK([RUN_OVS_VSCTL([add-br br0])], [0], [ignore], [], [OVS_VSCTL_CLEANUP]) -AT_CHECK([RUN_OVS_VSCTL([add-br br1])], +AT_CHECK([RUN_OVS_VSCTL([add-br br1])], [0], [ignore], [], [OVS_VSCTL_CLEANUP]) -AT_CHECK([RUN_OVS_VSCTL([set-controller br1 tcp:127.0.0.1])], +AT_CHECK([RUN_OVS_VSCTL([set-controller br1 tcp:127.0.0.1])], [0], [ignore], [], [OVS_VSCTL_CLEANUP]) -AT_CHECK([RUN_OVS_VSCTL([create n targets='"1.2.3.4:567"'])], +AT_CHECK([ + RUN_OVS_VSCTL_TOGETHER([--id=@n create netflow targets='"1.2.3.4:567"'], + [set bridge br0 netflow=@n])], [0], [stdout], [], [OVS_VSCTL_CLEANUP]) cp stdout netflow-uuid -AT_CHECK([RUN_OVS_VSCTL([list n `cat netflow-uuid`])], +AT_CHECK([RUN_OVS_VSCTL([list netflow `cat netflow-uuid`])], [0], [stdout], [], [OVS_VSCTL_CLEANUP]) -AT_CHECK([perl $srcdir/uuidfilt.pl netflow-uuid stdout], [0], +AT_CHECK([${PERL} $srcdir/uuidfilt.pl netflow-uuid stdout], [0], [[<0> + _uuid : <0> active_timeout : 0 add_id_to_interface : false @@ -639,63 +760,222 @@ engine_type : [] external_ids : {} targets : ["1.2.3.4:567"] ]], [ignore], [test ! -e pid || kill `cat pid`]) -AT_CHECK([RUN_OVS_VSCTL([list interx x])], +AT_CHECK([RUN_OVS_VSCTL([list interx x])], [1], [], [ovs-vsctl: unknown table "interx" ], [OVS_VSCTL_CLEANUP]) -AT_CHECK([RUN_OVS_VSCTL([list b x])], +AT_CHECK([RUN_OVS_VSCTL([list bridge x])], + [1], [], [ovs-vsctl: no row "x" in table Bridge +], [OVS_VSCTL_CLEANUP]) +AT_CHECK([RUN_OVS_VSCTL([get bridge x datapath_id])], [1], [], [ovs-vsctl: no row "x" in table Bridge ], [OVS_VSCTL_CLEANUP]) -AT_CHECK([RUN_OVS_VSCTL([get b br0 d])], +AT_CHECK([RUN_OVS_VSCTL([get bridge br0 d])], [1], [], [ovs-vsctl: Bridge contains more than one column whose name matches "d" ], [OVS_VSCTL_CLEANUP]) -AT_CHECK([RUN_OVS_VSCTL([get b br0 x])], +AT_CHECK([RUN_OVS_VSCTL([get bridge br0 x])], [1], [], [ovs-vsctl: Bridge does not contain a column whose name matches "x" ], [OVS_VSCTL_CLEANUP]) -AT_CHECK([RUN_OVS_VSCTL([get b br0 :y=z])], +AT_CHECK([RUN_OVS_VSCTL([get bridge br0 :y=z])], [1], [], [ovs-vsctl: :y=z: missing column name ], [OVS_VSCTL_CLEANUP]) -AT_CHECK([RUN_OVS_VSCTL([get b br0 datapath_id:y=z])], +AT_CHECK([RUN_OVS_VSCTL([get bridge br0 datapath_id:y=z])], [1], [], [ovs-vsctl: datapath_id:y=z: trailing garbage "=z" in argument ], [OVS_VSCTL_CLEANUP]) -AT_CHECK([RUN_OVS_VSCTL([set b br0 'datapath_id:y>=z'])], +AT_CHECK([RUN_OVS_VSCTL([set bridge br0 'datapath_id:y>=z'])], [1], [], [ovs-vsctl: datapath_id:y>=z: argument does not end in "=" followed by a value. ], [OVS_VSCTL_CLEANUP]) -AT_CHECK([RUN_OVS_VSCTL([wait-until b br0 datapath_id:y,z])], - [1], [], [ovs-vsctl: datapath_id:y,z: argument does not end in "=", "!=", "<", ">", "<=", or ">=" followed by a value. +AT_CHECK([RUN_OVS_VSCTL([set controller x connection_mode=standalone])], + [1], [], [ovs-vsctl: no row "x" in table Controller +], [OVS_VSCTL_CLEANUP]) +AT_CHECK([RUN_OVS_VSCTL([wait-until bridge br0 datapath_id:y,z])], + [1], [], [ovs-vsctl: datapath_id:y,z: argument does not end in "=", "!=", "<", ">", "<=", ">=", "{=}", "{!=}", "{<}", "{>}", "{<=}", or "{>=}" followed by a value. ], [OVS_VSCTL_CLEANUP]) -AT_CHECK([RUN_OVS_VSCTL([get b br0 datapath_id::])], +AT_CHECK([RUN_OVS_VSCTL([get bridge br0 datapath_id::])], [1], [], [ovs-vsctl: datapath_id::: trailing garbage ":" in argument ], [OVS_VSCTL_CLEANUP]) -AT_CHECK([RUN_OVS_VSCTL([get b br0 datapath_id:x])], +AT_CHECK([RUN_OVS_VSCTL([get bridge br0 datapath_id:x])], [1], [], [ovs-vsctl: cannot specify key to get for non-map column datapath_id ], [OVS_VSCTL_CLEANUP]) -AT_CHECK([RUN_OVS_VSCTL([get b br0 external_ids:x])], +AT_CHECK([RUN_OVS_VSCTL([get bridge br0 external_ids:x])], [1], [], [ovs-vsctl: no key "x" in Bridge record "br0" column external_ids ], [OVS_VSCTL_CLEANUP]) -AT_CHECK([RUN_OVS_VSCTL([set b br0 flood_vlans=-1])], +AT_CHECK([RUN_OVS_VSCTL([set bridge br0 flood_vlans=-1])], [1], [], [ovs-vsctl: constraint violation: -1 is not in the valid range 0 to 4095 (inclusive) ], [OVS_VSCTL_CLEANUP]) -AT_CHECK([RUN_OVS_VSCTL([set b br0 flood_vlans=4096])], +AT_CHECK([RUN_OVS_VSCTL([set bridge br0 flood_vlans=4096])], [1], [], [ovs-vsctl: constraint violation: 4096 is not in the valid range 0 to 4095 (inclusive) ], [OVS_VSCTL_CLEANUP]) -AT_CHECK([RUN_OVS_VSCTL([set c br1 'connection-mode=xyz'])], +AT_CHECK([RUN_OVS_VSCTL([set c br1 'connection-mode=xyz'])], [1], [], [[ovs-vsctl: constraint violation: xyz is not one of the allowed values ([in-band, out-of-band]) ]], [OVS_VSCTL_CLEANUP]) -AT_CHECK([RUN_OVS_VSCTL([set c br1 connection-mode:x=y])], +AT_CHECK([RUN_OVS_VSCTL([set c br1 connection-mode:x=y])], [1], [], [ovs-vsctl: cannot specify key to set for non-map column connection_mode ], [OVS_VSCTL_CLEANUP]) -AT_CHECK([RUN_OVS_VSCTL([add b br1 datapath_id x y])], +AT_CHECK([RUN_OVS_VSCTL([add bridge br1 datapath_id x y])], [1], [], [ovs-vsctl: "add" operation would put 2 values in column datapath_id of table Bridge but the maximum number is 1 ], [OVS_VSCTL_CLEANUP]) -AT_CHECK([RUN_OVS_VSCTL([remove n `cat netflow-uuid` targets '"1.2.3.4:567"'])], +AT_CHECK([RUN_OVS_VSCTL([remove netflow `cat netflow-uuid` targets '"1.2.3.4:567"'])], [1], [], [ovs-vsctl: "remove" operation would put 0 values in column targets of table NetFlow but the minimum number is 1 ], [OVS_VSCTL_CLEANUP]) -AT_CHECK([RUN_OVS_VSCTL([clear n `cat netflow-uuid` targets])], +AT_CHECK([RUN_OVS_VSCTL([remove netflow x targets '"1.2.3.4:567"'])], + [1], [], [ovs-vsctl: no row "x" in table NetFlow +], [OVS_VSCTL_CLEANUP]) +AT_CHECK([RUN_OVS_VSCTL([clear netflow x targets])], + [1], [], [ovs-vsctl: no row "x" in table NetFlow +], [OVS_VSCTL_CLEANUP]) +AT_CHECK([RUN_OVS_VSCTL([clear netflow `cat netflow-uuid` targets])], [1], [], [ovs-vsctl: "clear" operation cannot be applied to column targets of table NetFlow, which is not allowed to be empty ], [OVS_VSCTL_CLEANUP]) -AT_CHECK([RUN_OVS_VSCTL([destroy b br2])], +AT_CHECK([RUN_OVS_VSCTL([destroy bridge br2])], [1], [], [ovs-vsctl: no row "br2" in table Bridge ], [OVS_VSCTL_CLEANUP]) +AT_CHECK([RUN_OVS_VSCTL([add in br1 name x])], + [1], [], [ovs-vsctl: cannot modify read-only column name in table Interface +], [OVS_VSCTL_CLEANUP]) +AT_CHECK([RUN_OVS_VSCTL([set port br1 name br2])], + [1], [], [ovs-vsctl: cannot modify read-only column name in table Port +], [OVS_VSCTL_CLEANUP]) +AT_CHECK([RUN_OVS_VSCTL([remove bridge br1 name br1])], + [1], [], [ovs-vsctl: cannot modify read-only column name in table Bridge +], [OVS_VSCTL_CLEANUP]) +AT_CHECK([RUN_OVS_VSCTL([clear bridge br1 name])], + [1], [], [ovs-vsctl: cannot modify read-only column name in table Bridge +], [OVS_VSCTL_CLEANUP]) +OVS_VSCTL_CLEANUP +AT_CLEANUP + +AT_SETUP([database commands -- conditions]) +AT_KEYWORDS([ovs-vsctl]) +ON_EXIT([kill `cat pid`]) +OVS_VSCTL_SETUP +AT_CHECK( + [RUN_OVS_VSCTL_TOGETHER( + [add-br br0], + [add-br br1], [set bridge br1 flood_vlans=0 other-config:x='""'], + [add-br br2], [set bridge br2 flood_vlans=1 other-config:x=y], + [add-br br3], [set bridge br3 flood_vlans=0,1 other-config:x=z], + [add-br br4], [set bridge br4 flood_vlans=2], + [add-br br5], [set bridge br5 flood_vlans=0,2], + [add-br br6], [set bridge br6 flood_vlans=1,2], + [add-br br7], [set bridge br7 flood_vlans=0,1,2])], [0], [ + + + + + + + + + + + + + + +]) +m4_define([VSCTL_CHECK_FIND], + [AT_CHECK([echo `ovs-vsctl --bare --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge '$1' | sort`], [0], [$2 +])]) + +# Arithmetic relational operators without keys. +VSCTL_CHECK_FIND([flood_vlans=0], [br1]) +VSCTL_CHECK_FIND([flood_vlans=1], [br2]) +VSCTL_CHECK_FIND([flood_vlans=0,2], [br5]) +VSCTL_CHECK_FIND([flood_vlans=0,1,2], [br7]) +VSCTL_CHECK_FIND([flood_vlans=3], []) + +VSCTL_CHECK_FIND([flood_vlans!=0], [br0 br2 br3 br4 br5 br6 br7]) +VSCTL_CHECK_FIND([flood_vlans!=1], [br0 br1 br3 br4 br5 br6 br7]) +VSCTL_CHECK_FIND([flood_vlans!=0,2], [br0 br1 br2 br3 br4 br6 br7]) +VSCTL_CHECK_FIND([flood_vlans!=0,1,2], [br0 br1 br2 br3 br4 br5 br6]) +VSCTL_CHECK_FIND([flood_vlans!=3], [br0 br1 br2 br3 br4 br5 br6 br7]) + +VSCTL_CHECK_FIND([flood_vlans<2], [br0 br1 br2]) +VSCTL_CHECK_FIND([flood_vlans<0,2], [br0 br1 br2 br3 br4]) +VSCTL_CHECK_FIND([flood_vlans>1], [br3 br4 br5 br6 br7]) +VSCTL_CHECK_FIND([flood_vlans>0,1], [br5 br6 br7]) +VSCTL_CHECK_FIND([flood_vlans<=2], [br0 br1 br2 br4]) +VSCTL_CHECK_FIND([flood_vlans<=0,2], [br0 br1 br2 br3 br4 br5]) +VSCTL_CHECK_FIND([flood_vlans>=1], [br2 br3 br4 br5 br6 br7]) +VSCTL_CHECK_FIND([flood_vlans>=0,1], [br3 br5 br6 br7]) + +# Set relational operators without keys. +VSCTL_CHECK_FIND([flood_vlans{=}0], [br1]) +VSCTL_CHECK_FIND([flood_vlans{=}1], [br2]) +VSCTL_CHECK_FIND([flood_vlans{=}0,2], [br5]) +VSCTL_CHECK_FIND([flood_vlans{=}0,1,2], [br7]) +VSCTL_CHECK_FIND([flood_vlans{=}3], []) + +VSCTL_CHECK_FIND([flood_vlans{!=}0], [br0 br2 br3 br4 br5 br6 br7]) +VSCTL_CHECK_FIND([flood_vlans{!=}1], [br0 br1 br3 br4 br5 br6 br7]) +VSCTL_CHECK_FIND([flood_vlans{!=}0,2], [br0 br1 br2 br3 br4 br6 br7]) +VSCTL_CHECK_FIND([flood_vlans{!=}0,1,2], [br0 br1 br2 br3 br4 br5 br6]) +VSCTL_CHECK_FIND([flood_vlans{!=}3], [br0 br1 br2 br3 br4 br5 br6 br7]) + +VSCTL_CHECK_FIND([flood_vlans{<}[[]]], []) +VSCTL_CHECK_FIND([flood_vlans{<=}[[]]], [br0]) +VSCTL_CHECK_FIND([flood_vlans{<}0], [br0]) +VSCTL_CHECK_FIND([flood_vlans{<=}0], [br0 br1]) +VSCTL_CHECK_FIND([flood_vlans{<}1,2], [br0 br2 br4]) +VSCTL_CHECK_FIND([flood_vlans{<=}1,2], [br0 br2 br4 br6]) + +VSCTL_CHECK_FIND([flood_vlans{>}[[]]], [br1 br2 br3 br4 br5 br6 br7]) +VSCTL_CHECK_FIND([flood_vlans{>=}[[]]], [br0 br1 br2 br3 br4 br5 br6 br7]) +VSCTL_CHECK_FIND([flood_vlans{>}0], [br3 br5 br7]) +VSCTL_CHECK_FIND([flood_vlans{>=}0], [br1 br3 br5 br7]) +VSCTL_CHECK_FIND([flood_vlans{>}0,2], [br7]) +VSCTL_CHECK_FIND([flood_vlans{>=}1,2], [br6 br7]) +VSCTL_CHECK_FIND([flood_vlans{>=}0,2], [br5 br7]) + +# Arithmetic relational operators with keys. +VSCTL_CHECK_FIND([other-config:x=""], [br1]) +VSCTL_CHECK_FIND([other-config:x=y], [br2]) +VSCTL_CHECK_FIND([other-config:x=z], [br3]) + +VSCTL_CHECK_FIND([other-config:x!=""], [br2 br3]) +VSCTL_CHECK_FIND([other-config:x!=y], [br1 br3]) +VSCTL_CHECK_FIND([other-config:x!=z], [br1 br2]) + +VSCTL_CHECK_FIND([other-config:x>y], [br3]) +VSCTL_CHECK_FIND([other-config:x>=y], [br2 br3]) +VSCTL_CHECK_FIND([other-config:x=}[[]]], [br0 br1 br2 br3 br4 br5 br6 br7]) +VSCTL_CHECK_FIND([other-config:x{>=}x], []) +VSCTL_CHECK_FIND([other-config:x{>=}""], [br1]) +VSCTL_CHECK_FIND([other-config:x{>=}y], [br2]) +VSCTL_CHECK_FIND([other-config:x{>=}z], [br3]) + +VSCTL_CHECK_FIND([other-config:x{>}[[]]], [br1 br2 br3]) +VSCTL_CHECK_FIND([other-config:x{>}x], []) +VSCTL_CHECK_FIND([other-config:x{>}""], []) +VSCTL_CHECK_FIND([other-config:x{>}y], []) +VSCTL_CHECK_FIND([other-config:x{>}z], []) OVS_VSCTL_CLEANUP AT_CLEANUP @@ -703,11 +983,11 @@ AT_SETUP([database commands -- wait-until immediately true]) AT_KEYWORDS([ovs-vsctl]) OVS_VSCTL_SETUP AT_CHECK([RUN_OVS_VSCTL( - [add-br br0], + [add-br br0], [add-bond br0 bond0 eth0 eth1], [set port bond0 bond_updelay=500 other-config:abc=def])], [0], [], [], [OVS_VSCTL_CLEANUP]) -AT_CHECK([RUN_OVS_VSCTL([[wait-until Open_vSwitch . managers=[]]])], +AT_CHECK([RUN_OVS_VSCTL([[wait-until Open_vSwitch . manager_options=[]]])], [0], [], [], [OVS_VSCTL_CLEANUP]) AT_CHECK([RUN_OVS_VSCTL([[wait-until Open_vSwitch . bridges!=[]]])], [0], [], [], [OVS_VSCTL_CLEANUP]) @@ -721,17 +1001,12 @@ AT_CLEANUP AT_SETUP([database commands -- wait-until must wait]) AT_KEYWORDS([ovs-vsctl]) -# Disable lcov for this test. All the programs running in parallel -# race badly on access to profiling data. -DISABLE_LCOV=true -export DISABLE_LCOV - OVS_VSCTL_SETUP # Start ovs-vsctls in background. (RUN_OVS_VSCTL([[wait-until o . bridges!=[] -- get bridge br10 other-config:abc]])) > stdout1 & (RUN_OVS_VSCTL([[wait-until bridge br1 -- get bridge br1 other-config:abc]])) > stdout2 & -(RUN_OVS_VSCTL([[wait-until b br1 other-config={abc=def} -- get bridge br1 other-config]])) > stdout3 & +(RUN_OVS_VSCTL([[wait-until bridge br1 other-config={abc=def} -- get bridge br1 other-config]])) > stdout3 & (RUN_OVS_VSCTL([[wait-until port bond0 'bond_updelay>50' -- get port bond0 bond-updelay]])) > stdout4 & # Give the ovs-vsctls a chance to read the database @@ -771,7 +1046,7 @@ AT_CHECK( [--id=@m create mirror name=mymirror select-dst-port=@eth0 select-src-port=@eth0 output-port=@eth1])], [0], [stdout], [], [OVS_VSCTL_CLEANUP]) AT_CHECK( - [perl $srcdir/uuidfilt.pl stdout], [0], [dnl + [${PERL} $srcdir/uuidfilt.pl stdout], [0], [dnl @@ -785,7 +1060,7 @@ AT_CHECK( [list bridge br0])], [0], [stdout], [], [OVS_VSCTL_CLEANUP]) AT_CHECK( - [sed -n -e '/uuid/p' -e '/name/p' -e '/mirrors/p' -e '/select/p' -e '/output/p' < stdout | $srcdir/uuidfilt.pl], [0], [dnl + [sed -n -e '/uuid/p' -e '/name/p' -e '/mirrors/p' -e '/select/p' -e '/output/p' < stdout | ${PERL} $srcdir/uuidfilt.pl], [0], [dnl [_uuid : <0> name : "eth0" _uuid : <1> @@ -806,15 +1081,46 @@ name : "br0" OVS_VSCTL_CLEANUP AT_CLEANUP +AT_SETUP([unreferenced record warnings]) +AT_KEYWORDS([ovs-vsctl]) +OVS_VSCTL_SETUP +AT_CHECK( + [ovs-vsctl -vPATTERN:console:'%c|%p|%m' --no-wait -vreconnect:emer --db=unix:socket \ + -- create Bridge name=br0 | ${PERL} $srcdir/uuidfilt.pl], + [0], [<0> +], [vsctl|WARN|applying "create" command to table Bridge without --id option will have no effect +], [OVS_VSCTL_CLEANUP]) +AT_CHECK( + [ovs-vsctl -vPATTERN:console:'%c|%p|%m' --no-wait -vreconnect:emer --db=unix:socket \ + -- --id=@br0 create Bridge name=br0 | ${PERL} $srcdir/uuidfilt.pl], + [0], [<0> +], [vsctl|WARN|row id "@br0" was created but no reference to it was inserted, so it will not actually appear in the database +], [OVS_VSCTL_CLEANUP]) +AT_CHECK( + [ovs-vsctl -vPATTERN:console:'%c|%p|%m' --no-wait -vreconnect:emer --db=unix:socket \ + -- --id=@eth0_iface create Interface name=eth0 \ + -- --id=@eth0 create Port name=eth0 interfaces=@eth0_iface \ + -- --id=@m0 create Mirror name=m0 output_port=@eth0 \ + -- --id=@br0 create Bridge name=br0 mirrors=@m0 \ + -- set Open_vSwitch . bridges=@br0 | ${PERL} $srcdir/uuidfilt.pl], + [0], [<0> +<1> +<2> +<3> +], [vsctl|WARN|row id "@eth0" was created but only a weak reference to it was inserted, so it will not actually appear in the database +], [OVS_VSCTL_CLEANUP]) +OVS_VSCTL_CLEANUP +AT_CLEANUP + dnl This test really shows a bug -- "create" followed by "list" in dnl the same execution shows the wrong UUID on the "list" command. dnl The bug is documented in ovs-vsctl.8. AT_SETUP([created row UUID is wrong in same execution]) AT_KEYWORDS([ovs-vsctl]) OVS_VSCTL_SETUP -AT_CHECK([RUN_OVS_VSCTL([create Bridge name=br0 -- list b])], +AT_CHECK([RUN_OVS_VSCTL([--id=@br0 create Bridge name=br0 -- add Open_vSwitch . bridges @br0 -- list bridge])], [0], [stdout], [], [OVS_VSCTL_CLEANUP]) -AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], +AT_CHECK([${PERL} $srcdir/uuidfilt.pl stdout], [0], [[<0> _uuid : <1> controller : [] @@ -823,12 +1129,131 @@ datapath_type : "" external_ids : {} fail_mode : [] flood_vlans : [] +flow_tables : {} +ipfix : [] mirrors : [] name : "br0" netflow : [] other_config : {} ports : [] +protocols : [] sflow : [] +status : {} +stp_enable : false ]], [ignore], [test ! -e pid || kill `cat pid`]) OVS_VSCTL_CLEANUP AT_CLEANUP + +dnl This test will create a linux-htb QoS record that +dnl points to a few queues and use it on a1 and a2 port. +dnl It also destroys all records from Qos and Queue table. +AT_SETUP([--all option on destroy command]) +AT_KEYWORDS([ovs-vsctl]) +OVS_VSCTL_SETUP +AT_CHECK([RUN_OVS_VSCTL( + [add-br a], + [add-port a a1], + [add-port a a2])], [0], [], [], [OVS_VSCTL_CLEANUP]) +CHECK_BRIDGES([a, a, 0]) +CHECK_PORTS([a], [a1], [a2]) +CHECK_IFACES([a], [a1], [a2]) +AT_CHECK([RUN_OVS_VSCTL_TOGETHER( + [set Port a1 qos=@newqos], + [set Port a2 qos=@newqos], + [--id=@newqos create QoS type=linux-htb other-config:max-rate=1000000000 queues=0=@q0,1=@q1], + [--id=@q0 create Queue other-config:min-rate=100000000 other-config:max-rate=100000000], + [--id=@q1 create Queue other-config:min-rate=500000000])], [0], [ignore], [], [OVS_VSCTL_CLEANUP]) +AT_CHECK([RUN_OVS_VSCTL( + [--columns=other_config,type list Qos])], [0], +[other_config : {max-rate="1000000000"} +type : linux-htb +], [], [OVS_VSCTL_CLEANUP]) +AT_CHECK([RUN_OVS_VSCTL( + [--columns=other_config list Queue | sort | xargs echo])], [0], +[other_config : {max-rate=100000000, min-rate=100000000} other_config : {min-rate=500000000} +], [], [OVS_VSCTL_CLEANUP]) +AT_CHECK([RUN_OVS_VSCTL( + [clear Port a1 qos], + [clear Port a2 qos])], [0], [], [], [OVS_VSCTL_CLEANUP]) +AT_CHECK([RUN_OVS_VSCTL( + [--columns=qos list Port a1 a2])], [0], +[[qos : [] + +qos : [] +]], [], [OVS_VSCTL_CLEANUP]) +AT_CHECK([RUN_OVS_VSCTL( + [--all destroy Qos])], [0], [], [], [OVS_VSCTL_CLEANUP]) +AT_CHECK([RUN_OVS_VSCTL( + [-- list Qos])], [0], [], [], [OVS_VSCTL_CLEANUP]) +AT_CHECK([RUN_OVS_VSCTL( + [--all destroy Queue])], [0], [], [], [OVS_VSCTL_CLEANUP]) +AT_CHECK([RUN_OVS_VSCTL( + [-- list Queue])], [0], [], [], [OVS_VSCTL_CLEANUP]) +OVS_VSCTL_CLEANUP +AT_CLEANUP + +dnl ---------------------------------------------------------------------- +AT_BANNER([ovs-vsctl add-port -- reserved port names]) + +AT_SETUP([add-port -- reserved names 1]) +OVS_VSWITCHD_START + +# Test creating all reserved port names +m4_foreach( +[reserved_name], +[[ovs-netdev], +[ovs-dummy], +[gre_system], +[gre64_system], +[lisp_system], +[vxlan_system]], +[ +# Try creating the port +AT_CHECK([ovs-vsctl add-port br0 reserved_name], [0], [], [dnl +ovs-vsctl: Error detected while setting up 'reserved_name'. See ovs-vswitchd log for details. +]) +# Detect the warning log message +AT_CHECK([sed -n "s/^.*\(|bridge|WARN|.*\)$/\1/p" ovs-vswitchd.log], [0], [dnl +|bridge|WARN|could not create interface reserved_name, name is reserved +]) +# Delete the warning log message +AT_CHECK([sed "/|bridge|WARN|/d" ovs-vswitchd.log > ovs-vswitchd.log], [0], [], []) +# Delete the port +AT_CHECK([ovs-vsctl del-port br0 reserved_name], [0], [], [])]) +OVS_VSWITCHD_STOP +AT_CLEANUP + +AT_SETUP([add-port -- reserved names 2]) +# Creates all type of tunnel ports +OVS_VSWITCHD_START([add-port br0 p1 -- set Interface p1 type=gre \ + options:remote_ip=1.1.1.1 ofport_request=1\ + -- add-port br0 p2 -- set Interface p2 type=gre64 \ + options:local_ip=2.2.2.2 options:remote_ip=1.1.1.1 \ + ofport_request=2 \ + -- add-port br0 p3 -- set Interface p3 type=lisp \ + options:remote_ip=2.2.2.2 ofport_request=3 \ + -- add-port br0 p4 -- set Interface p4 type=vxlan \ + options:remote_ip=2.2.2.2 ofport_request=4]) + +# Test creating all reserved tunnel port names +m4_foreach( +[reserved_name], +[[gre_system], +[gre64_system], +[lisp_system], +[vxlan_system]], +[ +# Try creating the port +AT_CHECK([ovs-vsctl add-port br0 reserved_name], [0], [], [dnl +ovs-vsctl: Error detected while setting up 'reserved_name'. See ovs-vswitchd log for details. +]) +# Detect the warning log message +AT_CHECK([sed -n "s/^.*\(|bridge|WARN|.*\)$/\1/p" ovs-vswitchd.log], [0], [dnl +|bridge|WARN|could not create interface reserved_name, name is reserved +]) +# Delete the warning log message +AT_CHECK([sed "/|bridge|WARN|/d" ovs-vswitchd.log > ovs-vswitchd.log], [0], [], []) +# Delete the port +AT_CHECK([ovs-vsctl del-port br0 reserved_name], [0], [], [])]) +OVS_VSWITCHD_STOP +AT_CLEANUP