qa/suites/rbd: rename nbd folder to device folder

Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit af43f6162464a20625319a2783a104f7032ba21e)

diff --git a/qa/suites/rbd/device/% b/qa/suites/rbd/device/%
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/suites/rbd/device/.qa b/qa/suites/rbd/device/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/suites/rbd/device/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/suites/rbd/device/base b/qa/suites/rbd/device/base
new file mode 120000 (symlink)
index 0000000..fd10a85
--- /dev/null
+++ b/qa/suites/rbd/device/base
@@ -0,0 +1 @@
+../thrash/base
\ No newline at end of file

diff --git a/qa/suites/rbd/device/cluster/+ b/qa/suites/rbd/device/cluster/+
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/suites/rbd/device/cluster/.qa b/qa/suites/rbd/device/cluster/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/suites/rbd/device/cluster/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/suites/rbd/device/cluster/fixed-3.yaml b/qa/suites/rbd/device/cluster/fixed-3.yaml
new file mode 100644 (file)
index 0000000..1825891
--- /dev/null
+++ b/qa/suites/rbd/device/cluster/fixed-3.yaml
@@ -0,0 +1,4 @@
+roles:
+- [mon.a, mon.c, osd.0, osd.1, osd.2]
+- [mon.b, mgr.x, osd.3, osd.4, osd.5]
+- [client.0]

diff --git a/qa/suites/rbd/device/cluster/openstack.yaml b/qa/suites/rbd/device/cluster/openstack.yaml
new file mode 120000 (symlink)
index 0000000..48becbb
--- /dev/null
+++ b/qa/suites/rbd/device/cluster/openstack.yaml
@@ -0,0 +1 @@
+../../thrash/clusters/openstack.yaml
\ No newline at end of file

diff --git a/qa/suites/rbd/device/conf b/qa/suites/rbd/device/conf
new file mode 120000 (symlink)
index 0000000..4bc0fe8
--- /dev/null
+++ b/qa/suites/rbd/device/conf
@@ -0,0 +1 @@
+.qa/rbd/conf
\ No newline at end of file

diff --git a/qa/suites/rbd/device/msgr-failures b/qa/suites/rbd/device/msgr-failures
new file mode 120000 (symlink)
index 0000000..03689aa
--- /dev/null
+++ b/qa/suites/rbd/device/msgr-failures
@@ -0,0 +1 @@
+../thrash/msgr-failures
\ No newline at end of file

diff --git a/qa/suites/rbd/device/objectstore b/qa/suites/rbd/device/objectstore
new file mode 120000 (symlink)
index 0000000..c40bd32
--- /dev/null
+++ b/qa/suites/rbd/device/objectstore
@@ -0,0 +1 @@
+.qa/objectstore
\ No newline at end of file

diff --git a/qa/suites/rbd/device/supported-random-distro$ b/qa/suites/rbd/device/supported-random-distro$
new file mode 120000 (symlink)
index 0000000..0862b44
--- /dev/null
+++ b/qa/suites/rbd/device/supported-random-distro$
@@ -0,0 +1 @@
+.qa/distros/supported-random-distro$
\ No newline at end of file

diff --git a/qa/suites/rbd/device/thrashers b/qa/suites/rbd/device/thrashers
new file mode 120000 (symlink)
index 0000000..f461dad
--- /dev/null
+++ b/qa/suites/rbd/device/thrashers
@@ -0,0 +1 @@
+../thrash/thrashers
\ No newline at end of file

diff --git a/qa/suites/rbd/device/thrashosds-health.yaml b/qa/suites/rbd/device/thrashosds-health.yaml
new file mode 120000 (symlink)
index 0000000..9124eb1
--- /dev/null
+++ b/qa/suites/rbd/device/thrashosds-health.yaml
@@ -0,0 +1 @@
+.qa/tasks/thrashosds-health.yaml
\ No newline at end of file

diff --git a/qa/suites/rbd/device/workloads/.qa b/qa/suites/rbd/device/workloads/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/suites/rbd/device/workloads/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/suites/rbd/device/workloads/rbd_fsx_nbd.yaml b/qa/suites/rbd/device/workloads/rbd_fsx_nbd.yaml
new file mode 100644 (file)
index 0000000..b573767
--- /dev/null
+++ b/qa/suites/rbd/device/workloads/rbd_fsx_nbd.yaml
@@ -0,0 +1,14 @@
+overrides:
+  install:
+    ceph:
+      extra_packages: [rbd-nbd]
+tasks:
+- rbd_fsx:
+    clients: [client.0]
+    ops: 6000
+    nbd: True
+    holebdy: 512
+    punch_holes: true
+    readbdy: 512
+    truncbdy: 512
+    writebdy: 512

diff --git a/qa/suites/rbd/device/workloads/rbd_nbd.yaml b/qa/suites/rbd/device/workloads/rbd_nbd.yaml
new file mode 100644 (file)
index 0000000..ededea0
--- /dev/null
+++ b/qa/suites/rbd/device/workloads/rbd_nbd.yaml
@@ -0,0 +1,9 @@
+overrides:
+  install:
+    ceph:
+      extra_packages: [rbd-nbd]
+tasks:
+- workunit:
+    clients:
+      client.0:
+        - rbd/rbd-nbd.sh

diff --git a/qa/suites/rbd/device/workloads/rbd_nbd_diff_continuous.yaml b/qa/suites/rbd/device/workloads/rbd_nbd_diff_continuous.yaml
new file mode 100644 (file)
index 0000000..e0a7ebe
--- /dev/null
+++ b/qa/suites/rbd/device/workloads/rbd_nbd_diff_continuous.yaml
@@ -0,0 +1,14 @@
+overrides:
+  install:
+    ceph:
+      extra_packages:
+        - rbd-nbd
+      extra_system_packages:
+        - pv
+tasks:
+- workunit:
+    clients:
+      client.0:
+        - rbd/diff_continuous.sh
+    env:
+      RBD_DEVICE_TYPE: "nbd"

diff --git a/qa/suites/rbd/nbd/% b/qa/suites/rbd/nbd/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/qa/suites/rbd/nbd/.qa b/qa/suites/rbd/nbd/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/rbd/nbd/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file

diff --git a/qa/suites/rbd/nbd/base b/qa/suites/rbd/nbd/base
deleted file mode 120000 (symlink)
index fd10a85..0000000
--- a/qa/suites/rbd/nbd/base
+++ /dev/null
@@ -1 +0,0 @@
-../thrash/base
\ No newline at end of file

diff --git a/qa/suites/rbd/nbd/cluster/+ b/qa/suites/rbd/nbd/cluster/+
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/qa/suites/rbd/nbd/cluster/.qa b/qa/suites/rbd/nbd/cluster/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/rbd/nbd/cluster/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file

diff --git a/qa/suites/rbd/nbd/cluster/fixed-3.yaml b/qa/suites/rbd/nbd/cluster/fixed-3.yaml
deleted file mode 100644 (file)
index 1825891..0000000
--- a/qa/suites/rbd/nbd/cluster/fixed-3.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-roles:
-- [mon.a, mon.c, osd.0, osd.1, osd.2]
-- [mon.b, mgr.x, osd.3, osd.4, osd.5]
-- [client.0]

diff --git a/qa/suites/rbd/nbd/cluster/openstack.yaml b/qa/suites/rbd/nbd/cluster/openstack.yaml
deleted file mode 120000 (symlink)
index 48becbb..0000000
--- a/qa/suites/rbd/nbd/cluster/openstack.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../thrash/clusters/openstack.yaml
\ No newline at end of file

diff --git a/qa/suites/rbd/nbd/conf b/qa/suites/rbd/nbd/conf
deleted file mode 120000 (symlink)
index 4bc0fe8..0000000
--- a/qa/suites/rbd/nbd/conf
+++ /dev/null
@@ -1 +0,0 @@
-.qa/rbd/conf
\ No newline at end of file

diff --git a/qa/suites/rbd/nbd/msgr-failures b/qa/suites/rbd/nbd/msgr-failures
deleted file mode 120000 (symlink)
index 03689aa..0000000
--- a/qa/suites/rbd/nbd/msgr-failures
+++ /dev/null
@@ -1 +0,0 @@
-../thrash/msgr-failures
\ No newline at end of file

diff --git a/qa/suites/rbd/nbd/objectstore b/qa/suites/rbd/nbd/objectstore
deleted file mode 120000 (symlink)
index c40bd32..0000000
--- a/qa/suites/rbd/nbd/objectstore
+++ /dev/null
@@ -1 +0,0 @@
-.qa/objectstore
\ No newline at end of file

diff --git a/qa/suites/rbd/nbd/supported-random-distro$ b/qa/suites/rbd/nbd/supported-random-distro$
deleted file mode 120000 (symlink)
index 0862b44..0000000
--- a/qa/suites/rbd/nbd/supported-random-distro$
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/supported-random-distro$
\ No newline at end of file

diff --git a/qa/suites/rbd/nbd/thrashers b/qa/suites/rbd/nbd/thrashers
deleted file mode 120000 (symlink)
index f461dad..0000000
--- a/qa/suites/rbd/nbd/thrashers
+++ /dev/null
@@ -1 +0,0 @@
-../thrash/thrashers
\ No newline at end of file

diff --git a/qa/suites/rbd/nbd/thrashosds-health.yaml b/qa/suites/rbd/nbd/thrashosds-health.yaml
deleted file mode 120000 (symlink)
index 9124eb1..0000000
--- a/qa/suites/rbd/nbd/thrashosds-health.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/tasks/thrashosds-health.yaml
\ No newline at end of file

diff --git a/qa/suites/rbd/nbd/workloads/.qa b/qa/suites/rbd/nbd/workloads/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/rbd/nbd/workloads/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file

diff --git a/qa/suites/rbd/nbd/workloads/rbd_fsx_nbd.yaml b/qa/suites/rbd/nbd/workloads/rbd_fsx_nbd.yaml
deleted file mode 100644 (file)
index b573767..0000000
--- a/qa/suites/rbd/nbd/workloads/rbd_fsx_nbd.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-overrides:
-  install:
-    ceph:
-      extra_packages: [rbd-nbd]
-tasks:
-- rbd_fsx:
-    clients: [client.0]
-    ops: 6000
-    nbd: True
-    holebdy: 512
-    punch_holes: true
-    readbdy: 512
-    truncbdy: 512
-    writebdy: 512

diff --git a/qa/suites/rbd/nbd/workloads/rbd_nbd.yaml b/qa/suites/rbd/nbd/workloads/rbd_nbd.yaml
deleted file mode 100644 (file)
index ededea0..0000000
--- a/qa/suites/rbd/nbd/workloads/rbd_nbd.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-overrides:
-  install:
-    ceph:
-      extra_packages: [rbd-nbd]
-tasks:
-- workunit:
-    clients:
-      client.0:
-        - rbd/rbd-nbd.sh

diff --git a/qa/suites/rbd/nbd/workloads/rbd_nbd_diff_continuous.yaml b/qa/suites/rbd/nbd/workloads/rbd_nbd_diff_continuous.yaml
deleted file mode 100644 (file)
index e0a7ebe..0000000
--- a/qa/suites/rbd/nbd/workloads/rbd_nbd_diff_continuous.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-overrides:
-  install:
-    ceph:
-      extra_packages:
-        - rbd-nbd
-      extra_system_packages:
-        - pv
-tasks:
-- workunit:
-    clients:
-      client.0:
-        - rbd/diff_continuous.sh
-    env:
-      RBD_DEVICE_TYPE: "nbd"