diff options
| author | Ben Pfaff <blp@nicira.com> | 2010-02-09 12:13:46 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2010-02-09 12:13:52 -0800 |
| commit | bb1c67c813c9bd80c2bd9acf2bf5158b48841c61 (patch) | |
| tree | 9d4d7de09ac6e9a9fdb00ffebfee9915472b233a /tests | |
| parent | aeee85aab0f50f0408672a3150a41caf0a89cc3d (diff) | |
ovs-vsctl: Add --may-exist option for add-port, add-bond commands.
This is useful in interface-reconfigure, in an upcoming commit.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ovs-vsctl.at | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/tests/ovs-vsctl.at b/tests/ovs-vsctl.at index e6e209df..ee2905b4 100644 --- a/tests/ovs-vsctl.at +++ b/tests/ovs-vsctl.at @@ -244,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]) @@ -257,8 +263,14 @@ AT_CHECK([RUN_OVS_VSCTL( [add-br a], [add-br b], [add-port a a1], - [add-port b b1], + [--may-exist add-port b b1], [del-port a a1])], [0], [], [], [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]) @@ -347,6 +359,7 @@ m4_define([OVS_VSCTL_SETUP_SIMPLE_FAKE_CONF], [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])], |