CP-311259: Refine for comments

- Move tls lib to xapi-consts
- Ignore mli test check in ocaml/*/test_xxxt for quality-gate

Signed-off-by: Lin Liu <lin.liu01@citrix.com>

Author: Lin Liu

dune-project

@@ -31,15 +31,6 @@
 (package
  (name zstd))
 
-(package
- (name tls)
- (synopsis "TLS policy types and format-specific string renderers")
- (description
-  "Provides TLS policy types and renderers for GnuTLS priority strings and OpenSSL cipher lists.")
- (depends
-  (ocaml
-   (>= 4.14))))
-
 (package
  (name clock)
  (synopsis "Xapi's library for managing time")

ocaml/libs/tls/dune

@@ -9,8 +9,7 @@
       test_vm_placement test_vm_helpers test_repository test_repository_helpers
       test_ref test_xapi_helpers test_vm_group
       test_livepatch test_rpm test_updateinfo test_storage_smapiv1_wrapper test_storage_quicktest test_observer
-      test_pool_periodic_update_sync test_pkg_mgr test_tar_ext test_pool_repository
-      test_tls))
+      test_pool_periodic_update_sync test_pkg_mgr test_tar_ext test_pool_repository))
   (libraries
     alcotest
     angstrom
@@ -173,13 +172,6 @@
   (action (run ./check-no-xenctrl %{x}))
 )
 
-(test
-  (name test_tls)
-  (modes exe)
-  (modules test_tls)
-  (libraries alcotest tls)
-)
-
 (env (_ (env-vars (XAPI_TEST 1))))
 
 ; disassemble, but without sources

ocaml/tests/dune

@@ -0,0 +1,5 @@
+(test
+  (name test_tls_policy)
+  (package xapi-consts)
+  (libraries alcotest xapi-consts)
+)

ocaml/xapi-consts/test/dune

@@ -12,7 +12,7 @@
  * GNU Lesser General Public License for more details.
  *)
 
-open Tls
+open Tls_policy
 
 (* ---- GnuTLS tests ------------------------------------------------------- *)
 
@@ -162,5 +162,10 @@ let openssl_tests =
   ; ("string_of_policy_raises", `Quick, test_openssl_string_of_policy_raises)
   ]
 
-let () =
-  Alcotest.run "Tls" [("Gnutls", gnutls_tests); ("Openssl", openssl_tests)]
+let tests =
+  [
+    ("Gnutls", gnutls_tests)
+  ; ("Openssl", openssl_tests)
+  ]
+
+let () = Alcotest.run "Tls_policy" tests

ocaml/tests/test_tls.ml ocaml/xapi-consts/test/test_tls_policy.mlocaml/tests/test_tls.ml renamed to ocaml/xapi-consts/test/test_tls_policy.ml

@@ -0,0 +1,15 @@
+(*
+ * Copyright (c) Cloud Software Group, 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.
+ *)
+
+val tests : unit Alcotest.test list

ocaml/xapi-consts/test/test_tls_policy.mli

@@ -28,7 +28,7 @@ type policy = {
   ; server_preference: bool
 }
 
-(* ---- Default XenServer policy ------------------------------------------- *)
+(* ---- Default policy ------------------------------------------- *)
 
 let default =
   {

ocaml/libs/tls/tls.ml ocaml/xapi-consts/tls_policy.mlocaml/libs/tls/tls.ml renamed to ocaml/xapi-consts/tls_policy.ml

@@ -16,12 +16,12 @@
 
     Usage:
     {[
-      let () = print_endline (Tls.Gnutls.default_policy ())
-      let () = print_endline (Tls.Openssl.default_policy ())
-      let () = print_endline Tls.Openssl.default_curve
+      let () = print_endline (Tls_policy.Gnutls.default_policy ())
+      let () = print_endline (Tls_policy.Openssl.default_policy ())
+      let () = print_endline Tls_policy.Openssl.default_curve
       (* or with a custom policy: *)
       let my_policy = { ... }
-      let () = print_endline (Tls.Openssl.string_of_policy my_policy)
+      let () = print_endline (Tls_policy.Openssl.string_of_policy my_policy)
     ]} *)
 
 type version = TLS_1_2 | TLS_1_3