Remove log_successful_output from call_script

This has not actually been working for many years. We did not miss it.

Signed-off-by: Rob Hoes <[email protected]>

Author: robhoes

lib/network_utils.ml

@@ -87,7 +87,7 @@ let check_n_run run_func script args =
                                         "stdout", stdout;
                                         "stderr", stderr]))
 
-let call_script ?(log_successful_output=false) ?(timeout=Some 60.0) script args =
+let call_script ?(timeout=Some 60.0) script args =
   let call_script_internal env script args =
     let (out,err) = Forkhelpers.execute_command_get_output ~env ?timeout script args in
     out
@@ -354,8 +354,8 @@ module Ip = struct
     | V6 -> ["-6"]
     | V46 -> []
 
-  let call ?(log=false) args =
-    call_script ~log_successful_output:log iproute2 args
+  let call args =
+    call_script iproute2 args
 
   let find output attr =
     info "Looking for %s in [%s]" attr output;
@@ -379,7 +379,7 @@ module Ip = struct
 
   let link_set dev args =
     Sysfs.assert_exists dev;
-    ignore (call ~log:true ("link" :: "set" :: dev :: args))
+    ignore (call ("link" :: "set" :: dev :: args))
 
   let link_set_mtu dev mtu =
     try ignore (link_set dev ["mtu"; string_of_int mtu])
@@ -489,27 +489,27 @@ module Ip = struct
       else []
     in
     try
-      ignore (call ~log:true (["addr"; "add"; addr; "dev"; dev] @ broadcast))
+      ignore (call (["addr"; "add"; addr; "dev"; dev] @ broadcast))
     with _ -> ()
 
   let set_ipv6_link_local_addr dev =
     let addr = get_ipv6_link_local_addr dev in
     try
-      ignore (call ~log:true ["addr"; "add"; addr; "dev"; dev; "scope"; "link"])
+      ignore (call ["addr"; "add"; addr; "dev"; dev; "scope"; "link"])
     with _ -> ()
 
   let flush_ip_addr ?(ipv6=false) dev =
     try
       Sysfs.assert_exists dev;
       let mode = if ipv6 then "-6" else "-4" in
-      ignore (call ~log:true [mode; "addr"; "flush"; "dev"; dev])
+      ignore (call [mode; "addr"; "flush"; "dev"; dev])
     with _ -> ()
 
   let del_ip_addr dev (ip, prefixlen) = 
     let addr = Printf.sprintf "%s/%d" (Unix.string_of_inet_addr ip) prefixlen in
     try
       Sysfs.assert_exists dev;
-      ignore (call ~log:true ["addr"; "del"; addr; "dev"; dev])
+      ignore (call ["addr"; "del"; addr; "dev"; dev])
     with _ -> ()
 
   let route_show ?(version=V46) dev =
@@ -521,10 +521,10 @@ module Ip = struct
       Sysfs.assert_exists dev;
       match network with
       | None ->
-        ignore (call ~log:true ["route"; "replace"; "default"; "via"; Unix.string_of_inet_addr gateway; "dev"; dev])
+        ignore (call ["route"; "replace"; "default"; "via"; Unix.string_of_inet_addr gateway; "dev"; dev])
       | Some (ip, prefixlen) ->
         let addr = Printf.sprintf "%s/%d" (Unix.string_of_inet_addr ip) prefixlen in
-        ignore (call ~log:true ["route"; "replace"; addr; "via"; Unix.string_of_inet_addr gateway; "dev"; dev])
+        ignore (call ["route"; "replace"; addr; "via"; Unix.string_of_inet_addr gateway; "dev"; dev])
     with _ -> ()
 
   let set_gateway dev gateway = set_route dev gateway
@@ -534,12 +534,12 @@ module Ip = struct
 
   let create_vlan interface vlan =
     if not (Sysfs.exists (vlan_name interface vlan)) then
-      ignore (call ~log:true ["link"; "add"; "link"; interface; "name"; vlan_name interface vlan;
+      ignore (call ["link"; "add"; "link"; interface; "name"; vlan_name interface vlan;
                               "type"; "vlan"; "id"; string_of_int vlan])
 
   let destroy_vlan name =
     if Sysfs.exists name then
-      ignore (call ~log:true ["link"; "delete"; name])
+      ignore (call ["link"; "delete"; name])
 
   let set_vf_mac dev index mac =
     try
@@ -779,17 +779,17 @@ module Dhclient = struct
            | _ -> l) [] options in
     write_conf_file ~ipv6 interface options;
     let ipv6' = if ipv6 then ["-6"] else [] in
-    call_script ~log_successful_output:true ~timeout:None dhclient (ipv6' @ gw_opt @ ["-q";
-                                                                                      "-pf"; pid_file ~ipv6 interface;
-                                                                                      "-lf"; lease_file ~ipv6 interface;
-                                                                                      "-cf"; conf_file ~ipv6 interface;
-                                                                                      interface])
+    call_script ~timeout:None dhclient (ipv6' @ gw_opt @ ["-q";
+                                                          "-pf"; pid_file ~ipv6 interface;
+                                                          "-lf"; lease_file ~ipv6 interface;
+                                                          "-cf"; conf_file ~ipv6 interface;
+                                                          interface])
 
   let stop ?(ipv6=false) interface =
     try
-      ignore (call_script ~log_successful_output:true dhclient ["-r";
-                                                                "-pf"; pid_file ~ipv6 interface;
-                                                                interface]);
+      ignore (call_script dhclient ["-r";
+                                    "-pf"; pid_file ~ipv6 interface;
+                                    interface]);
       Unix.unlink (pid_file ~ipv6 interface)
     with _ -> ()
 
@@ -816,8 +816,8 @@ module Dhclient = struct
 end
 
 module Fcoe = struct
-  let call ?(log=false) args =
-    call_script ~log_successful_output:log ~timeout:(Some 10.0) !fcoedriver args
+  let call args =
+    call_script ~timeout:(Some 10.0) !fcoedriver args
 
   let get_capabilities name =
     try
@@ -830,7 +830,7 @@ end
 
 module Sysctl = struct
   let write value variable =
-    ignore (call_script ~log_successful_output:true sysctl ["-q"; "-w"; variable ^ "=" ^ value])
+    ignore (call_script sysctl ["-q"; "-w"; variable ^ "=" ^ value])
 
   let set_ipv6_autoconf interface value =
     try
@@ -904,20 +904,20 @@ end
 module Ovs = struct
 
   module Cli : sig
-    val vsctl : ?log:bool -> string list -> string
-    val ofctl : ?log:bool -> string list -> string
-    val appctl : ?log:bool -> string list -> string
+    val vsctl : string list -> string
+    val ofctl : string list -> string
+    val appctl : string list -> string
   end = struct
     open Xapi_stdext_threads
     let s = Semaphore.create 5
-    let vsctl ?(log=false) args =
+    let vsctl args =
       Semaphore.execute s (fun () ->
-          call_script ~log_successful_output:log ovs_vsctl ("--timeout=20" :: args)
+          call_script ovs_vsctl ("--timeout=20" :: args)
         )
-    let ofctl ?(log=false) args =
-      call_script ~log_successful_output:log ovs_ofctl args
-    let appctl ?(log=false) args =
-      call_script ~log_successful_output:log ovs_appctl args
+    let ofctl args =
+      call_script ovs_ofctl args
+    let appctl args =
+      call_script ovs_appctl args
   end
 
   module type Cli_S = module type of Cli
@@ -1044,7 +1044,7 @@ module Ovs = struct
           in
           let setting = if do_workaround then "on" else "off" in
           (try
-             ignore (call_script ~log_successful_output:true ovs_vlan_bug_workaround [interface; setting]);
+             ignore (call_script ovs_vlan_bug_workaround [interface; setting]);
            with _ -> ());
         ) phy_interfaces
 
@@ -1081,7 +1081,7 @@ module Ovs = struct
 
     let get_mcast_snooping_enable ~name =
       try
-        vsctl ~log:true ["--"; "get"; "bridge"; name; "mcast_snooping_enable"]
+        vsctl ["--"; "get"; "bridge"; name; "mcast_snooping_enable"]
         |> String.trim
         |> bool_of_string
       with _ -> false
@@ -1158,11 +1158,11 @@ module Ovs = struct
           ["--"; "set"; "bridge"; name; "other_config:mcast-snooping-disable-flood-unregistered=" ^ (string_of_bool !mcast_snooping_disable_flood_unregistered)]
         | _ -> []
       in
-      vsctl ~log:true (del_old_arg @ ["--"; "--may-exist"; "add-br"; name] @
+      vsctl (del_old_arg @ ["--"; "--may-exist"; "add-br"; name] @
                        vlan_arg @ mac_arg @ fail_mode_arg @ disable_in_band_arg @ external_id_arg @ vif_arg @ set_mac_table_size @ set_igmp_snooping @ set_ipv6_igmp_snooping @ disable_flood_unregistered)
 
     let destroy_bridge name =
-      vsctl ~log:true ["--"; "--if-exists"; "del-br"; name]
+      vsctl ["--"; "--if-exists"; "del-br"; name]
 
     let list_bridges () =
       let bridges = String.trim (vsctl ["list-br"]) in
@@ -1174,13 +1174,13 @@ module Ovs = struct
     let create_port ?(internal=false) name bridge =
       let type_args =
         if internal then ["--"; "set"; "interface"; name; "type=internal"] else [] in
-      vsctl ~log:true (["--"; "--may-exist"; "add-port"; bridge; name] @ type_args)
+      vsctl (["--"; "--may-exist"; "add-port"; bridge; name] @ type_args)
 
     let destroy_port name =
-      vsctl ~log:true ["--"; "--with-iface"; "--if-exists"; "del-port"; name]
+      vsctl ["--"; "--with-iface"; "--if-exists"; "del-port"; name]
 
     let port_to_bridge name =
-      vsctl ~log:true ["port-to-br"; name]
+      vsctl ["port-to-br"; name]
 
     let make_bond_properties name properties =
       let known_props = ["mode"; "hashing-algorithm"; "updelay"; "downdelay";
@@ -1256,7 +1256,7 @@ module Ovs = struct
                   ["--"; "set"; "interface"; iface ] @ per_iface_args)
                interfaces)
       in
-      vsctl ~log:true (["--"; "--may-exist"; "add-bond"; bridge; name] @ interfaces @
+      vsctl (["--"; "--may-exist"; "add-bond"; bridge; name] @ interfaces @
                        mac_args @ args @ per_iface_args)
 
     let get_fail_mode bridge =
@@ -1278,58 +1278,58 @@ module Ovs = struct
                Printf.sprintf "idle_timeout=0,priority=0,in_port=%s,dl_dst=%s,actions=local" port mac]
             ) ports)
       in
-      List.iter (fun flow -> ignore (ofctl ~log:true ["add-flow"; bridge; flow])) flows
+      List.iter (fun flow -> ignore (ofctl ["add-flow"; bridge; flow])) flows
 
     let mod_port bridge port action =
-      ofctl ~log:true ["mod-port"; bridge; port; action] |> ignore
+      ofctl ["mod-port"; bridge; port; action] |> ignore
 
     let set_mtu interface mtu =
-      vsctl ~log:true ["set"; "interface"; interface; Printf.sprintf "mtu_request=%d" mtu]
+      vsctl ["set"; "interface"; interface; Printf.sprintf "mtu_request=%d" mtu]
 
   end
   include Make(Cli)
 end
 
 module Brctl = struct
-  let call ?(log=false) args =
-    call_script ~log_successful_output:log !brctl args
+  let call args =
+    call_script !brctl args
 
   let create_bridge name =
     if not (List.mem name (Sysfs.list ())) then
-      ignore (call ~log:true ["addbr"; name])
+      ignore (call ["addbr"; name])
 
   let destroy_bridge name =
     if List.mem name (Sysfs.list ()) then
-      ignore (call ~log:true ["delbr"; name])
+      ignore (call ["delbr"; name])
 
   let create_port bridge name =
     if not (List.mem name (Sysfs.bridge_to_interfaces bridge)) then
-      ignore (call ~log:true ["addif"; bridge; name])
+      ignore (call ["addif"; bridge; name])
 
   let destroy_port bridge name =
     if List.mem name (Sysfs.bridge_to_interfaces bridge) then
-      ignore (call ~log:true ["delif"; bridge; name])
+      ignore (call ["delif"; bridge; name])
 
   let set_forwarding_delay bridge time =
-    ignore (call ~log:true ["setfd"; bridge; string_of_int time])
+    ignore (call ["setfd"; bridge; string_of_int time])
 end
 
 module Ethtool = struct
-  let call ?(log=false) args =
-    call_script ~log_successful_output:log !ethtool args
+  let call args =
+    call_script !ethtool args
 
   let set_options name options =
     if options <> [] then
-      ignore (call ~log:true ("-s" :: name :: (List.concat (List.map (fun (k, v) -> [k; v]) options))))
+      ignore (call ("-s" :: name :: (List.concat (List.map (fun (k, v) -> [k; v]) options))))
 
   let set_offload name options =
     if options <> [] then
-      ignore (call ~log:true ("-K" :: name :: (List.concat (List.map (fun (k, v) -> [k; v]) options))))
+      ignore (call ("-K" :: name :: (List.concat (List.map (fun (k, v) -> [k; v]) options))))
 end
 
 module Dracut = struct
-  let call ?(log=false) args =
-    call_script ~timeout:(Some !dracut_timeout) ~log_successful_output:log !dracut args
+  let call args =
+    call_script ~timeout:(Some !dracut_timeout) !dracut args
 
   let rebuild_initrd () =
     try
@@ -1341,8 +1341,8 @@ module Dracut = struct
 end
 
 module Modinfo = struct
-  let call ?(log=false) args =
-    call_script ~log_successful_output:log !modinfo args
+  let call args =
+    call_script !modinfo args
 
   let is_param_array driver param_name =
     try

test/network_test_lacp_properties.ml

@@ -70,7 +70,7 @@ let test_lacp_aggregation_key arg () =
 module OVS_Cli_test = struct
   include Ovs.Cli
   let vsctl_output = ref []
-  let vsctl ?(log=true) args =
+  let vsctl args =
     vsctl_output := args ;
     String.concat " " args
 end