qa/suites/nvmeof: increase hosts in cluster setup

In "nvmeof" task, change "client" config to "installer"
which allows to take inputs like "host.a".

nvmeof/basic: change 2-gateway-2-initiator to
	       4-gateway-2-inititator cluster
nvmeof/thrash: change 3-gateway-1-initiator to
	        4-gateway-1-inititaor cluster

Signed-off-by: Vallari Agrawal <val.agl002@gmail.com>

diff --git a/qa/suites/nvmeof/basic/clusters/2-gateways-2-initiator.yaml b/qa/suites/nvmeof/basic/clusters/2-gateways-2-initiator.yaml
deleted file mode 100644 (file)
index 56e6cc0..0000000
--- a/qa/suites/nvmeof/basic/clusters/2-gateways-2-initiator.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-roles:
-- - host.a
-  - mon.a
-  - mgr.x
-  - osd.0
-  - osd.1
-  - client.0
-  - ceph.nvmeof.nvmeof.a
-- - host.b
-  - mon.b
-  - mon.c
-  - osd.2
-  - osd.3
-  - osd.4
-  - client.1
-  - ceph.nvmeof.nvmeof.b
-- - client.2
-- - client.3
-
-overrides:
-  ceph:
-    conf:
-      mon:
-        # cephadm can take up to 5 minutes to bring up remaining mons
-        mon down mkfs grace: 300

diff --git a/qa/suites/nvmeof/basic/clusters/4-gateways-2-initiator.yaml b/qa/suites/nvmeof/basic/clusters/4-gateways-2-initiator.yaml
new file mode 100644 (file)
index 0000000..e8f390c
--- /dev/null
+++ b/qa/suites/nvmeof/basic/clusters/4-gateways-2-initiator.yaml
@@ -0,0 +1,30 @@
+roles:
+- - client.0
+- - client.1
+- - host.a
+  - mon.a
+  - mgr.x
+  - osd.0
+  - client.2
+  - ceph.nvmeof.nvmeof.a
+- - host.b
+  - mon.b
+  - osd.1
+  - client.3
+  - ceph.nvmeof.nvmeof.b
+- - host.c
+  - mon.c
+  - osd.2
+  - client.4
+  - ceph.nvmeof.nvmeof.c
+- - host.d
+  - osd.3
+  - client.5
+  - ceph.nvmeof.nvmeof.d
+
+overrides:
+  ceph:
+    conf:
+      mon:
+        # cephadm can take up to 5 minutes to bring up remaining mons
+        mon down mkfs grace: 300

diff --git a/qa/suites/nvmeof/basic/workloads/nvmeof_initiator.yaml b/qa/suites/nvmeof/basic/workloads/nvmeof_initiator.yaml
index 3e925ee6a13f2b4bbe4c199def109378448561c2..2e4741e8140796f4b0e507106d0723d975db797b 100644 (file)
--- a/qa/suites/nvmeof/basic/workloads/nvmeof_initiator.yaml
+++ b/qa/suites/nvmeof/basic/workloads/nvmeof_initiator.yaml
@@ -1,6 +1,6 @@
 tasks:
 - nvmeof:
-    client: client.0
+    installer: host.a
     gw_image: quay.io/ceph/nvmeof:1.2 # "default" is the image cephadm defaults to; change to test specific nvmeof images, example "latest"
     rbd:
       pool_name: mypool
@@ -16,7 +16,7 @@ tasks:
 - workunit:
     no_coverage_and_limits: true
     clients:
-      client.2:
+      client.0:
         - nvmeof/setup_subsystem.sh
     env:
       RBD_POOL: mypool
@@ -26,10 +26,10 @@ tasks:
     no_coverage_and_limits: true
     timeout: 30m
     clients:
-      client.2:
+      client.0:
         - nvmeof/basic_tests.sh
         - nvmeof/fio_test.sh --start_ns 1 --end_ns 30 --rbd_iostat
-      client.3:
+      client.1:
         - nvmeof/basic_tests.sh
         - nvmeof/fio_test.sh --start_ns 31 --end_ns 60
     env:

diff --git a/qa/suites/nvmeof/basic/workloads/nvmeof_namespaces.yaml b/qa/suites/nvmeof/basic/workloads/nvmeof_namespaces.yaml
index c87c3c2be1cac65d2d1d5e0e3abba4439df4a1aa..abea2e22a8745bcba096ab02171e5637a883de0b 100644 (file)
--- a/qa/suites/nvmeof/basic/workloads/nvmeof_namespaces.yaml
+++ b/qa/suites/nvmeof/basic/workloads/nvmeof_namespaces.yaml
@@ -1,6 +1,6 @@
 tasks:
 - nvmeof:
-    client: client.0
+    installer: host.a
     gw_image: quay.io/ceph/nvmeof:1.2 # "default" is the image cephadm defaults to; change to test specific nvmeof images, example "latest"
     rbd:
       pool_name: mypool
@@ -16,7 +16,7 @@ tasks:
 - workunit:
     no_coverage_and_limits: true
     clients:
-      client.2:
+      client.0:
         - nvmeof/setup_subsystem.sh
     env:
       RBD_POOL: mypool
@@ -26,10 +26,10 @@ tasks:
     no_coverage_and_limits: true
     timeout: 30m
     clients:
-      client.2:
+      client.0:
         - nvmeof/basic_tests.sh
         - nvmeof/fio_test.sh --rbd_iostat
-      client.3:
+      client.1:
         - nvmeof/basic_tests.sh
         - nvmeof/namespace_test.sh
     env:

diff --git a/qa/suites/nvmeof/basic/workloads/nvmeof_scalability.yaml b/qa/suites/nvmeof/basic/workloads/nvmeof_scalability.yaml
index 4720821c21ed3a702aeaa49a8f556d3d481b1f10..f496a67af09c412f7c65ed1751443d4688c02d1f 100644 (file)
--- a/qa/suites/nvmeof/basic/workloads/nvmeof_scalability.yaml
+++ b/qa/suites/nvmeof/basic/workloads/nvmeof_scalability.yaml
@@ -1,6 +1,6 @@
 tasks:
 - nvmeof:
-    client: client.0
+    installer: host.a
     gw_image: quay.io/ceph/nvmeof:1.2 # "default" is the image cephadm defaults to; change to test specific nvmeof images, example "latest"
     rbd:
       pool_name: mypool
@@ -17,7 +17,7 @@ tasks:
     no_coverage_and_limits: true
     timeout: 30m
     clients:
-      client.2:
+      client.0:
         - nvmeof/setup_subsystem.sh
         - nvmeof/basic_tests.sh
         - nvmeof/fio_test.sh --rbd_iostat
@@ -31,9 +31,8 @@ tasks:
     no_coverage_and_limits: true
     timeout: 30m
     clients:
-      client.2:
-        - nvmeof/scalability_test.sh nvmeof.a
-        - nvmeof/scalability_test.sh nvmeof.b 
+      client.0:
+        - nvmeof/scalability_test.sh nvmeof.a,nvmeof.b
+        - nvmeof/scalability_test.sh nvmeof.b,nvmeof.c,nvmeof.d
     env:
       SCALING_DELAYS: '50'
-

diff --git a/qa/suites/nvmeof/thrash/clusters/3-gateways-1-initiator.yaml b/qa/suites/nvmeof/thrash/clusters/3-gateways-1-initiator.yaml
deleted file mode 100644 (file)
index afe0ed7..0000000
--- a/qa/suites/nvmeof/thrash/clusters/3-gateways-1-initiator.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-roles:
-- - host.a
-  - mon.a
-  - mgr.x
-  - osd.0
-  - osd.1
-  - client.0
-  - ceph.nvmeof.nvmeof.a
-- - host.b
-  - mon.b
-  - osd.2
-  - osd.3
-  - osd.4
-  - client.1
-  - ceph.nvmeof.nvmeof.b
-- - host.c
-  - mon.c
-  - osd.5
-  - osd.6
-  - osd.7
-  - client.2
-  - ceph.nvmeof.nvmeof.c
-- - client.3 # initiator
-
-overrides:
-  ceph:
-    conf:
-      mon:
-        # cephadm can take up to 5 minutes to bring up remaining mons
-        mon down mkfs grace: 300

diff --git a/qa/suites/nvmeof/thrash/clusters/4-gateways-1-initiator.yaml b/qa/suites/nvmeof/thrash/clusters/4-gateways-1-initiator.yaml
new file mode 100644 (file)
index 0000000..37c727e
--- /dev/null
+++ b/qa/suites/nvmeof/thrash/clusters/4-gateways-1-initiator.yaml
@@ -0,0 +1,34 @@
+roles:
+- - client.0 # initiator
+- - host.a
+  - mon.a
+  - mgr.x
+  - osd.0
+  - osd.1
+  - client.1
+  - ceph.nvmeof.nvmeof.a
+- - host.b
+  - mon.b
+  - osd.2
+  - osd.3
+  - osd.4
+  - client.2
+  - ceph.nvmeof.nvmeof.b
+- - host.c
+  - mon.c
+  - osd.5
+  - osd.6
+  - osd.7
+  - client.3
+  - ceph.nvmeof.nvmeof.c
+- - host.d
+  - client.4
+  - ceph.nvmeof.nvmeof.d
+
+
+overrides:
+  ceph:
+    conf:
+      mon:
+        # cephadm can take up to 5 minutes to bring up remaining mons
+        mon down mkfs grace: 300

diff --git a/qa/suites/nvmeof/thrash/gateway-initiator-setup/3-subsys-60-namespace.yaml b/qa/suites/nvmeof/thrash/gateway-initiator-setup/3-subsys-60-namespace.yaml
index d545f9733824f22d9f2165ad91e4b426a261ab1e..6db0c0d4e18290547dee1992a4f8b0cc3d41a2fe 100644 (file)
--- a/qa/suites/nvmeof/thrash/gateway-initiator-setup/3-subsys-60-namespace.yaml
+++ b/qa/suites/nvmeof/thrash/gateway-initiator-setup/3-subsys-60-namespace.yaml
@@ -1,6 +1,6 @@
 tasks:
 - nvmeof:
-    client: client.0
+    installer: host.a
     gw_image: quay.io/ceph/nvmeof:1.2 # "default" is the image cephadm defaults to; change to test specific nvmeof images, example "latest"
     rbd:
       pool_name: mypool
@@ -16,7 +16,7 @@ tasks:
 - workunit:
     no_coverage_and_limits: true
     clients:
-      client.3:
+      client.0:
         - nvmeof/setup_subsystem.sh
         - nvmeof/basic_tests.sh
     env:

diff --git a/qa/suites/nvmeof/thrash/thrashers/nvmeof_mon_thrash.yaml b/qa/suites/nvmeof/thrash/thrashers/nvmeof_mon_thrash.yaml
index 4306de99e4d26cd71b279d60820e510d422634c7..6a5bd1d754ec13ca821ef95c71640d0a03172d56 100644 (file)
--- a/qa/suites/nvmeof/thrash/thrashers/nvmeof_mon_thrash.yaml
+++ b/qa/suites/nvmeof/thrash/thrashers/nvmeof_mon_thrash.yaml
@@ -13,7 +13,7 @@ overrides:
 
 tasks:
 - nvmeof.thrash:
-    checker_host: 'client.3'
+    checker_host: 'client.0'
     switch_thrashers: True
 
 - mon_thrash:

diff --git a/qa/suites/nvmeof/thrash/thrashers/nvmeof_thrash.yaml b/qa/suites/nvmeof/thrash/thrashers/nvmeof_thrash.yaml
index 0271e410f7c18eac2131d7f9a6b56dbf91f2bca2..422c821536a6216fdcd7914c9ce9cabc8ad95374 100644 (file)
--- a/qa/suites/nvmeof/thrash/thrashers/nvmeof_thrash.yaml
+++ b/qa/suites/nvmeof/thrash/thrashers/nvmeof_thrash.yaml
@@ -8,4 +8,4 @@ overrides:
 
 tasks:
 - nvmeof.thrash:
-    checker_host: 'client.3'
+    checker_host: 'client.0'

diff --git a/qa/suites/nvmeof/thrash/workloads/fio.yaml b/qa/suites/nvmeof/thrash/workloads/fio.yaml
index 46630a68281c45db99a3e08eed9ca27b6d54db81..b042b92d6ae413df5927c7bd26ed4233702bcbd2 100644 (file)
--- a/qa/suites/nvmeof/thrash/workloads/fio.yaml
+++ b/qa/suites/nvmeof/thrash/workloads/fio.yaml
@@ -3,7 +3,7 @@ tasks:
     no_coverage_and_limits: true
     timeout: 30m
     clients:
-      client.3:
+      client.0:
         - nvmeof/fio_test.sh --rbd_iostat
     env:
       RBD_POOL: mypool

diff --git a/qa/tasks/nvmeof.py b/qa/tasks/nvmeof.py
index d5b35bbd73342bd7cc0fbc56bc3ab950def76aa4..b89f123c97e032e2c0de958ade63332fa166bce4 100644 (file)
--- a/qa/tasks/nvmeof.py
+++ b/qa/tasks/nvmeof.py
@@ -24,7 +24,7 @@ class Nvmeof(Task):
     Setup nvmeof gateway on client and then share gateway config to target host.
 
         - nvmeof:
-            client: client.0
+            installer: host.a     // or 'nvmeof.nvmeof.a' 
             version: default
             rbd:
                 pool_name: mypool
@@ -38,15 +38,11 @@ class Nvmeof(Task):
     def setup(self):
         super(Nvmeof, self).setup()
         try:
-            self.client = self.config['client']
+            host = self.config['installer']
         except KeyError:
-            raise ConfigError('nvmeof requires a client to connect with')
-
-        self.cluster_name, type_, self.client_id = misc.split_role(self.client)
-        if type_ != 'client':
-            msg = 'client role ({0}) must be a client'.format(self.client)
-            raise ConfigError(msg)
-        self.remote = get_remote_for_role(self.ctx, self.client)
+            raise ConfigError('nvmeof requires a installer host to deploy service') 
+        self.cluster_name, _, _ = misc.split_role(host)
+        self.remote = get_remote_for_role(self.ctx, host)  
 
     def begin(self):
         super(Nvmeof, self).begin()