diff options
| author | Justin Pettit <jpettit@nicira.com> | 2010-07-15 14:53:36 -0700 |
|---|---|---|
| committer | Justin Pettit <jpettit@nicira.com> | 2010-07-30 21:26:54 -0700 |
| commit | 1a048029a0902439c3f17c49a7f71e4d09fecf70 (patch) | |
| tree | 116e5f3791eefa2205dd510daac6ca15c28cab11 /tests | |
| parent | 3a929702ae4153c97ea1b0bbb6af96b5a59573d0 (diff) | |
vswitchd: Remove default controller config from Open_vSwitch table
An OpenFlow controller is normally associated with a bridge. It was
possible to define a default controller in the Open_vSwitch table that
would be used if one was not associated with a bridge. This was seldom
used and mostly just caused confusion. This commit removes that
support, so an OpenFlow controller must always be associated with a
bridge.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ovs-vsctl.at | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/tests/ovs-vsctl.at b/tests/ovs-vsctl.at index 061a4f48..a8dc8546 100644 --- a/tests/ovs-vsctl.at +++ b/tests/ovs-vsctl.at @@ -360,76 +360,21 @@ 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 |