Rename MeterFeaturesStats to MeterFeatures

it reflate the fac that it is not statistics

Author: fugitifduck

lib/OpenFlow0x04.ml

@@ -5284,7 +5284,7 @@ module MeterConfig = struct
 
 end
 
-module MeterFeaturesStats = struct
+module MeterFeatures = struct
 
   cstruct ofp_meter_features {
     uint32_t max_meter;
@@ -5313,20 +5313,20 @@ module MeterFeaturesStats = struct
 
   end
 
-  type t = meterFeaturesStats
+  type t = meterFeatures
 
-  let sizeof (mfs : meterFeaturesStats) : int =
+  let sizeof (mfs : t) : int =
     sizeof_ofp_meter_features
 
-  let to_string (mfs : meterFeaturesStats) : string =
+  let to_string (mfs : t) : string =
     Format.sprintf "{ max_meter = %lu; band_typ = %s; capabilities = %s; max_band = %u; max_color = %u }"
     mfs.max_meter
     (Bands.to_string mfs.band_typ)
     (MeterFlags.to_string mfs.capabilities)
     mfs.max_band
     mfs.max_color
 
-  let marshal (buf : Cstruct.t) (mfs : meterFeaturesStats) : int =
+  let marshal (buf : Cstruct.t) (mfs : t) : int =
     set_ofp_meter_features_max_meter buf mfs.max_meter;
     set_ofp_meter_features_band_types buf (Bands.marshal mfs.band_typ);
     (* int -> int32 fix, before release of OF1.3.5 *)
@@ -5335,7 +5335,7 @@ module MeterFeaturesStats = struct
     set_ofp_meter_features_max_color buf mfs.max_color;
     sizeof_ofp_meter_features
 
-  let parse (bits : Cstruct.t) : meterFeaturesStats =
+  let parse (bits : Cstruct.t) : t =
     { max_meter = get_ofp_meter_features_max_meter bits
     ; band_typ = Bands.parse (get_ofp_meter_features_band_types bits)
     (* int32 -> int fix, before release of OF1.3.5 *)
@@ -5365,7 +5365,7 @@ module MultipartReply = struct
       | GroupFeaturesReply gf -> GroupFeatures.sizeof gf
       | MeterReply mr -> sum (map MeterStats.sizeof mr)
       | MeterConfig mc -> sum (map MeterConfig.sizeof mc)
-      | MeterFeaturesReply mf -> MeterFeaturesStats.sizeof mf
+      | MeterFeaturesReply mf -> MeterFeatures.sizeof mf
 
   let to_string (mpr : multipartReply) =
     match mpr.mpreply_typ with
@@ -5382,7 +5382,7 @@ module MultipartReply = struct
       | GroupFeaturesReply gf -> Format.sprintf "GroupFeatures %s" (GroupFeatures.to_string gf)
       | MeterReply mr -> Format.sprintf "MeterStats { %s }" (String.concat "; " (map MeterStats.to_string mr))
       | MeterConfig mc -> Format.sprintf "MeterConfig { %s }" (String.concat "; " (map MeterConfig.to_string mc))
-      | MeterFeaturesReply mf -> Format.sprintf "MeterFeaturesStats %s" (MeterFeaturesStats.to_string mf)
+      | MeterFeaturesReply mf -> Format.sprintf "MeterFeaturesStats %s" (MeterFeatures.to_string mf)
 
   let marshal (buf : Cstruct.t) (mpr : multipartReply) : int =
     let ofp_body_bits = Cstruct.shift buf sizeof_ofp_multipart_reply in
@@ -5432,7 +5432,7 @@ module MultipartReply = struct
           marshal_fields ofp_body_bits mc MeterConfig.marshal
       | MeterFeaturesReply mfr ->
           set_ofp_multipart_reply_typ buf (ofp_multipart_types_to_int OFPMP_METER_FEATURES);
-          MeterFeaturesStats.marshal ofp_body_bits mfr
+          MeterFeatures.marshal ofp_body_bits mfr
           )
 
   let parse (bits : Cstruct.t) : multipartReply =
@@ -5465,7 +5465,7 @@ module MultipartReply = struct
       | Some OFPMP_METER_CONFIG ->
           MeterConfig (parse_fields ofp_body_bits MeterConfig.parse MeterConfig.length_func)
       | Some OFPMP_METER_FEATURES ->
-          MeterFeaturesReply (MeterFeaturesStats.parse ofp_body_bits)
+          MeterFeaturesReply (MeterFeatures.parse ofp_body_bits)
       | _ -> raise (Unparsable (sprintf "NYI: can't parse this multipart reply"))) in
     let flags = (
       match int_to_ofp_multipart_request_flags (get_ofp_multipart_request_flags bits) with

lib/OpenFlow0x04_Core.ml

@@ -601,7 +601,7 @@ type meterConfig = { length : length; flags : meterFlags; meter_id : int32; band
 
 type meterBandMaps = { drop : bool; dscpRemark : bool}
 
-type meterFeaturesStats = { max_meter : int32; band_typ : meterBandMaps; 
+type meterFeatures = { max_meter : int32; band_typ : meterBandMaps; 
                             capabilities : meterFlags; max_band : int8;
                             max_color : int8 }
 
@@ -619,7 +619,7 @@ type multipartReplyTyp =
   | GroupFeaturesReply of groupFeatures
   | MeterReply of meterStats list
   | MeterConfig of meterConfig list
-  | MeterFeaturesReply of meterFeaturesStats
+  | MeterFeaturesReply of meterFeatures
 
 type multipartReply = {mpreply_typ : multipartReplyTyp; mpreply_flags : bool}
 

lib/OpenFlow0x04_Core.mli

@@ -568,7 +568,7 @@ type meterConfig = { length : length; flags : meterFlags; meter_id : int32; band
 
 type meterBandMaps = { drop : bool; dscpRemark : bool}
 
-type meterFeaturesStats = { max_meter : int32; band_typ : meterBandMaps; 
+type meterFeatures = { max_meter : int32; band_typ : meterBandMaps; 
                             capabilities : meterFlags; max_band : int8;
                             max_color : int8 }
 
@@ -586,7 +586,7 @@ type multipartReplyTyp =
   | GroupFeaturesReply of groupFeatures
   | MeterReply of meterStats list
   | MeterConfig of meterConfig list
-  | MeterFeaturesReply of meterFeaturesStats
+  | MeterFeaturesReply of meterFeatures
 
 type multipartReply = {mpreply_typ : multipartReplyTyp; mpreply_flags : bool}
 

quickcheck/Arbitrary_OpenFlow0x04.ml

@@ -1377,8 +1377,8 @@ module MultipartReply = struct
     let size_of = MeterConfig.sizeof
   end
 
-  module MeterFeaturesStats = struct
-    type t = MeterFeaturesStats.t
+  module MeterFeatures = struct
+    type t = MeterFeatures.t
 
     let arbitrary_meterBandMaps =
       arbitrary_bool >>= fun drop ->
@@ -1413,10 +1413,10 @@ module MultipartReply = struct
         max_color
       }
 
-    let marshal = MeterFeaturesStats.marshal
-    let parse = MeterFeaturesStats.parse
-    let to_string = MeterFeaturesStats.to_string
-    let size_of = MeterFeaturesStats.sizeof
+    let marshal = MeterFeatures.marshal
+    let parse = MeterFeatures.parse
+    let to_string = MeterFeatures.to_string
+    let size_of = MeterFeatures.sizeof
   end
 
   type t = MultipartReply.t
@@ -1436,7 +1436,7 @@ module MultipartReply = struct
           list1 GroupDesc.arbitrary >>= (fun n -> ret_gen {mpreply_typ = (GroupDescReply n);  mpreply_flags = flags});
           list1 MeterStats.arbitrary >>= (fun n -> ret_gen {mpreply_typ = (MeterReply n);  mpreply_flags = flags});
           list1 MeterConfig.arbitrary >>= (fun n -> ret_gen {mpreply_typ = (MeterConfig n);  mpreply_flags = flags});
-          MeterFeaturesStats.arbitrary >>= (fun n -> ret_gen {mpreply_typ = (MeterFeaturesReply n);  mpreply_flags = flags});
+          MeterFeatures.arbitrary >>= (fun n -> ret_gen {mpreply_typ = (MeterFeaturesReply n);  mpreply_flags = flags});
           ]
 
   let marshal = MultipartReply.marshal

test/Test.ml

@@ -388,8 +388,8 @@ module RoundTripping = struct
       (openflow_quickCheck GenMeterConfigReply.arbitrary
           GenMeterConfigReply.to_string GenMeterConfigReply.parse GenMeterConfigReply.marshal)
 
-  TEST "OpenFlow0x04 MultipartReply.MeterFeaturesStats RoundTrip" =
-      let module GenMeterFeaturesReply = Gen0x04.OpenFlow0x04_Unsize(Gen0x04.MultipartReply.MeterFeaturesStats) in
+  TEST "OpenFlow0x04 MultipartReply.MeterFeatures RoundTrip" =
+      let module GenMeterFeaturesReply = Gen0x04.OpenFlow0x04_Unsize(Gen0x04.MultipartReply.MeterFeatures) in
       (openflow_quickCheck GenMeterFeaturesReply.arbitrary
           GenMeterFeaturesReply.to_string GenMeterFeaturesReply.parse GenMeterFeaturesReply.marshal)