Merge branch 'w/2.7/improvement/ZENKO-4887' into tmp/octopus/w/2.8/im…

…provement/ZENKO-4887
scality · Sep 16, 2024 · 887030a · 887030a
2 parents e5c7eb5 + 55525d9
commit 887030a
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 9 deletions.
diff --git a/tests/ctst/features/pra.feature b/tests/ctst/features/pra.feature
@@ -41,11 +41,20 @@ Feature: PRA operations
     And the DATA_ACCESSOR user tries to perform PutObject on "DR" site
     Then it "should not" pass Vault authentication
 
+    # Switch to failover
+    When I request the failover state for the DR
+    Then the DR sink should be in phase "Failover"
+
     # Restore on DR site
-    When i restore object "obj2-1" for 2 days on "DR" site
+    When i restore object "obj2-1" for 200000 days on "DR" site
     Then object "obj2-1" should "" be "restored" and have the storage class "e2e-cold" on "DR" site
     And object "obj2-1" should "" be "transitioned" and have the storage class "e2e-cold" on "Primary" site
 
+    # Switch to failback
+    When I resume operations for the DR
+    Then the DR sink should be in phase "Running"
+    And object "obj2-1" should "" be "transitioned" and have the storage class "e2e-cold" on "DR" site
+
     # Pause / Resume DR
     When I pause the DR
     Then the DR source should be in phase "Paused"

diff --git a/tests/ctst/steps/dr/drctl.ts b/tests/ctst/steps/dr/drctl.ts
@@ -112,6 +112,15 @@ type FailoverConfig = {
     sinkZenkoNamespace?: string;
 };
 
+type FailbackConfig = {
+    wait?: boolean;
+    timeout?: string;
+    sinkKubeconfigPath?: string;
+    sinkKubeconfigData?: string;
+    sinkZenkoInstance?: string;
+    sinkZenkoNamespace?: string;
+};
+
 type UninstallConfig = {
     sinkZenkoDrInstance?: string;
     sourceZenkoDrInstance?: string;
@@ -217,6 +226,10 @@ export default class ZenkoDrctl {
         return this.runCommand('failover', this.paramToCli(config));
     }
 
+    async failback(config: FailbackConfig) {
+        return this.runCommand('failback', this.paramToCli(config));
+    }
+
     async status(config: StatusConfig) {
         return this.runCommand('status', this.paramToCli(config));
     }

diff --git a/tests/ctst/steps/pra.ts b/tests/ctst/steps/pra.ts
@@ -303,13 +303,14 @@ When('the DATA_ACCESSOR user tries to perform PutObject on {string} site', { tim
         this.setResult(await S3.putObject(this.getCommandParameters()));
     });
 
-Then('the kafka DR volume exists', { timeout: 60000 }, async function (this: Zenko) {
+const volumeTimeout = 60000;
+Then('the kafka DR volume exists', { timeout: volumeTimeout + 2000 }, async function (this: Zenko) {
     const volumeClaim = await getPVCFromLabel(this, 'kafka_cr', 'end2end-pra-sink-base-queue');
     this.logger.debug('kafka volume claim', { volumeClaim });
     assert(volumeClaim);
     const volume = await this.zenkoDrCtl?.volumeGet({
         volumeName: volumeClaim.spec?.volumeName,
-        timeout: '60s',
+        timeout: `${volumeTimeout.toString()}ms`,
     });
     this.logger.debug('kafka volume from drctl', { volume });
     assert(volume);
@@ -320,36 +321,57 @@ Then('the kafka DR volume exists', { timeout: 60000 }, async function (this: Zen
     assert(volumeParsed.result!['volume phase'] === 'Bound');
 });
 
-When('I pause the DR', { timeout: 360000 }, async function (this: Zenko) {
+const failoverTimeout = 360000;
+When ('I request the failover state for the DR', { timeout: failoverTimeout + 2000 }, async function (this: Zenko) {
+    await this.zenkoDrCtl?.failover({
+        sinkZenkoNamespace: 'default',
+        wait: true,
+        timeout: `${failoverTimeout.toString()}ms`,
+    });
+});
+
+const failbackTimeout = 360000;
+When ('I resume operations for the DR', { timeout: failbackTimeout + 2000 }, async function (this: Zenko) {
+    await this.zenkoDrCtl?.failback({
+        sinkZenkoNamespace: 'default',
+        wait: true,
+        timeout: `${failbackTimeout.toString()}ms`,
+    });
+});
+
+const pauseTimeout = 360000;
+When('I pause the DR', { timeout: pauseTimeout + 2000 }, async function (this: Zenko) {
     await this.zenkoDrCtl?.replicationPause({
         sourceZenkoDrInstance: 'end2end-source',
         sinkZenkoDrInstance: 'end2end-pra-sink',
         sinkZenkoNamespace: 'default',
         sourceZenkoNamespace: 'default',
         wait: true,
-        timeout: '6m',
+        timeout: `${pauseTimeout.toString()}ms`,
     });
 });
 
-When('I resume the DR', { timeout: 360000 }, async function (this: Zenko) {
+const resumeTimeout = 360000;
+When('I resume the DR', { timeout: resumeTimeout + 2000 }, async function (this: Zenko) {
     await this.zenkoDrCtl?.replicationResume({
         sourceZenkoDrInstance: 'end2end-source',
         sinkZenkoDrInstance: 'end2end-pra-sink',
         sinkZenkoNamespace: 'default',
         sourceZenkoNamespace: 'default',
         wait: true,
-        timeout: '6m',
+        timeout: `${resumeTimeout.toString()}ms`,
     });
 });
 
-When('I uninstall DR', { timeout: 360000 }, async function (this: Zenko) {
+const uninstallTimeout = 360000;
+When('I uninstall DR', { timeout: uninstallTimeout + 2000 }, async function (this: Zenko) {
     await this.zenkoDrCtl?.uninstall({
         sourceZenkoDrInstance: 'end2end-source',
         sinkZenkoDrInstance: 'end2end-pra-sink',
         sinkZenkoNamespace: 'default',
         sourceZenkoNamespace: 'default',
         wait: true,
-        timeout: '6m',
+        timeout: `${uninstallTimeout.toString()}ms`,
     });
 });