X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fovs-vsctl.at;h=e9b21065ecda8a4fb197e0ca9d8abc64f40b60bb;hb=55e199190427d962831486b5cec0d1723519a197;hp=0d35d17c70c189e8c39b2b9bfb02bb0a20aaedda;hpb=a4af00400a835eb87569ba40e21874c05e872c0f;p=openvswitch diff --git a/tests/ovs-vsctl.at b/tests/ovs-vsctl.at index 0d35d17c..e9b21065 100644 --- a/tests/ovs-vsctl.at +++ b/tests/ovs-vsctl.at @@ -167,6 +167,10 @@ AT_KEYWORDS([ovs-vsctl]) OVS_VSCTL_SETUP AT_CHECK([RUN_OVS_VSCTL([add-br a], [add-br b])], [0], [], [], [OVS_VSCTL_CLEANUP]) +AT_CHECK([RUN_OVS_VSCTL([--may-exist add-br a b 9])], [1], [], + [ovs-vsctl: "--may-exist add-br a b 9" but a is not a VLAN bridge +], + [OVS_VSCTL_CLEANUP]) CHECK_BRIDGES([a, a, 0], [b, b, 0]) CHECK_PORTS([a]) CHECK_IFACES([a]) @@ -240,6 +244,12 @@ OVS_VSCTL_SETUP AT_CHECK([RUN_OVS_VSCTL( [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], [], + [ovs-vsctl: "--may-exist add-bond a bond0 a2 a1" but bond0 actually has interface(s) a1, a2, a3 +], + [OVS_VSCTL_CLEANUP]) CHECK_BRIDGES([a, a, 0]) CHECK_PORTS([a], [bond0]) CHECK_IFACES([a], [a1], [a2], [a3]) @@ -252,9 +262,17 @@ OVS_VSCTL_SETUP AT_CHECK([RUN_OVS_VSCTL( [add-br a], [add-br b], - [add-port a a1], - [add-port b b1], - [del-port a a1])], [0], [], [], [OVS_VSCTL_CLEANUP]) + [add-port a a1 tag=9], + [get port a1 tag], + [--may-exist add-port b b1], + [del-port a a1])], [0], [9 +], [], [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], [], + [ovs-vsctl: "--may-exist add-port a b1" but b1 is actually attached to bridge b +], + [OVS_VSCTL_CLEANUP]) CHECK_BRIDGES([a, a, 0], [b, b, 0]) CHECK_PORTS([a]) CHECK_IFACES([a]) @@ -268,9 +286,11 @@ AT_KEYWORDS([ovs-vsctl]) OVS_VSCTL_SETUP AT_CHECK([RUN_OVS_VSCTL_TOGETHER( [add-br a], - [add-bond a bond0 a1 a2 a3], + [add-bond a bond0 a1 a2 a3 tag=9], + [get Port bond0 tag], [del-port bond0])], [0], [ +9 ], [], [OVS_VSCTL_CLEANUP]) CHECK_BRIDGES([a, a, 0]) @@ -334,6 +354,87 @@ CHECK_IFACES([a], [a1], [a2], [a3]) OVS_VSCTL_CLEANUP AT_CLEANUP +AT_SETUP([controllers]) +AT_KEYWORDS([controller ovs-vsctl]) +OVS_VSCTL_SETUP +AT_CHECK([RUN_OVS_VSCTL_TOGETHER( + [add-br br0], + + [set-controller tcp:1.2.3.4], + [get-controller], + [get-controller default], + [get-controller br0], + + [set-controller br0 tcp:4.5.6.7], + [get-controller], + [get-controller default], + [get-controller br0], + + [del-controller], + [get-controller], + [get-controller default], + [get-controller br0], + + [set-controller default tcp:8.9.10.11], + [get-controller], + [get-controller default], + [get-controller br0], + + [del-controller default], + [get-controller], + [get-controller default], + [get-controller br0], + + [del-controller br0], + [get-controller], + [get-controller default], + [get-controller br0], + + [set-controller default tcp:1.2.3.4 tcp:4.5.6.7], + [get-controller], + [get-controller default], + [get-controller br0], + + [set-controller br0 tcp:8.9.10.11 tcp:5.4.3.2], + [get-controller], + [get-controller default], + [get-controller br0])], [0], [ + +tcp:1.2.3.4 +tcp:1.2.3.4 +tcp:1.2.3.4 + +tcp:1.2.3.4 +tcp:1.2.3.4 +tcp:4.5.6.7 + + + +tcp:4.5.6.7 + +tcp:8.9.10.11 +tcp:8.9.10.11 +tcp:4.5.6.7 + + + +tcp:4.5.6.7 + + + + + +tcp:1.2.3.4\ntcp:4.5.6.7 +tcp:1.2.3.4\ntcp:4.5.6.7 +tcp:1.2.3.4\ntcp:4.5.6.7 + +tcp:1.2.3.4\ntcp:4.5.6.7 +tcp:1.2.3.4\ntcp: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 -- fake bridges]) @@ -341,8 +442,11 @@ m4_define([OVS_VSCTL_SETUP_SIMPLE_FAKE_CONF], [AT_CHECK( [RUN_OVS_VSCTL( [add-br xenbr0], + [--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])], [0], [], [], [OVS_VSCTL_CLEANUP])]) @@ -350,6 +454,15 @@ AT_SETUP([simple fake bridge]) AT_KEYWORDS([ovs-vsctl fake-bridge]) OVS_VSCTL_SETUP OVS_VSCTL_SETUP_SIMPLE_FAKE_CONF +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_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 +], [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_CLEANUP]) CHECK_BRIDGES([xapi1, xenbr0, 9], [xenbr0, xenbr0, 0]) CHECK_PORTS([xenbr0], [eth0]) CHECK_IFACES([xenbr0], [eth0]) @@ -451,7 +564,7 @@ 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([--force create b name=br0])], +AT_CHECK([RUN_OVS_VSCTL([create b name=br0])], [0], [stdout], [], [OVS_VSCTL_CLEANUP]) cp stdout out1 AT_CHECK([RUN_OVS_VSCTL([list b])], @@ -459,28 +572,29 @@ AT_CHECK([RUN_OVS_VSCTL([list b])], cp stdout out2 AT_CHECK([perl $srcdir/uuidfilt.pl out1 out2], [0], [[<0> -_uuid (RO): <0> -controller (RO): [] -datapath_id (RO): [] -datapath_type (RO): "" -external_ids (RW): {} -flood_vlans (RW): [] -mirrors (RO): [] -name (RO): "br0" -netflow (RO): [] -other_config (RW): {} -ports (RO): [] +_uuid : <0> +controller : [] +datapath_id : [] +datapath_type : "" +external_ids : {} +flood_vlans : [] +mirrors : [] +name : "br0" +netflow : [] +other_config : {} +ports : [] +sflow : [] ]], [ignore], [test ! -e pid || kill `cat pid`]) AT_CHECK( [RUN_OVS_VSCTL( [set bridge br0 \ 'other_config:datapath_id="0123456789ab"' \ 'other_config:hwaddr="00:11:22:33:44:55"' \ - 'external-ids={"xs-network-uuids"="9c45f225-a7cf-439d-976d-83db6271fda1"}' -- \ - add bridge br0 external_ids '"xs-network-names"="local; remote; cloud"'])], + 'external-ids={"uuids"="9c45f225-a7cf-439d-976d-83db6271fda1"}' -- \ + 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])], - [0], [{datapath_id="0123456789ab", hwaddr="00:11:22:33:44:55"}\n{xs-network-names="local; remote; cloud", xs-network-uuids="9c45f225-a7cf-439d-976d-83db6271fda1"} + [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])], [0], ["00:11:22:33:44:55" @@ -495,7 +609,7 @@ 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([--force destroy b br0])], +AT_CHECK([RUN_OVS_VSCTL([destroy b br0])], [0], [stdout], [], [OVS_VSCTL_CLEANUP]) AT_CHECK([RUN_OVS_VSCTL([list b])], [0], [], [], [OVS_VSCTL_CLEANUP]) @@ -505,25 +619,25 @@ AT_CLEANUP AT_SETUP([database commands -- negative checks]) AT_KEYWORDS([ovs-vsctl]) OVS_VSCTL_SETUP -AT_CHECK([RUN_OVS_VSCTL([--force create b name=br0])], +AT_CHECK([RUN_OVS_VSCTL([create b name=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([--force create n targets='"1.2.3.4:567"'])], +AT_CHECK([RUN_OVS_VSCTL([create n targets='"1.2.3.4:567"'])], [0], [stdout], [], [OVS_VSCTL_CLEANUP]) cp stdout netflow-uuid AT_CHECK([RUN_OVS_VSCTL([list n `cat netflow-uuid`])], [0], [stdout], [], [OVS_VSCTL_CLEANUP]) AT_CHECK([perl $srcdir/uuidfilt.pl netflow-uuid stdout], [0], [[<0> -_uuid (RO): <0> -active_timeout (RW): 0 -add_id_to_interface (RW): false -engine_id (RW): [] -engine_type (RW): [] -targets (RW): ["1.2.3.4:567"] +_uuid : <0> +active_timeout : 0 +add_id_to_interface : false +engine_id : [] +engine_type : [] +targets : ["1.2.3.4:567"] ]], [ignore], [test ! -e pid || kill `cat pid`]) AT_CHECK([RUN_OVS_VSCTL([list interx x])], [1], [], [ovs-vsctl: unknown table "interx" @@ -556,45 +670,27 @@ AT_CHECK([RUN_OVS_VSCTL([get b 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])], - [1], [], [ovs-vsctl: -1 is outside the valid range 1 to 4095 (inclusive) + [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])], - [1], [], [ovs-vsctl: 4096 is outside the valid range 1 to 4095 (inclusive) -], [OVS_VSCTL_CLEANUP]) -AT_CHECK([RUN_OVS_VSCTL([set b br0 datapath_id=4096])], - [1], [], [ovs-vsctl: datapath_id=4096: cannot modify read-only column datapath_id in table Bridge + [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'])], - [1], [], [ovs-vsctl: xyz is not valid (it does not match ^in-band|out-of-band$) -], [OVS_VSCTL_CLEANUP]) + [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])], [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])], - [1], [], [ovs-vsctl: cannot modify read-only column datapath_id in table Bridge -], [OVS_VSCTL_CLEANUP]) -AT_CHECK([RUN_OVS_VSCTL([--force add b br1 datapath_id 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 b br1 datapath_id x=y])], - [1], [], [ovs-vsctl: cannot modify read-only column datapath_id in table Bridge -], [OVS_VSCTL_CLEANUP]) AT_CHECK([RUN_OVS_VSCTL([remove n `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 minimun number is 1 ], [OVS_VSCTL_CLEANUP]) -AT_CHECK([RUN_OVS_VSCTL([clear bri br0 netflow])], - [1], [], [ovs-vsctl: cannot modify read-only column netflow in table Bridge -], [OVS_VSCTL_CLEANUP]) AT_CHECK([RUN_OVS_VSCTL([clear n `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([create b name=br2])], - [1], [], [ovs-vsctl: "create" requires --force -], [OVS_VSCTL_CLEANUP]) -AT_CHECK([RUN_OVS_VSCTL([destroy b br0])], - [1], [], [ovs-vsctl: "destroy" requires --force -], [OVS_VSCTL_CLEANUP]) -AT_CHECK([RUN_OVS_VSCTL([--force destroy b br2])], +AT_CHECK([RUN_OVS_VSCTL([destroy b br2])], [1], [], [ovs-vsctl: no row "br2" in table Bridge ], [OVS_VSCTL_CLEANUP]) OVS_VSCTL_CLEANUP @@ -606,21 +702,22 @@ 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([--force create Bridge name=br0 -- list b])], +AT_CHECK([RUN_OVS_VSCTL([create Bridge name=br0 -- list b])], [0], [stdout], [], [OVS_VSCTL_CLEANUP]) AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], [[<0> -_uuid (RO): <1> -controller (RO): [] -datapath_id (RO): [] -datapath_type (RO): "" -external_ids (RW): {} -flood_vlans (RW): [] -mirrors (RO): [] -name (RO): "br0" -netflow (RO): [] -other_config (RW): {} -ports (RO): [] +_uuid : <1> +controller : [] +datapath_id : [] +datapath_type : "" +external_ids : {} +flood_vlans : [] +mirrors : [] +name : "br0" +netflow : [] +other_config : {} +ports : [] +sflow : [] ]], [ignore], [test ! -e pid || kill `cat pid`]) OVS_VSCTL_CLEANUP AT_CLEANUP