From: Jason Dillaman <dillaman@redhat.com>
Date: Mon, 29 Feb 2016 14:16:27 +0000 (-0500)
Subject: rbd: updated tests to use new rbd default feature set
X-Git-Tag: v10.2.6~165^2^2~193^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d1c211dd4be5d981898b34e9d4f29ffbec47bed5;p=ceph.git

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
index 000000000000..fd42254c000f
--- /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
index 000000000000..322a728d318c
--- /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
index 4e31f21cc257..000000000000
--- 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
index 000000000000..ee1de610a91c
--- /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
index 000000000000..eda2b5e8a607
--- /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
index fef368b9bc43..000000000000
--- 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
index 000000000000..40b2312f6025
--- /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
index 000000000000..d0e905ff41aa
--- /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
index ede74cd8d595..000000000000
--- 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 fef368b9bc43..ee1de610a91c 100644
--- 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 c013ac5ca130..cfa0a25a70d0 100644
--- 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
index 000000000000..eda2b5e8a607
--- /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
index 0f760f21b557..000000000000
--- 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
index 000000000000..ee1de610a91c
--- /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
index 0f760f21b557..000000000000
--- 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
index 000000000000..eda2b5e8a607
--- /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
index fef368b9bc43..000000000000
--- 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
index 000000000000..40b2312f6025
--- /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
index 07b3d9f23a64..000000000000
--- 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
index 000000000000..d0e905ff41aa
--- /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
index ede74cd8d595..000000000000
--- 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"