git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reconnect: Implement "passive mode".
[sliver-openvswitch.git]
/
tests
/
ovs-vsctl.at
diff --git
a/tests/ovs-vsctl.at
b/tests/ovs-vsctl.at
index
07244a8
..
c634703
100644
(file)
--- 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],
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],
[--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], [],
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],
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], [
[del-port bond0])], [0], [
+9
], [], [OVS_VSCTL_CLEANUP])
CHECK_BRIDGES([a, a, 0])
], [], [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"' \
[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-nam
es"="local; remote; cloud"'])],
+ 'external-ids={"uuids"="9c45f225-a7cf-439d-976d-83db6271fda1"}' -- \
+ add bridge br0 external_ids '"
rol
es"="local; remote; cloud"'])],
[0], [], [], [OVS_VSCTL_CLEANUP])
AT_CHECK([RUN_OVS_VSCTL_ONELINE([get bridge br0 other_config external-ids])],
[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"
], [], [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"
@@
-590,6
+594,9
@@
AT_CHECK([RUN_OVS_VSCTL([set b br0 flood_vlans=-1])],
AT_CHECK([RUN_OVS_VSCTL([set b 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 b 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'])],
+ [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([set c br1 connection-mode:x=y])],
[1], [], [ovs-vsctl: cannot specify key to set for non-map column connection_mode
], [OVS_VSCTL_CLEANUP])