X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fovs-vsctl.at;h=e9b21065ecda8a4fb197e0ca9d8abc64f40b60bb;hb=6e8e271c0dc5e931d64436dea6643eb25527b1d0;hp=2ea9e40420eee958f1901048b9a4d489e84ea9e6;hpb=a0bc29a541fc7dc6e20137d5558e2094d614e6ab;p=openvswitch

diff --git a/tests/ovs-vsctl.at b/tests/ovs-vsctl.at
index 2ea9e404..e9b21065 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])
@@ -350,6 +354,87 @@ CHECK_IFACES([a], [a1], [a2], [a3])
 OVS_VSCTL_CLEANUP
 AT_CLEANUP
 
+AT_SETUP([controllers])
+AT_KEYWORDS([controller ovs-vsctl])
+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
+AT_CLEANUP
+
 dnl ----------------------------------------------------------------------
 AT_BANNER([ovs-vsctl unit tests -- fake bridges])