From 99fe7062d4a9ee6851ac4c89595e803c92c3dcbe Mon Sep 17 00:00:00 2001 From: David Scott Date: Wed, 3 Jun 2015 19:20:09 +0000 Subject: [PATCH 1/2] test: add a test for 'lvchange --addtag' Signed-off-by: David Scott --- test/test.ml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/test/test.ml b/test/test.ml index bffe21f..5209abf 100644 --- a/test/test.ml +++ b/test/test.ml @@ -186,6 +186,18 @@ let dm_exists name = match Devmapper.Linux.stat name with let dev_path_of name = "/dev/" ^ vg ^ "/" ^ name let mapper_path_of name = "/dev/mapper/" ^ vg ^ "-" ^ name +let lvchange_addtag = + "lvchange vg/lv [--addtag|--removetag]: check that we can add and remove tags" >:: + fun () -> + xenvm [ "lvcreate"; "-n"; "test"; "-L"; "3"; vg ] |> ignore_string; + assert_lv_exists ~expected_size_in_extents:1L "test"; + xenvm [ "lvchange"; vg ^ "/test"; "--addtag"; "hidden" ] |> ignore_string; + let vg_metadata, lv_metadata = Lwt_main.run (Client.get_lv "test") in + let tags = List.map Lvm.Name.Tag.to_string lv_metadata.Lvm.Lv.tags in + if not(List.mem "hidden" tags) + then failwith "Failed to add 'hidden' tag"; + xenvm [ "lvremove"; vg ^ "/test" ] |> ignore_string + let lvchange_n = "lvchange -an : check that we can deactivate a volume" >:: fun () -> @@ -231,6 +243,7 @@ let xenvmd_suite = "Commands which require xenvmd" >::: [ lvcreate_l; lvcreate_percent; lvcreate_toobig; + lvchange_addtag; lvchange_n; lvextend_toobig; vgs_online; From 07a9c5527e1f11365921ad92c4c5166b4674ce03 Mon Sep 17 00:00:00 2001 From: David Scott Date: Wed, 3 Jun 2015 19:22:34 +0000 Subject: [PATCH 2/2] test: add a test for 'lvchange --deltag' Signed-off-by: David Scott --- test/test.ml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/test/test.ml b/test/test.ml index 5209abf..bf19409 100644 --- a/test/test.ml +++ b/test/test.ml @@ -187,7 +187,7 @@ let dev_path_of name = "/dev/" ^ vg ^ "/" ^ name let mapper_path_of name = "/dev/mapper/" ^ vg ^ "-" ^ name let lvchange_addtag = - "lvchange vg/lv [--addtag|--removetag]: check that we can add and remove tags" >:: + "lvchange vg/lv [--addtag|--removetag]: check that we can add tags" >:: fun () -> xenvm [ "lvcreate"; "-n"; "test"; "-L"; "3"; vg ] |> ignore_string; assert_lv_exists ~expected_size_in_extents:1L "test"; @@ -198,6 +198,19 @@ let lvchange_addtag = then failwith "Failed to add 'hidden' tag"; xenvm [ "lvremove"; vg ^ "/test" ] |> ignore_string +let lvchange_deltag = + "lvchange vg/lv [--addtag|--deltag]: check that we can add and remove tags" >:: + fun () -> + xenvm [ "lvcreate"; "-n"; "test"; "-L"; "3"; vg ] |> ignore_string; + assert_lv_exists ~expected_size_in_extents:1L "test"; + xenvm [ "lvchange"; vg ^ "/test"; "--addtag"; "hidden" ] |> ignore_string; + xenvm [ "lvchange"; vg ^ "/test"; "--deltag"; "hidden" ] |> ignore_string; + let vg_metadata, lv_metadata = Lwt_main.run (Client.get_lv "test") in + let tags = List.map Lvm.Name.Tag.to_string lv_metadata.Lvm.Lv.tags in + if List.mem "hidden" tags + then failwith "Failed to remove 'hidden' tag"; + xenvm [ "lvremove"; vg ^ "/test" ] |> ignore_string + let lvchange_n = "lvchange -an : check that we can deactivate a volume" >:: fun () -> @@ -244,6 +257,7 @@ let xenvmd_suite = "Commands which require xenvmd" >::: [ lvcreate_percent; lvcreate_toobig; lvchange_addtag; + lvchange_deltag; lvchange_n; lvextend_toobig; vgs_online;