Merge pull request #92 from xapi-project/more-tunnelling

lvcreate supports %age arguments

Author: djs55

test/test.ml

@@ -55,20 +55,36 @@ let assert_lv_exists ?expected_size_in_extents name =
       ) in
   Lwt_main.run t
 
+let free_extents () =
+  let t =
+    Client.get ()
+    >>= fun vg ->
+    return (Lvm.Pv.Allocator.size (vg.Lvm.Vg.free_space)) in
+  Lwt_main.run t
+
 let lvcreate_L =
   "lvcreate -n <name> -L <mib> <vg>: check that we can create an LV with a size in MiB" >::
   fun () ->
-  xenvm [ "lvcreate"; "-n"; "test"; "-L"; "4"; vg ] |> ignore_string;
-  assert_lv_exists ~expected_size_in_extents:1L "test";
+  xenvm [ "lvcreate"; "-n"; "test"; "-L"; "16"; vg ] |> ignore_string;
+  assert_lv_exists ~expected_size_in_extents:4L "test";
   xenvm [ "lvremove"; vg ^ "/test" ] |> ignore_string
 
 let lvcreate_l =
   "lvcreate -n <name> -l <extents> <vg>: check that we can create an LV with a size in extents" >::
   fun () ->
-  xenvm [ "lvcreate"; "-n"; "test"; "-l"; "1"; vg ] |> ignore_string;
-  assert_lv_exists ~expected_size_in_extents:1L "test";
+  xenvm [ "lvcreate"; "-n"; "test"; "-l"; "2"; vg ] |> ignore_string;
+  assert_lv_exists ~expected_size_in_extents:2L "test";
   xenvm [ "lvremove"; vg ^ "/test" ] |> ignore_string
 
+let lvcreate_percent =
+  "lvcreate -n <name> -l 100%F <vg>: check that we can fill all free space in the VG" >::
+  fun () ->
+  xenvm [ "lvcreate"; "-n"; "test"; "-l"; "100%F"; vg ] |> ignore_string;
+  let free = free_extents () in
+  assert_equal ~printer:Int64.to_string 0L free;
+  xenvm [ "lvremove"; vg ^ "/test" ] |> ignore_string
+
+
 let file_exists filename =
   try
     Unix.LargeFile.stat filename |> ignore;
@@ -102,6 +118,7 @@ let lvchange_n =
 let xenvmd_suite = "Commands which require xenvmd" >::: [
   lvcreate_L;
   lvcreate_l;
+  lvcreate_percent;
   lvchange_n;
 ]
 

xenvm/lvcreate.ml

@@ -12,13 +12,16 @@ let lvcreate copts lv_name real_size percent_size tags vg_name =
     set_uri copts info;
     Client.get () >>= fun vg ->
 
-    let extent_size_mib = Int64.(div (mul 512L vg.Lvm.Vg.extent_size) (mul 1024L 1024L)) in
+    let extent_size_bytes = Int64.(mul 512L vg.Lvm.Vg.extent_size) in
 
     let size = match parse_size real_size percent_size with
     | `Absolute size -> size
-    | `Extents extents -> Int64.mul extent_size_mib extents
+    | `Extents extents -> Int64.mul extent_size_bytes extents
+    | `Free percent ->
+      let extents = Int64.(div (mul (Lvm.Pv.Allocator.size vg.Lvm.Vg.free_space) percent) 100L) in
+      let bytes = Int64.mul extent_size_bytes extents in
+      bytes
     | _ -> failwith "Initial size must be absolute" in
-
     if vg.Lvm.Vg.name <> vg_name then failwith "Invalid VG name";
     Client.create lv_name size tags >>= fun () -> 
     return info) in

xenvm/lvresize.ml

@@ -9,6 +9,7 @@ let lvresize copts live (vg_name,lv_opt) real_size percent_size =
   let size = match parse_size real_size percent_size with
   | `IncreaseBy x -> `IncreaseBy x
   | `Absolute x -> `Absolute x
+  | `Free _ -> failwith "Resizing to a percentage of free space not supported"
   | `DecreaseBy _ -> failwith "Shrinking volumes not supported"
   | `Extents _ -> failwith "Resizing in terms of extents not supported" in
 

xenvm/xenvm_common.ml

@@ -324,11 +324,18 @@ let parse_size_string =
     | Not_found ->
       failwith "Expecting a size of the form [0-9]+[mMbBkKgGtTsS]?"
 
-(* LogicalExtentsNumber[%{VG|PVS|FREE|ORIGIN}] *)
+(* LogicalExtentsNumber[%{VG|PVS|FREE|ORIGIN}] in the man page
+   but the command will apparently also accept '100%F' *)
 let parse_percent_size_string s =
   try
-    let _ = String.index s '%' in
-    failwith "Creating an LV with a %age size is not implemented yet"
+    let i = String.index s '%' in
+    let percent = Int64.of_string (String.sub s 0 i) in
+    match String.sub s (i + 1) (String.length s - i - 1) with
+    | "F" | "FREE" -> `Free percent
+    | "VG" -> failwith "Creating an LV with a %age of VG is not implemented yet"
+    | "PVS" -> failwith "Creating an LV with a %age of PVS is not implemented yet"
+    | "ORIGIN" -> failwith "Creating an LV with a %age of ORIGIN is not implemented yet"
+    | x -> failwith (Printf.sprintf "I don't understand the %%age size string: %s; expected [VG|PVS|FREE|ORIGIN]" x)
   with Not_found ->
     `Extents (Int64.of_string s)