multi: expose send_flow_mods in versioned controllers

Author: seliopou

async/Async_OpenFlow.mli

@@ -196,12 +196,15 @@ module OpenFlow0x01 : sig
     include Platform.CTL
       with type t := t
 
-    (* val clear_flows : t -> SDN.Pattern.t -> Client_id.t -> (unit, exn) Deferred.Result.t *)
+    open OpenFlow0x01_Core
+    open OpenFlow0x01_Stats
+
     val clear_table : t -> Client_id.t -> (unit, exn) Deferred.Result.t
+    val send_flow_mods : ?clear:bool -> t -> Client_id.t -> flowMod list -> (unit, exn) Deferred.Result.t
 
-    val send_pkt_out : t -> Client_id.t -> OpenFlow0x01_Core.packetOut -> (unit, exn) Deferred.Result.t
+    val send_pkt_out : t -> Client_id.t -> packetOut -> (unit, exn) Deferred.Result.t
     val barrier : t -> Client_id.t -> (unit, exn) Result.t Deferred.t
-    val stats : t -> Client_id.t -> OpenFlow0x01_Core.pattern -> (OpenFlow0x01_Stats.aggregateStats, exn) Deferred.Result.t
+    val stats : t -> Client_id.t -> pattern -> (aggregateStats, exn) Deferred.Result.t
   end
 
 end
@@ -220,11 +223,12 @@ module OpenFlow0x04 : sig
     include Platform.CTL
       with type t := t
 
+    open OpenFlow0x04_Core
 
-    (* val clear_flows : t -> Pattern.t -> Client_id.t -> (unit, exn) Deferred.Result.t *)
     val clear_table : t -> Client_id.t -> (unit, exn) Deferred.Result.t
+    val send_flow_mods : ?clear:bool -> t -> Client_id.t -> flowMod list -> (unit, exn) Deferred.Result.t
 
-    val send_pkt_out : t -> Client_id.t -> OpenFlow0x04_Core.packetOut -> (unit, exn) Deferred.Result.t
+    val send_pkt_out : t -> Client_id.t -> packetOut -> (unit, exn) Deferred.Result.t
     val barrier : t -> Client_id.t -> (unit, exn) Result.t Deferred.t
   end
 

async/Async_OpenFlow0x01.ml

@@ -201,9 +201,6 @@ module Controller = struct
     let open ChunkController in
     listen_pipe t (run (handshake 0x01) t.sub (listen t.sub))
 
-  let clear_flows (t : t) (pattern : SDN_Types.Pattern.t) (sw_id : Client_id.t) =
-    failwith "NYI: OF0x01.clear_flows"
-
   let clear_table (t : t) (sw_id : Client_id.t) =
     send_result t sw_id (0l, M.FlowModMsg (C.delete_all_flows))
 

async/Async_OpenFlow0x04.ml

@@ -233,9 +233,6 @@ module Controller = struct
     let open ChunkController in
     listen_pipe t (run (handshake 0x04) t.sub (listen t.sub))
 
-  let clear_flows (t : t) (pattern : SDN_Types.Pattern.t) (sw_id : Client_id.t) =
-    failwith "NYI: OF0x04.clear_flows"
-
   let clear_table (t : t) (sw_id : Client_id.t) =
     let flows = send_result t sw_id (0l, M.FlowModMsg C.delete_all_flows) in
     let groups = send_result t sw_id (0l, M.GroupModMsg C.delete_all_groups) in