From a7d9efdc41ab7c1a9c74387c8e2f7493da19c99c Mon Sep 17 00:00:00 2001 From: Mindy Date: Tue, 11 Jun 2019 18:03:45 -0500 Subject: [PATCH] remove context and resolver from test unikernel arguments --- test/config.ml | 8 ++------ test/unikernel.ml | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/test/config.ml b/test/config.ml index 3f7bbe8..7b95a1e 100644 --- a/test/config.ml +++ b/test/config.ml @@ -1,14 +1,10 @@ open Mirage let client = - let packages = [ package "cohttp-mirage"; package "duration" ] in foreign - ~packages - "Unikernel.Client" @@ time @-> console @-> stackv4 @-> resolver @-> conduit @-> job + "Unikernel.Client" @@ time @-> console @-> stackv4 @-> job let () = let stack = generic_stackv4 default_network in - let res_dns = resolver_dns stack in - let conduit = conduit_direct stack in - let job = [ client $ default_time $ default_console $ stack $ res_dns $ conduit ] in + let job = [ client $ default_time $ default_console $ stack ] in register "http-fetch" job diff --git a/test/unikernel.ml b/test/unikernel.ml index 2d5152b..fd5f127 100644 --- a/test/unikernel.ml +++ b/test/unikernel.ml @@ -40,7 +40,7 @@ module Log = (val Logs.src_log src : Logs.LOG) let netvm = "10.137.0.5" let uri = Uri.of_string @@ "http://" ^ netvm ^ ":8082" -module Client (T: TIME) (C: CONSOLE) (STACK: Mirage_stack_lwt.V4) (RES: Resolver_lwt.S) (CON: Conduit_mirage.S) = struct +module Client (T: TIME) (C: CONSOLE) (STACK: Mirage_stack_lwt.V4) = struct let tcp_connect port stack = Log.info (fun f -> f "Entering tcp connect test: %s:%d" @@ -108,7 +108,7 @@ module Client (T: TIME) (C: CONSOLE) (STACK: Mirage_stack_lwt.V4) (RES: Resolver Log.err (fun f -> f "UDP fetch test: failed: :( couldn't write the packet"); Lwt.return_unit - let start _time c stack res (ctx:CON.t) = + let start _time c stack = udp_fetch ~src_port:9090 ~echo_server_port:1235 stack >>= fun () -> udp_fetch ~src_port:9091 ~echo_server_port:6668 stack >>= fun () -> tcp_connect 53 stack >>= fun () ->