X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fovs-vsctl.at;h=fb5bc1d5dd4d4e7d6e1183b94289c53b66ff31ac;hb=3e5b3fdbf52cee41142ed8e2bf5cab9f49146d97;hp=152a6585c0dcecccd92dad014e249520e102d0a9;hpb=aed133bf9bce8f35b666c3052907f525c803c83b;p=openvswitch diff --git a/tests/ovs-vsctl.at b/tests/ovs-vsctl.at index 152a6585..fb5bc1d5 100644 --- a/tests/ovs-vsctl.at +++ b/tests/ovs-vsctl.at @@ -190,6 +190,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 @@ -301,7 +321,7 @@ AT_CLEANUP AT_SETUP([external IDs]) AT_KEYWORDS([ovs-vsctl]) OVS_VSCTL_SETUP -AT_CHECK([RUN_OVS_VSCTL_TOGETHER( +AT_CHECK([RUN_OVS_VSCTL_ONELINE( [add-br a], [add-port a a1], [add-bond a bond0 a2 a3], @@ -503,13 +523,41 @@ CHECK_BRIDGES OVS_VSCTL_CLEANUP AT_CLEANUP +dnl ---------------------------------------------------------------------- +AT_BANNER([ovs-vsctl unit tests -- manager commands]) + +AT_SETUP([managers]) +AT_KEYWORDS([manager ovs-vsctl]) +OVS_VSCTL_SETUP +AT_CHECK([RUN_OVS_VSCTL_TOGETHER( + [del-manager], + [get-manager], + [set-manager tcp:4.5.6.7], + [get-manager], + [set-manager tcp:8.9.10.11 tcp:5.4.3.2], + [get-manager], + [del-manager], + [get-manager])], [0], [ + + +tcp:4.5.6.7 + +tcp:5.4.3.2\ntcp:8.9.10.11 + + +], [], [OVS_VSCTL_CLEANUP]) +OVS_VSCTL_CLEANUP +AT_CLEANUP + dnl ---------------------------------------------------------------------- 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 b 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])], @@ -517,6 +565,7 @@ AT_CHECK([RUN_OVS_VSCTL([list b], [get b br0 _uuid])], cp stdout out2 AT_CHECK([perl $srcdir/uuidfilt.pl out1 out2], [0], [[<0> + _uuid : <0> controller : [] datapath_id : [] @@ -524,14 +573,43 @@ datapath_type : "" external_ids : {} fail_mode : [] flood_vlans : [] +flow_tables : {} mirrors : [] name : "br0" netflow : [] other_config : {} ports : [] 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])], + [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])], + [0], + [[fail_mode : [] +name : "br0" +datapath_type : "" +]], [ignore], [test ! -e pid || kill `cat pid`]) +AT_CHECK([ + RUN_OVS_VSCTL_TOGETHER([--id=@br1 create b name=br1 datapath_type="foo"], + [--id=@br2 create b 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], + [ignore], [test ! -e pid || kill `cat pid`]) +AT_CHECK([sed -n '/./p' stdout | sort], [0], + [[name : "br0" +name : "br2" +]]) AT_CHECK( [RUN_OVS_VSCTL( [set bridge br0 \ @@ -556,7 +634,10 @@ AT_CHECK([RUN_OVS_VSCTL([remove br br0 other_config 'datapath_id="0123456789ab"' AT_CHECK([RUN_OVS_VSCTL([clear br br0 external-ids -- get br br0 external_ids])], [0], [{} ], [], [OVS_VSCTL_CLEANUP]) -AT_CHECK([RUN_OVS_VSCTL([destroy b br0])], +AT_CHECK([RUN_OVS_VSCTL_TOGETHER([destroy b br0], + [destroy b br1], + [destroy b br2], + [clear o . bridges])], [0], [stdout], [], [OVS_VSCTL_CLEANUP]) AT_CHECK([RUN_OVS_VSCTL([list b])], [0], [], [], [OVS_VSCTL_CLEANUP]) @@ -566,19 +647,22 @@ 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([RUN_OVS_VSCTL([add-br br0])], [0], [ignore], [], [OVS_VSCTL_CLEANUP]) 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])], [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], [[<0> + _uuid : <0> active_timeout : 0 add_id_to_interface : false @@ -609,7 +693,7 @@ AT_CHECK([RUN_OVS_VSCTL([set b 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. + [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::])], [1], [], [ovs-vsctl: datapath_id::: trailing garbage ":" in argument @@ -635,10 +719,10 @@ AT_CHECK([RUN_OVS_VSCTL([set c br1 connection-mode:x=y])], AT_CHECK([RUN_OVS_VSCTL([add b 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([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])], @@ -647,6 +731,140 @@ AT_CHECK([RUN_OVS_VSCTL([destroy b br2])], OVS_VSCTL_CLEANUP AT_CLEANUP +AT_SETUP([database commands -- conditions]) +AT_KEYWORDS([ovs-vsctl]) +trap 'kill `cat pid`' 0 +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([ovs-vsctl --bare --timeout=5 --no-wait -vreconnect:ANY:emer --db=unix:socket -- --columns=name find bridge '$1' | sort | xargs echo], [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], []) +AT_CLEANUP + AT_SETUP([database commands -- wait-until immediately true]) AT_KEYWORDS([ovs-vsctl]) OVS_VSCTL_SETUP @@ -655,7 +873,7 @@ AT_CHECK([RUN_OVS_VSCTL( [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]) @@ -754,13 +972,44 @@ 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' --timeout=5 --no-wait -vreconnect:ANY:emer --db=unix:socket \ + -- create Bridge name=br0 | $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' --timeout=5 --no-wait -vreconnect:ANY:emer --db=unix:socket \ + -- --id=@br0 create Bridge name=br0 | $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' --timeout=5 --no-wait -vreconnect:ANY: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 | $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 b])], [0], [stdout], [], [OVS_VSCTL_CLEANUP]) AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], [[<0> @@ -771,12 +1020,15 @@ datapath_type : "" external_ids : {} fail_mode : [] flood_vlans : [] +flow_tables : {} mirrors : [] name : "br0" netflow : [] other_config : {} ports : [] sflow : [] +status : {} +stp_enable : false ]], [ignore], [test ! -e pid || kill `cat pid`]) OVS_VSCTL_CLEANUP AT_CLEANUP