[pve-devel] [PATCH ha-manager v5 17/23] test: ha tester: replace any reference to groups with node affinity rules

Daniel Kral d.kral at proxmox.com
Wed Jul 30 19:59:44 CEST 2025 

As these test cases do work with node affinity rules now, correctly
replace references to unrestricted/restricted groups with
non-strict/strict node affinity rules and also replace "nofailback" with
"disabled failback".

Signed-off-by: Daniel Kral <d.kral at proxmox.com>
---
 src/test/test-crs-static2/README                   |  3 ++-
 src/test/test-node-affinity-nonstrict1/README      |  7 ++++---
 src/test/test-node-affinity-nonstrict2/README      | 10 +++++-----
 src/test/test-node-affinity-nonstrict3/README      |  6 +++---
 src/test/test-node-affinity-nonstrict4/README      |  8 ++++----
 src/test/test-node-affinity-nonstrict5/README      |  8 ++++----
 src/test/test-node-affinity-nonstrict6/README      |  8 ++++----
 src/test/test-node-affinity-strict1/README         |  7 ++++---
 src/test/test-node-affinity-strict2/README         |  8 ++++----
 src/test/test-node-affinity-strict3/README         |  6 +++---
 src/test/test-node-affinity-strict4/README         |  8 ++++----
 src/test/test-node-affinity-strict5/README         |  8 ++++----
 src/test/test-node-affinity-strict6/README         | 11 ++++++-----
 src/test/test-recovery2/README                     |  4 ++--
 src/test/test-relocate-policy-default-group/README |  6 +++---
 src/test/test-resource-failure6/README             |  6 +++---
 16 files changed, 59 insertions(+), 55 deletions(-)

diff --git a/src/test/test-crs-static2/README b/src/test/test-crs-static2/README
index 61530a76..c4812b5b 100644
--- a/src/test/test-crs-static2/README
+++ b/src/test/test-crs-static2/README
@@ -1,4 +1,5 @@
 Test how service recovery works with the 'static' resource scheduling mode.
 
 Expect that the single service always gets recovered to the node with the most
-available resources. Also tests that the group priority still takes precedence.
+available resources. Also tests that the node affinity rule's node priority
+still takes precedence.
diff --git a/src/test/test-node-affinity-nonstrict1/README b/src/test/test-node-affinity-nonstrict1/README
index 8775b6ca..15798005 100644
--- a/src/test/test-node-affinity-nonstrict1/README
+++ b/src/test/test-node-affinity-nonstrict1/README
@@ -1,5 +1,6 @@
-Test whether a service in a unrestricted group will automatically migrate back
-to a node member in case of a manual migration to a non-member node.
+Test whether a ha resource in a non-strict node affinity rule will
+automatically migrate back to a node member in case of a manual migration to a
+non-member node.
 
 The test scenario is:
 - vm:101 should be kept on node3
@@ -7,4 +8,4 @@ The test scenario is:
 
 The expected outcome is:
 - As vm:101 is manually migrated to node2, it is migrated back to node3, as
-  node3 is a group member and has higher priority than the other nodes
+  node3 is a rule member and has higher priority than the other nodes
diff --git a/src/test/test-node-affinity-nonstrict2/README b/src/test/test-node-affinity-nonstrict2/README
index f27414b1..a2ad43ba 100644
--- a/src/test/test-node-affinity-nonstrict2/README
+++ b/src/test/test-node-affinity-nonstrict2/README
@@ -1,6 +1,6 @@
-Test whether a service in a unrestricted group with nofailback enabled will
-stay on the manual migration target node, even though the target node is not a
-member of the unrestricted group.
+Test whether a service in a non-strict node affinity rule, where the service
+has failback disabled, will stay on the manual migration target node, even
+though the target node is not a member of the non-strict node affinity rule.
 
 The test scenario is:
 - vm:101 should be kept on node3
@@ -8,5 +8,5 @@ The test scenario is:
 
 The expected outcome is:
 - As vm:101 is manually migrated to node2, vm:101 stays on node2; even though
-  node2 is not a group member, the nofailback flag prevents vm:101 to be
-  migrated back to a group member
+  node2 is not a rule member, the disabled failback flag prevents vm:101 to be
+  migrated back to a rule member.
diff --git a/src/test/test-node-affinity-nonstrict3/README b/src/test/test-node-affinity-nonstrict3/README
index c4ddfab8..98507ebd 100644
--- a/src/test/test-node-affinity-nonstrict3/README
+++ b/src/test/test-node-affinity-nonstrict3/README
@@ -1,6 +1,6 @@
-Test whether a service in a unrestricted group with only one node member will
-be migrated to a non-member node in case of a failover of their previously
-assigned node.
+Test whether a service in a non-strict node affinity rule with only one node
+member will be migrated to a non-member node in case of a failover of their
+previously assigned node.
 
 The test scenario is:
 - vm:101 should be kept on node3
diff --git a/src/test/test-node-affinity-nonstrict4/README b/src/test/test-node-affinity-nonstrict4/README
index a08f0e1d..31a46881 100644
--- a/src/test/test-node-affinity-nonstrict4/README
+++ b/src/test/test-node-affinity-nonstrict4/README
@@ -1,6 +1,6 @@
-Test whether a service in a unrestricted group with two node members will stay
-assigned to one of the node members in case of a failover of their previously
-assigned node.
+Test whether a service in a non-strict node affinity rule with two node members
+will stay assigned to one of the node members in case of a failover of their
+previously assigned node.
 
 The test scenario is:
 - vm:101 should be kept on node2 or node3
@@ -11,4 +11,4 @@ The test scenario is:
 
 The expected outcome is:
 - As node3 fails, vm:101 is migrated to node2, as it's the only available node
-  left in the unrestricted group
+  left in the non-strict node affinity rule
diff --git a/src/test/test-node-affinity-nonstrict5/README b/src/test/test-node-affinity-nonstrict5/README
index 0c370446..118cd14c 100644
--- a/src/test/test-node-affinity-nonstrict5/README
+++ b/src/test/test-node-affinity-nonstrict5/README
@@ -1,6 +1,6 @@
-Test whether a service in a unrestricted group with two differently prioritized
-node members will stay on the node with the highest priority in case of a
-failover or when the service is on a lower-priority node.
+Test whether a service in a non-strict node affinity rule with two differently
+prioritized node members will stay on the node with the highest priority in
+case of a failover or when the service is on a lower-priority node.
 
 The test scenario is:
 - vm:101 should be kept on node2 or node3
@@ -11,6 +11,6 @@ The expected outcome is:
 - As vm:101 runs on node3, it is automatically migrated to node2, as node2 has
   a higher priority than node3
 - As node2 fails, vm:101 is migrated to node3 as node3 is the next and only
-  available node member left in the unrestricted group
+  available node member left in the non-strict node affinity rule
 - As node2 comes back online, vm:101 is migrated back to node2, as node2 has a
   higher priority than node3
diff --git a/src/test/test-node-affinity-nonstrict6/README b/src/test/test-node-affinity-nonstrict6/README
index 4ab12756..64cdaecd 100644
--- a/src/test/test-node-affinity-nonstrict6/README
+++ b/src/test/test-node-affinity-nonstrict6/README
@@ -1,6 +1,6 @@
-Test whether a service in a unrestricted group with nofailback enabled and two
-differently prioritized node members will stay on the current node without
-migrating back to the highest priority node.
+Test whether a service in a non-strict node affinity rule with nofailback
+enabled and two differently prioritized node members will stay on the current
+node without migrating back to the highest priority node.
 
 The test scenario is:
 - vm:101 should be kept on node2 or node3
@@ -9,6 +9,6 @@ The test scenario is:
 
 The expected outcome is:
 - As node2 fails, vm:101 is migrated to node3 as it is the only available node
-  member left in the unrestricted group
+  member left in the non-strict node affinity rule
 - As node2 comes back online, vm:101 stays on node3; even though node2 has a
   higher priority, the nofailback flag prevents vm:101 to migrate back to node2
diff --git a/src/test/test-node-affinity-strict1/README b/src/test/test-node-affinity-strict1/README
index c717d589..85e82fa7 100644
--- a/src/test/test-node-affinity-strict1/README
+++ b/src/test/test-node-affinity-strict1/README
@@ -1,5 +1,6 @@
-Test whether a service in a restricted group will automatically migrate back to
-a restricted node member in case of a manual migration to a non-member node.
+Test whether a service in a strict node affinity rule will automatically
+migrate back to a restricted node member in case of a manual migration to a
+non-member node.
 
 The test scenario is:
 - vm:101 must be kept on node3
@@ -7,4 +8,4 @@ The test scenario is:
 
 The expected outcome is:
 - As vm:101 is manually migrated to node2, it is migrated back to node3, as
-  node3 is the only available node member left in the restricted group
+  node3 is the only available node member left in the strict node affinity rule
diff --git a/src/test/test-node-affinity-strict2/README b/src/test/test-node-affinity-strict2/README
index f4d06a14..156ca2dc 100644
--- a/src/test/test-node-affinity-strict2/README
+++ b/src/test/test-node-affinity-strict2/README
@@ -1,6 +1,6 @@
-Test whether a service in a restricted group with nofailback enabled will
-automatically migrate back to a restricted node member in case of a manual
-migration to a non-member node.
+Test whether a service in a strict node affinity rule, where the service has
+failback disabled, will automatically migrate back to a restricted node member
+in case of a manual migration to a non-member node.
 
 The test scenario is:
 - vm:101 must be kept on node3
@@ -8,4 +8,4 @@ The test scenario is:
 
 The expected outcome is:
 - As vm:101 is manually migrated to node2, it is migrated back to node3, as
-  node3 is the only available node member left in the restricted group
+  node3 is the only available node member left in the strict node affinity rule
diff --git a/src/test/test-node-affinity-strict3/README b/src/test/test-node-affinity-strict3/README
index 5aced390..b2167adb 100644
--- a/src/test/test-node-affinity-strict3/README
+++ b/src/test/test-node-affinity-strict3/README
@@ -1,5 +1,5 @@
-Test whether a service in a restricted group with only one node member will
-stay in recovery in case of a failover of their previously assigned node.
+Test whether a service in a strict node affinity rule with only one node member
+will stay in recovery in case of a failover of their previously assigned node.
 
 The test scenario is:
 - vm:101 must be kept on node3
@@ -7,4 +7,4 @@ The test scenario is:
 
 The expected outcome is:
 - As node3 fails, vm:101 stays in recovery since there's no available node
-  member left in the restricted group
+  member left in the strict node affinity rule
diff --git a/src/test/test-node-affinity-strict4/README b/src/test/test-node-affinity-strict4/README
index 25ded53e..f9ea4282 100644
--- a/src/test/test-node-affinity-strict4/README
+++ b/src/test/test-node-affinity-strict4/README
@@ -1,6 +1,6 @@
-Test whether a service in a restricted group with two node members will stay
-assigned to one of the node members in case of a failover of their previously
-assigned node.
+Test whether a service in a strict node affinity rule with two node members
+will stay assigned to one of the node members in case of a failover of their
+previously assigned node.
 
 The test scenario is:
 - vm:101 must be kept on node2 or node3
@@ -11,4 +11,4 @@ The test scenario is:
 
 The expected outcome is:
 - As node3 fails, vm:101 is migrated to node2, as it's the only available node
-  left in the restricted group
+  left in the strict node affinity rule
diff --git a/src/test/test-node-affinity-strict5/README b/src/test/test-node-affinity-strict5/README
index a4e67f42..56b31a88 100644
--- a/src/test/test-node-affinity-strict5/README
+++ b/src/test/test-node-affinity-strict5/README
@@ -1,6 +1,6 @@
-Test whether a service in a restricted group with two differently prioritized
-node members will stay on the node with the highest priority in case of a
-failover or when the service is on a lower-priority node.
+Test whether a service in a strict node affinity rule with two differently
+prioritized node members will stay on the node with the highest priority in
+case of a failover or when the service is on a lower-priority node.
 
 The test scenario is:
 - vm:101 must be kept on node2 or node3
@@ -11,6 +11,6 @@ The expected outcome is:
 - As vm:101 runs on node3, it is automatically migrated to node2, as node2 has
   a higher priority than node3
 - As node2 fails, vm:101 is migrated to node3 as node3 is the next and only
-  available node member left in the restricted group
+  available node member left in the strict node affinity rule
 - As node2 comes back online, vm:101 is migrated back to node2, as node2 has a
   higher priority than node3
diff --git a/src/test/test-node-affinity-strict6/README b/src/test/test-node-affinity-strict6/README
index c558afd1..57d7e701 100644
--- a/src/test/test-node-affinity-strict6/README
+++ b/src/test/test-node-affinity-strict6/README
@@ -1,6 +1,6 @@
-Test whether a service in a restricted group with nofailback enabled and two
-differently prioritized node members will stay on the current node without
-migrating back to the highest priority node.
+Test whether a service in a strict node affinity rule, where the service has
+failback disabled, and two differently prioritized node members will stay on
+the current node without migrating back to the highest priority node.
 
 The test scenario is:
 - vm:101 must be kept on node2 or node3
@@ -9,6 +9,7 @@ The test scenario is:
 
 The expected outcome is:
 - As node2 fails, vm:101 is migrated to node3 as it is the only available node
-  member left in the restricted group
+  member left in the strict node affinity rule
 - As node2 comes back online, vm:101 stays on node3; even though node2 has a
-  higher priority, the nofailback flag prevents vm:101 to migrate back to node2
+  higher priority, the disabled failback flag prevents vm:101 to migrate back
+  to node2
diff --git a/src/test/test-recovery2/README b/src/test/test-recovery2/README
index 017d0f20..61294c94 100644
--- a/src/test/test-recovery2/README
+++ b/src/test/test-recovery2/README
@@ -1,3 +1,3 @@
 Test what happens if a service needs to get recovered but select_service_node
-cannot return any possible node due to restricted groups, but after a while the
-original node comes up, in which case the service must be recovered.
+cannot return any possible node due to a strict node affinity rule, but after a
+while the original node comes up, in which case the service must be recovered.
diff --git a/src/test/test-relocate-policy-default-group/README b/src/test/test-relocate-policy-default-group/README
index 18ee13a0..4553efeb 100644
--- a/src/test/test-relocate-policy-default-group/README
+++ b/src/test/test-relocate-policy-default-group/README
@@ -1,7 +1,7 @@
-Test relocate policy on services with no group.
+Test relocate policy on services with no node affinity rule.
 Service 'fa:130' fails three times to restart and has a 'max_restart' policy
 of 0, thus will be relocated after each start try.
-As it has no group configured all available nodes should get chosen for
-when relocating.
+As it has no node affinity rule configured all available nodes should get
+chosen for when relocating.
 As we allow to relocate twice but the service fails three times we place
 it in the error state after all tries where used and all nodes where visited
diff --git a/src/test/test-resource-failure6/README b/src/test/test-resource-failure6/README
index 787af014..49a6f3a0 100644
--- a/src/test/test-resource-failure6/README
+++ b/src/test/test-resource-failure6/README
@@ -1,5 +1,5 @@
-Test relocate policy on services with no group.
+Test relocate policy on services with no node affinity rule.
 Service 'fa:130' fails three times to restart and has a 'max_restart' policy
 of 0, thus will be relocated after each start try.
-As it has no group configured all available nodes should get chosen for
-when relocating.
+As it has no node affinity rule configured all available nodes should get
+chosen for when relocating.
-- 
2.47.2

More information about the pve-devel mailing list