multi: expose aggregate and individual stats APIs for 0x01

Author: seliopou

async/Async_OpenFlow.mli

@@ -204,7 +204,8 @@ module OpenFlow0x01 : sig
 
     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 -> pattern -> (aggregateStats, exn) Deferred.Result.t
+    val aggregate_stats : t -> Client_id.t -> pattern -> (aggregateStats, exn) Deferred.Result.t
+    val individual_stats : t -> Client_id.t -> pattern -> (individualStats list, exn) Deferred.Result.t
   end
 
 end

async/Async_OpenFlow0x01.ml

@@ -111,7 +111,8 @@ module Controller = struct
     let c_id = client_id_of_switch_exn t sw_id in
     ChunkController.send_ignore_errors t.sub c_id (Message.marshal' msg)
 
-  let send_to_all t msg = ChunkController.send_to_all t.sub (Message.marshal' msg)
+  let send_to_all t msg =
+    ChunkController.send_to_all t.sub (Message.marshal' msg)
 
   let client_addr_port t sw_id =
     let c_id = client_id_of_switch_exn t sw_id in
@@ -222,7 +223,7 @@ module Controller = struct
       | M.BarrierReply -> Result.Ok ()
       | _              -> assert false)
 
-  let stats t sw_id pattern =
+  let aggregate_stats t sw_id pattern =
     let open OpenFlow0x01_Stats in
     let msg = AggregateRequest
       { as_of_match = pattern
@@ -232,4 +233,15 @@ module Controller = struct
     send_txn_with t sw_id (M.StatsRequestMsg msg) (function
       | M.StatsReplyMsg (AggregateFlowRep r) -> Result.Ok r
       | _                                    -> assert false)
+
+  let individual_stats t sw_id pattern =
+    let open OpenFlow0x01_Stats in
+    let msg = IndividualRequest
+      { is_of_match = pattern
+      ; is_table_id = 0xff
+      ; is_out_port = None }
+    in
+    send_txn_with t sw_id (M.StatsRequestMsg msg) (function
+      | M.StatsReplyMsg (IndividualFlowRep r) -> Result.Ok r
+      | _                                     -> assert false)
 end