[pve-devel] [PATCH ha-manager v4 16/19] test: ha tester: migrate groups to service and rules config

[Daniel Kral <d.kral@proxmox.com>]

This is done, because in an upcoming patch, which persistently migrates
HA groups to node affinity rules, it would make all these test cases try
to migrate the HA groups config to the service and rules config. As this
is not the responsibility of these test cases and HA groups become
deprecated anyway, move them now.

Signed-off-by: Daniel Kral <d.kral@proxmox.com>
---
 src/test/test-basic5/groups                           | 2 --
 src/test/test-basic5/rules_config                     | 3 +++
 src/test/test-basic5/service_config                   | 2 +-
 src/test/test-crs-static2/groups                      | 2 --
 src/test/test-crs-static2/rules_config                | 3 +++
 src/test/test-crs-static2/service_config              | 2 +-
 src/test/test-node-affinity-nonstrict1/groups         | 2 --
 src/test/test-node-affinity-nonstrict1/rules_config   | 3 +++
 src/test/test-node-affinity-nonstrict1/service_config | 2 +-
 src/test/test-node-affinity-nonstrict2/groups         | 3 ---
 src/test/test-node-affinity-nonstrict2/rules_config   | 3 +++
 src/test/test-node-affinity-nonstrict2/service_config | 2 +-
 src/test/test-node-affinity-nonstrict3/groups         | 2 --
 src/test/test-node-affinity-nonstrict3/rules_config   | 3 +++
 src/test/test-node-affinity-nonstrict3/service_config | 2 +-
 src/test/test-node-affinity-nonstrict4/groups         | 2 --
 src/test/test-node-affinity-nonstrict4/rules_config   | 3 +++
 src/test/test-node-affinity-nonstrict4/service_config | 2 +-
 src/test/test-node-affinity-nonstrict5/groups         | 2 --
 src/test/test-node-affinity-nonstrict5/rules_config   | 3 +++
 src/test/test-node-affinity-nonstrict5/service_config | 2 +-
 src/test/test-node-affinity-nonstrict6/groups         | 3 ---
 src/test/test-node-affinity-nonstrict6/rules_config   | 3 +++
 src/test/test-node-affinity-nonstrict6/service_config | 2 +-
 src/test/test-node-affinity-strict1/groups            | 3 ---
 src/test/test-node-affinity-strict1/rules_config      | 4 ++++
 src/test/test-node-affinity-strict1/service_config    | 2 +-
 src/test/test-node-affinity-strict2/groups            | 4 ----
 src/test/test-node-affinity-strict2/rules_config      | 4 ++++
 src/test/test-node-affinity-strict2/service_config    | 2 +-
 src/test/test-node-affinity-strict3/groups            | 3 ---
 src/test/test-node-affinity-strict3/rules_config      | 4 ++++
 src/test/test-node-affinity-strict3/service_config    | 2 +-
 src/test/test-node-affinity-strict4/groups            | 3 ---
 src/test/test-node-affinity-strict4/rules_config      | 4 ++++
 src/test/test-node-affinity-strict4/service_config    | 2 +-
 src/test/test-node-affinity-strict5/groups            | 3 ---
 src/test/test-node-affinity-strict5/rules_config      | 4 ++++
 src/test/test-node-affinity-strict5/service_config    | 2 +-
 src/test/test-node-affinity-strict6/groups            | 4 ----
 src/test/test-node-affinity-strict6/rules_config      | 4 ++++
 src/test/test-node-affinity-strict6/service_config    | 2 +-
 src/test/test-recovery1/groups                        | 4 ----
 src/test/test-recovery1/rules_config                  | 4 ++++
 src/test/test-recovery1/service_config                | 2 +-
 src/test/test-recovery2/groups                        | 4 ----
 src/test/test-recovery2/rules_config                  | 4 ++++
 src/test/test-recovery2/service_config                | 2 +-
 src/test/test-recovery3/groups                        | 4 ----
 src/test/test-recovery3/rules_config                  | 4 ++++
 src/test/test-recovery3/service_config                | 2 +-
 src/test/test-recovery4/groups                        | 4 ----
 src/test/test-recovery4/rules_config                  | 4 ++++
 src/test/test-recovery4/service_config                | 2 +-
 src/test/test-resource-failure2/groups                | 2 --
 src/test/test-resource-failure2/rules_config          | 3 +++
 src/test/test-resource-failure2/service_config        | 2 +-
 src/test/test-resource-failure3/service_config        | 2 +-
 src/test/test-shutdown2/groups                        | 2 --
 src/test/test-shutdown2/rules_config                  | 3 +++
 src/test/test-shutdown2/service_config                | 4 ++--
 src/test/test-shutdown3/groups                        | 2 --
 src/test/test-shutdown3/rules_config                  | 3 +++
 src/test/test-shutdown3/service_config                | 4 ++--
 64 files changed, 97 insertions(+), 84 deletions(-)
 delete mode 100644 src/test/test-basic5/groups
 create mode 100644 src/test/test-basic5/rules_config
 delete mode 100644 src/test/test-crs-static2/groups
 create mode 100644 src/test/test-crs-static2/rules_config
 delete mode 100644 src/test/test-node-affinity-nonstrict1/groups
 create mode 100644 src/test/test-node-affinity-nonstrict1/rules_config
 delete mode 100644 src/test/test-node-affinity-nonstrict2/groups
 create mode 100644 src/test/test-node-affinity-nonstrict2/rules_config
 delete mode 100644 src/test/test-node-affinity-nonstrict3/groups
 create mode 100644 src/test/test-node-affinity-nonstrict3/rules_config
 delete mode 100644 src/test/test-node-affinity-nonstrict4/groups
 create mode 100644 src/test/test-node-affinity-nonstrict4/rules_config
 delete mode 100644 src/test/test-node-affinity-nonstrict5/groups
 create mode 100644 src/test/test-node-affinity-nonstrict5/rules_config
 delete mode 100644 src/test/test-node-affinity-nonstrict6/groups
 create mode 100644 src/test/test-node-affinity-nonstrict6/rules_config
 delete mode 100644 src/test/test-node-affinity-strict1/groups
 create mode 100644 src/test/test-node-affinity-strict1/rules_config
 delete mode 100644 src/test/test-node-affinity-strict2/groups
 create mode 100644 src/test/test-node-affinity-strict2/rules_config
 delete mode 100644 src/test/test-node-affinity-strict3/groups
 create mode 100644 src/test/test-node-affinity-strict3/rules_config
 delete mode 100644 src/test/test-node-affinity-strict4/groups
 create mode 100644 src/test/test-node-affinity-strict4/rules_config
 delete mode 100644 src/test/test-node-affinity-strict5/groups
 create mode 100644 src/test/test-node-affinity-strict5/rules_config
 delete mode 100644 src/test/test-node-affinity-strict6/groups
 create mode 100644 src/test/test-node-affinity-strict6/rules_config
 delete mode 100644 src/test/test-recovery1/groups
 create mode 100644 src/test/test-recovery1/rules_config
 delete mode 100644 src/test/test-recovery2/groups
 create mode 100644 src/test/test-recovery2/rules_config
 delete mode 100644 src/test/test-recovery3/groups
 create mode 100644 src/test/test-recovery3/rules_config
 delete mode 100644 src/test/test-recovery4/groups
 create mode 100644 src/test/test-recovery4/rules_config
 delete mode 100644 src/test/test-resource-failure2/groups
 create mode 100644 src/test/test-resource-failure2/rules_config
 delete mode 100644 src/test/test-shutdown2/groups
 create mode 100644 src/test/test-shutdown2/rules_config
 delete mode 100644 src/test/test-shutdown3/groups
 create mode 100644 src/test/test-shutdown3/rules_config

diff --git a/src/test/test-basic5/groups b/src/test/test-basic5/groups
deleted file mode 100644
index 3c0cff1e..00000000
--- a/src/test/test-basic5/groups
+++ /dev/null
@@ -1,2 +0,0 @@
-group: prefer_node1
-	nodes node1
\ No newline at end of file
diff --git a/src/test/test-basic5/rules_config b/src/test/test-basic5/rules_config
new file mode 100644
index 00000000..d980209a
--- /dev/null
+++ b/src/test/test-basic5/rules_config
@@ -0,0 +1,3 @@
+node-affinity: vm101-should-be-on-node1
+	nodes node1
+	resources vm:101
diff --git a/src/test/test-basic5/service_config b/src/test/test-basic5/service_config
index 5bf422ca..c202a349 100644
--- a/src/test/test-basic5/service_config
+++ b/src/test/test-basic5/service_config
@@ -1,5 +1,5 @@
 {
-    "vm:101": { "node": "node1", "state": "enabled", "group": "prefer_node1" },
+    "vm:101": { "node": "node1", "state": "enabled" },
     "vm:102": { "node": "node2", "state": "enabled" },
     "vm:103": { "node": "node3", "state": "enabled" }
 }
\ No newline at end of file
diff --git a/src/test/test-crs-static2/groups b/src/test/test-crs-static2/groups
deleted file mode 100644
index 43e9bf5f..00000000
--- a/src/test/test-crs-static2/groups
+++ /dev/null
@@ -1,2 +0,0 @@
-group: prefer_node1
-        nodes node1
diff --git a/src/test/test-crs-static2/rules_config b/src/test/test-crs-static2/rules_config
new file mode 100644
index 00000000..33df2db0
--- /dev/null
+++ b/src/test/test-crs-static2/rules_config
@@ -0,0 +1,3 @@
+node-affinity: vm102-should-be-on-node1
+	nodes node1
+	resources vm:102
diff --git a/src/test/test-crs-static2/service_config b/src/test/test-crs-static2/service_config
index 1f2333d0..9c124471 100644
--- a/src/test/test-crs-static2/service_config
+++ b/src/test/test-crs-static2/service_config
@@ -1,3 +1,3 @@
 {
-    "vm:102": { "node": "node1", "state": "enabled", "group": "prefer_node1" }
+    "vm:102": { "node": "node1", "state": "enabled" }
 }
diff --git a/src/test/test-node-affinity-nonstrict1/groups b/src/test/test-node-affinity-nonstrict1/groups
deleted file mode 100644
index 50c9a2d7..00000000
--- a/src/test/test-node-affinity-nonstrict1/groups
+++ /dev/null
@@ -1,2 +0,0 @@
-group: should_stay_here
-	nodes node3
diff --git a/src/test/test-node-affinity-nonstrict1/rules_config b/src/test/test-node-affinity-nonstrict1/rules_config
new file mode 100644
index 00000000..f758b512
--- /dev/null
+++ b/src/test/test-node-affinity-nonstrict1/rules_config
@@ -0,0 +1,3 @@
+node-affinity: vm101-should-be-on-node3
+	nodes node3
+	resources vm:101
diff --git a/src/test/test-node-affinity-nonstrict1/service_config b/src/test/test-node-affinity-nonstrict1/service_config
index 5f558431..7f0b1bf9 100644
--- a/src/test/test-node-affinity-nonstrict1/service_config
+++ b/src/test/test-node-affinity-nonstrict1/service_config
@@ -1,3 +1,3 @@
 {
-    "vm:101": { "node": "node3", "state": "started", "group": "should_stay_here" }
+    "vm:101": { "node": "node3", "state": "started" }
 }
diff --git a/src/test/test-node-affinity-nonstrict2/groups b/src/test/test-node-affinity-nonstrict2/groups
deleted file mode 100644
index 59192fad..00000000
--- a/src/test/test-node-affinity-nonstrict2/groups
+++ /dev/null
@@ -1,3 +0,0 @@
-group: should_stay_here
-	nodes node3
-	nofailback 1
diff --git a/src/test/test-node-affinity-nonstrict2/rules_config b/src/test/test-node-affinity-nonstrict2/rules_config
new file mode 100644
index 00000000..f758b512
--- /dev/null
+++ b/src/test/test-node-affinity-nonstrict2/rules_config
@@ -0,0 +1,3 @@
+node-affinity: vm101-should-be-on-node3
+	nodes node3
+	resources vm:101
diff --git a/src/test/test-node-affinity-nonstrict2/service_config b/src/test/test-node-affinity-nonstrict2/service_config
index 5f558431..c7266eec 100644
--- a/src/test/test-node-affinity-nonstrict2/service_config
+++ b/src/test/test-node-affinity-nonstrict2/service_config
@@ -1,3 +1,3 @@
 {
-    "vm:101": { "node": "node3", "state": "started", "group": "should_stay_here" }
+    "vm:101": { "node": "node3", "state": "started", "failback": 0 }
 }
diff --git a/src/test/test-node-affinity-nonstrict3/groups b/src/test/test-node-affinity-nonstrict3/groups
deleted file mode 100644
index 50c9a2d7..00000000
--- a/src/test/test-node-affinity-nonstrict3/groups
+++ /dev/null
@@ -1,2 +0,0 @@
-group: should_stay_here
-	nodes node3
diff --git a/src/test/test-node-affinity-nonstrict3/rules_config b/src/test/test-node-affinity-nonstrict3/rules_config
new file mode 100644
index 00000000..f758b512
--- /dev/null
+++ b/src/test/test-node-affinity-nonstrict3/rules_config
@@ -0,0 +1,3 @@
+node-affinity: vm101-should-be-on-node3
+	nodes node3
+	resources vm:101
diff --git a/src/test/test-node-affinity-nonstrict3/service_config b/src/test/test-node-affinity-nonstrict3/service_config
index 777b2a7e..cdf0bd0c 100644
--- a/src/test/test-node-affinity-nonstrict3/service_config
+++ b/src/test/test-node-affinity-nonstrict3/service_config
@@ -1,5 +1,5 @@
 {
-    "vm:101": { "node": "node3", "state": "started", "group": "should_stay_here" },
+    "vm:101": { "node": "node3", "state": "started" },
     "vm:102": { "node": "node2", "state": "started" },
     "vm:103": { "node": "node2", "state": "started" }
 }
diff --git a/src/test/test-node-affinity-nonstrict4/groups b/src/test/test-node-affinity-nonstrict4/groups
deleted file mode 100644
index b1584b55..00000000
--- a/src/test/test-node-affinity-nonstrict4/groups
+++ /dev/null
@@ -1,2 +0,0 @@
-group: should_stay_here
-	nodes node2,node3
diff --git a/src/test/test-node-affinity-nonstrict4/rules_config b/src/test/test-node-affinity-nonstrict4/rules_config
new file mode 100644
index 00000000..c9faedb1
--- /dev/null
+++ b/src/test/test-node-affinity-nonstrict4/rules_config
@@ -0,0 +1,3 @@
+node-affinity: vm101-should-be-on-node2-node3
+	nodes node2,node3
+	resources vm:101
diff --git a/src/test/test-node-affinity-nonstrict4/service_config b/src/test/test-node-affinity-nonstrict4/service_config
index 777b2a7e..cdf0bd0c 100644
--- a/src/test/test-node-affinity-nonstrict4/service_config
+++ b/src/test/test-node-affinity-nonstrict4/service_config
@@ -1,5 +1,5 @@
 {
-    "vm:101": { "node": "node3", "state": "started", "group": "should_stay_here" },
+    "vm:101": { "node": "node3", "state": "started" },
     "vm:102": { "node": "node2", "state": "started" },
     "vm:103": { "node": "node2", "state": "started" }
 }
diff --git a/src/test/test-node-affinity-nonstrict5/groups b/src/test/test-node-affinity-nonstrict5/groups
deleted file mode 100644
index 03a0ee9b..00000000
--- a/src/test/test-node-affinity-nonstrict5/groups
+++ /dev/null
@@ -1,2 +0,0 @@
-group: should_stay_here
-	nodes node2:2,node3:1
diff --git a/src/test/test-node-affinity-nonstrict5/rules_config b/src/test/test-node-affinity-nonstrict5/rules_config
new file mode 100644
index 00000000..233b25d2
--- /dev/null
+++ b/src/test/test-node-affinity-nonstrict5/rules_config
@@ -0,0 +1,3 @@
+node-affinity: vm101-should-be-on-node2-node3
+	nodes node2:2,node3:1
+	resources vm:101
diff --git a/src/test/test-node-affinity-nonstrict5/service_config b/src/test/test-node-affinity-nonstrict5/service_config
index 5f558431..7f0b1bf9 100644
--- a/src/test/test-node-affinity-nonstrict5/service_config
+++ b/src/test/test-node-affinity-nonstrict5/service_config
@@ -1,3 +1,3 @@
 {
-    "vm:101": { "node": "node3", "state": "started", "group": "should_stay_here" }
+    "vm:101": { "node": "node3", "state": "started" }
 }
diff --git a/src/test/test-node-affinity-nonstrict6/groups b/src/test/test-node-affinity-nonstrict6/groups
deleted file mode 100644
index a7aed178..00000000
--- a/src/test/test-node-affinity-nonstrict6/groups
+++ /dev/null
@@ -1,3 +0,0 @@
-group: should_stay_here
-	nodes node2:2,node3:1
-	nofailback 1
diff --git a/src/test/test-node-affinity-nonstrict6/rules_config b/src/test/test-node-affinity-nonstrict6/rules_config
new file mode 100644
index 00000000..233b25d2
--- /dev/null
+++ b/src/test/test-node-affinity-nonstrict6/rules_config
@@ -0,0 +1,3 @@
+node-affinity: vm101-should-be-on-node2-node3
+	nodes node2:2,node3:1
+	resources vm:101
diff --git a/src/test/test-node-affinity-nonstrict6/service_config b/src/test/test-node-affinity-nonstrict6/service_config
index c4ece62c..98aef4e9 100644
--- a/src/test/test-node-affinity-nonstrict6/service_config
+++ b/src/test/test-node-affinity-nonstrict6/service_config
@@ -1,3 +1,3 @@
 {
-    "vm:101": { "node": "node2", "state": "started", "group": "should_stay_here" }
+    "vm:101": { "node": "node2", "state": "started", "failback": 0 }
 }
diff --git a/src/test/test-node-affinity-strict1/groups b/src/test/test-node-affinity-strict1/groups
deleted file mode 100644
index 370865f6..00000000
--- a/src/test/test-node-affinity-strict1/groups
+++ /dev/null
@@ -1,3 +0,0 @@
-group: must_stay_here
-	nodes node3
-	restricted 1
diff --git a/src/test/test-node-affinity-strict1/rules_config b/src/test/test-node-affinity-strict1/rules_config
new file mode 100644
index 00000000..25aa655f
--- /dev/null
+++ b/src/test/test-node-affinity-strict1/rules_config
@@ -0,0 +1,4 @@
+node-affinity: vm101-must-be-on-node3
+	nodes node3
+	resources vm:101
+	strict 1
diff --git a/src/test/test-node-affinity-strict1/service_config b/src/test/test-node-affinity-strict1/service_config
index 36ea15b1..7f0b1bf9 100644
--- a/src/test/test-node-affinity-strict1/service_config
+++ b/src/test/test-node-affinity-strict1/service_config
@@ -1,3 +1,3 @@
 {
-    "vm:101": { "node": "node3", "state": "started", "group": "must_stay_here" }
+    "vm:101": { "node": "node3", "state": "started" }
 }
diff --git a/src/test/test-node-affinity-strict2/groups b/src/test/test-node-affinity-strict2/groups
deleted file mode 100644
index e43eafc5..00000000
--- a/src/test/test-node-affinity-strict2/groups
+++ /dev/null
@@ -1,4 +0,0 @@
-group: must_stay_here
-	nodes node3
-	restricted 1
-	nofailback 1
diff --git a/src/test/test-node-affinity-strict2/rules_config b/src/test/test-node-affinity-strict2/rules_config
new file mode 100644
index 00000000..25aa655f
--- /dev/null
+++ b/src/test/test-node-affinity-strict2/rules_config
@@ -0,0 +1,4 @@
+node-affinity: vm101-must-be-on-node3
+	nodes node3
+	resources vm:101
+	strict 1
diff --git a/src/test/test-node-affinity-strict2/service_config b/src/test/test-node-affinity-strict2/service_config
index 36ea15b1..c7266eec 100644
--- a/src/test/test-node-affinity-strict2/service_config
+++ b/src/test/test-node-affinity-strict2/service_config
@@ -1,3 +1,3 @@
 {
-    "vm:101": { "node": "node3", "state": "started", "group": "must_stay_here" }
+    "vm:101": { "node": "node3", "state": "started", "failback": 0 }
 }
diff --git a/src/test/test-node-affinity-strict3/groups b/src/test/test-node-affinity-strict3/groups
deleted file mode 100644
index 370865f6..00000000
--- a/src/test/test-node-affinity-strict3/groups
+++ /dev/null
@@ -1,3 +0,0 @@
-group: must_stay_here
-	nodes node3
-	restricted 1
diff --git a/src/test/test-node-affinity-strict3/rules_config b/src/test/test-node-affinity-strict3/rules_config
new file mode 100644
index 00000000..25aa655f
--- /dev/null
+++ b/src/test/test-node-affinity-strict3/rules_config
@@ -0,0 +1,4 @@
+node-affinity: vm101-must-be-on-node3
+	nodes node3
+	resources vm:101
+	strict 1
diff --git a/src/test/test-node-affinity-strict3/service_config b/src/test/test-node-affinity-strict3/service_config
index 9adf02c8..cdf0bd0c 100644
--- a/src/test/test-node-affinity-strict3/service_config
+++ b/src/test/test-node-affinity-strict3/service_config
@@ -1,5 +1,5 @@
 {
-    "vm:101": { "node": "node3", "state": "started", "group": "must_stay_here" },
+    "vm:101": { "node": "node3", "state": "started" },
     "vm:102": { "node": "node2", "state": "started" },
     "vm:103": { "node": "node2", "state": "started" }
 }
diff --git a/src/test/test-node-affinity-strict4/groups b/src/test/test-node-affinity-strict4/groups
deleted file mode 100644
index 0ad2abc6..00000000
--- a/src/test/test-node-affinity-strict4/groups
+++ /dev/null
@@ -1,3 +0,0 @@
-group: must_stay_here
-	nodes node2,node3
-	restricted 1
diff --git a/src/test/test-node-affinity-strict4/rules_config b/src/test/test-node-affinity-strict4/rules_config
new file mode 100644
index 00000000..ceb59540
--- /dev/null
+++ b/src/test/test-node-affinity-strict4/rules_config
@@ -0,0 +1,4 @@
+node-affinity: vm101-must-be-on-node2-node3
+	nodes node2,node3
+	resources vm:101
+	strict 1
diff --git a/src/test/test-node-affinity-strict4/service_config b/src/test/test-node-affinity-strict4/service_config
index 9adf02c8..cdf0bd0c 100644
--- a/src/test/test-node-affinity-strict4/service_config
+++ b/src/test/test-node-affinity-strict4/service_config
@@ -1,5 +1,5 @@
 {
-    "vm:101": { "node": "node3", "state": "started", "group": "must_stay_here" },
+    "vm:101": { "node": "node3", "state": "started" },
     "vm:102": { "node": "node2", "state": "started" },
     "vm:103": { "node": "node2", "state": "started" }
 }
diff --git a/src/test/test-node-affinity-strict5/groups b/src/test/test-node-affinity-strict5/groups
deleted file mode 100644
index ec3cd799..00000000
--- a/src/test/test-node-affinity-strict5/groups
+++ /dev/null
@@ -1,3 +0,0 @@
-group: must_stay_here
-	nodes node2:2,node3:1
-	restricted 1
diff --git a/src/test/test-node-affinity-strict5/rules_config b/src/test/test-node-affinity-strict5/rules_config
new file mode 100644
index 00000000..8ad48205
--- /dev/null
+++ b/src/test/test-node-affinity-strict5/rules_config
@@ -0,0 +1,4 @@
+node-affinity: vm101-must-be-on-node2-node3
+	nodes node2:2,node3:1
+	resources vm:101
+	strict 1
diff --git a/src/test/test-node-affinity-strict5/service_config b/src/test/test-node-affinity-strict5/service_config
index 36ea15b1..7f0b1bf9 100644
--- a/src/test/test-node-affinity-strict5/service_config
+++ b/src/test/test-node-affinity-strict5/service_config
@@ -1,3 +1,3 @@
 {
-    "vm:101": { "node": "node3", "state": "started", "group": "must_stay_here" }
+    "vm:101": { "node": "node3", "state": "started" }
 }
diff --git a/src/test/test-node-affinity-strict6/groups b/src/test/test-node-affinity-strict6/groups
deleted file mode 100644
index cdd0e502..00000000
--- a/src/test/test-node-affinity-strict6/groups
+++ /dev/null
@@ -1,4 +0,0 @@
-group: must_stay_here
-	nodes node2:2,node3:1
-	restricted 1
-	nofailback 1
diff --git a/src/test/test-node-affinity-strict6/rules_config b/src/test/test-node-affinity-strict6/rules_config
new file mode 100644
index 00000000..8ad48205
--- /dev/null
+++ b/src/test/test-node-affinity-strict6/rules_config
@@ -0,0 +1,4 @@
+node-affinity: vm101-must-be-on-node2-node3
+	nodes node2:2,node3:1
+	resources vm:101
+	strict 1
diff --git a/src/test/test-node-affinity-strict6/service_config b/src/test/test-node-affinity-strict6/service_config
index 1d371e1e..98aef4e9 100644
--- a/src/test/test-node-affinity-strict6/service_config
+++ b/src/test/test-node-affinity-strict6/service_config
@@ -1,3 +1,3 @@
 {
-    "vm:101": { "node": "node2", "state": "started", "group": "must_stay_here" }
+    "vm:101": { "node": "node2", "state": "started", "failback": 0 }
 }
diff --git a/src/test/test-recovery1/groups b/src/test/test-recovery1/groups
deleted file mode 100644
index 06c7f76e..00000000
--- a/src/test/test-recovery1/groups
+++ /dev/null
@@ -1,4 +0,0 @@
-group: prefer_node2
-	nodes node2
-	restricted 1
-
diff --git a/src/test/test-recovery1/rules_config b/src/test/test-recovery1/rules_config
new file mode 100644
index 00000000..7ce791f5
--- /dev/null
+++ b/src/test/test-recovery1/rules_config
@@ -0,0 +1,4 @@
+node-affinity: vm102-must-be-on-node2
+	nodes node2
+	resources vm:102
+	strict 1
diff --git a/src/test/test-recovery1/service_config b/src/test/test-recovery1/service_config
index 39a05e59..933564e3 100644
--- a/src/test/test-recovery1/service_config
+++ b/src/test/test-recovery1/service_config
@@ -1,3 +1,3 @@
 {
-    "vm:102": { "node": "node2", "state": "enabled", "group": "prefer_node2" }
+    "vm:102": { "node": "node2", "state": "enabled" }
 }
diff --git a/src/test/test-recovery2/groups b/src/test/test-recovery2/groups
deleted file mode 100644
index 06c7f76e..00000000
--- a/src/test/test-recovery2/groups
+++ /dev/null
@@ -1,4 +0,0 @@
-group: prefer_node2
-	nodes node2
-	restricted 1
-
diff --git a/src/test/test-recovery2/rules_config b/src/test/test-recovery2/rules_config
new file mode 100644
index 00000000..7ce791f5
--- /dev/null
+++ b/src/test/test-recovery2/rules_config
@@ -0,0 +1,4 @@
+node-affinity: vm102-must-be-on-node2
+	nodes node2
+	resources vm:102
+	strict 1
diff --git a/src/test/test-recovery2/service_config b/src/test/test-recovery2/service_config
index 39a05e59..933564e3 100644
--- a/src/test/test-recovery2/service_config
+++ b/src/test/test-recovery2/service_config
@@ -1,3 +1,3 @@
 {
-    "vm:102": { "node": "node2", "state": "enabled", "group": "prefer_node2" }
+    "vm:102": { "node": "node2", "state": "enabled" }
 }
diff --git a/src/test/test-recovery3/groups b/src/test/test-recovery3/groups
deleted file mode 100644
index 06c7f76e..00000000
--- a/src/test/test-recovery3/groups
+++ /dev/null
@@ -1,4 +0,0 @@
-group: prefer_node2
-	nodes node2
-	restricted 1
-
diff --git a/src/test/test-recovery3/rules_config b/src/test/test-recovery3/rules_config
new file mode 100644
index 00000000..7ce791f5
--- /dev/null
+++ b/src/test/test-recovery3/rules_config
@@ -0,0 +1,4 @@
+node-affinity: vm102-must-be-on-node2
+	nodes node2
+	resources vm:102
+	strict 1
diff --git a/src/test/test-recovery3/service_config b/src/test/test-recovery3/service_config
index 39a05e59..933564e3 100644
--- a/src/test/test-recovery3/service_config
+++ b/src/test/test-recovery3/service_config
@@ -1,3 +1,3 @@
 {
-    "vm:102": { "node": "node2", "state": "enabled", "group": "prefer_node2" }
+    "vm:102": { "node": "node2", "state": "enabled" }
 }
diff --git a/src/test/test-recovery4/groups b/src/test/test-recovery4/groups
deleted file mode 100644
index 06c7f76e..00000000
--- a/src/test/test-recovery4/groups
+++ /dev/null
@@ -1,4 +0,0 @@
-group: prefer_node2
-	nodes node2
-	restricted 1
-
diff --git a/src/test/test-recovery4/rules_config b/src/test/test-recovery4/rules_config
new file mode 100644
index 00000000..7ce791f5
--- /dev/null
+++ b/src/test/test-recovery4/rules_config
@@ -0,0 +1,4 @@
+node-affinity: vm102-must-be-on-node2
+	nodes node2
+	resources vm:102
+	strict 1
diff --git a/src/test/test-recovery4/service_config b/src/test/test-recovery4/service_config
index 39a05e59..933564e3 100644
--- a/src/test/test-recovery4/service_config
+++ b/src/test/test-recovery4/service_config
@@ -1,3 +1,3 @@
 {
-    "vm:102": { "node": "node2", "state": "enabled", "group": "prefer_node2" }
+    "vm:102": { "node": "node2", "state": "enabled" }
 }
diff --git a/src/test/test-resource-failure2/groups b/src/test/test-resource-failure2/groups
deleted file mode 100644
index 01d634f2..00000000
--- a/src/test/test-resource-failure2/groups
+++ /dev/null
@@ -1,2 +0,0 @@
-group: all
-	nodes node1,node2,node3
diff --git a/src/test/test-resource-failure2/rules_config b/src/test/test-resource-failure2/rules_config
new file mode 100644
index 00000000..11ff0187
--- /dev/null
+++ b/src/test/test-resource-failure2/rules_config
@@ -0,0 +1,3 @@
+node-affinity: fa130-should-be-on-node1-node2-node3
+	nodes node1,node2,node3
+	resources fa:130
diff --git a/src/test/test-resource-failure2/service_config b/src/test/test-resource-failure2/service_config
index a3f54599..7f0a481c 100644
--- a/src/test/test-resource-failure2/service_config
+++ b/src/test/test-resource-failure2/service_config
@@ -1,3 +1,3 @@
 {
-    "fa:130": { "node": "node2", "max_restart": "2", "group" : "all" }
+    "fa:130": { "node": "node2", "max_restart": "2" }
 }
diff --git a/src/test/test-resource-failure3/service_config b/src/test/test-resource-failure3/service_config
index d596b9cf..61cfa1e1 100644
--- a/src/test/test-resource-failure3/service_config
+++ b/src/test/test-resource-failure3/service_config
@@ -1,3 +1,3 @@
 {
-    "fa:101": { "node": "node2", "group" : "all", "state" : "enabled" }
+    "fa:101": { "node": "node2", "state" : "enabled" }
 }
diff --git a/src/test/test-shutdown2/groups b/src/test/test-shutdown2/groups
deleted file mode 100644
index d8ee675e..00000000
--- a/src/test/test-shutdown2/groups
+++ /dev/null
@@ -1,2 +0,0 @@
-group: prefer_node3
-	nodes node3
diff --git a/src/test/test-shutdown2/rules_config b/src/test/test-shutdown2/rules_config
new file mode 100644
index 00000000..a7b9226d
--- /dev/null
+++ b/src/test/test-shutdown2/rules_config
@@ -0,0 +1,3 @@
+node-affinity: vm103-should-be-on-node3
+	nodes node3
+	resources vm:103
diff --git a/src/test/test-shutdown2/service_config b/src/test/test-shutdown2/service_config
index 7153f420..c6860e7c 100644
--- a/src/test/test-shutdown2/service_config
+++ b/src/test/test-shutdown2/service_config
@@ -1,3 +1,3 @@
 {
-    "vm:103": { "node": "node3", "state": "enabled", "group": "prefer_node3" }
-}
\ No newline at end of file
+    "vm:103": { "node": "node3", "state": "enabled" }
+}
diff --git a/src/test/test-shutdown3/groups b/src/test/test-shutdown3/groups
deleted file mode 100644
index d8ee675e..00000000
--- a/src/test/test-shutdown3/groups
+++ /dev/null
@@ -1,2 +0,0 @@
-group: prefer_node3
-	nodes node3
diff --git a/src/test/test-shutdown3/rules_config b/src/test/test-shutdown3/rules_config
new file mode 100644
index 00000000..aae55621
--- /dev/null
+++ b/src/test/test-shutdown3/rules_config
@@ -0,0 +1,3 @@
+node-affinity: ct103-should-be-on-node3
+	nodes node3
+	resources ct:103
diff --git a/src/test/test-shutdown3/service_config b/src/test/test-shutdown3/service_config
index 1b98cf4d..f2624ede 100644
--- a/src/test/test-shutdown3/service_config
+++ b/src/test/test-shutdown3/service_config
@@ -1,3 +1,3 @@
 {
-    "ct:103": { "node": "node3", "state": "enabled", "group": "prefer_node3" }
-}
\ No newline at end of file
+    "ct:103": { "node": "node3", "state": "enabled" }
+}
-- 
2.47.2



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel