From d7ebb6ed49ecae433fa2b9da4d4996582d821137 Mon Sep 17 00:00:00 2001
From: Aditya Nagesh <adityanagesh@microsoft.com>
Date: Thu, 7 Nov 2024 23:17:25 +0530
Subject: [PATCH] Hibernation Testcase: Add NoRedundancy Feature Requirement

Hibernation test cases requires VM Redundancy type to be
NoRedundancy. Add that to test requirement
---
 lisa/features/availability.py        |  5 +++++
 microsoft/testsuites/power/power.py  | 19 ++++++++++---------
 microsoft/testsuites/power/stress.py |  3 ++-
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/lisa/features/availability.py b/lisa/features/availability.py
index 5421624121..024f689f4f 100644
--- a/lisa/features/availability.py
+++ b/lisa/features/availability.py
@@ -138,3 +138,8 @@ def enabled(self) -> bool:
     AvailabilitySettings,
     availability_type=search_space.SetSpace(True, [AvailabilityType.AvailabilityZone]),
 )
+
+AvailabilityTypeNoRedundancy = partial(
+    AvailabilitySettings,
+    availability_type=search_space.SetSpace(True, [AvailabilityType.NoRedundancy]),
+)
diff --git a/microsoft/testsuites/power/power.py b/microsoft/testsuites/power/power.py
index d29a0aa537..d3cdcef898 100644
--- a/microsoft/testsuites/power/power.py
+++ b/microsoft/testsuites/power/power.py
@@ -15,6 +15,7 @@
     TestSuiteMetadata,
 )
 from lisa.features import Disk, HibernationEnabled, Sriov, Synthetic
+from lisa.features.availability import AvailabilityTypeNoRedundancy
 from lisa.node import Node
 from lisa.operating_system import BSD, Windows
 from lisa.testsuite import simple_requirement
@@ -61,7 +62,7 @@ def before_case(self, log: Logger, **kwargs: Any) -> None:
         priority=3,
         requirement=simple_requirement(
             network_interface=Synthetic(),
-            supported_features=[HibernationEnabled()],
+            supported_features=[HibernationEnabled(), AvailabilityTypeNoRedundancy()],
         ),
     )
     def verify_hibernation_synthetic_network(self, node: Node, log: Logger) -> None:
@@ -76,7 +77,7 @@ def verify_hibernation_synthetic_network(self, node: Node, log: Logger) -> None:
         priority=3,
         requirement=simple_requirement(
             network_interface=Sriov(),
-            supported_features=[HibernationEnabled()],
+            supported_features=[HibernationEnabled(), AvailabilityTypeNoRedundancy()],
         ),
     )
     def verify_hibernation_sriov_network(self, node: Node, log: Logger) -> None:
@@ -94,7 +95,7 @@ def verify_hibernation_sriov_network(self, node: Node, log: Logger) -> None:
         """,
         priority=3,
         requirement=simple_requirement(
-            supported_features=[HibernationEnabled()],
+            supported_features=[HibernationEnabled(), AvailabilityTypeNoRedundancy()],
         ),
     )
     def verify_hibernation_time_sync(self, node: Node, log: Logger) -> None:
@@ -136,7 +137,7 @@ def verify_hibernation_time_sync(self, node: Node, log: Logger) -> None:
         priority=3,
         requirement=simple_requirement(
             min_count=2,
-            supported_features=[HibernationEnabled()],
+            supported_features=[HibernationEnabled(), AvailabilityTypeNoRedundancy()],
         ),
     )
     def verify_hibernation_with_network_workload(
@@ -159,7 +160,7 @@ def verify_hibernation_with_network_workload(
         """,
         priority=3,
         requirement=simple_requirement(
-            supported_features=[HibernationEnabled()],
+            supported_features=[HibernationEnabled(), AvailabilityTypeNoRedundancy()],
         ),
     )
     def verify_hibernation_with_storage_workload(self, node: Node, log: Logger) -> None:
@@ -179,7 +180,7 @@ def verify_hibernation_with_storage_workload(self, node: Node, log: Logger) -> N
         """,
         priority=3,
         requirement=simple_requirement(
-            supported_features=[HibernationEnabled()],
+            supported_features=[HibernationEnabled(), AvailabilityTypeNoRedundancy()],
         ),
     )
     def verify_hibernation_with_memory_workload(self, node: Node, log: Logger) -> None:
@@ -207,7 +208,7 @@ def verify_hibernation_with_memory_workload(self, node: Node, log: Logger) -> No
         requirement=simple_requirement(
             min_nic_count=8,
             network_interface=Synthetic(),
-            supported_features=[HibernationEnabled()],
+            supported_features=[HibernationEnabled(), AvailabilityTypeNoRedundancy()],
         ),
     )
     def verify_hibernation_synthetic_network_max_nics(
@@ -225,7 +226,7 @@ def verify_hibernation_synthetic_network_max_nics(
         requirement=simple_requirement(
             min_nic_count=8,
             network_interface=Sriov(),
-            supported_features=[HibernationEnabled()],
+            supported_features=[HibernationEnabled(), AvailabilityTypeNoRedundancy()],
         ),
     )
     def verify_hibernation_sriov_network_max_nics(
@@ -242,7 +243,7 @@ def verify_hibernation_sriov_network_max_nics(
         priority=3,
         requirement=simple_requirement(
             min_nic_count=8,
-            supported_features=[HibernationEnabled()],
+            supported_features=[HibernationEnabled(), AvailabilityTypeNoRedundancy()],
             min_data_disk_count=32,
         ),
     )
diff --git a/microsoft/testsuites/power/stress.py b/microsoft/testsuites/power/stress.py
index 03ad354951..065f52e500 100644
--- a/microsoft/testsuites/power/stress.py
+++ b/microsoft/testsuites/power/stress.py
@@ -12,6 +12,7 @@
     TestSuiteMetadata,
 )
 from lisa.features import HibernationEnabled, Sriov
+from lisa.features.availability import AvailabilityTypeNoRedundancy
 from lisa.node import Node
 from lisa.operating_system import BSD, Windows
 from lisa.testsuite import simple_requirement
@@ -46,7 +47,7 @@ def before_case(self, log: Logger, **kwargs: Any) -> None:
         timeout=720000,
         requirement=simple_requirement(
             network_interface=Sriov(),
-            supported_features=[HibernationEnabled()],
+            supported_features=[HibernationEnabled(), AvailabilityTypeNoRedundancy()],
         ),
     )
     def stress_hibernation(self, environment: Environment, log: Logger) -> None: