rbd: updated tests to use new rbd default feature set

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

diff --git a/suites/rbd/cli/features/defaults.yaml b/suites/rbd/cli/features/defaults.yaml
new file mode 100644 (file)
index 0000000..fd42254
--- /dev/null
+++ b/suites/rbd/cli/features/defaults.yaml
@@ -0,0 +1,6 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default format: 2
+        rbd default features: 61

diff --git a/suites/rbd/cli/features/journaling.yaml b/suites/rbd/cli/features/journaling.yaml
new file mode 100644 (file)
index 0000000..322a728
--- /dev/null
+++ b/suites/rbd/cli/features/journaling.yaml
@@ -0,0 +1,6 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default format: 2
+        rbd default features: 125

diff --git a/suites/rbd/cli/features/object_map.yaml b/suites/rbd/cli/features/object_map.yaml
deleted file mode 100644 (file)
index 4e31f21..0000000
--- a/suites/rbd/cli/features/object_map.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      client:
-        rbd default format: 2
-        rbd default features: 13

diff --git a/suites/rbd/librbd/workloads/c_api_tests_with_defaults.yaml b/suites/rbd/librbd/workloads/c_api_tests_with_defaults.yaml
new file mode 100644 (file)
index 0000000..ee1de61
--- /dev/null
+++ b/suites/rbd/librbd/workloads/c_api_tests_with_defaults.yaml
@@ -0,0 +1,7 @@
+tasks:
+- workunit:
+    clients:
+      client.0:
+        - rbd/test_librbd.sh
+    env:
+      RBD_FEATURES: "61"

diff --git a/suites/rbd/librbd/workloads/c_api_tests_with_journaling.yaml b/suites/rbd/librbd/workloads/c_api_tests_with_journaling.yaml
new file mode 100644 (file)
index 0000000..eda2b5e
--- /dev/null
+++ b/suites/rbd/librbd/workloads/c_api_tests_with_journaling.yaml
@@ -0,0 +1,7 @@
+tasks:
+- workunit:
+    clients:
+      client.0:
+        - rbd/test_librbd.sh
+    env:
+      RBD_FEATURES: "125"

diff --git a/suites/rbd/librbd/workloads/c_api_tests_with_object_map.yaml b/suites/rbd/librbd/workloads/c_api_tests_with_object_map.yaml
deleted file mode 100644 (file)
index fef368b..0000000
--- a/suites/rbd/librbd/workloads/c_api_tests_with_object_map.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      client.0:
-        - rbd/test_librbd.sh
-    env:
-      RBD_FEATURES: "13"

diff --git a/suites/rbd/librbd/workloads/python_api_tests_with_defaults.yaml b/suites/rbd/librbd/workloads/python_api_tests_with_defaults.yaml
new file mode 100644 (file)
index 0000000..40b2312
--- /dev/null
+++ b/suites/rbd/librbd/workloads/python_api_tests_with_defaults.yaml
@@ -0,0 +1,7 @@
+tasks:
+- workunit:
+    clients:
+      client.0:
+        - rbd/test_librbd_python.sh
+    env:
+      RBD_FEATURES: "61"

diff --git a/suites/rbd/librbd/workloads/python_api_tests_with_journaling.yaml b/suites/rbd/librbd/workloads/python_api_tests_with_journaling.yaml
new file mode 100644 (file)
index 0000000..d0e905f
--- /dev/null
+++ b/suites/rbd/librbd/workloads/python_api_tests_with_journaling.yaml
@@ -0,0 +1,7 @@
+tasks:
+- workunit:
+    clients:
+      client.0:
+        - rbd/test_librbd_python.sh
+    env:
+      RBD_FEATURES: "125"

diff --git a/suites/rbd/librbd/workloads/python_api_tests_with_object_map.yaml b/suites/rbd/librbd/workloads/python_api_tests_with_object_map.yaml
deleted file mode 100644 (file)
index ede74cd..0000000
--- a/suites/rbd/librbd/workloads/python_api_tests_with_object_map.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      client.0:
-        - rbd/test_librbd_python.sh
-    env:
-      RBD_FEATURES: "13"

diff --git a/suites/rbd/thrash/workloads/rbd_api_tests.yaml b/suites/rbd/thrash/workloads/rbd_api_tests.yaml
index fef368b9bc43850bfbc9e787e89f645e3f8b14fa..ee1de610a91c046d860883e9f2d372030f66d277 100644 (file)
--- a/suites/rbd/thrash/workloads/rbd_api_tests.yaml
+++ b/suites/rbd/thrash/workloads/rbd_api_tests.yaml
@@ -4,4 +4,4 @@ tasks:
       client.0:
         - rbd/test_librbd.sh
     env:
-      RBD_FEATURES: "13"
+      RBD_FEATURES: "61"

diff --git a/suites/rbd/thrash/workloads/rbd_api_tests_copy_on_read.yaml b/suites/rbd/thrash/workloads/rbd_api_tests_copy_on_read.yaml
index c013ac5ca13043d833cf51a670b1ffb8d5bdd556..cfa0a25a70d0f98394b69f5141278ce2749519ce 100644 (file)
--- a/suites/rbd/thrash/workloads/rbd_api_tests_copy_on_read.yaml
+++ b/suites/rbd/thrash/workloads/rbd_api_tests_copy_on_read.yaml
@@ -4,7 +4,7 @@ tasks:
       client.0:
         - rbd/test_librbd.sh
     env:
-      RBD_FEATURES: "13"
+      RBD_FEATURES: "61"
 overrides:
   ceph:
     conf:

diff --git a/suites/rbd/thrash/workloads/rbd_api_tests_journaling.yaml b/suites/rbd/thrash/workloads/rbd_api_tests_journaling.yaml
new file mode 100644 (file)
index 0000000..eda2b5e
--- /dev/null
+++ b/suites/rbd/thrash/workloads/rbd_api_tests_journaling.yaml
@@ -0,0 +1,7 @@
+tasks:
+- workunit:
+    clients:
+      client.0:
+        - rbd/test_librbd.sh
+    env:
+      RBD_FEATURES: "125"

diff --git a/suites/rbd/thrash/workloads/rbd_api_tests_journalling.yaml b/suites/rbd/thrash/workloads/rbd_api_tests_journalling.yaml
deleted file mode 100644 (file)
index 0f760f2..0000000
--- a/suites/rbd/thrash/workloads/rbd_api_tests_journalling.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      client.0:
-        - rbd/test_librbd.sh
-    env:
-      RBD_FEATURES: "127"

diff --git a/suites/rbd/valgrind/workloads/c_api_tests_with_defaults.yaml b/suites/rbd/valgrind/workloads/c_api_tests_with_defaults.yaml
new file mode 100644 (file)
index 0000000..ee1de61
--- /dev/null
+++ b/suites/rbd/valgrind/workloads/c_api_tests_with_defaults.yaml
@@ -0,0 +1,7 @@
+tasks:
+- workunit:
+    clients:
+      client.0:
+        - rbd/test_librbd.sh
+    env:
+      RBD_FEATURES: "61"

diff --git a/suites/rbd/valgrind/workloads/c_api_tests_with_journal.yaml b/suites/rbd/valgrind/workloads/c_api_tests_with_journal.yaml
deleted file mode 100644 (file)
index 0f760f2..0000000
--- a/suites/rbd/valgrind/workloads/c_api_tests_with_journal.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      client.0:
-        - rbd/test_librbd.sh
-    env:
-      RBD_FEATURES: "127"

diff --git a/suites/rbd/valgrind/workloads/c_api_tests_with_journaling.yaml b/suites/rbd/valgrind/workloads/c_api_tests_with_journaling.yaml
new file mode 100644 (file)
index 0000000..eda2b5e
--- /dev/null
+++ b/suites/rbd/valgrind/workloads/c_api_tests_with_journaling.yaml
@@ -0,0 +1,7 @@
+tasks:
+- workunit:
+    clients:
+      client.0:
+        - rbd/test_librbd.sh
+    env:
+      RBD_FEATURES: "125"

diff --git a/suites/rbd/valgrind/workloads/c_api_tests_with_object_map.yaml b/suites/rbd/valgrind/workloads/c_api_tests_with_object_map.yaml
deleted file mode 100644 (file)
index fef368b..0000000
--- a/suites/rbd/valgrind/workloads/c_api_tests_with_object_map.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      client.0:
-        - rbd/test_librbd.sh
-    env:
-      RBD_FEATURES: "13"

diff --git a/suites/rbd/valgrind/workloads/python_api_tests_with_defaults.yaml b/suites/rbd/valgrind/workloads/python_api_tests_with_defaults.yaml
new file mode 100644 (file)
index 0000000..40b2312
--- /dev/null
+++ b/suites/rbd/valgrind/workloads/python_api_tests_with_defaults.yaml
@@ -0,0 +1,7 @@
+tasks:
+- workunit:
+    clients:
+      client.0:
+        - rbd/test_librbd_python.sh
+    env:
+      RBD_FEATURES: "61"

diff --git a/suites/rbd/valgrind/workloads/python_api_tests_with_journal.yaml b/suites/rbd/valgrind/workloads/python_api_tests_with_journal.yaml
deleted file mode 100644 (file)
index 07b3d9f..0000000
--- a/suites/rbd/valgrind/workloads/python_api_tests_with_journal.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      client.0:
-        - rbd/test_librbd_python.sh
-    env:
-      RBD_FEATURES: "127"

diff --git a/suites/rbd/valgrind/workloads/python_api_tests_with_journaling.yaml b/suites/rbd/valgrind/workloads/python_api_tests_with_journaling.yaml
new file mode 100644 (file)
index 0000000..d0e905f
--- /dev/null
+++ b/suites/rbd/valgrind/workloads/python_api_tests_with_journaling.yaml
@@ -0,0 +1,7 @@
+tasks:
+- workunit:
+    clients:
+      client.0:
+        - rbd/test_librbd_python.sh
+    env:
+      RBD_FEATURES: "125"

diff --git a/suites/rbd/valgrind/workloads/python_api_tests_with_object_map.yaml b/suites/rbd/valgrind/workloads/python_api_tests_with_object_map.yaml
deleted file mode 100644 (file)
index ede74cd..0000000
--- a/suites/rbd/valgrind/workloads/python_api_tests_with_object_map.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      client.0:
-        - rbd/test_librbd_python.sh
-    env:
-      RBD_FEATURES: "13"