config: add fixtures for iam name/path prefixes

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 83af25722c2a1591d47d1e97bec3df4f8a19f6a2)

diff --git a/s3tests.conf.SAMPLE b/s3tests.conf.SAMPLE
index 9593fc10a595032d6e2bd597fd6670d02113278a..60e99289a840f4c43cf28676a4a6e74af6b38e33 100644 (file)
--- a/s3tests.conf.SAMPLE
+++ b/s3tests.conf.SAMPLE
@@ -19,6 +19,14 @@ ssl_verify = False
 ## the prefix to 30 characters long, and avoid collisions
 bucket prefix = yournamehere-{random}-
 
+# all the iam account resources (users, roles, etc) created
+# will start with this name prefix
+iam name prefix = s3-tests-
+
+# all the iam account resources (users, roles, etc) created
+# will start with this path prefix
+iam path prefix = /s3-tests/
+
 [s3 main]
 # main display_name set in vstart.sh
 display_name = M. Tester

diff --git a/s3tests_boto3/functional/__init__.py b/s3tests_boto3/functional/__init__.py
index a65b54c6aeaeac500ca157dcf886fa7c65faf7ea..05abb62bb39b31c1bdf2e01eebe27c9c1fab35fd 100644 (file)
--- a/s3tests_boto3/functional/__init__.py
+++ b/s3tests_boto3/functional/__init__.py
@@ -261,11 +261,12 @@ def setup():
     config.tenant_email = cfg.get('s3 tenant',"email")
 
     # vars from the fixtures section
-    try:
-        template = cfg.get('fixtures', "bucket prefix")
-    except (configparser.NoOptionError):
-        template = 'test-{random}-'
+    template = cfg.get('fixtures', "bucket prefix", fallback='test-{random}-')
     prefix = choose_bucket_prefix(template=template)
+    template = cfg.get('fixtures', "iam name prefix", fallback="s3-tests-")
+    config.iam_name_prefix = choose_bucket_prefix(template=template)
+    template = cfg.get('fixtures', "iam path prefix", fallback="/s3-tests/")
+    config.iam_path_prefix = choose_bucket_prefix(template=template)
 
     alt_client = get_alt_client()
     tenant_client = get_tenant_client()
@@ -699,6 +700,15 @@ def get_token():
 def get_realm_name():
     return config.webidentity_realm
 
+def get_iam_name_prefix():
+    return config.iam_name_prefix
+
+def make_iam_name(name):
+    return config.iam_name_prefix + name
+
+def get_iam_path_prefix():
+    return config.iam_path_prefix
+
 def get_iam_access_key():
     return config.iam_access_key