testhelper: introduce exported_shares

Change the way we list shares in test-info.yml
This will be used to add additional functionality to tests.

Signed-off-by: Sachin Prabhu <[email protected]>

Author: spuiuk

test-info.yml.example

@@ -9,12 +9,16 @@ public_interfaces:
 exported_sharenames:
   - "gluster-vol"
 
+# List of dict of exported shares
+# name: share_name
+# mntdir: If this is a premounted share, the mount directory
+# fs: exported filesystem
+exported_shares:
+  - {"name": "export2"}
+  - {"name": "export3", "mntdir": "/mnt-cephfs", "fs": "cephfs"}
+
 test_users:
   - {"username": "test1", "password": "x"}
   - {"username": "test2", "password": "x"}
 
 test_backend: glusterfs
-
-premounted_shares:
-  - "/testdir1"
-  - "/testdir2"

testhelper/testhelper.py

@@ -76,6 +76,47 @@ def generate_random_bytes(size: int) -> bytes:
     return rba[:size]
 
 
+def get_shares(test_info: dict) -> typing.List[dict]:
+    """
+    Get list of shares
+
+    Parameters:
+    test_info: Dict containing the parsed yaml file.
+    Returns:
+    list of shares
+    """
+    if "shares" in test_info:
+        return test_info["shares"]
+
+    default_fs = test_info.get("test_backend", "")
+    arr = []
+    for sharename in test_info.get("exported_sharenames", []):
+        arr.append({"name": sharename, "mntdir": "", "fs": default_fs})
+    for share in test_info.get("exported_shares", []):
+        arr.append(
+            {
+                "name": share.get("name", ""),
+                "mntdir": share.get("mntdir", ""),
+                "fs": share.get("fs", default_fs),
+            }
+        )
+    test_info["shares"] = arr
+    return arr
+
+
+def is_premounted_share(share: dict) -> bool:
+    """
+    Is the share dict a premounted share
+
+    Paramters:
+    share: dict of the share
+    Returns:
+    bool
+    """
+    mntdir = share.get("mntdir", "")
+    return mntdir != ""
+
+
 def get_premounted_shares(test_info: dict) -> typing.List[Path]:
     """
     Get list of premounted shares
@@ -85,8 +126,11 @@ def get_premounted_shares(test_info: dict) -> typing.List[Path]:
     Returns:
     list of paths with shares
     """
-    premounted_shares = test_info.get("premounted_shares", [])
-    return [Path(mnt) for mnt in premounted_shares]
+    arr = []
+    for share in get_shares(test_info):
+        if is_premounted_share(share):
+            arr.append(Path(share["mntdir"]))
+    return arr
 
 
 def get_exported_shares(test_info: dict) -> typing.List[str]:
@@ -97,4 +141,8 @@ def get_exported_shares(test_info: dict) -> typing.List[str]:
     Returns:
     list of exported shares
     """
-    return test_info.get("exported_sharenames", [])
+    arr = []
+    for share in get_shares(test_info):
+        if not is_premounted_share(share):
+            arr.append(share["name"])
+    return arr