testhelper: allow users to override sharename

There could be some rare cases where the user may want to simultaneously
test two different SMB servers exporting the same sharename. In that
case, we cannot just use the sharename label as the sharename. In such
instances, allow the user to override the sharename by specifing a name
within the share definition.

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

Author: spuiuk

selftest/test-info1.yml

@@ -13,6 +13,8 @@ backend: glusterfs
 shares:
   # share export1
   export1:
+    # if present, use this sharename instead of label
+    name: export1-share
     # If present, it means the share is pre-mounted
     # at the location given
     path: /mnt/share/export1-cephfs-vfs

selftest/test_testhelper.py

@@ -7,6 +7,7 @@ def test_read_yaml1():
 
     export1 = testinfo["shares"]["export1"]
     assert export1["server"] == "hostname1"
+    assert export1["name"] == "export1-share"
     assert export1["path"] == "/mnt/share/export1-cephfs-vfs"
     assert export1["backend"]["name"] == "cephfs.vfs"
     assert "user1" not in export1["users"]

test-info.yml.example

@@ -13,6 +13,8 @@ backend: glusterfs
 shares:
   # share export1
   export1:
+    # if present, use this sharename instead of label
+    name: export1-share
     # If present, it means the share is pre-mounted
     # at the location given
     path: /mnt/share/export1-cephfs-vfs

testhelper/testhelper.py

@@ -56,7 +56,7 @@ def read_yaml(test_info_file):
         if shares[sharename] is None:
             shares[sharename] = {"name": sharename}
         share = shares[sharename]
-        share.setdefault("name", share)
+        share.setdefault("name", sharename)
         share.setdefault("backend", {})
         share.setdefault("server", default_server)
         share.setdefault("users", default_users)
@@ -99,10 +99,11 @@ def get_mount_parameters(test_info: dict, share: str) -> typing.Dict[str, str]:
     """
     s = get_share(test_info, share)
     server = s["server"]
+    sharename = s["name"]
     users = list(s["users"].keys())
     return gen_mount_params(
         server,
-        share,
+        sharename,
         users[0],
         s["users"][users[0]],
     )