Skip to content

Commit 597e38d

Browse files
author
Lin Liu
committed
CP-311215: Remove legacy PBIS code
PBIS was dropped since XS8, Here remove the legacy code to keep clean Signed-off-by: Lin Liu <lin.liu01@citrix.com>
1 parent beed772 commit 597e38d

File tree

4 files changed

+1
-1345
lines changed

4 files changed

+1
-1345
lines changed

ocaml/tests/suite_alcotest.ml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ let () =
6262
@ Test_vm.tests
6363
@ Test_dbsync_master.tests
6464
@ Test_pvs_cache_storage.tests
65-
@ Test_extauth_plugin_ADpbis.tests
6665
@ Test_helpers.tests
6766
@ Test_datamodel_lifecycle.tests
6867
@ Test_psr.tests

ocaml/tests/test_extauth_plugin_ADpbis.ml

Lines changed: 0 additions & 132 deletions
This file was deleted.

ocaml/xapi/extauth_ad.ml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,9 @@ open D
2222
module AD_type = struct
2323
exception Unknown_AD_type of string
2424

25-
type t = Pbis | Winbind
25+
type t = Winbind
2626

2727
let of_string = function
28-
| "pbis" ->
29-
Pbis
3028
| "winbind" ->
3129
Winbind
3230
| _ as at ->
@@ -36,20 +34,14 @@ end
3634

3735
module AD = struct
3836
let start_backend_daemon ~wait_until_success = function
39-
| AD_type.Pbis ->
40-
Extauth_plugin_ADpbis.Lwsmd.start ~wait_until_success ~timeout:5.
4137
| AD_type.Winbind ->
4238
Extauth_plugin_ADwinbind.Winbind.start ~wait_until_success ~timeout:5.
4339

4440
let stop_backend_daemon ~wait_until_success = function
45-
| AD_type.Pbis ->
46-
Extauth_plugin_ADpbis.Lwsmd.stop ~wait_until_success ~timeout:3.
4741
| AD_type.Winbind ->
4842
Extauth_plugin_ADwinbind.Winbind.stop ~wait_until_success ~timeout:3.
4943

5044
let init_service ~__context = function
51-
| AD_type.Pbis ->
52-
Extauth_plugin_ADpbis.Lwsmd.init_service ~__context
5345
| AD_type.Winbind ->
5446
Extauth_plugin_ADwinbind.Winbind.init_service ~__context
5547
end
@@ -71,7 +63,5 @@ let init_service ~__context =
7163

7264
let methods () =
7365
match !Xapi_globs.extauth_ad_backend |> AD_type.of_string with
74-
| Pbis ->
75-
Extauth_plugin_ADpbis.AuthADlw.methods
7666
| Winbind ->
7767
Extauth_plugin_ADwinbind.AuthADWinbind.methods

0 commit comments

Comments
 (0)