Change the default in the devel conf file to cluster_connections instead of bdevs_per_cluster.

Fixes: #1685

Signed-off-by: Gil Bregman <[email protected]>

Author: gbregman

ceph-nvmeof.conf

@@ -83,11 +83,11 @@ client_cert = ./client.crt
 [spdk]
 # Support multiple cluster allocation strategies
 # Legacy strategy, per ANA grp, max bdevs_per_cluster
-bdevs_per_cluster = 32
+# bdevs_per_cluster = 32
 # Flat bdevs per cluster, ignore ANA grp id
 # flat_bdevs_per_cluster = 32
 # Cluster pool
-# cluster_connections = 32
+cluster_connections = 32
 tgt_path = /usr/local/bin/nvmf_tgt
 #rpc_socket_dir = /var/tmp/
 #rpc_socket_name = spdk.sock

tests/ceph-nvmeof.no-huge.conf

@@ -71,7 +71,7 @@ server_cert = ./server.crt
 client_cert = ./client.crt
 
 [spdk]
-bdevs_per_cluster = 32
+cluster_connections = 32
 mem_size=4096
 tgt_path = /usr/local/bin/nvmf_tgt
 #rpc_socket_dir = /var/tmp/

tests/ceph-nvmeof.tls.conf

@@ -70,7 +70,7 @@ server_cert = /etc/ceph/server.crt
 client_cert = /etc/ceph/client.crt
 
 [spdk]
-bdevs_per_cluster = 32
+cluster_connections = 32
 tgt_path = /usr/local/bin/nvmf_tgt
 #rpc_socket_dir = /var/tmp/
 #rpc_socket_name = spdk.sock

tests/test_cli.py

@@ -518,8 +518,8 @@ def test_add_namespace(self, caplog, gateway):
              "--rbd-image", image2, "--uuid", uuid, "--size", "16MB", "--rbd-create-image",
              "--load-balancing-group", anagrpid, "--force"])
         assert f"Adding namespace 1 to {subsystem}: Successful" in caplog.text
-        assert f"Allocated cluster name='cluster_context_{anagrpid}_0'" in caplog.text
-        assert f"get_cluster cluster_name='cluster_context_{anagrpid}_0'" in caplog.text
+        assert f"Allocated cluster name='cluster_{anagrpid}'" in caplog.text
+        assert "get_cluster cluster_name" not in caplog.text
         assert "no_auto_visible: False" in caplog.text
         caplog.clear()
         cli(["namespace", "add", "--subsystem", subsystem, "--rbd-pool", pool,
@@ -1699,7 +1699,7 @@ def test_list_namespaces_all_subsystems(self, caplog):
         cli(["--verbose", "namespace", "list", "--nsid", "1"])
         assert "Cluster" in caplog.text
         assert "(Configured)" in caplog.text
-        assert "cluster_context_1_0" in caplog.text
+        assert "cluster_1" in caplog.text
         assert f"{image2}" in caplog.text
         assert f"{image15}" in caplog.text
         assert "1 (1)" in caplog.text
@@ -1926,7 +1926,8 @@ def test_add_namespace_ana(self, caplog, gateway):
         cli(["namespace", "add", "--subsystem", subsystem, "--rbd-pool", pool,
              "--rbd-image", image, "--load-balancing-group", anagrpid, "--force", "--nsid", "10"])
         assert f"Adding namespace 10 to {subsystem}: Successful" in caplog.text
-        assert f"get_cluster cluster_name='cluster_context_{anagrpid}_0'" in caplog.text
+        assert f"Allocated cluster name='cluster_{anagrpid}'" in caplog.text
+        assert f"cluster_name cluster_{anagrpid}\n" in caplog.text
         caplog.clear()
         cli(["--format", "json", "namespace", "list", "--subsystem", subsystem, "--nsid", "10"])
         assert f'"load_balancing_group": {anagrpid}' in caplog.text

tests/test_cli_change_lb.py

@@ -186,7 +186,7 @@ def test_change_namespace_lb_group(caplog, two_gateways):
          "--load-balancing-group", anagrpid, "--force"])
     time.sleep(15)
     assert f"Adding namespace 1 to {subsystem}: Successful" in caplog.text
-    assert f"get_cluster cluster_name='cluster_context_{anagrpid}_0'" in caplog.text
+    assert f"Allocated cluster name='cluster_{anagrpid}'" in caplog.text
     assert f"Received request to add namespace to {subsystem}, ana group {anagrpid}, " \
            f"no_auto_visible: False, disable_auto_resize: False, " \
            f"read_only: False, " \
@@ -276,7 +276,7 @@ def test_change_namespace_lb_group(caplog, two_gateways):
          "--load-balancing-group", anagrpid2, "--force"])
     time.sleep(15)
     assert f"Adding namespace 2 to {subsystem}: Successful" in caplog.text
-    assert f"get_cluster cluster_name='cluster_context_{anagrpid2}_0'" in caplog.text
+    assert f"Allocated cluster name='cluster_{anagrpid2}'" in caplog.text
     assert f"Received request to add namespace to {subsystem}, ana group {anagrpid2}, " \
            f"no_auto_visible: False, disable_auto_resize: False, " \
            f"read_only: False, " \