Skip to content

Commit 9eb33db

Browse files
euanhrobhoes
euanh
authored and
robhoes
committed
CA-18300: Update PVS site tests to use new Xapi_pvs_cache_storage calls
Signed-off-by: Euan Harris <[email protected]>
1 parent 05ef582 commit 9eb33db

File tree

1 file changed

+35
-34
lines changed

1 file changed

+35
-34
lines changed

‎ocaml/test/test_pvs_site.ml‎

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,18 @@ let test_add_local_sr () =
8080
let site = XF.introduce ~__context ~name in
8181
let sr1 = make_sr ~__context ~shared:false () in
8282
let sr2 = make_sr ~__context ~shared:false () in
83-
let cache () = DF.get_cache_storage ~__context ~self:site in
84-
( XF.add_cache_storage ~__context ~self:site ~value:sr1
85-
; XF.add_cache_storage ~__context ~self:site ~value:sr2
83+
let cache () =
84+
Db.PVS_site.get_cache_storage ~__context ~self:site
85+
|> List.map (fun pcs -> Db.PVS_cache_storage.get_SR ~__context ~self:pcs) in
86+
87+
( ignore (Xapi_pvs_cache_storage.create ~__context ~site:site ~sR:sr1 ~size:20L)
88+
; ignore (Xapi_pvs_cache_storage.create ~__context ~site:site ~sR:sr2 ~size:20L)
8689
; assert_equal true (List.mem sr1 @@ cache ())
8790
; assert_equal true (List.mem sr2 @@ cache ())
8891
; assert_raises_api_error Api_errors.pvs_site_sr_already_added
89-
(fun () -> XF.add_cache_storage ~__context ~self:site ~value:sr1)
92+
(fun () -> ignore (Xapi_pvs_cache_storage.create ~__context ~site:site ~sR:sr1 ~size:20L))
9093
; assert_raises_api_error Api_errors.pvs_site_sr_already_added
91-
(fun () -> XF.add_cache_storage ~__context ~self:site ~value:sr2)
94+
(fun () -> ignore (Xapi_pvs_cache_storage.create ~__context ~site:site ~sR:sr2 ~size:20L))
9295
)
9396

9497
let test_add_shared_sr () =
@@ -97,55 +100,56 @@ let test_add_shared_sr () =
97100
let __context = make_test_database () in
98101
let site = XF.introduce ~__context ~name in
99102
let sr1 = make_sr ~__context ~shared:true () in
100-
let cache () = DF.get_cache_storage ~__context ~self:site in
101-
( XF.add_cache_storage ~__context ~self:site ~value:sr1
103+
let cache () =
104+
Db.PVS_site.get_cache_storage ~__context ~self:site
105+
|> List.map (fun pcs -> Db.PVS_cache_storage.get_SR ~__context ~self:pcs) in
106+
107+
( ignore (Xapi_pvs_cache_storage.create ~__context ~site:site ~sR:sr1 ~size:20L)
102108
; assert_equal true (List.mem sr1 @@ cache ())
103109
; assert_raises_api_error Api_errors.pvs_site_sr_already_added
104-
(fun () -> XF.add_cache_storage ~__context ~self:site ~value:sr1)
110+
(fun () -> ignore (Xapi_pvs_cache_storage.create ~__context ~site:site ~sR:sr1 ~size:20L))
105111
)
106112

107113
let test_add_mixed_sr () =
108114
let module XF = Xapi_pvs_site in
109115
let module DF = Db.PVS_site in
110116
let __context = make_test_database () in
111117
let site = XF.introduce ~__context ~name in
112-
let cache () = DF.get_cache_storage ~__context ~self:site in
118+
let cache () =
119+
Db.PVS_site.get_cache_storage ~__context ~self:site
120+
|> List.map (fun pcs -> Db.PVS_cache_storage.get_SR ~__context ~self:pcs) in
113121
let sr1 = make_sr ~__context ~shared:true () in
114122
let sr2 = make_sr ~__context ~shared:false () in
115-
( XF.add_cache_storage ~__context ~self:site ~value:sr1
116-
; XF.add_cache_storage ~__context ~self:site ~value:sr2
123+
( ignore (Xapi_pvs_cache_storage.create ~__context ~site:site ~sR:sr1 ~size:20L)
124+
; ignore (Xapi_pvs_cache_storage.create ~__context ~site:site ~sR:sr2 ~size:20L)
117125
; assert_equal true (List.mem sr1 @@ cache ())
118126
; assert_equal true (List.mem sr2 @@ cache ())
119127
; assert_raises_api_error Api_errors.pvs_site_sr_already_added
120-
(fun () -> XF.add_cache_storage ~__context ~self:site ~value:sr1)
128+
(fun () -> ignore (Xapi_pvs_cache_storage.create ~__context ~site:site ~sR:sr1 ~size:20L))
121129
; assert_raises_api_error Api_errors.pvs_site_sr_already_added
122-
(fun () -> XF.add_cache_storage ~__context ~self:site ~value:sr2)
130+
(fun () -> ignore (Xapi_pvs_cache_storage.create ~__context ~site:site ~sR:sr2 ~size:20L))
123131
)
124132

125133
let test_remove_local_sr () =
126134
let module XF = Xapi_pvs_site in
127135
let module DF = Db.PVS_site in
128136
let __context = make_test_database () in
129137
let site = XF.introduce ~__context ~name in
138+
let cache () =
139+
Db.PVS_site.get_cache_storage ~__context ~self:site
140+
|> List.map (fun pcs -> Db.PVS_cache_storage.get_SR ~__context ~self:pcs) in
130141
let sr1 = make_sr ~__context ~shared:false () in
131142
let sr2 = make_sr ~__context ~shared:false () in
132143
let sr3 = make_sr ~__context ~shared:false () in
133-
let cache () = DF.get_cache_storage ~__context ~self:site in
134-
( XF.add_cache_storage ~__context ~self:site ~value:sr1
135-
; XF.add_cache_storage ~__context ~self:site ~value:sr2
136-
; assert_equal true (List.mem sr1 @@ cache ())
144+
( let pcs1 = Xapi_pvs_cache_storage.create ~__context ~site:site ~sR:sr1 ~size:20L in
145+
let pcs2 = Xapi_pvs_cache_storage.create ~__context ~site:site ~sR:sr2 ~size:20L in
146+
assert_equal true (List.mem sr1 @@ cache ())
137147
; assert_equal true (List.mem sr2 @@ cache ())
138148
; assert_equal false (List.mem sr3 @@ cache ())
139-
; assert_raises_api_error Api_errors.sr_not_in_pvs_site
140-
(fun () -> XF.remove_cache_storage ~__context ~self:site ~value:sr3)
141-
; XF.remove_cache_storage ~__context ~self:site ~value:sr1
149+
; Xapi_pvs_cache_storage.destroy ~__context ~self:pcs1
142150
; assert_equal true (List.mem sr2 @@ cache ())
143-
; XF.remove_cache_storage ~__context ~self:site ~value:sr2
151+
; Xapi_pvs_cache_storage.destroy ~__context ~self:pcs2
144152
; assert_equal [] (cache ())
145-
; assert_raises_api_error Api_errors.sr_not_in_pvs_site
146-
(fun () -> XF.remove_cache_storage ~__context ~self:site ~value:sr2)
147-
; assert_raises_api_error Api_errors.sr_not_in_pvs_site
148-
(fun () -> XF.remove_cache_storage ~__context ~self:site ~value:sr1)
149153
)
150154

151155
let test_remove_shared_sr () =
@@ -154,16 +158,13 @@ let test_remove_shared_sr () =
154158
let __context = make_test_database () in
155159
let site = XF.introduce ~__context ~name in
156160
let sr1 = make_sr ~__context ~shared:true () in
157-
let sr2 = make_sr ~__context ~shared:true () in
158-
let cache () = DF.get_cache_storage ~__context ~self:site in
159-
( XF.add_cache_storage ~__context ~self:site ~value:sr1
160-
; assert_equal true (List.mem sr1 @@ cache ())
161-
; assert_raises_api_error Api_errors.sr_not_in_pvs_site
162-
(fun () -> XF.remove_cache_storage ~__context ~self:site ~value:sr2)
163-
; XF.remove_cache_storage ~__context ~self:site ~value:sr1
161+
let cache () =
162+
Db.PVS_site.get_cache_storage ~__context ~self:site
163+
|> List.map (fun pcs -> Db.PVS_cache_storage.get_SR ~__context ~self:pcs) in
164+
( let pcs1 = Xapi_pvs_cache_storage.create ~__context ~site:site ~sR:sr1 ~size:20L in
165+
assert_equal true (List.mem sr1 @@ cache ())
166+
; Xapi_pvs_cache_storage.destroy ~__context ~self:pcs1
164167
; assert_equal [] (cache ())
165-
; assert_raises_api_error Api_errors.sr_not_in_pvs_site
166-
(fun () -> XF.remove_cache_storage ~__context ~self:site ~value:sr1)
167168
)
168169

169170
let test_set_name () =

0 commit comments

Comments
 (0)