add account_id field to config sections

use fallback=None to make account_id optional. getters may return None
for non-account users

Signed-off-by: Casey Bodley <cbodley@redhat.com>

diff --git a/s3tests.conf.SAMPLE b/s3tests.conf.SAMPLE
index 8baae3c92dfc366a7a4e751e0fc5be8299c28fea..5a4c4b4f62579756fbca8c9abf75e7eeb503ac0a 100644 (file)
--- a/s3tests.conf.SAMPLE
+++ b/s3tests.conf.SAMPLE
@@ -150,6 +150,7 @@ display_name = youruseridhere
 [iam root]
 access_key = AAAAAAAAAAAAAAAAAAaa
 secret_key = aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+account_id = RGW11111111111111111
 user_id = RGW11111111111111111
 email = account1@ceph.com
 
@@ -157,6 +158,7 @@ email = account1@ceph.com
 [iam alt root]
 access_key = BBBBBBBBBBBBBBBBBBbb
 secret_key = bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+account_id = RGW22222222222222222
 user_id = RGW22222222222222222
 email = account2@ceph.com
 

diff --git a/s3tests/functional/__init__.py b/s3tests/functional/__init__.py
index b4e1dfd737033b7fcfaa8098014cd4058891f2eb..5fcb1f4712154ac42f98ccc9648c476080030825 100644 (file)
--- a/s3tests/functional/__init__.py
+++ b/s3tests/functional/__init__.py
@@ -221,6 +221,7 @@ def configure():
     config.main_display_name = cfg.get('s3 main',"display_name")
     config.main_user_id = cfg.get('s3 main',"user_id")
     config.main_email = cfg.get('s3 main',"email")
+    config.main_account_id = cfg.get('s3 main', 'account_id', fallback=None)
     try:
         config.main_kms_keyid = cfg.get('s3 main',"kms_keyid")
     except (configparser.NoSectionError, configparser.NoOptionError):
@@ -263,12 +264,14 @@ def configure():
     config.alt_display_name = cfg.get('s3 alt',"display_name")
     config.alt_user_id = cfg.get('s3 alt',"user_id")
     config.alt_email = cfg.get('s3 alt',"email")
+    config.alt_account_id = cfg.get('s3 alt', 'account_id', fallback=None)
 
     config.tenant_access_key = cfg.get('s3 tenant',"access_key")
     config.tenant_secret_key = cfg.get('s3 tenant',"secret_key")
     config.tenant_display_name = cfg.get('s3 tenant',"display_name")
     config.tenant_user_id = cfg.get('s3 tenant',"user_id")
     config.tenant_email = cfg.get('s3 tenant',"email")
+    config.tenant_account_id = cfg.get('s3 tenant', 'account_id', fallback=None)
     config.tenant_name = cfg.get('s3 tenant',"tenant")
 
     config.iam_access_key = cfg.get('iam',"access_key")
@@ -281,11 +284,13 @@ def configure():
     config.iam_root_secret_key = cfg.get('iam root',"secret_key")
     config.iam_root_user_id = cfg.get('iam root',"user_id")
     config.iam_root_email = cfg.get('iam root',"email")
+    config.iam_root_account_id = cfg.get('iam root', 'account_id', fallback=None)
 
     config.iam_alt_root_access_key = cfg.get('iam alt root',"access_key")
     config.iam_alt_root_secret_key = cfg.get('iam alt root',"secret_key")
     config.iam_alt_root_user_id = cfg.get('iam alt root',"user_id")
     config.iam_alt_root_email = cfg.get('iam alt root',"email")
+    config.iam_alt_root_account_id = cfg.get('iam alt root', 'account_id', fallback=None)
 
     # vars from the fixtures section
     template = cfg.get('fixtures', "bucket prefix", fallback='test-{random}-')
@@ -715,6 +720,9 @@ def get_main_user_id():
 def get_main_email():
     return config.main_email
 
+def get_main_account_id():
+    return config.main_account_id
+
 def get_main_api_name():
     return config.main_api_name
 
@@ -736,6 +744,9 @@ def get_alt_display_name():
 def get_alt_user_id():
     return config.alt_user_id
 
+def get_alt_account_id():
+    return config.alt_account_id
+
 def get_alt_email():
     return config.alt_email
 
@@ -748,6 +759,9 @@ def get_tenant_aws_secret_key():
 def get_tenant_display_name():
     return config.tenant_display_name
 
+def get_tenant_account_id():
+    return config.tenant_account_id
+
 def get_tenant_name():
     return config.tenant_name
 
@@ -796,12 +810,18 @@ def get_iam_root_user_id():
 def get_iam_root_email():
     return config.iam_root_email
 
+def get_iam_root_account_id():
+    return config.iam_root_account_id
+
 def get_iam_alt_root_user_id():
     return config.iam_alt_root_user_id
 
 def get_iam_alt_root_email():
     return config.iam_alt_root_email
 
+def get_iam_alt_root_account_id():
+    return config.iam_alt_root_account_id
+
 def get_user_token():
     return config.webidentity_user_token