Merge pull request #2067 from kaifengz/CA-146821-master

CA-146821: Accept IPv6 address when configuring WLB

Author: johnelse

ocaml/test/OMakefile

@@ -49,6 +49,7 @@ OCAML_OBJS = \
 	test_vm_helpers \
 	test_xenopsd_metadata \
 	test_ca121350 \
+	test_workload_balancing \
 
 OCamlProgram(suite, suite $(OCAML_OBJS) )
 

ocaml/test/suite.ml

@@ -39,6 +39,7 @@ let base_suite =
 			Test_pgpu_helpers.test;
 			Test_vm_helpers.test;
 			Test_xenopsd_metadata.test;
+			Test_workload_balancing.test;
 			(* Test_ca121350.test; *)
 		]
 

ocaml/test/test_workload_balancing.ml

@@ -0,0 +1,53 @@
+(*
+ * Copyright (C) 2014 Citrix Systems Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; version 2.1 only. with the special
+ * exception on linking described in file LICENSE.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *)
+
+open OUnit
+open Test_common
+
+let test_split_host_port () =
+	let split = Workload_balancing.split_host_port in
+	let assert_succeed url host port =
+		assert_equal (split url) (host, port)
+	in
+	let assert_raise_url_invalid url =
+		assert_raises_api_error Api_errors.wlb_url_invalid ~args:[url] (fun () -> split url)
+	in
+
+	(* succeed cases *)
+	assert_succeed "192.168.0.1:80" "192.168.0.1" 80;
+	assert_succeed "hostname.com:80" "hostname.com" 80;
+	assert_succeed "[fe80::a085:31cf:b31a:6a]:80" "fe80::a085:31cf:b31a:6a" 80;
+
+	(* missing port number *)
+	assert_raise_url_invalid "192.168.0.1";
+	assert_raise_url_invalid "hostname.noport.com";
+	assert_raise_url_invalid "[fe80::a085:31cf:b31a:6a]";
+
+	(* non-integer port *)
+	assert_raise_url_invalid "192.168.0.1:http";
+	assert_raise_url_invalid "hostname.com:port";
+	assert_raise_url_invalid "[fe80::a085:31cf:b31a:6a]:ipv6";
+
+	(* malformed IPv6 host port peers *)
+	assert_raise_url_invalid "[fe80::a085:31cf:b31a:6a]80";
+	assert_raise_url_invalid "[fe80::a085:31cf:b31a:6a:80";
+
+	(* others *)
+	assert_raise_url_invalid "http://example.com:80/"
+
+let test =
+	"test_workload_balancing" >:::
+		[
+			"test_split_host_port" >:: test_split_host_port;
+		]

ocaml/xapi/workload_balancing.ml

@@ -73,11 +73,21 @@ let raise_internal_error args =
 
 let split_host_port url =
   try
-    match String.split_f (fun a -> a = ':') url with
-      | [host; port] ->
+    if url.[0] = '[' then (* IPv6 *)
+      begin
+          let host_end = String.rindex url ']' in
+          if url.[host_end + 1] <> ':' then
+              raise_url_invalid url;
+          let host = String.sub url 1 (host_end - 1) in
+          let port = String.sub url (host_end + 2) (String.length url - host_end - 2) in
           (host, int_of_string port)
-      | _ ->
-          raise_url_invalid url
+      end
+    else
+      match String.split_f (fun a -> a = ':') url with
+        | [host; port] ->
+            (host, int_of_string port)
+        | _ ->
+            raise_url_invalid url
   with
     | _ -> raise_url_invalid url