Add interactive tests for functions to lookup a pv|lv by name|uuid.

Signed-off-by: Dave Wysochanski <wysochanski@pobox.com>
Reviewed-by: Petr Rockai <prockai@redhat.com>

diff --git a/test/api/test.c b/test/api/test.c
index f19268f7a19d547c34380fda511ca31a296d1129..434baea1f3b907f70cb55a661af3116dd4a60f2a 100644 (file)
--- a/test/api/test.c
+++ b/test/api/test.c
@@ -113,6 +113,14 @@ static void _show_help(void)
               "Lookup a vgname from a device name\n");
        printf("'vgname_from_pvid pvid': "
               "Lookup a vgname from a pvid\n");
+       printf("'lv_from_uuid vgname lvuuid': "
+              "Lookup an LV from an LV uuid\n");
+       printf("'lv_from_name vgname lvname': "
+              "Lookup an LV from an LV name\n");
+       printf("'pv_from_uuid vgname pvuuid': "
+              "Lookup an LV from an LV uuid\n");
+       printf("'pv_from_name vgname pvname': "
+              "Lookup an LV from an LV name\n");
        printf("'quit': exit the program\n");
 }
 
@@ -468,6 +476,30 @@ static void _show_one_vg(vg_t vg)
                lvm_vg_get_pv_count(vg), lvm_vg_get_seqno(vg));
 }
 
+static void _print_pv(pv_t pv)
+{
+       if (!pv)
+               return;
+       printf("%s (%s): size=%"PRIu64", free=%"PRIu64
+              ", dev_size=%"PRIu64", mda_count=%"PRIu64"\n",
+              lvm_pv_get_name(pv), lvm_pv_get_uuid(pv),
+              lvm_pv_get_size(pv), lvm_pv_get_free(pv),
+              lvm_pv_get_dev_size(pv),
+              lvm_pv_get_mda_count(pv));
+}
+
+static void _print_lv(vg_t vg, lv_t lv)
+{
+       if (!lv)
+               return;
+       printf("%s/%s (%s): size=%"PRIu64", %sACTIVE / %sSUSPENDED\n",
+              lvm_vg_get_name(vg),
+              lvm_lv_get_name(lv), lvm_lv_get_uuid(lv),
+              lvm_lv_get_size(lv),
+              lvm_lv_is_active(lv) ? "" : "IN",
+              lvm_lv_is_suspended(lv) ? "" : "NOT ");
+}
+
 static void _list_open_vgs(void)
 {
        dm_hash_iter(_vgid_hash, (dm_hash_iterate_fn) _show_one_vg);
@@ -488,12 +520,7 @@ static void _pvs_in_vg(char **argv, int argc)
        }
        printf("PVs in VG %s:\n", lvm_vg_get_name(vg));
        dm_list_iterate_items(pvl, pvs) {
-               printf("%s (%s): size=%"PRIu64", free=%"PRIu64
-                       ", dev_size=%"PRIu64", mda_count=%"PRIu64"\n",
-                       lvm_pv_get_name(pvl->pv), lvm_pv_get_uuid(pvl->pv),
-                       lvm_pv_get_size(pvl->pv), lvm_pv_get_free(pvl->pv),
-                       lvm_pv_get_dev_size(pvl->pv),
-                       lvm_pv_get_mda_count(pvl->pv));
+               _print_pv(pvl->pv);
        }
 }
 
@@ -715,6 +742,59 @@ static void _lv_tag(char **argv, int argc, int add)
        printf("%s tag %s to LV %s\n",
               add ? "adding":"removing", argv[3], argv[2]);
 }
+
+static void _lv_from_uuid(char **argv, int argc)
+{
+       vg_t vg;
+
+       if (argc < 3) {
+               printf("Please enter vgname, lv_uuid\n");
+               return;
+       }
+       if (!(vg = _lookup_vg_by_name(argv, argc)))
+               return;
+       _print_lv(vg, lvm_lv_from_uuid(vg, argv[2]));
+}
+
+static void _lv_from_name(char **argv, int argc)
+{
+       vg_t vg;
+
+       if (argc < 3) {
+               printf("Please enter vgname, lv_uuid\n");
+               return;
+       }
+       if (!(vg = _lookup_vg_by_name(argv, argc)))
+               return;
+       _print_lv(vg, lvm_lv_from_name(vg, argv[2]));
+}
+
+static void _pv_from_uuid(char **argv, int argc)
+{
+       vg_t vg;
+
+       if (argc < 3) {
+               printf("Please enter vgname, pv_uuid\n");
+               return;
+       }
+       if (!(vg = _lookup_vg_by_name(argv, argc)))
+               return;
+       _print_pv(lvm_pv_from_uuid(vg, argv[2]));
+}
+
+static void _pv_from_name(char **argv, int argc)
+{
+       vg_t vg;
+
+       if (argc < 3) {
+               printf("Please enter vgname, pv_uuid\n");
+               return;
+       }
+       if (!(vg = _lookup_vg_by_name(argv, argc)))
+               return;
+       _print_pv(lvm_pv_from_name(vg, argv[2]));
+}
+
 static void _vgname_from_pvid(char **argv, int argc, lvm_t libh)
 {
        const char *vgname;
@@ -762,12 +842,7 @@ static void _lvs_in_vg(char **argv, int argc)
        }
        printf("LVs in VG %s:\n", lvm_vg_get_name(vg));
        dm_list_iterate_items(lvl, lvs) {
-               printf("%s/%s (%s): size=%"PRIu64", %sACTIVE / %sSUSPENDED\n",
-                       lvm_vg_get_name(vg),
-                       lvm_lv_get_name(lvl->lv), lvm_lv_get_uuid(lvl->lv),
-                       lvm_lv_get_size(lvl->lv),
-                       lvm_lv_is_active(lvl->lv) ? "" : "IN",
-                       lvm_lv_is_suspended(lvl->lv) ? "" : "NOT ");
+               _print_lv(vg, lvl->lv);
        }
 }
 
@@ -978,6 +1053,14 @@ static int lvmapi_test_shell(lvm_t libh)
                        _vgname_from_devname(argv, argc, libh);
                } else if (!strcmp(argv[0], "vgname_from_pvid")) {
                        _vgname_from_pvid(argv, argc, libh);
+               } else if (!strcmp(argv[0], "lv_from_uuid")) {
+                       _lv_from_uuid(argv, argc);
+               } else if (!strcmp(argv[0], "lv_from_name")) {
+                       _lv_from_name(argv, argc);
+               } else if (!strcmp(argv[0], "pv_from_uuid")) {
+                       _pv_from_uuid(argv, argc);
+               } else if (!strcmp(argv[0], "pv_from_name")) {
+                       _pv_from_name(argv, argc);
                } else {
                        printf ("Unrecognized command %s\n", argv[0]);
                }