X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fovs-vsctl.at;h=c6347037268e792e3495afb2eab9393f42ad223a;hb=fb0d597fb64308c60001e3afc9b31eb295dedb6b;hp=045b1c301467bb6e496be8285a8d664b0b91ee5d;hpb=bfc96d9b50ae119fcbf39a9511bd9f662e7ad390;p=openvswitch diff --git a/tests/ovs-vsctl.at b/tests/ovs-vsctl.at index 045b1c30..c6347037 100644 --- a/tests/ovs-vsctl.at +++ b/tests/ovs-vsctl.at @@ -262,9 +262,11 @@ OVS_VSCTL_SETUP AT_CHECK([RUN_OVS_VSCTL( [add-br a], [add-br b], - [add-port a a1], + [add-port a a1 tag=9], + [get port a1 tag], [--may-exist add-port b b1], - [del-port a a1])], [0], [], [], [OVS_VSCTL_CLEANUP]) + [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], [], @@ -284,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]) @@ -505,11 +509,11 @@ AT_CHECK( [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"