Merge pull request #56 from sharady/xcp-networkd-fcoe

CP-12093: Add fcoe_driver interface to identify FCoE supported NICs

Author: robhoes

lib/network_utils.ml

@@ -33,6 +33,7 @@ let modprobe = "/sbin/modprobe"
 let ethtool = ref "/sbin/ethtool"
 let bonding_dir = "/proc/net/bonding/"
 let dhcp6c = "/sbin/dhcp6c"
+let fcoedriver = ref "/opt/xensource/libexec/fcoe_driver"
 
 let call_script ?(log_successful_output=false) script args =
 	try
@@ -546,6 +547,19 @@ module Dhclient = struct
 		end
 end
 
+module Fcoe = struct
+	let call ?(log=false) args =
+		call_script ~log_successful_output:log !fcoedriver args
+
+	let get_capabilities name =
+		try
+			let output = call ["--xapi"; name; "capable"] in
+			if String.has_substr output "True" then ["fcoe"] else []
+                with _ ->
+                        debug "Failed to get fcoe support status on device %s" name;
+                        []
+end
+
 module Sysctl = struct
 	let write value variable =
 		ignore (call_script ~log_successful_output:true sysctl ["-q"; "-w"; variable ^ "=" ^ value])

networkd/network_server.ml

@@ -317,6 +317,11 @@ module Interface = struct
 			Ethtool.set_offload name params
 		) ()
 
+	let get_capabilities _ dbg ~name =
+		Debug.with_thread_associated dbg (fun () ->
+			Fcoe.get_capabilities name
+		) ()
+
 	let is_connected _ dbg ~name =
 		Debug.with_thread_associated dbg (fun () ->
 			Sysfs.get_carrier name

networkd/networkd.ml

@@ -40,6 +40,12 @@ let resources = [
     essential = true;
     path = Network_utils.ethtool;
     perms = [ Unix.X_OK ];
+  };
+  { Xcp_service.name = "fcoedriver";
+    description = "used to identify fcoe interfaces";
+    essential = false;
+    path = Network_utils.fcoedriver;
+    perms = [ Unix.X_OK ];
   }
 ]