datapath: Fix build with backported dev_get_stats().

[sliver-openvswitch.git] / tests / ovs-vsctl.at

diff --git a/tests/ovs-vsctl.at b/tests/ovs-vsctl.at
index ee2905b..e9b2106 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], 
-  [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])
 
@@ -505,11 +590,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"
@@ -590,14 +675,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])
-if test "$HAVE_PCRE" = yes; then
-    AT_CHECK([RUN_OVS_VSCTL([set c br1 'connection-mode=xyz'])], 
-      [1], [], [ovs-vsctl: constraint violation: "xyz" is not a either "in-band" or "out-of-band"
-], [OVS_VSCTL_CLEANUP])
-else
-    AT_CHECK([RUN_OVS_VSCTL([set c br1 'connection-mode=xyz'])], 
-      [0], [], [], [OVS_VSCTL_CLEANUP])
-fi
+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])