From: Kalpesh Pandya <kapandya@redhat.com>
Date: Fri, 16 Jul 2021 09:51:53 +0000 (+0530)
Subject: qa/tasks: Addition of two new parameters for sts-tests
X-Git-Tag: v16.2.11~244^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9658a7a8eecfbfc9c0af8c3f0b1829f40a064080;p=ceph.git

qa/tasks: Addition of two new parameters for sts-tests

Addition of SUB and AZP parameter for some new sts-tests

Signed-off-by: Kalpesh Pandya <kapandya@redhat.com>
(cherry picked from commit 74b5ec876cade98195196428c3f3f9edafb35128)
---

diff --git a/qa/suites/rgw/sts/tasks/first.yaml b/qa/suites/rgw/sts/tasks/first.yaml
new file mode 100644
index 000000000000..8892f7082284
--- /dev/null
+++ b/qa/suites/rgw/sts/tasks/first.yaml
@@ -0,0 +1,17 @@
+tasks:
+- tox: [ client.0 ]
+- keycloak:
+    client.0:
+      keycloak_version: 11.0.0
+- s3tests:
+    client.0:
+      sts_tests: True
+      force-branch: ceph-pacific
+      rgw_server: client.0
+      extra_attrs: ['webidentity_test']
+overrides:
+  ceph:
+    conf:
+      client:
+              rgw sts key: abcdefghijklmnop
+              rgw s3 auth use sts: true
diff --git a/qa/suites/rgw/sts/tasks/webidentity.yaml b/qa/suites/rgw/sts/tasks/webidentity.yaml
deleted file mode 100644
index 8892f7082284..000000000000
--- a/qa/suites/rgw/sts/tasks/webidentity.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-tasks:
-- tox: [ client.0 ]
-- keycloak:
-    client.0:
-      keycloak_version: 11.0.0
-- s3tests:
-    client.0:
-      sts_tests: True
-      force-branch: ceph-pacific
-      rgw_server: client.0
-      extra_attrs: ['webidentity_test']
-overrides:
-  ceph:
-    conf:
-      client:
-              rgw sts key: abcdefghijklmnop
-              rgw s3 auth use sts: true
diff --git a/qa/tasks/keycloak.py b/qa/tasks/keycloak.py
index 0f1fc9d7a380..92615bdd3430 100644
--- a/qa/tasks/keycloak.py
+++ b/qa/tasks/keycloak.py
@@ -256,21 +256,39 @@ def run_admin_cmds(ctx,config):
             if(character!=':'):
                 ans5+=character
 
-        out6= toxvenv_sh(ctx, remote, 
+        str1 = 'curl'
+        str2 = '-k'
+        str3 = '-v'
+        str4 = '-X'
+        str5 = 'POST'
+        str6 = '-u'
+        str7 = '-d'
+        str8 = 'http://localhost:8080/auth/realms/'+realm_name+'/protocol/openid-connect/token/introspect'
+
+        out6= toxvenv_sh(ctx, remote,
                  [
-                  'curl', '-k', '-v', 
-                  '-X', 'POST', 
-                  '-u', ans0, 
-                  '-d', acc_token, 
-                  'http://localhost:8080/auth/realms/'+realm_name+'/protocol/openid-connect/token/introspect', run.Raw('|'), 
-                  'jq', '-r', '.aud'
+                  str1, str2, str3, str4, str5, str6, ans0, str7, acc_token, str8, run.Raw('|'), 'jq', '-r', '.aud'
+                 ])
+
+        out7= toxvenv_sh(ctx, remote,
+                 [ 
+                  str1, str2, str3, str4, str5, str6, ans0, str7, acc_token, str8, run.Raw('|'), 'jq', '-r', '.sub'
+                 ])
+
+        out8= toxvenv_sh(ctx, remote,
+                 [ 
+                  str1, str2, str3, str4, str5, str6, ans0, str7, acc_token, str8, run.Raw('|'), 'jq', '-r', '.azp'
                  ])
 
         ans6=out6.rstrip()
+        ans7=out7.rstrip()
+        ans8=out8.rstrip()
 
         os.environ['TOKEN']=ans4
         os.environ['THUMBPRINT']=ans5
         os.environ['AUD']=ans6
+        os.environ['SUB']=ans7
+        os.environ['AZP']=ans8
         os.environ['KC_REALM']=realm_name
 
     try:
diff --git a/qa/tasks/s3tests.py b/qa/tasks/s3tests.py
index ea2c1623405f..676818168c29 100644
--- a/qa/tasks/s3tests.py
+++ b/qa/tasks/s3tests.py
@@ -251,6 +251,8 @@ def create_users(ctx, config):
         s3tests_conf.setdefault('webidentity', {})
         s3tests_conf['webidentity'].setdefault('token',os.environ['TOKEN'])
         s3tests_conf['webidentity'].setdefault('aud',os.environ['AUD'])
+        s3tests_conf['webidentity'].setdefault('sub',os.environ['SUB'])
+        s3tests_conf['webidentity'].setdefault('azp',os.environ['AZP'])
         s3tests_conf['webidentity'].setdefault('thumbprint',os.environ['THUMBPRINT'])
         s3tests_conf['webidentity'].setdefault('KC_REALM',os.environ['KC_REALM'])