From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16462 invoked by alias); 24 Feb 2010 18:16:36 -0000 Received: (qmail 16444 invoked by uid 9657); 24 Feb 2010 18:16:36 -0000 Date: Wed, 24 Feb 2010 18:16:00 -0000 Message-ID: <20100224181636.16442.qmail@sourceware.org> From: wysochanski@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2/test/api test.c Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: lvm2-cvs-owner@sourceware.org X-SW-Source: 2010-02/txt/msg00051.txt.bz2 CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: wysochanski@sourceware.org 2010-02-24 18:16:36 Modified files: test/api : test.c Log message: Update lvm2app interactive unit test for vg/lv tags. Simple test of vg/lv tag addition/deletion. Signed-off-by: Dave Wysochanski Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/api/test.c.diff?cvsroot=lvm2&r1=1.28&r2=1.29 --- LVM2/test/api/test.c 2010/02/14 03:23:07 1.28 +++ LVM2/test/api/test.c 2010/02/24 18:16:35 1.29 @@ -89,6 +89,14 @@ "Issue a lvm_config_reload() API to reload LVM config\n"); printf("'config_override' device: " "Issue a lvm_config_override() with accept device filter\n"); + printf("'vg_get_tags vgname': " + "List the tags of a VG\n"); + printf("'lv_get_tags vgname lvname': " + "List the tags of a LV\n"); + printf("'vg_{add|remove}_tag vgname tag': " + "Add/remove a tag from a VG\n"); + printf("'lv_{add|remove}_tag vgname lvname tag': " + "Add/remove a tag from a LV\n"); printf("'quit': exit the program\n"); } @@ -468,13 +476,11 @@ { struct dm_list *list; struct lvm_str_list *strl; - const char *tmp; list = lvm_list_vg_names(libh); printf("VG names:\n"); dm_list_iterate_items(strl, list) { - tmp = strl->str; - printf("%s\n", tmp); + printf("%s\n", strl->str); } } @@ -482,17 +488,94 @@ { struct dm_list *list; struct lvm_str_list *strl; - const char *tmp; list = lvm_list_vg_uuids(libh); printf("VG uuids:\n"); dm_list_iterate_items(strl, list) { - tmp = strl->str; - printf("%s\n", tmp); + printf("%s\n", strl->str); } } +static void _display_tags(struct dm_list *list) +{ + struct lvm_str_list *strl; + if (dm_list_empty(list)) { + printf("No tags exist\n"); + return; + } else if (!list) { + printf("Error obtaining tags\n"); + return; + } + dm_list_iterate_items(strl, list) { + printf("%s\n", strl->str); + } +} + +static void _vg_get_tags(char **argv, int argc) +{ + vg_t vg; + + if (!(vg = _lookup_vg_by_name(argv, argc))) + return; + printf("VG tags:\n"); + _display_tags(lvm_vg_get_tags(vg)); +} + +static void _vg_tag(char **argv, int argc, int add) +{ + vg_t vg; + if (argc < 3) { + printf("Please enter vgname, tag\n"); + return; + } + if (!(vg = _lookup_vg_by_name(argv, argc))) + return; + if (add && lvm_vg_add_tag(vg, argv[2])) + printf("Error "); + else if (!add && lvm_vg_remove_tag(vg, argv[2])){ + printf("Error "); + } else { + printf("Success "); + } + printf("%s tag %s to VG %s\n", + add ? "adding":"removing", argv[2], argv[1]); +} + +static void _lv_get_tags(char **argv, int argc) +{ + lv_t lv; + + if (argc < 3) { + printf("Please enter vgname, lvname\n"); + return; + } + if (!(lv = _lookup_lv_by_name(argv[2]))) + return; + printf("LV tags:\n"); + _display_tags(lvm_lv_get_tags(lv)); +} + +static void _lv_tag(char **argv, int argc, int add) +{ + lv_t lv; + + if (argc < 3) { + printf("Please enter vgname, lvname\n"); + return; + } + if (!(lv = _lookup_lv_by_name(argv[2]))) + return; + if (add && lvm_lv_add_tag(lv, argv[3])) + printf("Error "); + else if (!add && lvm_lv_remove_tag(lv, argv[3])){ + printf("Error "); + } else { + printf("Success "); + } + printf("%s tag %s to LV %s\n", + add ? "adding":"removing", argv[3], argv[2]); +} static void _lvs_in_vg(char **argv, int argc) { struct dm_list *lvs; @@ -549,6 +632,7 @@ printf("activating LV %s in VG %s\n", argv[2], argv[1]); } + static void _vg_remove_lv(char **argv, int argc) { lv_t lv; @@ -670,6 +754,18 @@ _scan_vgs(libh); } else if (!strcmp(argv[0], "vg_create_lv_linear")) { _vg_create_lv_linear(argv, argc); + } else if (!strcmp(argv[0], "vg_add_tag")) { + _vg_tag(argv, argc, 1); + } else if (!strcmp(argv[0], "vg_remove_tag")) { + _vg_tag(argv, argc, 0); + } else if (!strcmp(argv[0], "vg_get_tags")) { + _vg_get_tags(argv, argc); + } else if (!strcmp(argv[0], "lv_add_tag")) { + _lv_tag(argv, argc, 1); + } else if (!strcmp(argv[0], "lv_remove_tag")) { + _lv_tag(argv, argc, 0); + } else if (!strcmp(argv[0], "lv_get_tags")) { + _lv_get_tags(argv, argc); } else { printf ("Unrecognized command %s\n", argv[0]); }