Skip to content

Remove inactive with_vm quicktests #3577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Remove inactive with_vm quicktests #3577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 0 additions & 78 deletions ocaml/quicktest/quicktest.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,47 +573,6 @@ let rec wait_for_task_complete session_id task =
| `pending | `cancelling -> wait_for_task_complete session_id task
| _ -> ()

(* CP-831 *)
let test_vhd_locking_hook session_id vm =
let test = make_test "test vhd locking hook" 2 in
start test;
Client.VM.start !rpc session_id vm false false;
(* Add a new VDI whose VBD is unplugged (so 2 plugged, 1 unplugged *)

let all_srs = all_srs_with_vdi_create session_id in
let sr = List.hd all_srs in

let new_vdi = Client.VDI.create !rpc session_id "lvhd_testvdi"
"description" sr 4194304L `user false false [] [] [] [] in
let new_vbd = Client.VBD.create ~rpc:!rpc ~session_id ~vM:vm ~vDI:new_vdi ~userdevice:"9" ~bootable:false
~mode:`RW ~_type:`Disk ~unpluggable:true ~empty:false ~other_config:[Xapi_globs.owner_key,""]
~qos_algorithm_type:"" ~qos_algorithm_params:[] in

(* In a background thread plug/unplug the new VBD to cause some transient locking failures *)
let start = Unix.gettimeofday () in
debug test "Starting up conflicting thread in the background";
let total_bg_ops = ref 0 in
let t = Thread.create
(fun () ->
while Unix.gettimeofday () -. start < 30. do
(* We throw away exceptions because unplugs can fail (if the guest isn't ready) and this causes the
next plug to fail. We use asynchronous operations because we are sharing a single HTTP connection to the
master and we genuinely want the operations to (attempt to) execute in parallel *)
let task = Client.Async.VBD.plug !rpc session_id new_vbd in
incr total_bg_ops;
wait_for_task_complete session_id task;
let task = Client.Async.VBD.unplug !rpc session_id new_vbd in
incr total_bg_ops;
wait_for_task_complete session_id task
done) () in
(* Give the background thread a chance to start *)
Thread.delay 1.5;
(* Verify that the function 'test' can be called in the script *)

Thread.join t;
debug test (Printf.sprintf "Meanwhile background thread executed %d conflicting operations" !total_bg_ops);
success test

let powercycle_test session_id vm =
let test = make_test "Powercycling VM" 1 in
start test;
Expand Down Expand Up @@ -796,37 +755,6 @@ let async_test session_id =
let make_vif ~session_id ~vM ~network ~device =
Client.VIF.create ~rpc:!rpc ~session_id ~vM ~network ~mTU:0L ~mAC:"" ~device ~other_config:["promiscuous", "on"; "mtu", "1400"] ~qos_algorithm_type:"" ~qos_algorithm_params:[]

let with_vm s f =
try
let (_: API.ref_VM) = find_template s vm_template in
Copy link
Contributor

@mseri mseri Apr 25, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you stick with this, you should probably also remove vm_template from quicktest_common. What if instead we select the first debian or centos template from the list of available templates and keep the tests?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm doing a quicktest rewrite at the moment, and for that it will be more convenient to just remove these temporarily. So I'll remove these in my quicktest rewrite PR, and I'll make a ticket to re-enable them.

let test = make_test "Setting up test VM" 0 in
start test;
let vm = install_vm test s in
f s vm;
vm_uninstall test s vm;
success test
with Unable_to_find_suitable_vm_template ->
(* SKIP *)
()

let vm_powercycle_test s vm =
let test = make_test "VM powercycle test" 1 in
start test;
(* Try to add some VIFs *)
let (guest_installer_network: API.ref_network) = find_guest_installer_network s in
debug test (Printf.sprintf "Adding VIF to guest installer network (%s)" (Client.Network.get_uuid !rpc s guest_installer_network));
let (_: API.ref_VIF) = make_vif ~session_id:s ~vM:vm ~network:guest_installer_network ~device:"0" ~locking_mode:`network_default ~ipv4_allowed:[] ~ipv6_allowed:[] in
begin match Client.PIF.get_all !rpc s with
| pif :: _ ->
let net = Client.PIF.get_network !rpc s pif in
debug test (Printf.sprintf "Adding VIF to physical network (%s)" (Client.Network.get_uuid !rpc s net));
let (_: API.ref_VIF) = make_vif ~session_id:s ~vM:vm ~network:net ~device:"1" ~locking_mode:`network_default ~ipv4_allowed:[] ~ipv6_allowed:[] in
()
| _ -> ()
end;
powercycle_test s vm;
success test


let _ =
let all_tests = [
Expand All @@ -836,9 +764,6 @@ let _ =
"vdi";
"async";
"import";
"powercycle";
"lifecycle";
"vhd";
"copy";
"cbt";
"import_raw_vdi";
Expand Down Expand Up @@ -891,9 +816,6 @@ let _ =
maybe_run_test "vdi" (fun () -> vdi_test s);
maybe_run_test "async" (fun () -> async_test s);
maybe_run_test "import" (fun () -> import_export_test s);
maybe_run_test "vhd" (fun () -> with_vm s test_vhd_locking_hook);
maybe_run_test "powercycle" (fun () -> with_vm s vm_powercycle_test);
maybe_run_test "lifecycle" (fun () -> with_vm s Quicktest_lifecycle.test);
maybe_run_test "copy" (fun () -> Quicktest_vdi_copy.start s sr);
maybe_run_test "import_raw_vdi" (fun () -> Quicktest_import_raw_vdi.start s);
with
Expand Down
199 changes: 0 additions & 199 deletions ocaml/quicktest/quicktest_lifecycle.ml
View file
Open in desktop

This file was deleted.