Checking concurrency param

e2e/__init__.py

@@ -57,14 +57,95 @@
 from stress_test.continuous_failover_ha_2node import RandomMultiClient2NodeFailoverTest
 from stress_test.continuous_failover_ha_rdma import RandomRDMAFailoverTest
 from stress_test.continuous_failover_ha_rdma_multi_outage import RandomRDMAMultiFailoverTest
-from stress_test.continuous_failover_ha_multi_client_quick_outage import RandomRapidFailoverNoGap
+from stress_test.continuous_failover_ha_k8s import RandomK8sMultiOutageFailoverTest
+from stress_test.continuous_failover_ha_multi_client_quick_outage import (
+    RandomRapidFailoverNoGap,
+    RandomRapidFailoverNoGapV2,
+    RandomRapidFailoverNoGapV2NoMigration,
+)
 from stress_test.continuous_parallel_lvol_snapshot_clone import TestParallelLvolSnapshotCloneAPI
 from stress_test.continuous_failover_ha_namespace import RandomMultiClientFailoverNamespaceTest
 from stress_test.continuous_single_node_outage import RandomMultiClientSingleNodeTest
+from stress_test.continuous_failover_ha_security import (
+    RandomSecurityFailoverTest,
+    RandomAllSecurityFailoverTest,
+)
 
+from e2e_tests.security.test_lvol_security import (
+    TestLvolSecurityCombinations,
+    TestLvolAllowedHostsPositive,
+    TestLvolAllowedHostsNegative,
+    TestLvolDynamicHostManagement,
+    TestLvolCryptoWithAllowedHosts,
+    TestLvolDhcapDirections,
+    TestLvolMultipleAllowedHosts,
+    TestLvolSecurityNegativeHostOps,
+    TestLvolSecurityNegativeCreation,
+    TestLvolSecurityNegativeConnect,
+    TestLvolAllowedHostsNoDhchap,
+    # Extended security tests (TC-SEC-070..127)
+    TestLvolSecurityHAFailover,
+    TestLvolSecurityMgmtNodeReboot,
+    TestLvolSecurityDynamicModification,
+    TestLvolSecurityMultiClientConcurrent,
+    TestLvolSecurityScaleAndRapidOps,
+    TestLvolSecurityNegativeConnectExtended,
+    TestLvolSecurityCloneOverride,
+    TestLvolSecurityWithBackup,
+    TestLvolSecurityResize,
+    TestLvolSecurityVolumeListFields,
+    TestLvolSecurityRDMA,
+    TestLvolSecurityOutageRecovery,
+    TestLvolSecurityNetworkInterrupt,  # last: may trigger core dump / node abort
+)
 
 from e2e_tests.upgrade_tests.major_upgrade import TestMajorUpgrade, TestMajorUpgradeSingleNode
 
+from e2e_tests.backup.test_backup_restore import (
+    TestBackupBasicPositive,
+    TestBackupRestoreDataIntegrity,
+    TestBackupPolicy,
+    TestBackupNegative,
+    TestBackupCryptoLvol,
+    TestBackupCustomGeometry,
+    TestBackupDeleteAndRestore,
+    TestBackupCrossClusterRestore,  # NOT in get_backup_tests(); run explicitly only
+    # Extra coverage tests (TC-BCK-100..148)
+    TestBackupConcurrentIO,
+    TestBackupMultipleRestores,
+    TestBackupDeltaChainPointInTime,
+    TestBackupEmptyLvol,
+    TestBackupPoolRecreateRestore,
+    TestBackupPolicyAgeOnly,
+    TestBackupSnapshotClone,
+    TestBackupFilesystemXFS,
+    TestBackupLargeLvol,
+    TestBackupDeleteInProgress,
+    TestBackupPolicyMultipleLvols,
+    # Extended backup tests (TC-BCK-150..190)
+    TestBackupSecurityLvol,
+    TestBackupPolicyVersionsOne,
+    TestBackupPolicyMultipleOnSameLvol,
+    TestBackupPolicyLvolLevel,
+    TestBackupResizedLvol,
+    TestBackupListFields,
+    TestBackupUpgradeCompatibility,
+    TestBackupRestoreEdgeCases,
+    TestBackupSourceSwitch,
+)
+
+from stress_test.continuous_backup_stress import (
+    BackupStressParallelSnapshots,
+    BackupStressTcpFailover,
+    BackupStressRdmaFailover,
+    BackupStressCryptoMix,
+    BackupStressPolicyRetention,
+    BackupStressRestoreConcurrent,
+    TestBackupInterruptedBackup,
+    TestBackupInterruptedRestore,
+    BackupStressMarathon,
+)
+
 
 from load_tests.lvol_outage_load import TestLvolOutageLoadTest
 
@@ -93,7 +174,82 @@
     TestHASingleNodeReboot,
     TestHASingleNodeOutage,
     TestSingleNodeResizeLvolCone,
-    TestAddK8sNodesDuringFioRun
+    TestAddK8sNodesDuringFioRun,
+    # Security E2E tests
+    TestLvolSecurityCombinations,
+    TestLvolAllowedHostsPositive,
+    TestLvolAllowedHostsNegative,
+    TestLvolDynamicHostManagement,
+    TestLvolCryptoWithAllowedHosts,
+    TestLvolDhcapDirections,
+    TestLvolMultipleAllowedHosts,
+    TestLvolAllowedHostsNoDhchap,
+    # Security negative tests
+    TestLvolSecurityNegativeHostOps,
+    TestLvolSecurityNegativeCreation,
+    TestLvolSecurityNegativeConnect,
+    # Extended security E2E tests (TC-SEC-070..127)
+    TestLvolSecurityMgmtNodeReboot,
+    TestLvolSecurityDynamicModification,
+    TestLvolSecurityMultiClientConcurrent,
+    TestLvolSecurityScaleAndRapidOps,
+    TestLvolSecurityNegativeConnectExtended,
+    TestLvolSecurityCloneOverride,
+    TestLvolSecurityWithBackup,
+    TestLvolSecurityResize,
+    TestLvolSecurityVolumeListFields,
+    TestLvolSecurityRDMA,
+    TestLvolSecurityHAFailover,
+    TestLvolSecurityOutageRecovery,
+    TestLvolSecurityNetworkInterrupt,  # last: may trigger core dump / node abort
+    # Security stress tests
+    RandomSecurityFailoverTest,
+    RandomAllSecurityFailoverTest,
+    # RDMA stress tests
+    RandomRDMAFailoverTest,
+    RandomRDMAMultiFailoverTest,
+    # Backup E2E tests
+    TestBackupBasicPositive,
+    TestBackupRestoreDataIntegrity,
+    TestBackupPolicy,
+    TestBackupNegative,
+    TestBackupCryptoLvol,
+    TestBackupCustomGeometry,
+    TestBackupDeleteAndRestore,
+    TestBackupInterruptedBackup,
+    TestBackupInterruptedRestore,
+    # Backup extra E2E tests (TC-BCK-100..148)
+    TestBackupConcurrentIO,
+    TestBackupMultipleRestores,
+    TestBackupDeltaChainPointInTime,
+    TestBackupEmptyLvol,
+    TestBackupPoolRecreateRestore,
+    TestBackupPolicyAgeOnly,
+    TestBackupSnapshotClone,
+    TestBackupFilesystemXFS,
+    TestBackupLargeLvol,
+    TestBackupDeleteInProgress,
+    TestBackupPolicyMultipleLvols,
+    # Extended backup E2E tests (TC-BCK-150..190)
+    TestBackupSecurityLvol,
+    TestBackupPolicyVersionsOne,
+    TestBackupPolicyMultipleOnSameLvol,
+    TestBackupPolicyLvolLevel,
+    TestBackupResizedLvol,
+    TestBackupListFields,
+    TestBackupUpgradeCompatibility,
+    TestBackupRestoreEdgeCases,
+    TestBackupSourceSwitch,
+    # Backup stress tests
+    BackupStressParallelSnapshots,
+    BackupStressTcpFailover,
+    BackupStressRdmaFailover,
+    BackupStressCryptoMix,
+    BackupStressPolicyRetention,
+    BackupStressRestoreConcurrent,
+    BackupStressMarathon,
+    # Cross-cluster restore — explicit-only (requires CLUSTER2_* env vars)
+    TestBackupCrossClusterRestore,
 ]
 
 def get_all_tests(custom=True, ha_test=False):
@@ -126,6 +282,21 @@ def get_all_tests(custom=True, ha_test=False):
         # TestManyClonesFromSameSnapshot,
         # TestDeviceNodeRestart
     ]
+    # tests += [
+    #     # Security E2E tests
+    #     TestLvolSecurityCombinations,
+    #     TestLvolAllowedHostsPositive,
+    #     TestLvolAllowedHostsNegative,
+    #     TestLvolDynamicHostManagement,
+    #     TestLvolCryptoWithAllowedHosts,
+    #     TestLvolDhcapDirections,
+    #     TestLvolMultipleAllowedHosts,
+    #     TestLvolAllowedHostsNoDhchap,
+    #     # Security negative tests
+    #     TestLvolSecurityNegativeHostOps,
+    #     TestLvolSecurityNegativeCreation,
+    #     TestLvolSecurityNegativeConnect,
+    # ]
     if not custom:
         tests.remove(TestLvolFioNpcsCustom)
     else:
@@ -138,6 +309,38 @@ def get_all_tests(custom=True, ha_test=False):
         # tests.remove(TestHASingleNodeOutage)
     return tests
 
+def get_security_tests():
+    return [
+        # Security E2E tests
+        TestLvolSecurityCombinations,
+        TestLvolAllowedHostsPositive,
+        TestLvolAllowedHostsNegative,
+        TestLvolDynamicHostManagement,
+        TestLvolCryptoWithAllowedHosts,
+        TestLvolDhcapDirections,
+        TestLvolMultipleAllowedHosts,
+        TestLvolAllowedHostsNoDhchap,
+        # Security negative tests
+        TestLvolSecurityNegativeHostOps,
+        TestLvolSecurityNegativeCreation,
+        TestLvolSecurityNegativeConnect,
+        # Extended security tests (TC-SEC-070..127)
+        TestLvolSecurityMgmtNodeReboot,
+        TestLvolSecurityDynamicModification,
+        TestLvolSecurityMultiClientConcurrent,
+        TestLvolSecurityScaleAndRapidOps,
+        TestLvolSecurityNegativeConnectExtended,
+        TestLvolSecurityCloneOverride,
+        TestLvolSecurityWithBackup,
+        TestLvolSecurityResize,
+        TestLvolSecurityVolumeListFields,
+        TestLvolSecurityRDMA,
+        TestLvolSecurityHAFailover,
+        TestLvolSecurityOutageRecovery,
+        TestLvolSecurityNetworkInterrupt,  # last: may trigger core dump / node abort
+    ]
+
+
 def get_stress_tests():
     tests = [
         TestStressLvolCloneClusterFioRun,
@@ -155,13 +358,66 @@ def get_stress_tests():
         RandomMultiClient2NodeFailoverTest,
         RandomRDMAFailoverTest,
         RandomRDMAMultiFailoverTest,
+        RandomK8sMultiOutageFailoverTest,
         RandomRapidFailoverNoGap,
+        RandomRapidFailoverNoGapV2,
+        RandomRapidFailoverNoGapV2NoMigration,
         TestParallelLvolSnapshotCloneAPI,
         RandomMultiClientFailoverNamespaceTest,
         RandomMultiClientSingleNodeTest,
     ]
     return tests
 
+def get_backup_tests():
+    return [
+        # E2E backup tests
+        TestBackupBasicPositive,
+        TestBackupRestoreDataIntegrity,
+        TestBackupPolicy,
+        TestBackupNegative,
+        TestBackupCryptoLvol,
+        # TestBackupCustomGeometry, # Will re-enable when we have a way to reliably test it in CI (currently requires manual setup of custom geometry pool)
+        TestBackupDeleteAndRestore,
+        # Interrupted-operation tests
+        TestBackupInterruptedBackup,
+        TestBackupInterruptedRestore,
+        # Extra coverage tests (TC-BCK-100..148)
+        TestBackupConcurrentIO,
+        TestBackupMultipleRestores,
+        TestBackupDeltaChainPointInTime,
+        TestBackupEmptyLvol,
+        TestBackupPoolRecreateRestore,
+        TestBackupPolicyAgeOnly,
+        TestBackupSnapshotClone,
+        TestBackupFilesystemXFS,
+        TestBackupLargeLvol,
+        TestBackupDeleteInProgress,
+        TestBackupPolicyMultipleLvols,
+        # Extended backup tests (TC-BCK-150..190)
+        TestBackupSecurityLvol,
+        TestBackupPolicyVersionsOne,
+        TestBackupPolicyMultipleOnSameLvol,
+        TestBackupPolicyLvolLevel,
+        TestBackupResizedLvol,
+        TestBackupListFields,
+        TestBackupUpgradeCompatibility,
+        TestBackupRestoreEdgeCases,
+        TestBackupSourceSwitch,
+    ]
+
+
+def get_backup_stress_tests():
+    return [
+        BackupStressParallelSnapshots,
+        BackupStressTcpFailover,
+        BackupStressRdmaFailover,
+        BackupStressCryptoMix,
+        BackupStressPolicyRetention,
+        BackupStressRestoreConcurrent,
+        BackupStressMarathon,
+    ]
+
+
 def get_upgrade_tests():
     tests = [
         TestMajorUpgrade,

e2e/e2e.py

@@ -1,7 +1,7 @@
 ### simplyblock e2e tests
 import argparse
 import traceback
-from __init__ import get_all_tests, ALL_TESTS
+from __init__ import get_all_tests, get_security_tests, get_backup_tests, get_backup_stress_tests, ALL_TESTS
 from logger_config import setup_logger
 from exceptions.custom_exception import (
     TestNotFoundException,
@@ -54,7 +54,15 @@ def main():
     test_class_run = []
     new_nodes = args.new_nodes.strip().split() if args.new_nodes else []
     skipped_cases = 0
-    if args.testname is None or len(args.testname.strip()) == 0:
+
+    # group keywords — run a named category of tests
+    if args.testname and args.testname.strip().lower() == "security":
+        test_class_run = get_security_tests()
+    elif args.testname and args.testname.strip().lower() == "backup":
+        test_class_run = get_backup_tests()
+    elif args.testname and args.testname.strip().lower() == "backup-stress":
+        test_class_run = get_backup_stress_tests()
+    elif args.testname is None or len(args.testname.strip()) == 0:
         for cls in tests:
             if cls.__name__ == "TestAddNodesDuringFioRun":
                 if len(new_nodes) == 0 or len(new_nodes) % 2 != 0:
@@ -77,7 +85,8 @@ def main():
             test_class_run.append(cls)
     else:
         for cls in ALL_TESTS:
-            if args.testname.lower() in cls.__name__.lower():
+            needle = args.testname.lower().replace("_", "")
+            if needle in cls.__name__.lower():
                 if cls.__name__ == "TestAddNodesDuringFioRun" and (len(new_nodes) == 0 or len(new_nodes) % 2 != 0):
                     raise ValueError("TestAddNodesDuringFioRun requires --new-nodes with IPs in multiples of 2.")
                 if cls.__name__ == "TestRestartNodeOnAnotherHost" and len(new_nodes) == 0:
@@ -154,19 +163,18 @@ def main():
             test_obj.run()
             passed_cases.append(f"{test.__name__}")
         except Exception as exp:
-            logger.error(traceback.format_exc())
-            errors[f"{test.__name__}"] = [exp]
+            tb = traceback.format_exc()
+            logger.error(tb)
+            errors[f"{test.__name__}"] = [exp, tb]
         try:
-            if i == (len(test_class_run) - 1) or check_for_dumps():
-                test_obj.collect_management_details(post_teardown=False)
+            test_obj.collect_management_details(post_teardown=False)
             test_obj.teardown(delete_lvols=False, close_ssh=False)
             if not args.run_k8s:
                 test_obj.stop_docker_logs_collect()
             else:
                 test_obj.stop_k8s_log_collect()
             test_obj.fetch_all_nodes_distrib_log()
-            if i == (len(test_class_run) - 1) or check_for_dumps():
-                test_obj.collect_management_details(post_teardown=True)
+            test_obj.collect_management_details(post_teardown=True)
             test_obj.teardown(delete_lvols=True, close_ssh=False)
             all_nodes = test_obj._get_all_nodes()
             test_obj.ssh_obj.collect_final_docker_logs_simple(all_nodes, test_obj.docker_logs_path)
@@ -240,7 +248,9 @@ def main():
             logger.error(f"Failed to update Test Run status: {e}")
 
     if errors:
-        raise MultipleExceptions(errors)
+        exc = MultipleExceptions(errors)
+        logger.error(f"MultipleExceptions: {exc}")
+        raise exc
     if skipped_cases:
         raise SkippedTestsException("There are SKIPPED Tests. Please check!!")