From 581d7da8293b5c6009c27428137b817cc69b11c0 Mon Sep 17 00:00:00 2001 From: Ansis Atteka Date: Thu, 24 Oct 2013 15:36:29 -0700 Subject: [PATCH] tests: use full table names in ovs-vsctl commands It is more obvious to figure out what exactly test is doing if ovs-vsctl commands contain full table names. Signed-off-by: Ansis Atteka Acked-by: Ben Pfaff --- tests/ovs-vsctl.at | 70 +++++++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/tests/ovs-vsctl.at b/tests/ovs-vsctl.at index 4449f7a2e..851e4d8dd 100644 --- a/tests/ovs-vsctl.at +++ b/tests/ovs-vsctl.at @@ -620,11 +620,11 @@ AT_SETUP([database commands -- positive checks]) AT_KEYWORDS([ovs-vsctl]) OVS_VSCTL_SETUP AT_CHECK( - [RUN_OVS_VSCTL_TOGETHER([--id=@br0 create b name=br0], + [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], @@ -651,26 +651,26 @@ 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_TOGETHER([--id=@br1 create b name=br1 datapath_type="foo"], - [--id=@br2 create b name=br2 external-ids:bar=quux], + 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" @@ -691,25 +691,25 @@ AT_CHECK([RUN_OVS_VSCTL([get bridge br0 other_config:hwaddr -- --if-exists get b [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 b x datapath_id])], +AT_CHECK([RUN_OVS_VSCTL([--if-exists get bridge x datapath_id])], [0], [], [], [OVS_VSCTL_CLEANUP]) -AT_CHECK([RUN_OVS_VSCTL([--if-exists list b x])], +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]) @@ -763,46 +763,46 @@ targets : ["1.2.3.4:567"] 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 b x datapath_id])], +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([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 b br0 datapath_id:y,z])], +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'])], @@ -811,7 +811,7 @@ AT_CHECK([RUN_OVS_VSCTL([set c br1 'connection-mode=xyz'])], 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 netflow `cat netflow-uuid` targets '"1.2.3.4:567"'])], @@ -826,7 +826,7 @@ AT_CHECK([RUN_OVS_VSCTL([clear netflow x 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])], +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])], @@ -835,10 +835,10 @@ AT_CHECK([RUN_OVS_VSCTL([add in br1 name x])], 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 b br1 name br1])], +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 b br1 name])], +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 @@ -1006,7 +1006,7 @@ 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 @@ -1118,7 +1118,7 @@ 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([--id=@br0 create Bridge name=br0 -- add Open_vSwitch . bridges @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], [[<0> -- 2.20.1