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 <[email protected]>

Author: VallariAg

…sic/clusters/2-gateways-2-initiator.yaml …sic/clusters/4-gateways-2-initiator.yamlqa/suites/nvmeof/basic/clusters/2-gateways-2-initiator.yaml renamed to qa/suites/nvmeof/basic/clusters/4-gateways-2-initiator.yaml qa/suites/nvmeof/basic/clusters/2-gateways-2-initiator.yaml renamed to qa/suites/nvmeof/basic/clusters/4-gateways-2-initiator.yaml

@@ -1,21 +1,26 @@
 roles:
+- - client.0
+- - client.1
 - - host.a
   - mon.a
   - mgr.x
   - osd.0
-  - osd.1
-  - client.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
-  - osd.4
-  - client.1
-  - ceph.nvmeof.nvmeof.b
-- - client.2
-- - client.3
+  - client.5
+  - ceph.nvmeof.nvmeof.d
 
 overrides:
   ceph:

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:

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:

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'
-

…ash/clusters/3-gateways-1-initiator.yaml …ash/clusters/4-gateways-1-initiator.yamlqa/suites/nvmeof/thrash/clusters/3-gateways-1-initiator.yaml renamed to qa/suites/nvmeof/thrash/clusters/4-gateways-1-initiator.yaml qa/suites/nvmeof/thrash/clusters/3-gateways-1-initiator.yaml renamed to qa/suites/nvmeof/thrash/clusters/4-gateways-1-initiator.yaml

@@ -1,26 +1,30 @@
 roles:
+- - client.0 # initiator
 - - host.a
   - mon.a
   - mgr.x
   - osd.0
   - osd.1
-  - client.0
+  - client.1
   - ceph.nvmeof.nvmeof.a
 - - host.b
   - mon.b
   - osd.2
   - osd.3
   - osd.4
-  - client.1
+  - client.2
   - ceph.nvmeof.nvmeof.b
 - - host.c
   - mon.c
   - osd.5
   - osd.6
   - osd.7
-  - client.2
+  - client.3
   - ceph.nvmeof.nvmeof.c
-- - client.3 # initiator
+- - host.d
+  - client.4
+  - ceph.nvmeof.nvmeof.d
+
 
 overrides:
   ceph:

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:

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:

qa/suites/nvmeof/thrash/thrashers/nvmeof_thrash.yaml

@@ -8,4 +8,4 @@ overrides:
 
 tasks:
 - nvmeof.thrash:
-    checker_host: 'client.3'
+    checker_host: 'client.0'

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

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()