CP-27898 remove dead code

Signed-off-by: Christian Lindig <[email protected]>

Author: lindig

lib/network_utils.ml

@@ -416,11 +416,6 @@ module Ip = struct
   let get_mtu dev =
     int_of_string (List.hd (link dev "mtu"))
 
-  let get_state dev =
-    match addr dev "state" with
-    | "UP" :: _ -> true
-    | _ -> false
-
   let get_mac dev =
     List.hd (link dev "link/ether")
 
@@ -897,10 +892,6 @@ module Proc = struct
       error "Error: could not read /proc/net/vlan/config";
       []
 
-  let get_bond_links_up name =
-    let statusses = get_bond_slave_info name "MII Status" in
-    List.fold_left (fun x (_, y) -> x + (if y = "up" then 1 else 0)) 0 statusses
-
   let get_ipv6_disabled () =
     try
       Unixext.string_of_file "/proc/sys/net/ipv6/conf/all/disable_ipv6"
@@ -1025,11 +1016,6 @@ module Ovs = struct
           ) ([], None) lines
       with _ -> [], None
 
-    let get_bond_links_up name =
-      let slaves, _ = get_bond_link_status name in
-      let links_up = List.filter snd slaves in
-      List.length (links_up)
-
     let get_bond_mode name =
       try
         let output = String.trim (vsctl ~log:false ["get"; "port"; name; "bond_mode"]) in
@@ -1209,9 +1195,6 @@ module Ovs = struct
     let destroy_port name =
       vsctl ["--"; "--with-iface"; "--if-exists"; "del-port"; name]
 
-    let port_to_bridge name =
-      vsctl ~log:false ["port-to-br"; name]
-
     let make_bond_properties name properties =
       let known_props = ["mode"; "hashing-algorithm"; "updelay"; "downdelay";
                          "miimon"; "use_carrier"; "rebalance-interval";

networkd/network_server.ml

@@ -376,16 +376,6 @@ module Interface = struct
       end
       ) ()
 
-  let get_ipv6_gateway _ dbg ~name =
-    Debug.with_thread_associated dbg (fun () ->
-        let output = Ip.route_show ~version:Ip.V6 name in
-        try
-          let line = List.find (fun s -> Astring.String.is_prefix ~affix:"default via" s) (Astring.String.cuts ~empty:false ~sep:"\n" output) in
-          let addr = List.nth (Astring.String.cuts ~empty:false ~sep:" " line) 2 in
-          Some (Unix.inet_addr_of_string addr)
-        with Not_found -> None
-      ) ()
-
   let set_ipv6_gateway _ dbg ~name ~address =
     Debug.with_thread_associated dbg (fun () ->
       if Proc.get_ipv6_disabled () then
@@ -511,11 +501,6 @@ module Interface = struct
         Ip.link_set_down name
       ) ()
 
-  let is_persistent _ dbg ~name =
-    Debug.with_thread_associated dbg (fun () ->
-        (get_config name).persistent_i
-      ) ()
-
   let set_persistent dbg name value =
     Debug.with_thread_associated dbg (fun () ->
         debug "Making interface %s %spersistent" name (if value then "" else "non-");
@@ -598,13 +583,6 @@ module Bridge = struct
       warn "Network-conf file not found. Falling back to Open vSwitch.";
       backend_kind := Openvswitch
 
-  let get_bond_links_up _ dbg ~name =
-    Debug.with_thread_associated dbg (fun () ->
-        match !backend_kind with
-        | Openvswitch -> Ovs.get_bond_links_up name
-        | Bridge -> Proc.get_bond_links_up name
-      ) ()
-
   let get_all dbg () =
     Debug.with_thread_associated dbg (fun () ->
         match !backend_kind with
@@ -820,13 +798,6 @@ module Bridge = struct
         !backend_kind
       ) ()
 
-  let get_ports _ dbg ~name =
-    Debug.with_thread_associated dbg (fun () ->
-        match !backend_kind with
-        | Openvswitch -> Ovs.bridge_to_ports name
-        | Bridge -> raise (Network_error Not_implemented)
-      ) ()
-
   let get_all_ports dbg from_cache =
     Debug.with_thread_associated dbg (fun () ->
         if from_cache then
@@ -838,13 +809,6 @@ module Bridge = struct
           | Bridge -> raise (Network_error Not_implemented)
       ) ()
 
-  let get_bonds _ dbg ~name =
-    Debug.with_thread_associated dbg (fun () ->
-        match !backend_kind with
-        | Openvswitch -> Ovs.bridge_to_ports name
-        | Bridge -> raise (Network_error Not_implemented)
-      ) ()
-
   let get_all_bonds dbg from_cache =
     Debug.with_thread_associated dbg (fun () ->
         if from_cache then
@@ -895,13 +859,6 @@ module Bridge = struct
             ) slaves
       ) ()
 
-  let get_vlan _ dbg ~name =
-    Debug.with_thread_associated dbg (fun () ->
-        match !backend_kind with
-        | Openvswitch -> Ovs.bridge_to_vlan name
-        | Bridge -> raise (Network_error Not_implemented)
-      ) ()
-
   let add_default_flows _ dbg bridge mac interfaces =
     Debug.with_thread_associated dbg (fun () ->
         match !backend_kind with
@@ -1051,23 +1008,6 @@ module Bridge = struct
             physical_ifaces
       ) ()
 
-  let get_fail_mode _ dbg ~name =
-    Debug.with_thread_associated dbg (fun () ->
-        match !backend_kind with
-        | Openvswitch ->
-          begin match Ovs.get_fail_mode name with
-            | "standalone" -> Some Standalone
-            | "secure" -> Some Secure
-            | _ -> None
-          end
-        | Bridge -> raise (Network_error Not_implemented)
-      ) ()
-
-  let is_persistent _ dbg ~name =
-    Debug.with_thread_associated dbg (fun () ->
-        (get_config name).persistent_b
-      ) ()
-
   let set_persistent dbg name value =
     Debug.with_thread_associated dbg (fun () ->
         debug "Making bridge %s %spersistent" name (if value then "" else "non-");

networkd_db/networkd_db.ml

@@ -16,15 +16,6 @@ open Network_interface
 
 let name = "networkd_db"
 
-(* catch signals for clean shutdown *)
-let stop _signal =
-  exit 0
-
-let handle_shutdown () =
-  Sys.set_signal Sys.sigterm (Sys.Signal_handle stop);
-  Sys.set_signal Sys.sigint (Sys.Signal_handle stop);
-  Sys.set_signal Sys.sigpipe Sys.Signal_ignore
-
 let _ =
   let bridge = ref "" in
   let iface = ref "" in