Use persona terminology and decouple identity setup from actions

delthas · delthas · commit 5907d2a91f82 · 2026-03-13T10:56:56.000+01:00
- Rename "role" to "persona" in feature file and step definitions - Replace hardcoded Keycloak usernames with World parameter keys - Add Given step for persona setup, decoupled from When action - Split into "tries to retrieve" (no status check) and "retrieves" (asserts 200) - Add generic "Then the http response code is {int}" step in common - Remove section comments from feature file Issue: ZENKO-5202
diff --git a/tests/ctst/common/common.ts b/tests/ctst/common/common.ts
@@ -427,6 +427,12 @@ Then('the API should {string} with {string}', function (this: Zenko, result: str
     }
 });
 
+Then('the http response code is {int}', function (this: Zenko, expectedStatus: number) {
+    const response = this.getSaved<{ statusCode: number }>('lastHttpResponse');
+    assert.strictEqual(response.statusCode, expectedStatus,
+        `Expected status ${expectedStatus} but got ${response.statusCode}`);
+});
+
 Then('the operation finished without error', function (this: Zenko) {
     this.useSavedIdentity();
     assert.strictEqual(!!this.getResult().err, false);
diff --git a/tests/ctst/features/reporting/StorageUsageReporting.feature b/tests/ctst/features/reporting/StorageUsageReporting.feature
@@ -2,46 +2,45 @@ Feature: Storage Usage Reporting API
   The storage usage reporting API allows authorized Keycloak users to retrieve
   aggregated storage usage metrics across all accounts and locations.
 
-    # Permission tests
     @2.14.0
     @PreMerge
     @StorageUsageReporting
-    Scenario Outline: Storage usage report access control per role
-        When the user retrieves the storage usage report as "<role>"
-        Then the storage usage report http response code is <expectedStatus>
+    Scenario Outline: Storage usage report access control per persona
+        Given an identity with the "<persona>" keycloak persona
+        When the user tries to retrieve the storage usage report
+        Then the http response code is <expectedStatus>
 
         Examples:
-          | role             | expectedStatus |
-          | storage_manager  | 200            |
-          | data_consumer    | 403            |
+          | persona                  | expectedStatus |
+          | StorageManagerUsername   | 200            |
+          | DataConsumerUsername     | 403            |
 
-    # Content tests
     @2.14.0
     @PreMerge
     @StorageUsageReporting
     Scenario: Storage usage report has a valid structure
-        When the user retrieves the storage usage report as "storage_manager"
-        Then the storage usage report http response code is 200
-        And the storage usage report response has a valid structure
+        Given an identity with the "StorageManagerUsername" keycloak persona
+        When the user retrieves the storage usage report
+        Then the storage usage report response has a valid structure
 
     @2.14.0
     @PreMerge
     @StorageUsageReporting
     Scenario: Storage usage report contains multiple accounts
-        Given 2 additional accounts
-        When the user retrieves the storage usage report as "storage_manager"
-        Then the storage usage report http response code is 200
-        And the storage usage report contains the additional accounts
+        Given an identity with the "StorageManagerUsername" keycloak persona
+        And 2 additional accounts
+        When the user retrieves the storage usage report
+        Then the storage usage report contains the additional accounts
 
     @2.14.0
     @PreMerge
     @StorageUsageReporting
     @PrepareStorageUsageReportingScenarios
     Scenario Outline: Storage usage report returns accurate metrics
         Given the environment is set up with bucket created, test data uploaded, and count-items ran
-        When the user retrieves the storage usage report as "storage_manager"
-        Then the storage usage report http response code is 200
-        And the report contains the test account with location "<locationName>"
+        And an identity with the "StorageManagerUsername" keycloak persona
+        When the user retrieves the storage usage report
+        Then the report contains the test account with location "<locationName>"
         And the report shows 3 objects and 600 bytes
 
         Examples:
diff --git a/tests/ctst/steps/reporting/storageUsageReporting.ts b/tests/ctst/steps/reporting/storageUsageReporting.ts
@@ -1,4 +1,4 @@
-import { When, Then } from '@cucumber/cucumber';
+import { Given, When, Then } from '@cucumber/cucumber';
 import { strict as assert } from 'assert';
 import Zenko from '../../world/Zenko';
 import { IdentityEnum } from 'cli-testing';
@@ -14,26 +14,37 @@ interface ReportingUsageResponse {
     accounts: Record<string, Record<string, LocationUsage>>;
 }
 
-When('the user retrieves the storage usage report as {string}', async function (this: Zenko, role: string) {
-    const result = await this.managementAPIRequest(
+Given('an identity with the {string} keycloak persona', function (this: Zenko, persona: string) {
+    const username = (this.parameters as Record<string, string>)[persona] || persona;
+    this.addToSaved('keycloakPersona', username);
+});
+
+async function fetchStorageUsageReport(world: Zenko) {
+    const persona = world.getSaved<string>('keycloakPersona');
+    const result = await world.managementAPIRequest(
         'GET',
-        `/instance/${this.parameters.InstanceID}/reporting/usage`,
+        `/instance/${world.parameters.InstanceID}/reporting/usage`,
         {},
         {},
-        role,
+        persona,
     );
-    this.addToSaved('reportingResponse', result);
+    world.addToSaved('lastHttpResponse', result);
+    return result;
+}
+
+When('the user tries to retrieve the storage usage report', async function (this: Zenko) {
+    await fetchStorageUsageReport(this);
 });
 
-Then('the storage usage report http response code is {int}', function (this: Zenko, expectedStatus: number) {
-    const response = this.getSaved<{ statusCode: number }>('reportingResponse');
-    assert.strictEqual(response.statusCode, expectedStatus,
-        `Expected status ${expectedStatus} but got ${response.statusCode}`);
+When('the user retrieves the storage usage report', async function (this: Zenko) {
+    const result = await fetchStorageUsageReport(this);
+    assert.strictEqual(result.statusCode, 200,
+        `Expected status 200 but got ${result.statusCode}`);
 });
 
 Then('the storage usage report response has a valid structure', function (this: Zenko) {
     const response = this.getSaved<{ statusCode: number; data: ReportingUsageResponse }>(
-        'reportingResponse');
+        'lastHttpResponse');
     const data = response.data;
     assert.strictEqual(typeof data.isTruncated, 'boolean',
         'isTruncated should be a boolean');
@@ -45,7 +56,7 @@ Then('the storage usage report response has a valid structure', function (this:
 
 Then('the storage usage report contains the additional accounts', async function (this: Zenko) {
     const response = this.getSaved<{ statusCode: number; data: ReportingUsageResponse }>(
-        'reportingResponse');
+        'lastHttpResponse');
     const accountNames = this.getSavedIdentities()
         .filter(id => id.identityType === IdentityEnum.ACCOUNT)
         .map(id => id.accountName);
@@ -57,7 +68,7 @@ Then('the storage usage report contains the additional accounts', async function
 
 Then('the report contains the test account with location {string}', async function (this: Zenko, locationName: string) {
     const response = this.getSaved<{ statusCode: number; data: ReportingUsageResponse }>(
-        'reportingResponse');
+        'lastHttpResponse');
     const accountName = this.getSaved<string>('accountName');
 
     assert.ok(accountName in response.data.accounts,
